diff -r 9e18ec63eec3 -r aeb5f203b3eb src/settingseditor/settingseditor.cpp --- a/src/settingseditor/settingseditor.cpp Sun Nov 03 18:17:08 2019 +0200 +++ b/src/settingseditor/settingseditor.cpp Fri Nov 08 19:05:07 2019 +0200 @@ -1,13 +1,19 @@ #include +#include "keyboardshortcutseditor.h" #include "settingseditor.h" #include "ui_settingseditor.h" -SettingsEditor::SettingsEditor(QSettings* settings, QWidget* parent) : +SettingsEditor::SettingsEditor( + QSettings* settings, + const uiutilities::KeySequenceMap& defaultKeyboardShortcuts, + QWidget* parent +) : QDialog{parent}, ui{*new Ui_SettingsEditor}, settings{settings}, libraries{settings, this}, - librariesEditor{settings, this} + librariesEditor{settings, this}, + defaultKeyboardShortcuts{defaultKeyboardShortcuts} { this->ui.setupUi(this); this->loadLocales(); @@ -20,6 +26,7 @@ &SettingsEditor::accepted, this, &SettingsEditor::handleAccepted); + this->ui.keyboardShortcutsView->setModel(new KeyboardShortcutsEditor{parent, this}); } SettingsEditor::~SettingsEditor()