diff options
author | Jonathan White <support@dmapps.us> | 2019-11-09 20:16:05 +0300 |
---|---|---|
committer | Janek Bevendorff <janek@jbev.net> | 2019-11-09 20:16:05 +0300 |
commit | a07bae253036c866e84962ea2ce25546849db2cd (patch) | |
tree | afcccd04b4ad1689657582a8791d9d0f39da78f9 /src/gui/EntryPreviewWidget.cpp | |
parent | 29ca08f9ffff75728183df878644ffde504ac9e3 (diff) |
Correct formatting of preview widget fields (#3727)
* Fix #3701 - replace QLabel with QTextEdit to enable scrolling of notes
* Notes are plain text. They will remain as plain text and hyperlinks will not be enabled in the notes. Until the notes editor is moved to a rich text / html editor this will remain the case.
* Convert username and password fields in preview pane to QLineEdit's to allow for full copying and viewing if larger than the field width.
Diffstat (limited to 'src/gui/EntryPreviewWidget.cpp')
-rw-r--r-- | src/gui/EntryPreviewWidget.cpp | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp index af8c1cd21..e46e3a663 100644 --- a/src/gui/EntryPreviewWidget.cpp +++ b/src/gui/EntryPreviewWidget.cpp @@ -58,6 +58,15 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent) m_ui->entryAttachmentsWidget->setReadOnly(true); m_ui->entryAttachmentsWidget->setButtonsVisible(false); + // Match background of read-only text edit fields with the window + m_ui->entryPasswordLabel->setBackgroundRole(QPalette::Window); + m_ui->entryUsernameLabel->setBackgroundRole(QPalette::Window); + m_ui->entryNotesTextEdit->setBackgroundRole(QPalette::Window); + m_ui->groupNotesTextEdit->setBackgroundRole(QPalette::Window); + // Align notes text with label text + m_ui->entryNotesTextEdit->document()->setDocumentMargin(0); + m_ui->groupNotesTextEdit->document()->setDocumentMargin(0); + connect(m_ui->entryUrlLabel, SIGNAL(linkActivated(QString)), SLOT(openEntryUrl())); connect(m_ui->entryTotpButton, SIGNAL(toggled(bool)), m_ui->entryTotpLabel, SLOT(setVisible(bool))); @@ -173,44 +182,35 @@ void EntryPreviewWidget::setPasswordVisible(bool state) { const QString password = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->password()); if (state) { - m_ui->entryPasswordLabel->setRawText(password); - m_ui->entryPasswordLabel->setToolTip(password); - m_ui->entryPasswordLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); + m_ui->entryPasswordLabel->setText(password); + m_ui->entryPasswordLabel->setCursorPosition(0); + } else if (password.isEmpty() && config()->get("security/passwordemptynodots").toBool()) { + m_ui->entryPasswordLabel->setText(""); } else { - m_ui->entryPasswordLabel->setTextInteractionFlags(Qt::NoTextInteraction); - m_ui->entryPasswordLabel->setToolTip({}); - if (password.isEmpty() && config()->get("security/passwordemptynodots").toBool()) { - m_ui->entryPasswordLabel->setRawText(""); - } else { - m_ui->entryPasswordLabel->setRawText(QString("\u25cf").repeated(6)); - } + m_ui->entryPasswordLabel->setText(QString("\u25cf").repeated(6)); } } void EntryPreviewWidget::setEntryNotesVisible(bool state) { - setNotesVisible(m_ui->entryNotesLabel, m_currentEntry->notes(), state); + setNotesVisible(m_ui->entryNotesTextEdit, m_currentEntry->notes(), state); } void EntryPreviewWidget::setGroupNotesVisible(bool state) { - setNotesVisible(m_ui->groupNotesLabel, m_currentGroup->notes(), state); + setNotesVisible(m_ui->groupNotesTextEdit, m_currentGroup->notes(), state); } -void EntryPreviewWidget::setNotesVisible(QLabel* notesLabel, const QString& notes, bool state) +void EntryPreviewWidget::setNotesVisible(QTextEdit* notesWidget, const QString& notes, bool state) { if (state) { - // Add html hyperlinks to notes that start with XXXX:// - QString hyperlinkNotes = notes; - notesLabel->setText(hyperlinkNotes.replace(QRegExp("(\\w+:\\/\\/\\S+)"), "<a href=\"\\1\">\\1</a>")); - notesLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); + notesWidget->setPlainText(notes); + notesWidget->moveCursor(QTextCursor::Start); + notesWidget->ensureCursorVisible(); } else { - if (notes.isEmpty()) { - notesLabel->setText(""); - } else { - notesLabel->setText(QString("\u25cf").repeated(6)); + if (!notes.isEmpty()) { + notesWidget->setPlainText(QString("\u25cf").repeated(6)); } - notesLabel->setTextInteractionFlags(Qt::NoTextInteraction); } } @@ -218,12 +218,13 @@ void EntryPreviewWidget::updateEntryGeneralTab() { Q_ASSERT(m_currentEntry); m_ui->entryUsernameLabel->setText(m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->username())); + m_ui->entryUsernameLabel->setCursorPosition(0); if (config()->get("security/HidePasswordPreviewPanel").toBool()) { // Hide password setPasswordVisible(false); // Show the password toggle button if there are dots in the label - m_ui->togglePasswordButton->setVisible(!m_ui->entryPasswordLabel->rawText().isEmpty()); + m_ui->togglePasswordButton->setVisible(!m_ui->entryPasswordLabel->text().isEmpty()); m_ui->togglePasswordButton->setChecked(false); } else { // Show password @@ -233,7 +234,7 @@ void EntryPreviewWidget::updateEntryGeneralTab() if (config()->get("security/hidenotes").toBool()) { setEntryNotesVisible(false); - m_ui->toggleEntryNotesButton->setVisible(!m_ui->entryNotesLabel->text().isEmpty()); + m_ui->toggleEntryNotesButton->setVisible(!m_ui->entryNotesTextEdit->toPlainText().isEmpty()); m_ui->toggleEntryNotesButton->setChecked(false); } else { setEntryNotesVisible(true); @@ -241,9 +242,9 @@ void EntryPreviewWidget::updateEntryGeneralTab() } if (config()->get("GUI/MonospaceNotes", false).toBool()) { - m_ui->entryNotesLabel->setFont(Font::fixedFont()); + m_ui->entryNotesTextEdit->setFont(Font::fixedFont()); } else { - m_ui->entryNotesLabel->setFont(Font::defaultFont()); + m_ui->entryNotesTextEdit->setFont(Font::defaultFont()); } m_ui->entryUrlLabel->setRawText(m_currentEntry->displayUrl()); @@ -329,7 +330,7 @@ void EntryPreviewWidget::updateGroupGeneralTab() if (config()->get("security/hidenotes").toBool()) { setGroupNotesVisible(false); - m_ui->toggleGroupNotesButton->setVisible(!m_ui->groupNotesLabel->text().isEmpty()); + m_ui->toggleGroupNotesButton->setVisible(!m_ui->groupNotesTextEdit->toPlainText().isEmpty()); m_ui->toggleGroupNotesButton->setChecked(false); } else { setGroupNotesVisible(true); @@ -337,9 +338,9 @@ void EntryPreviewWidget::updateGroupGeneralTab() } if (config()->get("GUI/MonospaceNotes", false).toBool()) { - m_ui->groupNotesLabel->setFont(Font::fixedFont()); + m_ui->groupNotesTextEdit->setFont(Font::fixedFont()); } else { - m_ui->groupNotesLabel->setFont(Font::defaultFont()); + m_ui->groupNotesTextEdit->setFont(Font::defaultFont()); } } |