Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 15:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolving advanced values in entry preview

Browse Source 
* Fixes #10961
* Fixes #7410 - show content of references when previewing notes
This commit is contained in:
Jonathan White 2024-09-22 21:42:23 -04:00
parent feafceca57
commit 34fe413dad
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/EntryPreviewWidget.cpp
View File

@ -321,7 +321,8 @@ void EntryPreviewWidget::setPasswordVisible(bool state)
void EntryPreviewWidget::setEntryNotesVisible(bool state) void EntryPreviewWidget::setEntryNotesVisible(bool state)
{ {
setNotesVisible(m_ui->entryNotesTextEdit, m_currentEntry->notes(), state); setNotesVisible(
m_ui->entryNotesTextEdit, m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->notes()), state);
m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show", state)); m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show", state));
} }
@ -427,6 +428,8 @@ void EntryPreviewWidget::updateEntryAdvancedTab()
m_ui->entryAttributesTable->item(i, 0)->setFont(font); m_ui->entryAttributesTable->item(i, 0)->setFont(font);
m_ui->entryAttributesTable->item(i, 0)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft); m_ui->entryAttributesTable->item(i, 0)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft);
auto value = m_currentEntry->resolveMultiplePlaceholders(attributes->value(key));
if (attributes->isProtected(key)) { if (attributes->isProtected(key)) {
// only show the reveal button on protected attributes // only show the reveal button on protected attributes
auto button = new QToolButton(); auto button = new QToolButton();
@ -453,10 +456,10 @@ void EntryPreviewWidget::updateEntryAdvancedTab()
m_ui->entryAttributesTable->setCellWidget(i, 1, button); m_ui->entryAttributesTable->setCellWidget(i, 1, button);
m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(QString("\u25cf").repeated(6))); m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(QString("\u25cf").repeated(6)));
} else { } else {
m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(attributes->value(key))); m_ui->entryAttributesTable->setItem(i, 2, new QTableWidgetItem(value));
} }
m_ui->entryAttributesTable->item(i, 2)->setData(Qt::UserRole, attributes->value(key)); m_ui->entryAttributesTable->item(i, 2)->setData(Qt::UserRole, value);
m_ui->entryAttributesTable->item(i, 2)->setToolTip(tr("Double click to copy value")); m_ui->entryAttributesTable->item(i, 2)->setToolTip(tr("Double click to copy value"));
m_ui->entryAttributesTable->item(i, 2)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft); m_ui->entryAttributesTable->item(i, 2)->setTextAlignment(Qt::AlignTop | Qt::AlignLeft);