3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes and tweaks in keyboard shortcuts dialog

Browse source
This commit is contained in:
enricoturri1966 2020-12-09 14:03:30 +01:00
parent a2494689b9
commit 5470af3938
2 changed files with 57 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

121
src/slic3r/GUI/KBShortcutsDialog.cpp
View file

@ -8,24 +8,7 @@
#include "GUI_App.hpp" #include "GUI_App.hpp"
#include "wxExtensions.hpp" #include "wxExtensions.hpp"
#include "MainFrame.hpp" #include "MainFrame.hpp"
#define NOTEBOOK_TOP 1
#define NOTEBOOK_LEFT 2
#define LISTBOOK_TOP 3
#define LISTBOOK_LEFT 4
#define TOOLBOOK 5
#define CHOICEBOOK 6
#define BOOK_TYPE NOTEBOOK_TOP
#if (BOOK_TYPE == NOTEBOOK_TOP) || (BOOK_TYPE == NOTEBOOK_LEFT)
#include <wx/notebook.h> #include <wx/notebook.h>
#elif (BOOK_TYPE == LISTBOOK_TOP) || (BOOK_TYPE == LISTBOOK_LEFT)
#include <wx/listbook.h>
#elif BOOK_TYPE == TOOLBOOK
#include <wx/toolbook.h>
#elif BOOK_TYPE == CHOICEBOOK
#include <wx/choicebk.h>
#endif // BOOK_TYPE
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
@ -45,26 +28,14 @@ KBShortcutsDialog::KBShortcutsDialog()
main_sizer->Add(create_header(this, bold_font), 0, wxEXPAND | wxALL, 10); main_sizer->Add(create_header(this, bold_font), 0, wxEXPAND | wxALL, 10);
#if BOOK_TYPE == NOTEBOOK_TOP
wxNotebook* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP); wxNotebook* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP);
#elif BOOK_TYPE == NOTEBOOK_LEFT main_sizer->Add(book, 1, wxEXPAND | wxALL, 10);
wxNotebook* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_LEFT);
#elif BOOK_TYPE == LISTBOOK_TOP
wxListbook* book = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_TOP);
#elif BOOK_TYPE == LISTBOOK_LEFT
wxListbook* book = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_LEFT);
#elif BOOK_TYPE == TOOLBOOK
wxToolbook* book = new wxToolbook(this, wxID_ANY);
#elif BOOK_TYPE == CHOICEBOOK
wxChoicebook* book = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_TOP);
#endif // BOOK_TYPE
main_sizer->Add(book, 1, wxEXPAND | wxALL, 10);
fill_shortcuts(); fill_shortcuts();
for (size_t i = 0; i < m_full_shortcuts.size(); ++i) { for (size_t i = 0; i < m_full_shortcuts.size(); ++i) {
wxPanel* page = create_page(book, m_full_shortcuts[i], font, bold_font); wxPanel* page = create_page(book, m_full_shortcuts[i], font, bold_font);
m_pages.push_back(page); m_pages.push_back(page);
book->AddPage(page, m_full_shortcuts[i].first, i == 0); book->AddPage(page, m_full_shortcuts[i].first.first, i == 0);
} }
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK); wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
@ -73,6 +44,7 @@ main_sizer->Add(book, 1, wxEXPAND | wxALL, 10);
SetSizer(main_sizer); SetSizer(main_sizer);
main_sizer->SetSizeHints(this); main_sizer->SetSizeHints(this);
this->CenterOnParent();
} }
void KBShortcutsDialog::on_dpi_changed(const wxRect& suggested_rect) void KBShortcutsDialog::on_dpi_changed(const wxRect& suggested_rect)
@ -142,7 +114,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({ { _L("Commands"), "" }, commands_shortcuts });
Shortcuts plater_shortcuts = { Shortcuts plater_shortcuts = {
{ "A", L("Arrange") }, { "A", L("Arrange") },
@ -192,7 +164,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({ { _L("Plater"), "" }, plater_shortcuts });
Shortcuts gizmos_shortcuts = { Shortcuts gizmos_shortcuts = {
{ ctrl, L("All gizmos: Rotate - left mouse button; Pan - right mouse button") }, { ctrl, L("All gizmos: Rotate - left mouse button; Pan - right mouse button") },
@ -204,7 +176,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ alt, L("Gizmo rotate: Press to rotate selected objects around their own center") }, { alt, L("Gizmo rotate: Press to rotate selected objects around their own center") },
}; };
m_full_shortcuts.push_back(std::make_pair(_L("Gizmos"), gizmos_shortcuts)); m_full_shortcuts.push_back({ { _L("Gizmos"), _L("The following shortcuts are applicable when the specified gizmo is active") }, gizmos_shortcuts });
} }
else { else {
Shortcuts commands_shortcuts = { Shortcuts commands_shortcuts = {
@ -216,7 +188,7 @@ void KBShortcutsDialog::fill_shortcuts()
#endif // __APPLE__ #endif // __APPLE__
}; };
m_full_shortcuts.push_back(std::make_pair(_L("Commands"), commands_shortcuts)); m_full_shortcuts.push_back({ { _L("Commands"), "" }, commands_shortcuts });
} }
Shortcuts preview_shortcuts = { Shortcuts preview_shortcuts = {
@ -240,20 +212,16 @@ void KBShortcutsDialog::fill_shortcuts()
#endif // ENABLE_ARROW_KEYS_WITH_SLIDERS #endif // ENABLE_ARROW_KEYS_WITH_SLIDERS
}; };
m_full_shortcuts.push_back(std::make_pair(_L("Preview"), preview_shortcuts)); m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts });
Shortcuts layers_slider_shortcuts = { Shortcuts layers_slider_shortcuts = {
#if ENABLE_ARROW_KEYS_WITH_SLIDERS #if ENABLE_ARROW_KEYS_WITH_SLIDERS
{ L("Arrow Up"), L("Vertical slider - Move active thumb Up") }, { L("Arrow Up"), L("Move active thumb Up") },
{ L("Arrow Down"), L("Vertical slider - Move active thumb Down") }, { L("Arrow Down"), L("Move active thumb Down") },
{ L("Arrow Left"), L("Vertical slider - Set upper thumb as active") }, { L("Arrow Left"), L("Set upper thumb as active") },
{ L("Arrow Right"), L("Vertical slider - Set lower thumb as active") }, { L("Arrow Right"), L("Set lower thumb as active") },
{ "+", L("Vertical slider - Add color change marker for current layer") }, { "+", L("Add color change marker for current layer") },
{ "-", L("Vertical slider - Delete color change marker for current layer") }, { "-", L("Delete color change marker for current layer") },
{ L("Arrow Up"), L("Horizontal slider - Set left thumb as active") },
{ L("Arrow Down"), L("Horizontal slider - Set right thumb as active") },
{ L("Arrow Left"), L("Horizontal slider - Move active thumb Left") },
{ L("Arrow Right"), L("Horizontal slider - Move active thumb Right") },
#else #else
{ L("Arrow Up"), L("Move current slider thumb Up") }, { L("Arrow Up"), L("Move current slider thumb Up") },
{ L("Arrow Down"), L("Move current slider thumb Down") }, { L("Arrow Down"), L("Move current slider thumb Down") },
@ -266,16 +234,23 @@ void KBShortcutsDialog::fill_shortcuts()
{ ctrl, 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({ { _L("Vertical Slider"), _L("The following shortcuts are applicable when the vertical slider, in preview, is active") }, layers_slider_shortcuts });
Shortcuts sequential_slider_shortcuts = { Shortcuts sequential_slider_shortcuts = {
#if ENABLE_ARROW_KEYS_WITH_SLIDERS
{ L("Arrow Left"), L("Move active thumb Left") },
{ L("Arrow Right"), L("Move active thumb Right") },
{ L("Arrow Up"), L("Set left thumb as active") },
{ L("Arrow Down"), L("Set right thumb as active") },
#else
{ L("Arrow Left"), L("Move active slider thumb Left") }, { L("Arrow Left"), L("Move active slider thumb Left") },
{ L("Arrow Right"), L("Move active slider thumb Right") }, { L("Arrow Right"), L("Move active slider thumb Right") },
#endif // ENABLE_ARROW_KEYS_WITH_SLIDERS
{ "Shift+", L("Press to speed up 5 times while moving thumb\nwith arrow keys or mouse wheel") }, { "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") }, { 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)); m_full_shortcuts.push_back({ { _L("Horizontal Slider"), _L("The following shortcuts are applicable when the horizontal slider, in preview, is active") }, sequential_slider_shortcuts });
} }
wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_font) wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_font)
@ -308,22 +283,29 @@ wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_f
return panel; return panel;
} }
wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const std::pair<wxString, Shortcuts>& shortcuts, const wxFont& font, const wxFont& bold_font) wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& shortcuts, const wxFont& font, const wxFont& bold_font)
{ {
wxPanel* main_page = new wxPanel(parent);
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
if (!shortcuts.first.second.empty()) {
main_sizer->AddSpacer(10);
wxBoxSizer* info_sizer = new wxBoxSizer(wxHORIZONTAL);
info_sizer->AddStretchSpacer();
info_sizer->Add(new wxStaticText(main_page, wxID_ANY, shortcuts.first.second), 0);
info_sizer->AddStretchSpacer();
main_sizer->Add(info_sizer, 0, wxEXPAND);
main_sizer->AddSpacer(10);
}
static const int max_items_per_column = 20; static const int max_items_per_column = 20;
int columns_count = 1 + (int)shortcuts.second.size() / max_items_per_column; int columns_count = 1 + static_cast<int>(shortcuts.second.size()) / max_items_per_column;
wxScrolledWindow* page = new wxScrolledWindow(parent); wxScrolledWindow* scrollable_panel = new wxScrolledWindow(main_page);
page->SetScrollbars(20, 20, 50, 50); scrollable_panel->SetScrollbars(20, 20, 50, 50);
page->SetInitialSize(wxSize(850, 450)); scrollable_panel->SetInitialSize(wxSize(850, 450));
#if (BOOK_TYPE == LISTBOOK_TOP) || (BOOK_TYPE == LISTBOOK_LEFT)
wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, page, " " + shortcuts.first + " ");
sizer->GetStaticBox()->SetFont(bold_font);
#else
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
#endif // BOOK_TYPE
wxBoxSizer* scrollable_panel_sizer = new wxBoxSizer(wxVERTICAL);
wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(2 * columns_count, 5, 15); wxFlexGridSizer* grid_sizer = new wxFlexGridSizer(2 * columns_count, 5, 15);
int items_count = (int)shortcuts.second.size(); int items_count = (int)shortcuts.second.size();
@ -332,25 +314,30 @@ wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const std::pair<wxStri
int id = j * max_items_per_column + i; int id = j * max_items_per_column + i;
if (id < items_count) { if (id < items_count) {
const auto& [shortcut, description] = shortcuts.second[id]; const auto& [shortcut, description] = shortcuts.second[id];
auto key = new wxStaticText(page, wxID_ANY, _(shortcut)); auto key = new wxStaticText(scrollable_panel, wxID_ANY, _(shortcut));
key->SetFont(bold_font); key->SetFont(bold_font);
grid_sizer->Add(key, 0, wxALIGN_CENTRE_VERTICAL); grid_sizer->Add(key, 0, wxALIGN_CENTRE_VERTICAL);
auto desc = new wxStaticText(page, wxID_ANY, _(description)); auto desc = new wxStaticText(scrollable_panel, wxID_ANY, _(description));
desc->SetFont(font); desc->SetFont(font);
grid_sizer->Add(desc, 0, wxALIGN_CENTRE_VERTICAL); grid_sizer->Add(desc, 0, wxALIGN_CENTRE_VERTICAL);
} }
else { else {
grid_sizer->Add(new wxStaticText(page, wxID_ANY, ""), 0, wxALIGN_CENTRE_VERTICAL); if (columns_count > 1) {
grid_sizer->Add(new wxStaticText(page, wxID_ANY, ""), 0, wxALIGN_CENTRE_VERTICAL); grid_sizer->Add(new wxStaticText(scrollable_panel, wxID_ANY, ""), 0, wxALIGN_CENTRE_VERTICAL);
grid_sizer->Add(new wxStaticText(scrollable_panel, wxID_ANY, ""), 0, wxALIGN_CENTRE_VERTICAL);
}
} }
} }
} }
sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 10); scrollable_panel_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, 10);
scrollable_panel->SetSizer(scrollable_panel_sizer);
page->SetSizer(sizer); main_sizer->Add(scrollable_panel, 1, wxEXPAND);
return page; main_page->SetSizer(main_sizer);
return main_page;
} }
} // namespace GUI } // namespace GUI

