Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotkeys #5205

Closed
wants to merge 6 commits into from
Closed

Hotkeys #5205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d7846d
UI fixes for Keyboard Shortcuts dialog
jamincollins Apr 26, 2024
8bc7f3c
fix CTRL+Q on Linux/Windows
jamincollins Apr 26, 2024
4a7d5fe
Tab color changes
yw4z Apr 30, 2024
be8a309
Merge pull request #7 from yw4z/patch-1
jamincollins Apr 30, 2024
c189273
Update KBShortcutsDialog.cpp
yw4z May 2, 2024
a95acb1
Merge pull request #9 from yw4z/patch-1
jamincollins May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/slic3r/GUI/KBShortcutsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ void KBShortcutsDialog::OnSelectTabel(wxCommandEvent &event)
while (i != m_hash_selector.end()) {
Select *sel = i->second;
if (id == sel->m_index) {
sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#FFFFFF")));
sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#FFFFFF")));
sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#009688"))); // ORCA use orca color for selected tab background
sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#009688"))); // ORCA use orca color for selected tab background
sel->m_tab_text->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#FEFEFE"))); // ORCA use white text for selected tab
sel->m_tab_text->SetFont(::Label::Head_13);
sel->m_tab_button->Refresh();
sel->m_tab_text->Refresh();
Expand All @@ -105,6 +106,7 @@ void KBShortcutsDialog::OnSelectTabel(wxCommandEvent &event)
} else {
sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#F8F8F8")));
sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#F8F8F8")));
sel->m_tab_text->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#262E30"))); // ORCA use black text for unselected tab
sel->m_tab_text->SetFont(::Label::Body_13);
sel->m_tab_button->Refresh();
sel->m_tab_text->Refresh();
Expand All @@ -125,6 +127,7 @@ wxWindow *KBShortcutsDialog::create_button(int id, wxString text)
auto stext = new wxStaticText(tab_button, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, 0);
stext->SetFont(::Label::Body_13);
stext->SetForegroundColour(wxColour(38, 46, 48));
stext->SetMinSize(wxSize(FromDIP(100), -1));
stext->Wrap(-1);
sizer->Add(stext, 1, wxALIGN_CENTER, 0);

Expand Down Expand Up @@ -345,15 +348,17 @@ wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& s

for (int i = 0; i < items_count; ++i) {
const auto &[shortcut, description] = shortcuts.second[i];
auto key = new wxStaticText(scrollable_panel, wxID_ANY, _(shortcut));
auto key = new wxStaticText(scrollable_panel, wxID_ANY, _(shortcut));
key->SetForegroundColour(wxColour(50, 58, 61));
key->SetMinSize(wxSize(FromDIP(100), -1));
key->SetFont(bold_font);
grid_sizer->Add(key, 0, wxALIGN_CENTRE_VERTICAL);

auto desc = new wxStaticText(scrollable_panel, wxID_ANY, _(description));
desc->SetFont(font);
desc->SetForegroundColour(wxColour(50, 58, 61));
desc->Wrap(FromDIP(600));
desc->SetMinSize(wxSize(FromDIP(700), -1));
desc->Wrap(FromDIP(700));
grid_sizer->Add(desc, 0, wxALIGN_CENTRE_VERTICAL);
}

Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
this->Iconize();
return;
}
if (evt.CmdDown() && evt.GetKeyCode() == 'Q') { wxPostEvent(this, wxCloseEvent(wxEVT_CLOSE_WINDOW)); return;}
if (evt.CmdDown() && evt.RawControlDown() && evt.GetKeyCode() == 'F') {
EnableFullScreenView(true);
if (IsFullScreen()) {
Expand All @@ -557,6 +556,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
}
return;}
#endif
if (evt.CmdDown() && evt.GetKeyCode() == 'Q') { wxPostEvent(this, wxCloseEvent(wxEVT_CLOSE_WINDOW)); return;}
if (evt.CmdDown() && evt.GetKeyCode() == 'R') { if (m_slice_enable) { wxGetApp().plater()->update(true, true); wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_PLATE)); this->m_tabpanel->SetSelection(tpPreview); } return; }
if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'G') {
m_plater->apply_background_progress();
Expand Down