From d6fa17aab9800e92e369a8ba5c24510de7ad37af Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 11 Dec 2018 16:29:40 +0100 Subject: Fix navigation buttons using wrong icons --- lib/configuration/configuration.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/configuration/configuration.h b/lib/configuration/configuration.h index 162fbd7..cce00bd 100644 --- a/lib/configuration/configuration.h +++ b/lib/configuration/configuration.h @@ -94,11 +94,19 @@ public: { Q_CHECK_PTR(action); - action->setShortcut(QKeySequence::fromString(value(name).value())); - connect(this, &Configuration::settingChanged, action, [=](const std::string &path, const QString &value) { - if(path == name) - action->setShortcut(QKeySequence::fromString(value)); - }); + const auto shortcutText = this->value(name); + if(shortcutText) { + const QString tooltip = action->toolTip(); + action->setShortcut(QKeySequence::fromString(shortcutText.value())); + action->setToolTip(QString("%1 (%2)").arg(tooltip, shortcutText.value())); + + connect(this, &Configuration::settingChanged, action, [=](const std::string &path, const QString &value) { + if(path == name) { + action->setShortcut(QKeySequence::fromString(value)); + action->setToolTip(QString("%1 (%2)").arg(tooltip, value)); + } + }); + } } QHash section(const std::string &prefix) const; -- cgit v1.2.1