6
src/slic3r/GUI/KBShortcutsDialog.hpp
View file

@ -15,7 +15,8 @@ class KBShortcutsDialog : public DPIDialog
{ {
typedef std::pair<std::string, std::string> Shortcut; typedef std::pair<std::string, std::string> Shortcut;
typedef std::vector<Shortcut> Shortcuts; typedef std::vector<Shortcut> Shortcuts;
typedef std::vector<std::pair<wxString, Shortcuts>> ShortcutsVec; typedef std::pair<std::pair<wxString, wxString>, Shortcuts> ShortcutsItem;
typedef std::vector<ShortcutsItem> ShortcutsVec;
ShortcutsVec m_full_shortcuts; ShortcutsVec m_full_shortcuts;
ScalableBitmap m_logo_bmp; ScalableBitmap m_logo_bmp;
@ -32,8 +33,7 @@ private:
void fill_shortcuts(); void fill_shortcuts();
wxPanel* create_header(wxWindow* parent, const wxFont& bold_font); wxPanel* create_header(wxWindow* parent, const wxFont& bold_font);
wxPanel* create_page(wxWindow* parent, const std::pair<wxString, Shortcuts>& shortcuts, const wxFont& font, const wxFont& bold_font); wxPanel* create_page(wxWindow* parent, const ShortcutsItem& shortcuts, const wxFont& font, const wxFont& bold_font);
}; };
} // namespace GUI } // namespace GUI