Manually merged version conflict (litteral) and features for git integration and hanling of pwgen

4 files changed, 12 insertions, 4 deletions

diff --git a/dialog.cpp b/dialog.cpp
index 00a74994..22192eaa 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -615,6 +615,10 @@ void Dialog::on_toolButtonPwgen_clicked()
     QString pwgen = selectExecutable();
     if (!pwgen.isEmpty()) {
         ui->pwgenPath->setText(pwgen);
+        ui->checkBoxUsePwgen->setEnabled(true);
+    } else {
+        ui->checkBoxUsePwgen->setEnabled(false);
+        ui->checkBoxUsePwgen->setChecked(false);
     }
 }
 
@@ -635,6 +639,7 @@ void Dialog::setPwgenPath(QString pwgen)
     ui->pwgenPath->setText(pwgen);
     if (pwgen.isEmpty()) {
         ui->checkBoxUsePwgen->setChecked(false);
+        ui->checkBoxUsePwgen->setEnabled(false);
     }
     on_checkBoxUsePwgen_clicked();
 }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7b6152ec..9e719643 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -974,8 +974,11 @@ void MainWindow::on_deleteButton_clicked()
             currentAction = DELETE;
             executePass("rm -f \"" + file + '"');
         } else {
-            // TODO GIT
-            QFile(file).remove();
+            if (useGit) {
+                executeWrapper(gitExecutable, "rm -f \"" + file + '"');
+            } else {
+                QFile(file).remove();
+            }
         }
     } else {
         file = getDir(ui->treeView->currentIndex(), usePass);
diff --git a/qtpass.iss b/qtpass.iss
index 9cb9161f..2cd3556a 100644
--- a/qtpass.iss
+++ b/qtpass.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

 

 #define MyAppName "QtPass"

-#define MyAppVersion "0.9.0"

+#define MyAppVersion "0.9.1"

 #define MyAppPublisher "IJhack"

 #define MyAppURL "http://qtpass.org/"

 #define MyAppExeName "qtpass.exe"

diff --git a/qtpass.pro b/qtpass.pro
index d1589b7a..1607f770 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -18,7 +18,7 @@ macx {
 }
 
 TEMPLATE   = app
-VERSION    = 0.9.0
+VERSION    = 0.9.1
 
 SOURCES   += main.cpp\
              mainwindow.cpp \