Fix shortcut editor not reflecting unsaved value

jdpurcell · Dec 29, 2023 · 8dd1cea · 8dd1cea
1 parent 819d75c
commit 8dd1cea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/qvoptionsdialog.cpp b/src/qvoptionsdialog.cpp
@@ -401,10 +401,10 @@ void QVOptionsDialog::updateShortcutsTable()
 void QVOptionsDialog::shortcutCellDoubleClicked(int row, int column)
 {
     Q_UNUSED(column)
-    auto *shortcutDialog = new QVShortcutDialog(row, this);
-    shortcutDialog->registerGetTransientShortcutCallback([this](int index) {
+    auto getTransientShortcutCallback = [this](int index) {
         return transientShortcuts.value(index);
-    });
+    };
+    auto *shortcutDialog = new QVShortcutDialog(row, getTransientShortcutCallback, this);
     connect(shortcutDialog, &QVShortcutDialog::shortcutsListChanged, this, [this](int index, const QStringList &stringListShortcuts) {
         transientShortcuts.replace(index, stringListShortcuts);
         updateShortcutsTable();

diff --git a/src/qvshortcutdialog.cpp b/src/qvshortcutdialog.cpp
@@ -6,7 +6,7 @@
 
 #include <QDebug>
 
-QVShortcutDialog::QVShortcutDialog(int index, QWidget *parent) :
+QVShortcutDialog::QVShortcutDialog(int index, GetTransientShortcutCallback getTransientShortcutCallback, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::QVShortcutDialog)
 {
@@ -18,7 +18,9 @@ QVShortcutDialog::QVShortcutDialog(int index, QWidget *parent) :
     connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &QVShortcutDialog::buttonBoxClicked);
 
     shortcutObject = qvApp->getShortcutManager().getShortcutsList().value(index);
+    shortcutObject.shortcuts = getTransientShortcutCallback(index);
     this->index = index;
+    this->getTransientShortcutCallback = getTransientShortcutCallback;
     ui->keySequenceEdit->setKeySequence(shortcutObject.shortcuts.join(", "));
 }
 
@@ -27,11 +29,6 @@ QVShortcutDialog::~QVShortcutDialog()
     delete ui;
 }
 
-void QVShortcutDialog::registerGetTransientShortcutCallback(const GetTransientShortcutCallback callback)
-{
-    getTransientShortcutCallback = callback;
-}
-
 void QVShortcutDialog::done(int r)
 {
     if (r == QDialog::Accepted)
@@ -79,7 +76,7 @@ QString QVShortcutDialog::shortcutAlreadyBound(const QKeySequence &chosenSequenc
     for (int i = 0; i < shortcutsList.length(); i++)
     {
         const auto &shortcut = shortcutsList.value(i);
-        const auto shortcuts = getTransientShortcutCallback ? getTransientShortcutCallback(i) : shortcut.shortcuts;
+        const auto shortcuts = getTransientShortcutCallback(i);
         const auto sequenceList = ShortcutManager::stringListToKeySequenceList(shortcuts);
 
         if (sequenceList.contains(chosenSequence) && shortcut.name != exemptShortcut)

diff --git a/src/qvshortcutdialog.h b/src/qvshortcutdialog.h
@@ -16,10 +16,9 @@ class QVShortcutDialog : public QDialog
 public:
     using GetTransientShortcutCallback = std::function<QStringList(int)>;
 
-    explicit QVShortcutDialog(int index, QWidget *parent = nullptr);
+    explicit QVShortcutDialog(int index, const GetTransientShortcutCallback getTransientShortcutCallback, QWidget *parent = nullptr);
     ~QVShortcutDialog() override;
 
-    void registerGetTransientShortcutCallback(const GetTransientShortcutCallback callback);
     QString shortcutAlreadyBound(const QKeySequence &chosenSequence, const QString &exemptShortcut);
     void acceptValidated();