3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 15:57:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH:Gizmo shortcut key added

Browse source 
Change-Id: I4d089ef521b16d3ffedd07ba8b22043b899fe7b2
(cherry picked from commit 2f425b8321b3d24d24928185d0c33d54a3a9126b)
This commit is contained in:
xiangdong.yang 2022-07-28 10:15:33 +08:00 • committed by Lane.Wei
parent 7ced9f4e23
commit cd907bbc9a
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -5067,7 +5067,7 @@ bool GLCanvas3D::_init_main_toolbar()
item.name = "add"; item.name = "add";
item.icon_filename = "toolbar_open.svg"; item.icon_filename = "toolbar_open.svg";
item.tooltip = _utf8(L("Add")); item.tooltip = _utf8(L("Add")) + " [" + GUI::shortkey_ctrl_prefix() + "I]";
item.sprite_id = 0; item.sprite_id = 0;
item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ADD)); }; item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ADD)); };
item.enabling_callback = []()->bool {return wxGetApp().plater()->can_add_model(); }; item.enabling_callback = []()->bool {return wxGetApp().plater()->can_add_model(); };
@ -5105,7 +5105,7 @@ bool GLCanvas3D::_init_main_toolbar()
item.name = "arrange"; item.name = "arrange";
item.icon_filename = "toolbar_arrange.svg"; item.icon_filename = "toolbar_arrange.svg";
item.tooltip = _utf8(L("Auto arrange")); item.tooltip = _utf8(L("Arrange all objects")) + " [A]\n" + _utf8(L("Arrange objects on selected plates")) + " [Shift+A]";
item.sprite_id++; item.sprite_id++;
item.left.action_callback = []() {}; item.left.action_callback = []() {};
item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); };

2
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View file

@ -174,7 +174,7 @@ bool GLGizmoAdvancedCut::on_init()
if (!GLGizmoRotate3D::on_init()) if (!GLGizmoRotate3D::on_init())
return false; return false;
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_C;
return true; return true;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -76,7 +76,7 @@ std::string GLGizmoFdmSupports::on_get_name() const
bool GLGizmoFdmSupports::on_init() bool GLGizmoFdmSupports::on_init()
{ {
// BBS // BBS
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_L;
m_desc["clipping_of_view"] = _L("Section view") + ": "; m_desc["clipping_of_view"] = _L("Section view") + ": ";
m_desc["cursor_size"] = _L("Pen size") + ": "; m_desc["cursor_size"] = _L("Pen size") + ": ";

2
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
View file

@ -25,7 +25,7 @@ GLGizmoFlatten::GLGizmoFlatten(GLCanvas3D& parent, const std::string& icon_filen
bool GLGizmoFlatten::on_init() bool GLGizmoFlatten::on_init()
{ {
// BBS // BBS
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_F;
return true; return true;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View file

@ -94,7 +94,7 @@ void GLGizmoMmuSegmentation::init_extruders_data()
bool GLGizmoMmuSegmentation::on_init() bool GLGizmoMmuSegmentation::on_init()
{ {
// BBS // BBS
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_N;
m_desc["clipping_of_view"] = _L("Section view") + ": "; m_desc["clipping_of_view"] = _L("Section view") + ": ";
m_desc["cursor_size"] = _L("Pen size") + ": "; m_desc["cursor_size"] = _L("Pen size") + ": ";

2
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
View file

@ -56,7 +56,7 @@ bool GLGizmoMove3D::on_init()
m_grabbers.push_back(Grabber()); m_grabbers.push_back(Grabber());
} }
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_M;
return true; return true;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
View file

@ -466,7 +466,7 @@ bool GLGizmoRotate3D::on_init()
m_gizmos[i].set_highlight_color(AXES_COLOR[i]); m_gizmos[i].set_highlight_color(AXES_COLOR[i]);
} }
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_R;
return true; return true;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View file

@ -74,7 +74,7 @@ bool GLGizmoScale3D::on_init()
// BBS // BBS
m_grabbers[4].enabled = false; m_grabbers[4].enabled = false;
m_shortcut_key = WXK_NONE; m_shortcut_key = WXK_CONTROL_S;
return true; return true;
} }