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

attributes: unbreak copy-to-clipboard on KDE

Browse Source 
The 'text' property of the QAction gets mangled by KDE when it adds its
own accelerator shortcuts. But the data property is ours. Use that for
keying instead.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
This commit is contained in:
Steven Noonan 2018-03-05 08:57:01 -08:00 committed by Janek Bevendorff
parent 4c9dcf5c98
commit 386b78b896
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/DatabaseWidget.cpp
View File

@ -598,7 +598,7 @@ void DatabaseWidget::copyAttribute(QAction* action)
return; return;
} }
setClipboardTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->attributes()->value(action->text()))); setClipboardTextAndMinimize(currentEntry->resolveMultiplePlaceholders(currentEntry->attributes()->value(action->data().toString())));
} }
void DatabaseWidget::setClipboardTextAndMinimize(const QString& text) void DatabaseWidget::setClipboardTextAndMinimize(const QString& text)

1
src/gui/MainWindow.cpp
View File

@ -499,6 +499,7 @@ void MainWindow::updateCopyAttributesMenu()
const QStringList customEntryAttributes = dbWidget->customEntryAttributes(); const QStringList customEntryAttributes = dbWidget->customEntryAttributes();
for (const QString& key : customEntryAttributes) { for (const QString& key : customEntryAttributes) {
QAction* action = m_ui->menuEntryCopyAttribute->addAction(key); QAction* action = m_ui->menuEntryCopyAttribute->addAction(key);
action->setData(QVariant(key));
m_copyAdditionalAttributeActions->addAction(action); m_copyAdditionalAttributeActions->addAction(action);
} }
} }