From 841b40a4120957e2b9ec8d911ba24be25204f8ea Mon Sep 17 00:00:00 2001 From: James LaChance Date: Thu, 29 Oct 2020 01:53:04 -0400 Subject: [PATCH] Read shortcut from m_settings in shortcuts widget Fixes #1111 --- src/config/shortcutswidget.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index b11e9afa..963207cb 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -84,13 +84,20 @@ void ShortcutsWidget::initInfoTable() // add content for (int i = 0; i < shortcuts().size(); ++i) { - m_table->setItem(i, 0, new QTableWidgetItem(m_shortcuts.at(i).at(1))); + const auto current_shortcut = m_shortcuts.at(i); + const auto identifier = current_shortcut.at(0); + const auto description = current_shortcut.at(1); + const auto default_key_sequence = current_shortcut.at(2); + m_table->setItem(i, 0, new QTableWidgetItem(description)); - QTableWidgetItem* item = new QTableWidgetItem(m_shortcuts.at(i).at(2)); + const auto key_sequence = identifier.isEmpty() + ? default_key_sequence + : m_config.shortcut(identifier); + QTableWidgetItem* item = new QTableWidgetItem(key_sequence); item->setTextAlignment(Qt::AlignCenter); m_table->setItem(i, 1, item); - if (m_shortcuts.at(i).at(0).isEmpty()) { + if (identifier.isEmpty()) { QFont font; font.setBold(true); item->setFont(font);