Merge remote-tracking branch 'capostrophic/controlplus'

7 years ago · 9a8a4c744f
parent 7688696765 97ff24b8d6
commit 9a8a4c744f
1 changed files with 2 additions and 2 deletions
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@ -132,7 +132,7 @@ namespace CSMPrefs
                    if (mods && i == 0)
                    {
                        if (mods & Qt::ControlModifier)
-                            result.append("Ctl+");
+                            result.append("Ctrl+");
                        if (mods & Qt::ShiftModifier)
                            result.append("Shift+");
                        if (mods & Qt::AltModifier)
@ -196,7 +196,7 @@ namespace CSMPrefs

            std::string name = value.substr(start, end - start);

-            if (name == "Ctl")
+            if (name == "Ctrl")
            {
                mods |= Qt::ControlModifier;
            }