From e80d87c00a0461b213f18292c27c9d91d6dfafd0 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: Fri, 21 May 2021 07:47:42 -0400
Subject: [PATCH] Fix macOS shortcut display

---
 toonz/sources/toonz/shortcutpopup.cpp |  7 ++++++
 toonz/sources/toonz/statusbar.cpp     | 32 ++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/toonz/sources/toonz/shortcutpopup.cpp b/toonz/sources/toonz/shortcutpopup.cpp
index 38f1b408..719aba13 100644
--- a/toonz/sources/toonz/shortcutpopup.cpp
+++ b/toonz/sources/toonz/shortcutpopup.cpp
@@ -63,6 +63,13 @@ public:
     text = text.replace("&&", "&");
     setText(0, text);
     QString shortcut = m_action->shortcut().toString();
+#ifdef MACOSX
+    shortcut = shortcut.replace("Ctrl", QString::fromStdWString(L"\u2318"));
+    shortcut = shortcut.replace("Shift", QString::fromStdWString(L"\u21e7"));
+    shortcut = shortcut.replace("Alt", QString::fromStdWString(L"\u2325"));
+    shortcut = shortcut.replace("Meta", QString::fromStdWString(L"\u2303"));
+    shortcut = shortcut.replace("+", "");
+#endif
     setText(1, shortcut);
   }
   QAction *getAction() const { return m_action; }
diff --git a/toonz/sources/toonz/statusbar.cpp b/toonz/sources/toonz/statusbar.cpp
index 9480c393..c12fc752 100644
--- a/toonz/sources/toonz/statusbar.cpp
+++ b/toonz/sources/toonz/statusbar.cpp
@@ -150,16 +150,12 @@ void StatusBar::updateInfoText() {
 QString trModKey(QString key) {
 #ifdef MACOSX
   // Convert Windows key modifier to macOS modifier
-  if (key == "Ctrl")  // Command
-    return QString::fromStdWString(L"\u2318");
-  else if (key == "Shift")
-    return QString::fromStdWString(L"\u21e7");
-  else if (key == "Alt")
-    return QString::fromStdWString(L"\u2325");
-//  else if (key == "???") // Control
-//    return QString::fromStdWString(L"\u2303");
+  key = key.replace("Ctrl", QString::fromStdWString(L"\u2318"));
+  key = key.replace("Shift", QString::fromStdWString(L"\u21e7"));
+  key = key.replace("Alt", QString::fromStdWString(L"\u2325"));
+  key = key.replace("Meta", QString::fromStdWString(L"\u2303"));
+  key = key.replace("+", "");
 #endif
-
   return key;
 }
 
@@ -191,7 +187,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                .arg(cmd2TextSeparator) +
            spacer +
            tr("%1%2Scale Symmetrically from Center w/ Proportion Lock")
-               .arg(trModKey("Shift") + "+" + trModKey("Alt"))
+               .arg(trModKey("Shift+Alt"))
                .arg(cmdTextSeparator)});
   lMap.insert({"T_Edit", tr("Animate Tool: Modifies the position, "
                             "rotation and size of the current column")});
@@ -207,7 +203,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Add / Remove Vanishing Point")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Alt"))
+                       .arg(trModKey("Ctrl+Alt"))
                        .arg(cmdTextSeparator) +
                    spacer +
                    tr("%1%2Draw to Vanishing Point")
@@ -215,7 +211,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Allow or Disallow Snapping")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Shift"))
+                       .arg(trModKey("Ctrl+Shift"))
                        .arg(cmdTextSeparator)});
   lMap.insert({"T_BrushSmartRaster",
                tr("Brush Tool : Draws in the work area freehand") + spacer +
@@ -228,7 +224,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Add / Remove Vanishing Point")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Alt"))
+                       .arg(trModKey("Ctrl+Alt"))
                        .arg(cmdTextSeparator) +
                    spacer +
                    tr("%1%2Draw to Vanishing Point")
@@ -245,7 +241,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Add / Remove Vanishing Point")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Alt"))
+                       .arg(trModKey("Ctrl+Alt"))
                        .arg(cmdTextSeparator) +
                    spacer +
                    tr("%1%2Draw to Vanishing Point")
@@ -285,7 +281,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
   lMap.insert({"T_GeometricVector",
                tr("Geometry Tool: Draws geometric shapes") + spacer +
                    tr("%1%2Allow or Disallow Snapping")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Shift"))
+                       .arg(trModKey("Ctrl+Shift"))
                        .arg(cmdTextSeparator)});
   lMap.insert({"T_GeometricVectorRectangle",
                tr("Geometry Tool: Draws geometric shapes") + spacer +
@@ -298,7 +294,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Allow or Disallow Snapping")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Shift"))
+                       .arg(trModKey("Ctrl+Shift"))
                        .arg(cmdTextSeparator)});
   lMap.insert({"T_GeometricVectorEllipse",
                tr("Geometry Tool: Draws geometric shapes") + spacer +
@@ -311,7 +307,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                        .arg(cmd2TextSeparator) +
                    spacer +
                    tr("%1%2Allow or Disallow Snapping")
-                       .arg(trModKey("Ctrl") + "+" + trModKey("Shift"))
+                       .arg(trModKey("Ctrl+Shift"))
                        .arg(cmdTextSeparator)});
   lMap.insert(
       {"T_GeometricVectorPolyline",
@@ -327,7 +323,7 @@ std::unordered_map<std::string, QString> StatusBar::makeMap(
                .arg(cmd2TextSeparator) +
            spacer +
            tr("%1%2Allow or Disallow Snapping")
-               .arg(trModKey("Ctrl") + "+" + trModKey("Shift"))
+               .arg(trModKey("Ctrl+Shift"))
                .arg(cmdTextSeparator)});
   lMap.insert({"T_Type", tr("Type Tool: Adds text")});
   lMap.insert({"T_PaintBrush",