From 86da625d9a59706df7c6268363cc67eab2e75718 Mon Sep 17 00:00:00 2001 From: Jonathan Klimt Date: Thu, 28 Jan 2016 15:04:31 +0100 Subject: [PATCH 1/3] Settings tab in configuration is the first that shows up when opening the config window --- configdialog.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configdialog.ui b/configdialog.ui index 1f612d179..3c6465b68 100644 --- a/configdialog.ui +++ b/configdialog.ui @@ -6,7 +6,7 @@ 0 0 - 561 + 564 526 @@ -29,7 +29,7 @@ - 1 + 0 From 5adcc4a68a63c8a932b6dd1f800f8306b6b6e87a Mon Sep 17 00:00:00 2001 From: Jonathan Klimt Date: Thu, 28 Jan 2016 15:23:34 +0100 Subject: [PATCH 2/3] removed the seperate clearbutton and inserted background text to the search bar --- mainwindow.cpp | 5 ----- mainwindow.h | 1 - mainwindow.ui | 38 +++++++++++--------------------------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 75cf02887..678d51c3a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1002,11 +1002,6 @@ QModelIndex MainWindow::firstFile(QModelIndex parentIndex) { return index; } -/** - * @brief MainWindow::on_clearButton_clicked - */ -void MainWindow::on_clearButton_clicked() { ui->lineEdit->clear(); } - /** * @brief MainWindow::getRecipientList * @param for_file diff --git a/mainwindow.h b/mainwindow.h index 9f32e4ba2..1a3825746 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -74,7 +74,6 @@ class MainWindow : public QMainWindow { void clearPanel(); void on_lineEdit_textChanged(const QString &arg1); void on_lineEdit_returnPressed(); - void on_clearButton_clicked(); void on_addButton_clicked(); void on_deleteButton_clicked(); void on_editButton_clicked(); diff --git a/mainwindow.ui b/mainwindow.ui index b96685ca8..f1d585ad5 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 398 + 855 291 @@ -292,29 +292,14 @@ 26 - - - - - - - 0 - 26 - - - - Clear search - - X + - - - :/icons/edit-clear.svg - + + Search Password - - Qt::ToolButtonIconOnly + + true @@ -346,11 +331,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:'.SF NS Text'; 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><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; 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'; 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'; text-decoration: underline; color:#4183c4;">issues</span></a><span style=" font-family:'Helvetica Neue,Helvetica,Segoe UI,Arial,freesans,sans-serif'; 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'; 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:'Noto Sans'; 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> @@ -370,7 +355,6 @@ p, li { white-space: pre-wrap; } lineEdit - clearButton addButton editButton deleteButton From 8013d233c23e121a2f45c083d647d912ab0fdc53 Mon Sep 17 00:00:00 2001 From: Jonathan Klimt Date: Fri, 29 Jan 2016 15:24:55 +0100 Subject: [PATCH 3/3] Esc Key clears search field --- mainwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 678d51c3a..00a62d1ec 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1585,6 +1585,9 @@ void MainWindow::keyPressEvent(QKeyEvent * event) { case Qt::Key_Enter: on_editButton_clicked(); break; + case Qt::Key_Escape: + ui->lineEdit->clear(); + break; default: break; }