diff options
author | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-08-05 20:25:05 +0200 |
---|---|---|
committer | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-08-05 20:25:05 +0200 |
commit | 3bdfa73ff1b3d378cfca3c21db22d784ddea6f88 (patch) | |
tree | 958aa56b8a8186e279b1f1964a31b2ec1532b7a8 | |
parent | 53974da3025603a6bee304efceb43746a57bb86f (diff) | |
parent | c8298134303e6907afdfd154511bedef9ab056bb (diff) |
Merge branch 'develop' of github.com:IJHack/qtpass into develop
-rw-r--r-- | dialog.ui | 59 | ||||
-rw-r--r-- | mainwindow.cpp | 5 | ||||
-rw-r--r-- | mainwindow.ui | 11 |
3 files changed, 44 insertions, 31 deletions
@@ -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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-weight:600; color:#333333;">QtPass</span><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; color:#333333;"> is a GUI for </span><a href="http://www.passwordstore.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;">pass</span></a>, the standard unix password manager.</p> -<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please report any <a href="https://github.com/IJHack/qtpass/issues"><span style=" text-decoration: underline; color:#4183c4;">issues</span></a> you might have with this software.</p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://qtpass.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;">Documentation</span></a></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/IJHack/qtpass"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; text-decoration: underline; color:#4183c4; background-color:transparent;">Source code</span></a></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; font-weight:600; color:#333333;">QtPass</span><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"> is a GUI for </span><a href="http://www.passwordstore.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;">pass</span></a><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;">, the standard unix password manager.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"><br />Please report any </span><a href="https://github.com/IJHack/qtpass/issues"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4;">issues</span></a><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; color:#333333;"> you might have with this software.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://qtpass.org/"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;">Documentation</span></a></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/IJHack/qtpass"><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; font-size:13pt; text-decoration: underline; color:#4183c4; background-color:transparent;">Source code</span></a></p></body></html></string> </property> </widget> </widget> |