From 3649379a00735ce4e02096f984cec215340e8e4c Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Wed, 17 Feb 2021 18:43:44 +0200 Subject: [PATCH] fix - Overview Shortcuts does not work properly #1339 --- src/config/shortcutswidget.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index 4345d742..c6a9df41 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -90,12 +90,17 @@ void ShortcutsWidget::initInfoTable() const auto default_key_sequence = current_shortcut.at(2); m_table->setItem(i, 0, new QTableWidgetItem(description)); -#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \ - defined(Q_OS_MACX)) + const auto key_sequence = identifier.isEmpty() + ? default_key_sequence + : m_config.shortcut(identifier); +#if defined(Q_OS_MACOS) + // QTableWidgetItem* item = + // new + // QTableWidgetItem(nativeOSHotKeyText(m_shortcuts.at(i).at(2))); QTableWidgetItem* item = - new QTableWidgetItem(nativeOSHotKeyText(m_shortcuts.at(i).at(2))); + new QTableWidgetItem(nativeOSHotKeyText(key_sequence)); #else - QTableWidgetItem* item = new QTableWidgetItem(m_shortcuts.at(i).at(2)); + QTableWidgetItem* item = new QTableWidgetItem(key_sequence); #endif item->setTextAlignment(Qt::AlignCenter); m_table->setItem(i, 1, item);