mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:"Option" key on Mac is equal to "Alt" key on Windows 

jira: STUDIO-7218
Change-Id: Ic2ce789e1b874fdbb7829b8814e7a851f0af8aaa
This commit is contained in:
zhou.xu 2024-06-03 09:09:42 +08:00 committed by Lane.Wei
parent 76b5bc626e
commit 7750c82ebf
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1174,9 +1174,10 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed)
m_selection.set_volumes(&m_volumes.volumes); 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_caption"] = _L("Left mouse button");
m_assembly_view_desc["object_selection"] = _L("object selection"); 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["part_selection"] = _L("part selection");
m_assembly_view_desc["number_key_caption"] = "1~16 " + _L("number keys"); 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"); m_assembly_view_desc["number_key"] = _L("number keys can quickly change the color of objects");

9
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View File

@ -83,8 +83,9 @@ bool GLGizmoFdmSupports::on_init()
{ {
// BBS // BBS
m_shortcut_key = WXK_CONTROL_L; m_shortcut_key = WXK_CONTROL_L;
const wxString ctrl = GUI::shortkey_ctrl_prefix();
m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); 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["clipping_of_view"] = _L("Section view");
m_desc["reset_direction"] = _L("Reset direction"); m_desc["reset_direction"] = _L("Reset direction");
m_desc["cursor_size_caption"] = _L("Ctrl + Mouse wheel"); 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["highlight_by_angle"] = _L("Highlight overhang areas");
m_desc["gap_fill"] = _L("Gap fill"); m_desc["gap_fill"] = _L("Gap fill");
m_desc["perform"] = _L("Perform"); 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["gap_area"] = _L("Gap area");
m_desc["tool_type"] = _L("Tool type"); 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["smart_fill_angle"] = _L("Smart fill angle");
m_desc["on_overhangs_only"] = _L("On overhangs only"); m_desc["on_overhangs_only"] = _L("On overhangs only");

17
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View File

@ -104,11 +104,12 @@ bool GLGizmoMmuSegmentation::on_init()
{ {
// BBS // BBS
m_shortcut_key = WXK_CONTROL_N; m_shortcut_key = WXK_CONTROL_N;
const wxString ctrl = GUI::shortkey_ctrl_prefix();
m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); 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["clipping_of_view"] = _L("Section view");
m_desc["reset_direction"] = _L("Reset direction"); 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_size"] = _L("Pen size");
m_desc["cursor_type"] = _L("Pen shape"); 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_caption"] = _L("Key 1~9");
m_desc["shortcut_key"] = _L("Choose filament"); m_desc["shortcut_key"] = _L("Choose filament");
m_desc["edge_detection"] = _L("Edge detection"); 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["gap_area"] = _L("Gap area");
m_desc["perform"] = _L("Perform"); m_desc["perform"] = _L("Perform");
@ -134,15 +135,15 @@ bool GLGizmoMmuSegmentation::on_init()
m_desc["tool_smart_fill"] = _L("Smart fill"); m_desc["tool_smart_fill"] = _L("Smart fill");
m_desc["tool_bucket_fill"] = _L("Bucket 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["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"); m_desc["height_range"] = _L("Height range");
//add toggle wire frame hint //add toggle wire frame hint
m_desc["toggle_wireframe_caption"] = _L("Alt + Shift + Enter"); m_desc["toggle_wireframe_caption"] = alt + _L("Shift + Enter");
m_desc["toggle_wireframe"] = _L("Toggle Wireframe"); m_desc["toggle_wireframe"] = _L("Toggle Wireframe");
init_extruders_data(); init_extruders_data();

7
src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
View File

@ -28,11 +28,12 @@ void GLGizmoSeam::on_shutdown()
bool GLGizmoSeam::on_init() bool GLGizmoSeam::on_init()
{ {
m_shortcut_key = WXK_CONTROL_P; m_shortcut_key = WXK_CONTROL_P;
const wxString ctrl = GUI::shortkey_ctrl_prefix();
m_desc["clipping_of_view_caption"] = _L("Alt + Mouse wheel"); 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["clipping_of_view"] = _L("Section view");
m_desc["reset_direction"] = _L("Reset direction"); 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_size"] = _L("Brush size");
m_desc["cursor_type"] = _L("Brush shape"); m_desc["cursor_type"] = _L("Brush shape");
m_desc["enforce_caption"] = _L("Left mouse button"); m_desc["enforce_caption"] = _L("Left mouse button");