From 7750c82ebf4d34abd2a2f3ea90f772138508ea3f Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Mon, 3 Jun 2024 09:09:42 +0800 Subject: [PATCH] ENH:"Option" key on Mac is equal to "Alt" key on Windows jira: STUDIO-7218 Change-Id: Ic2ce789e1b874fdbb7829b8814e7a851f0af8aaa --- src/slic3r/GUI/GLCanvas3D.cpp | 3 ++- src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp | 9 +++++---- .../GUI/Gizmos/GLGizmoMmuSegmentation.cpp | 17 +++++++++-------- src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp | 7 ++++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3d724db76..024209301 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1174,9 +1174,10 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed) m_selection.set_volumes(&m_volumes.volumes); + const wxString alt = GUI::shortkey_alt_prefix(); m_assembly_view_desc["object_selection_caption"] = _L("Left mouse button"); m_assembly_view_desc["object_selection"] = _L("object selection"); - m_assembly_view_desc["part_selection_caption"] = "Alt +" + _L("Left mouse button"); + m_assembly_view_desc["part_selection_caption"] = alt + _L("Left mouse button"); m_assembly_view_desc["part_selection"] = _L("part selection"); m_assembly_view_desc["number_key_caption"] = "1~16 " + _L("number keys"); m_assembly_view_desc["number_key"] = _L("number keys can quickly change the color of objects"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 850e14c89..b7278b60a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -83,8 +83,9 @@ bool GLGizmoFdmSupports::on_init() { // BBS m_shortcut_key = WXK_CONTROL_L; - - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + const wxString ctrl = GUI::shortkey_ctrl_prefix(); + const wxString alt = GUI::shortkey_alt_prefix(); + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); @@ -99,10 +100,10 @@ bool GLGizmoFdmSupports::on_init() m_desc["highlight_by_angle"] = _L("Highlight overhang areas"); m_desc["gap_fill"] = _L("Gap fill"); m_desc["perform"] = _L("Perform"); - m_desc["gap_area_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["gap_area_caption"] = ctrl +_L("Mouse wheel"); m_desc["gap_area"] = _L("Gap area"); m_desc["tool_type"] = _L("Tool type"); - m_desc["smart_fill_angle_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["smart_fill_angle_caption"] = ctrl + _L("Mouse wheel"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); m_desc["on_overhangs_only"] = _L("On overhangs only"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 4d555f6ab..549538a0c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -104,11 +104,12 @@ bool GLGizmoMmuSegmentation::on_init() { // BBS m_shortcut_key = WXK_CONTROL_N; - - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + const wxString ctrl = GUI::shortkey_ctrl_prefix(); + const wxString alt = GUI::shortkey_alt_prefix(); + m_desc["clipping_of_view_caption"] = alt+ _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"] = ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Pen size"); m_desc["cursor_type"] = _L("Pen shape"); @@ -119,7 +120,7 @@ bool GLGizmoMmuSegmentation::on_init() m_desc["shortcut_key_caption"] = _L("Key 1~9"); m_desc["shortcut_key"] = _L("Choose filament"); m_desc["edge_detection"] = _L("Edge detection"); - m_desc["gap_area_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["gap_area_caption"] = ctrl + _L("Mouse wheel"); m_desc["gap_area"] = _L("Gap area"); m_desc["perform"] = _L("Perform"); @@ -134,15 +135,15 @@ bool GLGizmoMmuSegmentation::on_init() m_desc["tool_smart_fill"] = _L("Smart fill"); m_desc["tool_bucket_fill"] = _L("Bucket fill"); - m_desc["smart_fill_angle_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["smart_fill_angle_caption"] = ctrl + _L("Mouse wheel"); m_desc["smart_fill_angle"] = _L("Smart fill angle"); - m_desc["height_range_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["height_range_caption"] = ctrl + _L("Mouse wheel"); m_desc["height_range"] = _L("Height range"); //add toggle wire frame hint - m_desc["toggle_wireframe_caption"] = _L("Alt + Shift + Enter"); - m_desc["toggle_wireframe"] = _L("Toggle Wireframe"); + m_desc["toggle_wireframe_caption"] = alt + _L("Shift + Enter"); + m_desc["toggle_wireframe"] = _L("Toggle Wireframe"); init_extruders_data(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index e75f70c77..71b702224 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -28,11 +28,12 @@ void GLGizmoSeam::on_shutdown() bool GLGizmoSeam::on_init() { m_shortcut_key = WXK_CONTROL_P; - - m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); + const wxString ctrl = GUI::shortkey_ctrl_prefix(); + const wxString alt = GUI::shortkey_alt_prefix(); + m_desc["clipping_of_view_caption"] = alt + _L("Mouse wheel"); m_desc["clipping_of_view"] = _L("Section view"); m_desc["reset_direction"] = _L("Reset direction"); - m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); + m_desc["cursor_size_caption"]= ctrl + _L("Mouse wheel"); m_desc["cursor_size"] = _L("Brush size"); m_desc["cursor_type"] = _L("Brush shape"); m_desc["enforce_caption"] = _L("Left mouse button");