From 5af9cd3a2355497d2228aa33d799fa44d536cd90 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 12 Jun 2024 17:58:43 +0800 Subject: [PATCH] FIX:fix bug of shortcut key jira: STUDIO-7252 Change-Id: Ic5bfbc0ffe0ad096b99df53f0aff36c7ebf0c1b4 (cherry picked from commit 17867078f062b3b879d47eea6be3e16b1e055fbd) --- src/slic3r/GUI/KBShortcutsDialog.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index d3b2b04ef..6ea898bb3 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -213,7 +213,11 @@ void KBShortcutsDialog::fill_shortcuts() {L("Del"), L("Delete selected")}, #endif // Help - { "?", L("Show keyboard shortcuts list") } +#ifdef __WINDOWS__ + { "Shift+Alt+?", L("Show keyboard shortcuts list") } +#else + {"Shift+?", L("Show keyboard shortcuts list")} +#endif }; m_full_shortcuts.push_back({{_L("Global shortcuts"), ""}, global_shortcuts}); @@ -264,14 +268,8 @@ void KBShortcutsDialog::fill_shortcuts() Shortcuts gizmos_shortcuts = { {"Esc", L("Deselect all")}, - {L("Shift+"), L("Move: press to snap by 1mm")}, - #ifdef __APPLE__ - {L("⌘+Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, - {L("⌥+Mouse wheel"), L("Support/Color Painting: adjust section position")}, - #else - {L("Ctrl+Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, - {L("Alt+Mouse wheel"), L("Support/Color Painting: adjust section position")}, - #endif + {ctrl + L("Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, + {alt + L("Mouse wheel"), L("Support/Color Painting: adjust section position")}, }; m_full_shortcuts.push_back({{_L("Gizmo"), ""}, gizmos_shortcuts});