From 8e185cc65e41aa786a11b765db33dce9d2a72e8b Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 4 Aug 2015 00:31:57 +0200 Subject: added commit for removal in "native" mode --- mainwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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.\""); } } -- cgit v1.2.3 From c8298134303e6907afdfd154511bedef9ab056bb Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 4 Aug 2015 01:01:20 +0200 Subject: just the visual objets for auto push/pull --- dialog.ui | 59 ++++++++++++++++++++++++++++++++++++----------------------- mainwindow.ui | 11 +++++------ 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dialog.ui b/dialog.ui index 4d431fe9..7ba7f8d2 100644 --- a/dialog.ui +++ b/dialog.ui @@ -208,7 +208,7 @@ - + @@ -235,14 +235,7 @@ - - - - Automatically add .gpg-id files - - - - + true @@ -287,17 +280,17 @@ - + Use TrayIcon - - + + - Hide on close + Hide content @@ -311,14 +304,14 @@ - - + + - Hide content + Hide on close - + true @@ -335,7 +328,7 @@ - + true @@ -345,7 +338,14 @@ - + + + + Start minimized + + + + true @@ -355,10 +355,24 @@ - - + + - Start minimized + Automatically add .gpg-id files + + + + + + + Automatically push updates + + + + + + + Automatically pull in updates @@ -508,7 +522,6 @@ checkBoxHidePassword checkBoxHideContent checkBoxUseGit - checkBoxAddGPGId checkBoxUseTrayIcon checkBoxHideOnClose profileTable diff --git a/mainwindow.ui b/mainwindow.ui index 22d221f0..6e0eae9c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -160,12 +160,11 @@ <!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> +</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> -- cgit v1.2.3