GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-21 20:18:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added shortcut strings to gizmos and toolbars tooltips

Browse Source
This commit is contained in:
Enrico Turri 2019-01-16 11:51:30 +01:00
parent 52493e1739
commit 8146be5510
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5784,7 +5784,7 @@ bool GLCanvas3D::_init_toolbar()
GLToolbarItem::Data item; GLToolbarItem::Data item;
item.name = "add"; item.name = "add";
item.tooltip = GUI::L_str("Add..."); item.tooltip = GUI::L_str("Add... [Ctrl+I]");
item.sprite_id = 0; item.sprite_id = 0;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_ADD; item.action_event = EVT_GLTOOLBAR_ADD;
@ -5792,7 +5792,7 @@ bool GLCanvas3D::_init_toolbar()
return false; return false;
item.name = "delete"; item.name = "delete";
item.tooltip = GUI::L_str("Delete"); item.tooltip = GUI::L_str("Delete [Del]");
item.sprite_id = 1; item.sprite_id = 1;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_DELETE; item.action_event = EVT_GLTOOLBAR_DELETE;
@ -5800,7 +5800,7 @@ bool GLCanvas3D::_init_toolbar()
return false; return false;
item.name = "deleteall"; item.name = "deleteall";
item.tooltip = GUI::L_str("Delete all"); item.tooltip = GUI::L_str("Delete all [Ctrl+Del]");
item.sprite_id = 2; item.sprite_id = 2;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_DELETE_ALL; item.action_event = EVT_GLTOOLBAR_DELETE_ALL;
@ -5808,7 +5808,7 @@ bool GLCanvas3D::_init_toolbar()
return false; return false;
item.name = "arrange"; item.name = "arrange";
item.tooltip = GUI::L_str("Arrange"); item.tooltip = GUI::L_str("Arrange [A]");
item.sprite_id = 3; item.sprite_id = 3;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_ARRANGE; item.action_event = EVT_GLTOOLBAR_ARRANGE;
@ -5819,7 +5819,7 @@ bool GLCanvas3D::_init_toolbar()
return false; return false;
item.name = "more"; item.name = "more";
item.tooltip = GUI::L_str("Add instance"); item.tooltip = GUI::L_str("Add instance [+]");
item.sprite_id = 4; item.sprite_id = 4;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_MORE; item.action_event = EVT_GLTOOLBAR_MORE;
@ -5827,7 +5827,7 @@ bool GLCanvas3D::_init_toolbar()
return false; return false;
item.name = "fewer"; item.name = "fewer";
item.tooltip = GUI::L_str("Remove instance"); item.tooltip = GUI::L_str("Remove instance [-]");
item.sprite_id = 5; item.sprite_id = 5;
item.is_toggable = false; item.is_toggable = false;
item.action_event = EVT_GLTOOLBAR_FEWER; item.action_event = EVT_GLTOOLBAR_FEWER;

13
src/slic3r/GUI/GLGizmo.cpp
View File

@ -748,7 +748,7 @@ bool GLGizmoRotate3D::on_init()
std::string GLGizmoRotate3D::on_get_name() const std::string GLGizmoRotate3D::on_get_name() const
{ {
return L("Rotate"); return L("Rotate [R]");
} }
void GLGizmoRotate3D::on_start_dragging(const GLCanvas3D::Selection& selection) void GLGizmoRotate3D::on_start_dragging(const GLCanvas3D::Selection& selection)
@ -838,7 +838,7 @@ bool GLGizmoScale3D::on_init()
std::string GLGizmoScale3D::on_get_name() const std::string GLGizmoScale3D::on_get_name() const
{ {
return L("Scale"); return L("Scale [S]");
} }
void GLGizmoScale3D::on_start_dragging(const GLCanvas3D::Selection& selection) void GLGizmoScale3D::on_start_dragging(const GLCanvas3D::Selection& selection)
@ -1197,7 +1197,7 @@ bool GLGizmoMove3D::on_init()
std::string GLGizmoMove3D::on_get_name() const std::string GLGizmoMove3D::on_get_name() const
{ {
return L("Move"); return L("Move [M]");
} }
void GLGizmoMove3D::on_start_dragging(const GLCanvas3D::Selection& selection) void GLGizmoMove3D::on_start_dragging(const GLCanvas3D::Selection& selection)
@ -1427,7 +1427,7 @@ bool GLGizmoFlatten::on_init()
std::string GLGizmoFlatten::on_get_name() const std::string GLGizmoFlatten::on_get_name() const
{ {
return L("Place on face"); return L("Place on face [F]");
} }
bool GLGizmoFlatten::on_is_activable(const GLCanvas3D::Selection& selection) const bool GLGizmoFlatten::on_is_activable(const GLCanvas3D::Selection& selection) const
@ -2240,9 +2240,8 @@ bool GLGizmoSlaSupports::on_is_selectable() const
} }
std::string GLGizmoSlaSupports::on_get_name() const std::string GLGizmoSlaSupports::on_get_name() const
{ {
return L("SLA Support Points"); return L("SLA Support Points [L]");
} }
@ -2353,7 +2352,7 @@ bool GLGizmoCut::on_init()
std::string GLGizmoCut::on_get_name() const std::string GLGizmoCut::on_get_name() const
{ {
return L("Cut"); return L("Cut [C]");
} }
void GLGizmoCut::on_set_state() void GLGizmoCut::on_set_state()

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

@ -120,8 +120,7 @@ void KBShortcutsDialog::fill_shortcuts()
main_shortcuts.push_back(Shortcut("+" ,L("Add Instance to selected object "))); main_shortcuts.push_back(Shortcut("+" ,L("Add Instance to selected object ")));
main_shortcuts.push_back(Shortcut("-" ,L("Remove Instance from selected object"))); main_shortcuts.push_back(Shortcut("-" ,L("Remove Instance from selected object")));
main_shortcuts.push_back(Shortcut("?" ,L("Show keyboard shortcuts list"))); main_shortcuts.push_back(Shortcut("?" ,L("Show keyboard shortcuts list")));
main_shortcuts.push_back(Shortcut("PgUp/PgDn" ,L("Switch between 3D and Preview"))); main_shortcuts.push_back(Shortcut("Shift+LeftMouse", L("Select multiple object/Move multiple object")));
main_shortcuts.push_back(Shortcut("Shift+LeftMouse" ,L("Select multiple object/Move multiple object")));
m_full_shortcuts.emplace(_(L("Main Shortcuts")), main_shortcuts); m_full_shortcuts.emplace(_(L("Main Shortcuts")), main_shortcuts);

4
src/slic3r/GUI/Plater.cpp
View File

@ -2490,7 +2490,7 @@ void Plater::priv::init_view_toolbar()
GLToolbarItem::Data item; GLToolbarItem::Data item;
item.name = "3D"; item.name = "3D";
item.tooltip = GUI::L_str("3D editor view"); item.tooltip = GUI::L_str("3D editor view [Ctrl+5]");
item.sprite_id = 0; item.sprite_id = 0;
item.action_event = EVT_GLVIEWTOOLBAR_3D; item.action_event = EVT_GLVIEWTOOLBAR_3D;
item.is_toggable = false; item.is_toggable = false;
@ -2498,7 +2498,7 @@ void Plater::priv::init_view_toolbar()
return; return;
item.name = "Preview"; item.name = "Preview";
item.tooltip = GUI::L_str("Preview"); item.tooltip = GUI::L_str("Preview [Ctrl+6]");
item.sprite_id = 1; item.sprite_id = 1;
item.action_event = EVT_GLVIEWTOOLBAR_PREVIEW; item.action_event = EVT_GLVIEWTOOLBAR_PREVIEW;
item.is_toggable = false; item.is_toggable = false;