diff options
| author | Vojtech Bubnik <bubnikv@gmail.com> | 2020-12-09 13:02:45 +0300 |
|---|---|---|
| committer | Vojtech Bubnik <bubnikv@gmail.com> | 2020-12-09 13:02:45 +0300 |
| commit | 1210a250c8584f34ae5dfc6aeb5e36294998852b (patch) | |
| tree | 0c5fa77c9187cf207a3414da339a93dd13cf028f | |
| parent | 4af3819c855a933972608181728c1619735092b2 (diff) | |
| parent | 5a9e94e67d324c6c3b340a67a9231d70cbe08cde (diff) | |
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
| -rw-r--r-- | src/slic3r/GUI/DoubleSlider.cpp | 5 | ||||
| -rw-r--r-- | src/slic3r/GUI/Preferences.cpp | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 5ec4b3ee2..48a7677cf 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1795,8 +1795,9 @@ void Control::show_add_context_menu() append_add_color_change_menu_item(&menu); } - append_menu_item(&menu, wxID_ANY, _L("Add pause print") + " (" + gcode(PausePrint) + ")", "", - [this](wxCommandEvent&) { add_code_as_tick(PausePrint); }, "pause_print", &menu); + if (!gcode(PausePrint).empty()) + append_menu_item(&menu, wxID_ANY, _L("Add pause print") + " (" + gcode(PausePrint) + ")", "", + [this](wxCommandEvent&) { add_code_as_tick(PausePrint); }, "pause_print", &menu); if (!gcode(Template).empty()) append_menu_item(&menu, wxID_ANY, _L("Add custom template") + " (" + gcode(Template) + ")", "", diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index c2566f20f..1aa9d803e 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -44,10 +44,13 @@ static void activate_options_tab(std::shared_ptr<ConfigOptionsGroup> optgroup) void PreferencesDialog::build() { + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + const wxFont& font = wxGetApp().normal_font(); + SetFont(font); + auto app_config = get_app_config(); wxNotebook* tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME); - tabs->SetFont(wxGetApp().normal_font()); // Add "General" tab m_optgroup_general = create_options_tab(_L("General"), tabs); @@ -328,12 +331,12 @@ void PreferencesDialog::build() #endif // ENABLE_ENVIRONMENT_MAP auto sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(tabs, 1, wxEXPAND); + sizer->Add(tabs, 1, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5); auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL); wxButton* btn = static_cast<wxButton*>(FindWindowById(wxID_OK, this)); btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { accept(); }); - sizer->Add(buttons, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM| wxTOP, 10); + sizer->Add(buttons, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP, 10); SetSizer(sizer); sizer->SetSizeHints(this); |