From 223c5a165174761675337abed9576a81898d550e Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 12 Jan 2014 17:08:36 +0100 Subject: [PATCH] Use an icon for the button that shows/masks passwords. Closes #38 Additionally make use of the new PasswordEdit class where possible. --- COPYING | 1 + .../16x16/actions/password-show-off.png | Bin 0 -> 783 bytes .../16x16/actions/password-show-on.png | Bin 0 -> 838 bytes src/gui/ChangeMasterKeyWidget.cpp | 13 +++--- src/gui/ChangeMasterKeyWidget.h | 1 - src/gui/ChangeMasterKeyWidget.ui | 17 ++++---- src/gui/DatabaseOpenWidget.cpp | 10 ++--- src/gui/DatabaseOpenWidget.h | 1 - src/gui/DatabaseOpenWidget.ui | 15 +++---- src/gui/entry/EditEntryWidget.cpp | 38 +++--------------- src/gui/entry/EditEntryWidget.h | 5 --- src/gui/entry/EditEntryWidgetMain.ui | 15 ++++--- 12 files changed, 39 insertions(+), 77 deletions(-) create mode 100644 share/icons/application/16x16/actions/password-show-off.png create mode 100644 share/icons/application/16x16/actions/password-show-on.png diff --git a/COPYING b/COPYING index fbb9b2820..7dbc29c1c 100644 --- a/COPYING +++ b/COPYING @@ -134,6 +134,7 @@ Files: share/icons/application/*/actions/application-exit.png share/icons/application/*/actions/document-save-as.png share/icons/application/*/actions/edit-clear-locationbar-ltr.png share/icons/application/*/actions/edit-clear-locationbar-rtl.png + share/icons/application/*/actions/password-show-*.png share/icons/application/*/actions/system-search.png share/icons/application/*/status/dialog-error.png share/icons/application/*/status/dialog-information.png diff --git a/share/icons/application/16x16/actions/password-show-off.png b/share/icons/application/16x16/actions/password-show-off.png new file mode 100644 index 0000000000000000000000000000000000000000..24277f6dea1913a153409028f33509d285ac89fa GIT binary patch literal 783 zcmV+q1MvKbP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0B*Vf0B*Vg*50uf00007bV*G`2iXY{ z02>=Ewir|Z00NImL_t(|+ND!ZNLq0m|30T<{zngiHO!T@!=N$U#Zk=7)-ExI-Mk3e z!9xte4r2`Qu!EE3wo8Oyw@Nddj5)N!vbqdg9)caF;79_?lBf18W6In2_gL@-ZI?bE z?~A8_hh zrYA!~L(dY4gc+Of5}|Mr{C@ujkx0}F7enTDyH_HS$TvWEymJ|w_{&1Ta% z9FBfc^He?$g+lL1Ef5HRfWkeg@$qpp#O@C=`k>fk5CZN5FGm7LUi*tJSKZ*=({Zm5SjSm?(OaE0D>c67^Z7rV1QNP zw064<8=IT3vb+o!9aL$WBh_d$FfuYiNP5x8kLh&!7f0ap`CxHz(TclLG)=SUE|~@r znT&hN<#MRk>)cVHxnM9D06lty2j@N~AQ$)pQ!r$+S(>OQ?e4N;V`E%H71vR#)kGQj zk(!XQn8aJse+3Y^Tn_U2{641e4)48<-@$F1D#jCrzP>)zY&LU=;CT~Ih)4BQDm98q zN)-G9Q&Us-F!P74R_o@$!GRKQp;IoGD`?)v?CflGW@e`C@p$0U_zlzSGG8;ai&Fpq N002ovPDHLkV1k_*Wv&1K literal 0 HcmV?d00001 diff --git a/share/icons/application/16x16/actions/password-show-on.png b/share/icons/application/16x16/actions/password-show-on.png new file mode 100644 index 0000000000000000000000000000000000000000..ea53bd1c0b39c86e89eba3b2c32b5b4772bc19eb GIT binary patch literal 838 zcmV-M1G)T(P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0B*Vf0B*Vg*50uf00007bV*G`2iXY{ z023CQ-tOT500PEIL_t(|+NG0SNRwd{$N#Uct-Tw#IWsnC8nY&C?)Qq;m3uT`*41|PM7&QKeqPvI1pA~ zH~!$jb8(*kIsbDwI4Tqp;5ZHxMWL;&Et|*VT^0xgtlRB&+H5w~=kp;mGxPrfg@uL3 zi;Ii9mzS5XkpNB8P%4#>N~N~)@^Z^Tfkb!*kFv5dnk3FU9FFeE$w?i{vOcj`tjx*D zxk2Kg-EO}`KA#7`A&~@u_W-gEu`1T-bZ=T)TPHxMsj0zVXtmlB05lTNXf&q^3JS9S zvG};LvC$4fQc@E3p=2@{m6w-C4-E}%flyglSrLsyo^0>zr0__RP$Xi>Fzf5;>YjsO zG#abqa`|9KN5|K=K*IFJwY9awGcz;i#3?7Zj58W4%>IIB<{Ouuo<=F;a(9c>TC~2t z{?lMERP^@twj^#rSYKa1dF^F(4FyR2;*{mkpqKVNRt|F`b>Axui%) zuh(n(`ubdPBTY?BJq*LBs;jH8vMs^)z%C?9!eP^Z{SCqu8TGNKKWYw6v5827_7c?d^_% zfq_U|z+^Ikv~qK9ZjSOT_&J(mA-`}1ul#EmQ>u|FN&^${5CI7k3dR1$5Dtg0Ha9mv z0wLMua_z5dZF+jzL2TSA%vTF12B$co`ZgsxmH|5GLy??=IyW18dy)9SNf#WS&o?-o z&Zo&B%+AhYadB~Ze0=-`v&uv@D)HIfzz<<`#S8su0cXBzq$1H6LZJ}IZR`td^!NAc zHa9nY6b_-}y5VBOvj*+P)^?8HA4nm`^xNz8GDKvgtE=m^)oP7eEEXJ@KceF}5O#Zz Q)&Kwi07*qoM6N<$g3GCaPXGV_ literal 0 HcmV?d00001 diff --git a/src/gui/ChangeMasterKeyWidget.cpp b/src/gui/ChangeMasterKeyWidget.cpp index abe5f4b51..b6786f5cd 100644 --- a/src/gui/ChangeMasterKeyWidget.cpp +++ b/src/gui/ChangeMasterKeyWidget.cpp @@ -18,6 +18,7 @@ #include "ChangeMasterKeyWidget.h" #include "ui_ChangeMasterKeyWidget.h" +#include "core/FilePath.h" #include "keys/FileKey.h" #include "keys/PasswordKey.h" #include "gui/FileDialog.h" @@ -31,7 +32,9 @@ ChangeMasterKeyWidget::ChangeMasterKeyWidget(QWidget* parent) connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(generateKey())); connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject())); - connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), SLOT(togglePassword(bool))); + m_ui->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); + connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), m_ui->enterPasswordEdit, SLOT(setShowPassword(bool))); + m_ui->repeatPasswordEdit->enableVerifyMode(m_ui->enterPasswordEdit); connect(m_ui->createKeyFileButton, SIGNAL(clicked()), SLOT(createKeyFile())); connect(m_ui->browseKeyFileButton, SIGNAL(clicked()), SLOT(browseKeyFile())); } @@ -40,12 +43,6 @@ ChangeMasterKeyWidget::~ChangeMasterKeyWidget() { } -void ChangeMasterKeyWidget::togglePassword(bool checked) -{ - m_ui->enterPasswordEdit->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); - m_ui->repeatPasswordEdit->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); -} - void ChangeMasterKeyWidget::createKeyFile() { QString filters = QString("%1 (*.key);;%2 (*)").arg(tr("Key files"), tr("All files")); @@ -77,7 +74,7 @@ void ChangeMasterKeyWidget::clearForms() { m_key.clear(); - m_ui->passwordGroup->setChecked(true); + m_ui->passwordGroup->setChecked(false); m_ui->enterPasswordEdit->setText(""); m_ui->repeatPasswordEdit->setText(""); m_ui->keyFileGroup->setChecked(false); diff --git a/src/gui/ChangeMasterKeyWidget.h b/src/gui/ChangeMasterKeyWidget.h index 384aad2d1..46fc3efc9 100644 --- a/src/gui/ChangeMasterKeyWidget.h +++ b/src/gui/ChangeMasterKeyWidget.h @@ -45,7 +45,6 @@ Q_SIGNALS: private Q_SLOTS: void generateKey(); void reject(); - void togglePassword(bool checked); void createKeyFile(); void browseKeyFile(); diff --git a/src/gui/ChangeMasterKeyWidget.ui b/src/gui/ChangeMasterKeyWidget.ui index 712e91f65..862a7a925 100644 --- a/src/gui/ChangeMasterKeyWidget.ui +++ b/src/gui/ChangeMasterKeyWidget.ui @@ -52,7 +52,7 @@ - + QLineEdit::Password @@ -60,15 +60,9 @@ - - ... - true - - true - @@ -81,7 +75,7 @@ - + QLineEdit::Password @@ -151,6 +145,13 @@ + + + PasswordEdit + QLineEdit +
gui/PasswordEdit.h
+ + passwordGroup enterPasswordEdit diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp index 4adb9b3a0..973192523 100644 --- a/src/gui/DatabaseOpenWidget.cpp +++ b/src/gui/DatabaseOpenWidget.cpp @@ -20,6 +20,7 @@ #include "core/Config.h" #include "core/Database.h" +#include "core/FilePath.h" #include "gui/FileDialog.h" #include "gui/MessageBox.h" #include "format/KeePass2Reader.h" @@ -40,7 +41,9 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent) m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - connect(m_ui->buttonTogglePassword, SIGNAL(toggled(bool)), SLOT(togglePassword(bool))); + m_ui->buttonTogglePassword->setIcon(filePath()->onOffIcon("actions", "password-show")); + connect(m_ui->buttonTogglePassword, SIGNAL(toggled(bool)), + m_ui->editPassword, SLOT(setShowPassword(bool))); connect(m_ui->buttonBrowseFile, SIGNAL(clicked()), SLOT(browseKeyFile())); connect(m_ui->editPassword, SIGNAL(textChanged(QString)), SLOT(activatePassword())); @@ -155,11 +158,6 @@ void DatabaseOpenWidget::reject() Q_EMIT editFinished(false); } -void DatabaseOpenWidget::togglePassword(bool checked) -{ - m_ui->editPassword->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); -} - void DatabaseOpenWidget::activatePassword() { m_ui->checkPassword->setChecked(true); diff --git a/src/gui/DatabaseOpenWidget.h b/src/gui/DatabaseOpenWidget.h index e957cd7de..ad40c5711 100644 --- a/src/gui/DatabaseOpenWidget.h +++ b/src/gui/DatabaseOpenWidget.h @@ -52,7 +52,6 @@ protected Q_SLOTS: void reject(); private Q_SLOTS: - void togglePassword(bool checked); void activatePassword(); void activateKeyFile(); void setOkButtonEnabled(); diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui index 951ab188b..935e7696a 100644 --- a/src/gui/DatabaseOpenWidget.ui +++ b/src/gui/DatabaseOpenWidget.ui @@ -72,7 +72,7 @@ - + QLineEdit::Password @@ -80,15 +80,9 @@ - - ... - true - - true - @@ -144,6 +138,13 @@ + + + PasswordEdit + QLineEdit +
gui/PasswordEdit.h
+ + checkPassword editPassword diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index a80267790..8080b2b9e 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -29,6 +29,7 @@ #include "core/Config.h" #include "core/Database.h" #include "core/Entry.h" +#include "core/FilePath.h" #include "core/Metadata.h" #include "core/TimeDelta.h" #include "core/Tools.h" @@ -80,19 +81,16 @@ EditEntryWidget::~EditEntryWidget() { } -const QColor EditEntryWidget::CorrectSoFarColor = QColor(255, 205, 15); -const QColor EditEntryWidget::ErrorColor = QColor(255, 125, 125); - void EditEntryWidget::setupMain() { m_mainUi->setupUi(m_mainWidget); add(tr("Entry"), m_mainWidget); - connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), SLOT(togglePassword(bool))); + m_mainUi->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); + connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool))); connect(m_mainUi->tooglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); - connect(m_mainUi->passwordEdit, SIGNAL(textEdited(QString)), SLOT(setPasswordCheckColors())); - connect(m_mainUi->passwordRepeatEdit, SIGNAL(textEdited(QString)), SLOT(setPasswordCheckColors())); + m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); connect(m_mainUi->passwordGenerator, SIGNAL(newPassword(QString)), SLOT(setGeneratedPassword(QString))); m_mainUi->expirePresets->setMenu(createPresetsMenu()); @@ -307,11 +305,10 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->urlEdit->setText(entry->url()); m_mainUi->passwordEdit->setText(entry->password()); m_mainUi->passwordRepeatEdit->setText(entry->password()); - setPasswordCheckColors(); m_mainUi->expireCheck->setChecked(entry->timeInfo().expires()); m_mainUi->expireDatePicker->setDateTime(entry->timeInfo().expiryTime().toLocalTime()); m_mainUi->expirePresets->setEnabled(!m_history); - m_mainUi->togglePasswordButton->setChecked(true); + m_mainUi->togglePasswordButton->setChecked(false); m_mainUi->notesEdit->setPlainText(entry->notes()); @@ -478,12 +475,6 @@ void EditEntryWidget::cancel() Q_EMIT editFinished(false); } -void EditEntryWidget::togglePassword(bool checked) -{ - m_mainUi->passwordEdit->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); - m_mainUi->passwordRepeatEdit->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); -} - void EditEntryWidget::togglePasswordGeneratorButton(bool checked) { m_mainUi->passwordGenerator->setVisible(checked); @@ -494,25 +485,6 @@ bool EditEntryWidget::passwordsEqual() return m_mainUi->passwordEdit->text() == m_mainUi->passwordRepeatEdit->text(); } -void EditEntryWidget::setPasswordCheckColors() -{ - if (passwordsEqual()) { - m_mainUi->passwordRepeatEdit->setStyleSheet(""); - } - else { - QString stylesheet = "QLineEdit { background: %1; }"; - - if (m_mainUi->passwordEdit->text().startsWith(m_mainUi->passwordRepeatEdit->text())) { - stylesheet = stylesheet.arg(CorrectSoFarColor.name()); - } - else { - stylesheet = stylesheet.arg(ErrorColor.name()); - } - - m_mainUi->passwordRepeatEdit->setStyleSheet(stylesheet); - } -} - void EditEntryWidget::setGeneratedPassword(const QString& password) { m_mainUi->passwordEdit->setText(password); diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index bfdde1636..4e3d82efa 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -58,9 +58,6 @@ public: void loadEntry(Entry* entry, bool create, bool history, const QString& parentName, Database* database); - static const QColor CorrectSoFarColor; - static const QColor ErrorColor; - void createPresetsMenu(QMenu* expirePresetsMenu); QString entryTitle() const; @@ -71,9 +68,7 @@ Q_SIGNALS: private Q_SLOTS: void saveEntry(); void cancel(); - void togglePassword(bool checked); void togglePasswordGeneratorButton(bool checked); - void setPasswordCheckColors(); void setGeneratedPassword(const QString& password); void insertAttribute(); void editCurrentAttribute(); diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index 5b0001f8b..0a26bede4 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -44,7 +44,7 @@ - + QLineEdit::Password @@ -52,15 +52,9 @@ - - ... - true - - true - @@ -75,7 +69,7 @@ - + QLineEdit::Password @@ -160,6 +154,11 @@
gui/PasswordGeneratorWidget.h
1 + + PasswordEdit + QLineEdit +
gui/PasswordEdit.h
+ titleEdit