[settings] fix reading/saving shortcuts which contain "=" #546

easymodo · Jun 20, 2024 · 7672cb4 · 7672cb4
1 parent 7685c27
commit 7672cb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/qimgv/components/actionmanager/actionmanager.cpp b/qimgv/components/actionmanager/actionmanager.cpp
@@ -41,11 +41,11 @@ void ActionManager::initDefaults() {
     actionManager->defaults.insert(InputMap::keyNameCtrl() + "+WheelUp", "zoomInCursor");
     actionManager->defaults.insert(InputMap::keyNameCtrl() + "+WheelDown", "zoomOutCursor");
     actionManager->defaults.insert("=", "zoomIn"); // [=+] key on the number row
-    actionManager->defaults.insert(InputMap::keyNameCtrl() + "=", "zoomIn");
+    actionManager->defaults.insert(InputMap::keyNameCtrl() + "+=", "zoomIn");
     actionManager->defaults.insert("+", "zoomIn");
-    actionManager->defaults.insert(InputMap::keyNameCtrl() + "+", "zoomIn");
+    actionManager->defaults.insert(InputMap::keyNameCtrl() + "++", "zoomIn");
     actionManager->defaults.insert("-", "zoomOut");
-    actionManager->defaults.insert(InputMap::keyNameCtrl() + "-", "zoomOut");
+    actionManager->defaults.insert(InputMap::keyNameCtrl() + "+-", "zoomOut");
     actionManager->defaults.insert(InputMap::keyNameCtrl() + "+Down", "zoomOut");
     actionManager->defaults.insert(InputMap::keyNameCtrl() + "+Up", "zoomIn");
     actionManager->defaults.insert("Up", "scrollUp");

diff --git a/qimgv/settings.cpp b/qimgv/settings.cpp
@@ -640,8 +640,8 @@ void Settings::readShortcuts(QMap<QString, QString> &shortcuts) {
     for(int i = 0; i < in.count(); i++) {
         pair = in[i].split("=");
         if(!pair[0].isEmpty() && !pair[1].isEmpty()) {
-            if(pair[1]=="eq")
-                pair[1]="=";
+            if(pair[1].endsWith("eq"))
+                pair[1]=pair[1].chopped(2) + "=";
             shortcuts.insert(pair[1], pair[0]);
         }
     }
@@ -654,8 +654,8 @@ void Settings::saveShortcuts(const QMap<QString, QString> &shortcuts) {
     QStringList out;
     while(i.hasNext()) {
         i.next();
-        if(i.key() == "=")
-            out << i.value() + "=" + "eq";
+        if(i.key().endsWith("="))
+            out << i.value() + "=" + i.key().chopped(1) + "eq";
         else
             out << i.value() + "=" + i.key();
     }