From 64cb1553d0205dd579e382671cc265c0ba889893 Mon Sep 17 00:00:00 2001 From: Xavier Valls Date: Tue, 18 May 2021 15:08:48 +0200 Subject: [PATCH] Add a button to reveal protected attributes in entry preview Closes #1930 --- src/gui/EntryPreviewWidget.cpp | 60 ++++++++-- src/gui/EntryPreviewWidget.ui | 196 ++++++++++++--------------------- 2 files changed, 118 insertions(+), 138 deletions(-) diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp index 5bb2de419..33754d919 100644 --- a/src/gui/EntryPreviewWidget.cpp +++ b/src/gui/EntryPreviewWidget.cpp @@ -19,6 +19,7 @@ #include "EntryPreviewWidget.h" #include "ui_EntryPreviewWidget.h" +#include "Clipboard.h" #include "Font.h" #include "entry/EntryAttachmentsModel.h" #include "gui/Icons.h" @@ -276,29 +277,68 @@ void EntryPreviewWidget::updateEntryGeneralTab() void EntryPreviewWidget::updateEntryAdvancedTab() { Q_ASSERT(m_currentEntry); - m_ui->entryAttributesEdit->clear(); + m_ui->entryAttributesTable->clear(); + const EntryAttributes* attributes = m_currentEntry->attributes(); const QStringList customAttributes = attributes->customKeys(); const bool hasAttributes = !customAttributes.isEmpty(); const bool hasAttachments = !m_currentEntry->attachments()->isEmpty(); + m_ui->entryAttributesTable->setRowCount(customAttributes.size()); + m_ui->entryAttributesTable->setColumnCount(3); setTabEnabled(m_ui->entryTabWidget, m_ui->entryAdvancedTab, hasAttributes || hasAttachments); if (hasAttributes) { - QString attributesText(""); + auto i = 0; + QFont font; + font.setBold(true); for (const QString& key : customAttributes) { - QString value; - if (m_currentEntry->attributes()->isProtected(key)) { - value = "" + tr("[PROTECTED]") + ""; + m_ui->entryAttributesTable->setItem(i, 0, new QTableWidgetItem(key)); + + if (attributes->isProtected(key)) { + // only show the reveal button on protected attributes + auto button = new QToolButton(); + button->setCheckable(true); + button->setChecked(false); + button->setIcon(icons()->onOffIcon("password-show", false)); + button->setProperty("value", attributes->value(key)); + button->setProperty("row", i); + m_ui->entryAttributesTable->setCellWidget(i, 1, button); + m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(QString("\u25cf").repeated(6))); + + connect(button, &QToolButton::clicked, this, [this](bool state) { + auto btn = qobject_cast(sender()); + btn->setIcon(icons()->onOffIcon("password-show", state)); + auto row = btn->property("row").toInt(); + if (state) { + m_ui->entryAttributesTable->item(row, 2)->setText(btn->property("value").toString()); + } else { + m_ui->entryAttributesTable->item(row, 2)->setText(QString("\u25cf").repeated(6)); + } + // Maintain button height while showing contents of cell + auto size = btn->size(); + m_ui->entryAttributesTable->resizeRowToContents(row); + btn->setFixedSize(size); + }); } else { - value = m_currentEntry->attributes()->value(key).toHtmlEscaped(); - value.replace('\n', "
"); + m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(attributes->value(key))); } - attributesText.append(QString("").arg(key, value)); + + m_ui->entryAttributesTable->item(i, 0)->setFont(font); + m_ui->entryAttributesTable->item(i, 0)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft); + m_ui->entryAttributesTable->item(i, 2)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft); + + ++i; } - attributesText.append("
%1:%2
"); - m_ui->entryAttributesEdit->setText(attributesText); + connect(m_ui->entryAttributesTable, &QTableWidget::cellDoubleClicked, this, [this](int row, int column) { + if (column == 2) { + clipboard()->setText(m_ui->entryAttributesTable->item(row, column)->text()); + } + }); } + m_ui->entryAttributesTable->horizontalHeader()->setStretchLastSection(true); + m_ui->entryAttributesTable->resizeColumnsToContents(); + m_ui->entryAttributesTable->resizeRowsToContents(); m_ui->entryAttachmentsWidget->setEntryAttachments(m_currentEntry->attachments()); } diff --git a/src/gui/EntryPreviewWidget.ui b/src/gui/EntryPreviewWidget.ui index 961e75505..b11aa6dab 100644 --- a/src/gui/EntryPreviewWidget.ui +++ b/src/gui/EntryPreviewWidget.ui @@ -145,7 +145,7 @@ - 0 + 1 false @@ -534,71 +534,23 @@ Advanced - + - 0 + 5 5 - 0 + 5 5 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - + + 8 + - - - - 0 - 0 - - - - - 75 - true - - - - Attributes - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - @@ -617,87 +569,75 @@ - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed + + Qt::ClickFocus - - - 5 - 20 - + + + + + + + 0 + 0 + - + + + 75 + true + + + + Attributes + + - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - + - Qt::ClickFocus + Qt::NoFocus - + + QTableView::item {padding: 3px;} + + + QFrame::NoFrame + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::NoSelection + + + false + + + false + + + false + + true - + + + false + - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - - - Qt::ClickFocus - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - @@ -738,7 +678,7 @@ Default Sequence - Qt::AlignRight|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -754,7 +694,7 @@ sequence - Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter