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

ENABLE_GCODE_VIEWER -> Updated keyboard shortcuts dialog

Browse Source
This commit is contained in:
enricoturri1966 2020-06-09 08:37:24 +02:00
parent d358fe85fa
commit 345c01c54f
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
#include "libslic3r/libslic3r.h"
#include "KBShortcutsDialog.hpp" #include "KBShortcutsDialog.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
@ -29,7 +30,7 @@ namespace Slic3r {
namespace GUI { namespace GUI {
KBShortcutsDialog::KBShortcutsDialog() KBShortcutsDialog::KBShortcutsDialog()
: DPIDialog(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(L("Keyboard Shortcuts")), : DPIDialog(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _L("Keyboard Shortcuts"),
#if ENABLE_SCROLLABLE #if ENABLE_SCROLLABLE
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
#else #else
@ -146,7 +147,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ "?", L("Show keyboard shortcuts list") } { "?", L("Show keyboard shortcuts list") }
}; };
m_full_shortcuts.push_back(std::make_pair(_(L("Commands")), commands_shortcuts)); m_full_shortcuts.push_back(std::make_pair(_L("Commands"), commands_shortcuts));
Shortcuts plater_shortcuts = { Shortcuts plater_shortcuts = {
{ "A", L("Arrange") }, { "A", L("Arrange") },
@ -186,7 +187,7 @@ void KBShortcutsDialog::fill_shortcuts()
#endif // ENABLE_RENDER_PICKING_PASS #endif // ENABLE_RENDER_PICKING_PASS
}; };
m_full_shortcuts.push_back(std::make_pair(_(L("Plater")), plater_shortcuts)); m_full_shortcuts.push_back(std::make_pair(_L("Plater"), plater_shortcuts));
Shortcuts gizmos_shortcuts = { Shortcuts gizmos_shortcuts = {
{ "Shift+", L("Press to snap by 5% in Gizmo scale\nor to snap by 1mm in Gizmo move") }, { "Shift+", L("Press to snap by 5% in Gizmo scale\nor to snap by 1mm in Gizmo move") },
@ -195,7 +196,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ alt, L("Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\nselected objects around their own center") }, { alt, L("Press to scale (in Gizmo scale) or rotate (in Gizmo rotate)\nselected objects around their own center") },
}; };
m_full_shortcuts.push_back(std::make_pair(_(L("Gizmos")), gizmos_shortcuts)); m_full_shortcuts.push_back(std::make_pair(_L("Gizmos"), gizmos_shortcuts));
Shortcuts preview_shortcuts = { Shortcuts preview_shortcuts = {
{ L("Arrow Up"), L("Upper Layer") }, { L("Arrow Up"), L("Upper Layer") },
@ -205,7 +206,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ "L", L("Show/Hide Legend") } { "L", L("Show/Hide Legend") }
}; };
m_full_shortcuts.push_back(std::make_pair(_(L("Preview")), preview_shortcuts)); m_full_shortcuts.push_back(std::make_pair(_L("Preview"), preview_shortcuts));
Shortcuts layers_slider_shortcuts = { Shortcuts layers_slider_shortcuts = {
{ L("Arrow Up"), L("Move current slider thumb Up") }, { L("Arrow Up"), L("Move current slider thumb Up") },
@ -213,10 +214,23 @@ void KBShortcutsDialog::fill_shortcuts()
{ L("Arrow Left"), L("Set upper thumb to current slider thumb") }, { L("Arrow Left"), L("Set upper thumb to current slider thumb") },
{ L("Arrow Right"), L("Set lower thumb to current slider thumb") }, { L("Arrow Right"), L("Set lower thumb to current slider thumb") },
{ "+", L("Add color change marker for current layer") }, { "+", L("Add color change marker for current layer") },
{ "-", L("Delete color change marker for current layer") } { "-", L("Delete color change marker for current layer") },
{ "Shift+", L("Press to speed up 5 times while moving thumb\nwith arrow keys or mouse wheel") },
{ ctrl, L("Press to speed up 5 times while moving thumb\nwith arrow keys or mouse wheel") },
}; };
m_full_shortcuts.push_back(std::make_pair(_(L("Layers Slider")), layers_slider_shortcuts)); m_full_shortcuts.push_back(std::make_pair(_L("Layers Slider"), layers_slider_shortcuts));
#if ENABLE_GCODE_VIEWER
Shortcuts sequential_slider_shortcuts = {
{ L("Arrow Left"), L("Move current slider thumb Left") },
{ L("Arrow Right"), L("Move current slider thumb Right") },
{ "Shift+", L("Press to speed up 5 times while moving thumb\nwith arrow keys or mouse wheel") },
{ ctrl, L("Press to speed up 5 times while moving thumb\nwith arrow keys or mouse wheel") },
};
m_full_shortcuts.push_back(std::make_pair(_L("Sequential Slider"), sequential_slider_shortcuts));
#endif // ENABLE_GCODE_VIEWER
} }
wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_font) wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_font)
@ -239,7 +253,7 @@ wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_f
sizer->Add(m_header_bitmap, 0, wxEXPAND | wxLEFT | wxRIGHT, 10); sizer->Add(m_header_bitmap, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
// text // text
wxStaticText* text = new wxStaticText(panel, wxID_ANY, _(L("Keyboard shortcuts"))); wxStaticText* text = new wxStaticText(panel, wxID_ANY, _L("Keyboard shortcuts"));
text->SetFont(header_font); text->SetFont(header_font);
sizer->Add(text, 0, wxALIGN_CENTER_VERTICAL); sizer->Add(text, 0, wxALIGN_CENTER_VERTICAL);