Merge branch 'develop' of github.com:IJHack/qtpass into develop

3 files changed, 44 insertions, 31 deletions

diff --git a/dialog.ui b/dialog.ui
index 4d431fe9..7ba7f8d2 100644
--- a/dialog.ui
+++ b/dialog.ui
@@ -208,7 +208,7 @@
        </property>
        <item>
         <layout class="QGridLayout" name="gridLayout_2">
-         <item row="3" column="3">
+         <item row="4" column="3">
           <layout class="QHBoxLayout" name="horizontalLayout_6">
            <item>
             <widget class="QSpinBox" name="spinBoxPasswordLength">
@@ -235,14 +235,7 @@
            </item>
           </layout>
          </item>
-         <item row="2" column="1" colspan="2">
-          <widget class="QCheckBox" name="checkBoxAddGPGId">
-           <property name="text">
-            <string>Automatically add .gpg-id files</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
+         <item row="4" column="0">
           <widget class="QCheckBox" name="checkBoxUsePwgen">
            <property name="enabled">
             <bool>true</bool>
@@ -287,17 +280,17 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="0">
+         <item row="6" column="0">
           <widget class="QCheckBox" name="checkBoxUseTrayIcon">
            <property name="text">
             <string>Use TrayIcon</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
-          <widget class="QCheckBox" name="checkBoxHideOnClose">
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="checkBoxHideContent">
            <property name="text">
-            <string>Hide on close</string>
+            <string>Hide content</string>
            </property>
           </widget>
          </item>
@@ -311,14 +304,14 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="checkBoxHideContent">
+         <item row="6" column="1">
+          <widget class="QCheckBox" name="checkBoxHideOnClose">
            <property name="text">
-            <string>Hide content</string>
+            <string>Hide on close</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
+         <item row="4" column="1">
           <widget class="QCheckBox" name="checkBoxUseSymbols">
            <property name="enabled">
             <bool>true</bool>
@@ -335,7 +328,7 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="1" colspan="3">
+         <item row="5" column="1" colspan="3">
           <widget class="QLineEdit" name="lineEditPasswordChars">
            <property name="enabled">
             <bool>true</bool>
@@ -345,7 +338,14 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
+         <item row="6" column="2">
+          <widget class="QCheckBox" name="checkBoxStartMinimized">
+           <property name="text">
+            <string>Start minimized</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
           <widget class="QLabel" name="labelPasswordChars">
            <property name="enabled">
             <bool>true</bool>
@@ -355,10 +355,24 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="2">
-          <widget class="QCheckBox" name="checkBoxStartMinimized">
+         <item row="2" column="3">
+          <widget class="QCheckBox" name="checkBoxAddGPGId">
            <property name="text">
-            <string>Start minimized</string>
+            <string>Automatically add .gpg-id files</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <widget class="QCheckBox" name="checkBoxAutoPush">
+           <property name="text">
+            <string>Automatically push updates</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QCheckBox" name="checkBoxAutoPull">
+           <property name="text">
+            <string>Automatically pull in updates</string>
            </property>
           </widget>
          </item>
@@ -508,7 +522,6 @@
   <tabstop>checkBoxHidePassword</tabstop>
   <tabstop>checkBoxHideContent</tabstop>
   <tabstop>checkBoxUseGit</tabstop>
-  <tabstop>checkBoxAddGPGId</tabstop>
   <tabstop>checkBoxUseTrayIcon</tabstop>
   <tabstop>checkBoxHideOnClose</tabstop>
   <tabstop>profileTable</tabstop>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ff504121..6b74e90d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -938,7 +938,7 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false)
             QString path = file;
             path.replace(QRegExp("\\.gpg$"), "");
             path.replace(QRegExp("^" + passStore), "");
-            executeWrapper(gitExecutable, "commit \"" + file + "\" -m \"" + (overwrite ? "Edit" : "Add") + " for " + path + " using QtPass\"");
+            executeWrapper(gitExecutable, "commit \"" + file + "\" -m \"" + (overwrite ? "Edit" : "Add") + " for " + path + " using QtPass.\"");
         }
     }
 }
@@ -985,6 +985,7 @@ void MainWindow::on_deleteButton_clicked()
         } else {
             if (useGit) {
                 executeWrapper(gitExecutable, "rm -f \"" + file + '"');
+                executeWrapper(gitExecutable, "commit \"" + file + "\" -m \" Remove for " + getFile(ui->treeView->currentIndex(), true) + " using QtPass.\"");
             } else {
                 QFile(file).remove();
             }
@@ -1189,7 +1190,7 @@ void MainWindow::on_usersButton_clicked()
         }
         QString path = gpgIdFile;
         path.replace(QRegExp("\\.gpg$"), "");
-        executeWrapper(gitExecutable, "commit \"" + gpgIdFile + "\" -m \"Added "+ path + " using QtPass\"");
+        executeWrapper(gitExecutable, "commit \"" + gpgIdFile + "\" -m \"Added "+ path + " using QtPass.\"");
     }
 }
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 22d221f0..6e0eae9c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -160,12 +160,11 @@
         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-weight:600; color:#333333;&quot;&gt;QtPass&lt;/span&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; color:#333333;&quot;&gt; is a GUI for &lt;/span&gt;&lt;a href=&quot;http://www.passwordstore.org/&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;pass&lt;/span&gt;&lt;/a&gt;, the standard unix password manager.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please report any &lt;a href=&quot;https://github.com/IJHack/qtpass/issues&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4183c4;&quot;&gt;issues&lt;/span&gt;&lt;/a&gt; you might have with this software.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://qtpass.org/&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Documentation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/IJHack/qtpass&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Source code&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; font-weight:600; color:#333333;&quot;&gt;QtPass&lt;/span&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;&quot;&gt; is a GUI for &lt;/span&gt;&lt;a href=&quot;http://www.passwordstore.org/&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;pass&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;&quot;&gt;, the standard unix password manager.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;&quot;&gt;&lt;br /&gt;Please report any &lt;/span&gt;&lt;a href=&quot;https://github.com/IJHack/qtpass/issues&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4;&quot;&gt;issues&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;&quot;&gt; you might have with this software.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://qtpass.org/&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Documentation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/IJHack/qtpass&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;&quot;&gt;Source code&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </widget>