Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-06 12:25:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove resolving placeholders for notes

Browse source
This commit is contained in:
Jonathan White 2018-05-05 17:58:37 -04:00 • committed by Jonathan White
parent 9ed2a74421
commit 13a313ff66
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/DetailsWidget.cpp
View file

@ -198,7 +198,7 @@ void DetailsWidget::updateEntryNotesTab()
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
const QString notes = m_currentEntry->notes(); const QString notes = m_currentEntry->notes();
setTabEnabled(m_ui->entryTabWidget, m_ui->entryNotesTab, !notes.isEmpty()); setTabEnabled(m_ui->entryTabWidget, m_ui->entryNotesTab, !notes.isEmpty());
m_ui->entryNotesEdit->setText(m_currentEntry->resolveMultiplePlaceholders(notes)); m_ui->entryNotesEdit->setText(notes);
} }
void DetailsWidget::updateEntryAttributesTab() void DetailsWidget::updateEntryAttributesTab()

2
src/gui/entry/EntryModel.cpp
View file

@ -185,7 +185,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
return result; return result;
case Notes: case Notes:
// Display only first line of notes in simplified format // Display only first line of notes in simplified format
result = entry->resolveMultiplePlaceholders(entry->notes().section("\n", 0, 0).simplified()); result = entry->notes().section("\n", 0, 0).simplified();
if (attr->isReference(EntryAttributes::NotesKey)) { if (attr->isReference(EntryAttributes::NotesKey)) {
result.prepend(tr("Ref: ", "Reference abbreviation")); result.prepend(tr("Ref: ", "Reference abbreviation"));
} }