razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix macOS shortcut display

Browse source
This commit is contained in:
manongjohn 2021-05-21 07:47:42 -04:00
parent a6b6269c7c
commit e80d87c00a
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toonz/sources/toonz/shortcutpopup.cpp
View file

@ -63,6 +63,13 @@ public:
text = text.replace("&&", "&"); text = text.replace("&&", "&");
setText(0, text); setText(0, text);
QString shortcut = m_action->shortcut().toString(); 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); setText(1, shortcut);
} }
QAction *getAction() const { return m_action; } QAction *getAction() const { return m_action; }

32
toonz/sources/toonz/statusbar.cpp
View file

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