From 5bc000cc3193ee42f5e8b65a4e785c2646d209ec Mon Sep 17 00:00:00 2001 From: Joe Brown Date: Sat, 29 Apr 2017 21:00:15 -0500 Subject: [PATCH 1/5] Use fixed-width font for Notes Fixed width, and a smaller font size, make for easier readability in the notes section. --- src/gui/entry/EditEntryWidgetMain.ui | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index afc1d4f2..1d497708 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -127,6 +127,12 @@ 100 + + + Monospace + 10 + + From 0c2d71c2cee497129a26bc40a2a8bbf1d3adf004 Mon Sep 17 00:00:00 2001 From: Joe Brown Date: Sat, 29 Apr 2017 21:23:28 -0500 Subject: [PATCH 2/5] Notes section no longer visible by default. There is a simple checkbox that allows your notes to become visible again. This is always disabled by default, as the use case referenced in issue #342 (and my own use case) has confidential data in that field. Passes all tests (YubiKey is N/A) on Ubuntu 16.04.2 with Qt 5.5.1. --- src/gui/entry/EditEntryWidget.cpp | 3 +++ src/gui/entry/EditEntryWidgetMain.ui | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 2d17c345..000a1e55 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -99,6 +99,7 @@ void EditEntryWidget::setupMain() connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool))); connect(m_mainUi->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); + connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), m_mainUi->notesEdit, SLOT(setVisible(bool))); m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); connect(m_mainUi->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); @@ -308,7 +309,9 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->passwordRepeatEdit->setReadOnly(m_history); m_mainUi->expireCheck->setEnabled(!m_history); m_mainUi->expireDatePicker->setReadOnly(m_history); + m_mainUi->notesEnabled->setChecked(false); m_mainUi->notesEdit->setReadOnly(m_history); + m_mainUi->notesEdit->setVisible(false); m_mainUi->togglePasswordGeneratorButton->setChecked(false); m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history); m_mainUi->passwordGenerator->reset(); diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index 1d497708..f291e37c 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -79,10 +79,10 @@ - - + + - Notes: + Notes From fdceeb368e75f3044d33ee0a634fda06e6123e93 Mon Sep 17 00:00:00 2001 From: Joe Brown Date: Sun, 28 May 2017 20:58:56 -0500 Subject: [PATCH 3/5] Do not hide notes by default. --- src/gui/entry/EditEntryWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 000a1e55..1d584abb 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -309,7 +309,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->passwordRepeatEdit->setReadOnly(m_history); m_mainUi->expireCheck->setEnabled(!m_history); m_mainUi->expireDatePicker->setReadOnly(m_history); - m_mainUi->notesEnabled->setChecked(false); + m_mainUi->notesEnabled->setChecked(true); m_mainUi->notesEdit->setReadOnly(m_history); m_mainUi->notesEdit->setVisible(false); m_mainUi->togglePasswordGeneratorButton->setChecked(false); From ff01a7da1ed8a5df0493c1c6f32d31e3ef5d381e Mon Sep 17 00:00:00 2001 From: Joe Brown Date: Sun, 28 May 2017 21:58:15 -0500 Subject: [PATCH 4/5] Hint is displayed when notes section is hidden. The alignment is a bit off, however. A better option may be simply disabling the QPlainTextEdit widget and stashing the actual notes in another buffer somewhere. --- src/gui/entry/EditEntryWidget.cpp | 10 ++++++++-- src/gui/entry/EditEntryWidget.h | 1 + src/gui/entry/EditEntryWidgetMain.ui | 13 +++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 1d584abb..a152ebb7 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -99,7 +99,7 @@ void EditEntryWidget::setupMain() connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool))); connect(m_mainUi->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); - connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), m_mainUi->notesEdit, SLOT(setVisible(bool))); + connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleHideNotes(bool))); m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); connect(m_mainUi->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString))); @@ -262,6 +262,12 @@ void EditEntryWidget::updateAttachmentButtonsEnabled(const QModelIndex& current) m_advancedUi->removeAttachmentButton->setEnabled(enable && !m_history); } +void EditEntryWidget::toggleHideNotes(bool visible) +{ + m_mainUi->notesEdit->setVisible(visible); + m_mainUi->notesHint->setVisible(!visible); +} + QString EditEntryWidget::entryTitle() const { if (m_entry) { @@ -311,7 +317,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->expireDatePicker->setReadOnly(m_history); m_mainUi->notesEnabled->setChecked(true); m_mainUi->notesEdit->setReadOnly(m_history); - m_mainUi->notesEdit->setVisible(false); + m_mainUi->notesEdit->setVisible(true); m_mainUi->togglePasswordGeneratorButton->setChecked(false); m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history); m_mainUi->passwordGenerator->reset(); diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index 2888d43a..74da2c46 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -100,6 +100,7 @@ private slots: void updateHistoryButtons(const QModelIndex& current, const QModelIndex& previous); void useExpiryPreset(QAction* action); void updateAttachmentButtonsEnabled(const QModelIndex& current); + void toggleHideNotes(bool visible); private: void setupMain(); diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index f291e37c..2c9aa59b 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -135,6 +135,19 @@ + + + + false + + + Toggle the checkbox to reveal the notes section. + + + Qt::AlignTop + + + From 9840470df8f95995e121ea5cfbac3d30a2175c0e Mon Sep 17 00:00:00 2001 From: thez3ro Date: Wed, 25 Oct 2017 16:40:14 +0200 Subject: [PATCH 5/5] hide note option --- src/gui/SettingsWidget.cpp | 2 ++ src/gui/SettingsWidgetSecurity.ui | 7 +++++++ src/gui/entry/EditEntryWidget.cpp | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp index aa0e5664..a8b0e942 100644 --- a/src/gui/SettingsWidget.cpp +++ b/src/gui/SettingsWidget.cpp @@ -163,6 +163,7 @@ void SettingsWidget::loadSettings() m_secUi->passwordCleartextCheckBox->setChecked(config()->get("security/passwordscleartext").toBool()); m_secUi->passwordDetailsCleartextCheckBox->setChecked(config()->get("security/hidepassworddetails").toBool()); m_secUi->passwordRepeatCheckBox->setChecked(config()->get("security/passwordsrepeat").toBool()); + m_secUi->hideNotesCheckBox->setChecked(config()->get("security/hidenotes").toBool()); for (const ExtraPage& page: asConst(m_extraPages)) { @@ -231,6 +232,7 @@ void SettingsWidget::saveSettings() config()->set("security/passwordscleartext", m_secUi->passwordCleartextCheckBox->isChecked()); config()->set("security/hidepassworddetails", m_secUi->passwordDetailsCleartextCheckBox->isChecked()); config()->set("security/passwordsrepeat", m_secUi->passwordRepeatCheckBox->isChecked()); + config()->set("security/hidenotes", m_secUi->hideNotesCheckBox->isChecked()); // Security: clear storage if related settings are disabled if (!config()->get("RememberLastDatabases").toBool()) { diff --git a/src/gui/SettingsWidgetSecurity.ui b/src/gui/SettingsWidgetSecurity.ui index 53c69db6..17d324f7 100644 --- a/src/gui/SettingsWidgetSecurity.ui +++ b/src/gui/SettingsWidgetSecurity.ui @@ -143,6 +143,13 @@ + + + + Hide entry notes by default + + + diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index a152ebb7..8457c5af 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -315,9 +315,10 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->passwordRepeatEdit->setReadOnly(m_history); m_mainUi->expireCheck->setEnabled(!m_history); m_mainUi->expireDatePicker->setReadOnly(m_history); - m_mainUi->notesEnabled->setChecked(true); + m_mainUi->notesEnabled->setChecked(!config()->get("security/hidenotes").toBool()); m_mainUi->notesEdit->setReadOnly(m_history); - m_mainUi->notesEdit->setVisible(true); + m_mainUi->notesEdit->setVisible(!config()->get("security/hidenotes").toBool()); + m_mainUi->notesHint->setVisible(config()->get("security/hidenotes").toBool()); m_mainUi->togglePasswordGeneratorButton->setChecked(false); m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history); m_mainUi->passwordGenerator->reset();