";
text += "";
@@ -104,8 +104,8 @@ static wxString generate_html_page(const Config::SnapshotDB &snapshot_db, const
bool dark_mode = wxGetApp().dark_mode();
wxString text =
""
- ""
- "";
+ ""
+ "";
text += "";
for (size_t i_row = 0; i_row < snapshot_db.snapshots().size(); ++ i_row) {
const Config::Snapshot &snapshot = snapshot_db.snapshots()[snapshot_db.snapshots().size() - i_row - 1];
@@ -125,7 +125,11 @@ ConfigSnapshotDialog::ConfigSnapshotDialog(const Config::SnapshotDB &snapshot_db
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX)
{
this->SetFont(wxGetApp().normal_font());
+#ifdef _WIN32
+ wxGetApp().UpdateDarkUI(this);
+#else
this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
this->SetSizer(vsizer);
@@ -152,6 +156,7 @@ ConfigSnapshotDialog::ConfigSnapshotDialog(const Config::SnapshotDB &snapshot_db
}
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxCLOSE);
+ wxGetApp().UpdateDarkUI(static_cast(this->FindWindowById(wxID_CLOSE, this)));
this->SetEscapeId(wxID_CLOSE);
this->Bind(wxEVT_BUTTON, &ConfigSnapshotDialog::onCloseDialog, this, wxID_CLOSE);
vsizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index f7d16d843..bc66532a0 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -38,6 +39,7 @@
#include "slic3r/Config/Snapshot.hpp"
#include "slic3r/Utils/PresetUpdater.hpp"
#include "format.hpp"
+#include "MsgDialog.hpp"
#if defined(__linux__) && defined(__WXGTK3__)
#define wxLinux_gtk3 true
@@ -177,6 +179,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
, vendor_id(vendor.id)
, width(0)
{
+ wxGetApp().UpdateDarkUI(this);
const auto &models = vendor.models;
auto *sizer = new wxBoxSizer(wxVERTICAL);
@@ -235,6 +238,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
bitmaps.push_back(bitmap_widget);
auto *variants_panel = new wxPanel(this);
+ wxGetApp().UpdateDarkUI(variants_panel);
auto *variants_sizer = new wxBoxSizer(wxVERTICAL);
variants_panel->SetSizer(variants_sizer);
const auto model_id = model.id;
@@ -323,6 +327,10 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
title_sizer->Add(sel_all, 0, wxRIGHT, BTN_SPACING);
title_sizer->Add(sel_none);
+ wxGetApp().UpdateDarkUI(sel_all_std);
+ wxGetApp().UpdateDarkUI(sel_all);
+ wxGetApp().UpdateDarkUI(sel_none);
+
// fill button indexes used later for buttons rescaling
if (is_variants)
m_button_indexes = { sel_all_std->GetId(), sel_all->GetId(), sel_none->GetId() };
@@ -412,6 +420,8 @@ ConfigWizardPage::ConfigWizardPage(ConfigWizard *parent, wxString title, wxStrin
, shortname(std::move(shortname))
, indent(indent)
{
+ wxGetApp().UpdateDarkUI(this);
+
auto *sizer = new wxBoxSizer(wxVERTICAL);
auto *text = new wxStaticText(this, wxID_ANY, std::move(title), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
@@ -637,6 +647,11 @@ PageMaterials::PageMaterials(ConfigWizard *parent, Materials *materials, wxStrin
btn_sizer->Add(sel_all, 0, wxRIGHT, em / 2);
btn_sizer->Add(sel_none);
+ wxGetApp().UpdateDarkUI(list_printer);
+ wxGetApp().UpdateDarkUI(list_type);
+ wxGetApp().UpdateDarkUI(list_vendor);
+ wxGetApp().UpdateDarkUI(sel_all);
+ wxGetApp().UpdateDarkUI(sel_none);
grid->Add(new wxBoxSizer(wxHORIZONTAL));
grid->Add(new wxBoxSizer(wxHORIZONTAL));
@@ -717,12 +732,16 @@ void PageMaterials::set_compatible_printers_html_window(const std::vectorGetParent()->GetBackgroundColour();
+#else
+#if defined(_WIN32)
+ wxGetApp().get_window_default_clr();
#else
wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+#endif
#endif
const auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
- const auto text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ const auto text_clr = wxGetApp().get_label_clr_default();//wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
const auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
wxString first_line = _L("Filaments marked with * are not compatible with some installed printers.");
wxString text;
@@ -1003,6 +1022,7 @@ void PageMaterials::update_lists(int sel_type, int sel_vendor, int last_selected
sel_vendor_prev = sel_vendor;
}
+ wxGetApp().UpdateDarkUI(list_profile);
}
void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool material_type_ordering)
@@ -1150,6 +1170,8 @@ PageCustom::PageCustom(ConfigWizard *parent)
tc_profile_name = new wxTextCtrl(this, wxID_ANY, default_profile_name);
auto *label = new wxStaticText(this, wxID_ANY, _L("Custom profile name:"));
+ wxGetApp().UpdateDarkUI(tc_profile_name);
+
tc_profile_name->Enable(false);
tc_profile_name->Bind(wxEVT_KILL_FOCUS, [this](wxFocusEvent &evt) {
if (tc_profile_name->GetValue().IsEmpty()) {
@@ -1338,6 +1360,7 @@ PageFirmware::PageFirmware(ConfigWizard *parent)
}
gcode_picker = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices);
+ wxGetApp().UpdateDarkUI(gcode_picker);
const auto &enum_values = gcode_opt.enum_values;
auto needle = enum_values.cend();
if (gcode_opt.default_value) {
@@ -1406,10 +1429,26 @@ static void focus_event(wxFocusEvent& e, wxTextCtrl* ctrl, double def_value)
ctrl->SetValue(double_to_string(val));
}
+class DiamTextCtrl : public wxTextCtrl
+{
+public:
+ DiamTextCtrl(wxWindow* parent)
+ {
+#ifdef _WIN32
+ long style = wxBORDER_SIMPLE;
+#else
+ long style = 0;
+#endif
+ Create(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(Field::def_width_thinner() * wxGetApp().em_unit(), wxDefaultCoord), style);
+ wxGetApp().UpdateDarkUI(this);
+ }
+ ~DiamTextCtrl() {}
+};
+
PageDiameters::PageDiameters(ConfigWizard *parent)
: ConfigWizardPage(parent, _L("Filament and Nozzle Diameters"), _L("Print Diameters"), 1)
- , diam_nozzle(new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(Field::def_width_thinner() * wxGetApp().em_unit(), wxDefaultCoord)))
- , diam_filam (new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(Field::def_width_thinner() * wxGetApp().em_unit(), wxDefaultCoord)))
+ , diam_nozzle(new DiamTextCtrl(this))
+ , diam_filam (new DiamTextCtrl(this))
{
auto *default_nozzle = print_config_def.get("nozzle_diameter")->get_default_value();
wxString value = double_to_string(default_nozzle != nullptr && default_nozzle->size() > 0 ? default_nozzle->get_at(0) : 0.5);
@@ -1477,10 +1516,29 @@ void PageDiameters::apply_custom_config(DynamicPrintConfig &config)
set_extrusion_width("solid_infill_extrusion_width", 0.45);
}
+class SpinCtrlDouble: public wxSpinCtrlDouble
+{
+public:
+ SpinCtrlDouble(wxWindow* parent)
+ {
+#ifdef _WIN32
+ long style = wxSP_ARROW_KEYS | wxBORDER_SIMPLE;
+#else
+ long style = wxSP_ARROW_KEYS;
+#endif
+ Create(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, style);
+#ifdef _WIN32
+ wxGetApp().UpdateDarkUI(this->GetText());
+#endif
+ this->Refresh();
+ }
+ ~SpinCtrlDouble() {}
+};
+
PageTemperatures::PageTemperatures(ConfigWizard *parent)
: ConfigWizardPage(parent, _L("Nozzle and Bed Temperatures"), _L("Temperatures"), 1)
- , spin_extr(new wxSpinCtrlDouble(this, wxID_ANY))
- , spin_bed(new wxSpinCtrlDouble(this, wxID_ANY))
+ , spin_extr(new SpinCtrlDouble(this))
+ , spin_bed (new SpinCtrlDouble(this))
{
spin_extr->SetIncrement(5.0);
const auto &def_extr = *print_config_def.get("temperature");
@@ -1703,6 +1761,7 @@ void ConfigWizardIndex::on_paint(wxPaintEvent & evt)
x += + bullet_w + em_w/2;
const auto text_size = dc.GetTextExtent(item.label);
+ dc.SetTextForeground(wxGetApp().get_label_clr_default());
dc.DrawText(item.label, x, y + yoff_text);
y += yinc;
@@ -2341,7 +2400,8 @@ bool ConfigWizard::priv::check_and_install_missing_materials(Technology technolo
const auto ask_and_select_default_materials = [this](const wxString &message, const std::set &printer_models, Technology technology)
{
- wxMessageDialog msg(q, message, _L("Notice"), wxYES_NO);
+ //wxMessageDialog msg(q, message, _L("Notice"), wxYES_NO);
+ MessageDialog msg(q, message, _L("Notice"), wxYES_NO);
if (msg.ShowModal() == wxID_YES)
select_default_materials_for_printer_models(technology, printer_models);
};
@@ -2628,6 +2688,12 @@ ConfigWizard::ConfigWizard(wxWindow *parent)
p->btnsizer->Add(p->btn_finish, 0, wxLEFT, BTN_SPACING);
p->btnsizer->Add(p->btn_cancel, 0, wxLEFT, BTN_SPACING);
+ wxGetApp().UpdateDarkUI(p->btn_sel_all);
+ wxGetApp().UpdateDarkUI(p->btn_prev);
+ wxGetApp().UpdateDarkUI(p->btn_next);
+ wxGetApp().UpdateDarkUI(p->btn_finish);
+ wxGetApp().UpdateDarkUI(p->btn_cancel);
+
const auto prusa_it = p->bundles.find("PrusaResearch");
wxCHECK_RET(prusa_it != p->bundles.cend(), "Vendor PrusaResearch not found");
const VendorProfile *vendor_prusa = prusa_it->second.vendor_profile;
@@ -2798,5 +2864,11 @@ void ConfigWizard::on_dpi_changed(const wxRect &suggested_rect)
Refresh();
}
+void ConfigWizard::on_sys_color_changed()
+{
+ wxGetApp().UpdateDlgDarkUI(this);
+ Refresh();
+}
+
}
}
diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp
index 86245836b..88d2e2d7c 100644
--- a/src/slic3r/GUI/ConfigWizard.hpp
+++ b/src/slic3r/GUI/ConfigWizard.hpp
@@ -47,6 +47,7 @@ public:
static const wxString& name(const bool from_menu = false);
protected:
void on_dpi_changed(const wxRect &suggested_rect) override ;
+ void on_sys_color_changed() override;
private:
struct priv;
diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp
index 481eee6d4..d610d9672 100644
--- a/src/slic3r/GUI/DoubleSlider.cpp
+++ b/src/slic3r/GUI/DoubleSlider.cpp
@@ -165,6 +165,8 @@ void Control::msw_rescale()
void Control::sys_color_changed()
{
+ GUI::wxGetApp().UpdateDarkUI(GetParent());
+
m_bmp_add_tick_on .msw_rescale();
m_bmp_add_tick_off.msw_rescale();
m_bmp_del_tick_on .msw_rescale();
@@ -494,7 +496,7 @@ void Control::draw_focus_rect()
void Control::render()
{
#ifdef _WIN32
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ GUI::wxGetApp().UpdateDarkUI(this);
#else
SetBackgroundColour(GetParent()->GetBackgroundColour());
#endif // _WIN32
@@ -990,11 +992,7 @@ void Control::draw_colored_band(wxDC& dc)
// don't color a band for MultiExtruder mode
if (m_ticks.empty() || m_mode == MultiExtruder) {
-#ifdef _WIN32
- draw_band(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW), main_band);
-#else
draw_band(dc, GetParent()->GetBackgroundColour(), main_band);
-#endif // _WIN32
return;
}
@@ -1593,12 +1591,9 @@ void Control::append_change_extruder_menu_item(wxMenu* menu, bool switch_current
(switch_current_code ? _L("Switch code to Change extruder") : _L("Change extruder") ) :
_L("Change extruder (N/A)");
- wxMenuItem* change_extruder_menu_item = menu->AppendSubMenu(change_extruder_menu, change_extruder_menu_name, _L("Use another extruder"));
- change_extruder_menu_item->SetBitmap(create_scaled_bitmap(active_extruders[1] > 0 ? "edit_uni" : "change_extruder"));
-
- GUI::wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this, change_extruder_menu_item](wxUpdateUIEvent& evt) {
- enable_menu_item(evt, [this]() {return m_mode == MultiAsSingle; }, change_extruder_menu_item, this); },
- change_extruder_menu_item->GetId());
+ append_submenu(menu, change_extruder_menu, wxID_ANY, change_extruder_menu_name, _L("Use another extruder"),
+ active_extruders[1] > 0 ? "edit_uni" : "change_extruder",
+ [this]() {return m_mode == MultiAsSingle; }, GUI::wxGetApp().plater());
}
}
@@ -1626,7 +1621,7 @@ void Control::append_add_color_change_menu_item(wxMenu* menu, bool switch_curren
format_wxstr(_L("Switch code to Color change (%1%) for:"), gcode(ColorChange)) :
format_wxstr(_L("Add color change (%1%) for:"), gcode(ColorChange));
wxMenuItem* add_color_change_menu_item = menu->AppendSubMenu(add_color_change_menu, menu_name, "");
- add_color_change_menu_item->SetBitmap(create_scaled_bitmap("colorchange_add_m"));
+ add_color_change_menu_item->SetBitmap(create_menu_bitmap("colorchange_add_m"));
}
}
@@ -2143,6 +2138,8 @@ static std::string get_new_color(const std::string& color)
* */
static void upgrade_text_entry_dialog(wxTextEntryDialog* dlg, double min = -1.0, double max = -1.0)
{
+ GUI::wxGetApp().UpdateDlgDarkUI(dlg);
+
// detect TextCtrl and OK button
wxTextCtrl* textctrl {nullptr};
wxWindowList& dlg_items = dlg->GetChildren();
@@ -2487,7 +2484,8 @@ bool Control::check_ticks_changed_event(Type type)
_L("Your current changes will delete all saved color changes.") + "\n\n\t" +
_L("Are you sure you want to continue?");
- wxMessageDialog msg(this, message, _L("Notice"), wxYES_NO);
+ //wxMessageDialog msg(this, message, _L("Notice"), wxYES_NO);
+ GUI::MessageDialog msg(this, message, _L("Notice"), wxYES_NO);
if (msg.ShowModal() == wxID_YES) {
m_ticks.erase_all_ticks_with_code(ColorChange);
post_ticks_changed_event(ColorChange);
@@ -2507,7 +2505,8 @@ bool Control::check_ticks_changed_event(Type type)
_L("Your current changes will delete all saved extruder (tool) changes.") + "\n\n\t" +
_L("Are you sure you want to continue?") ) ;
- wxMessageDialog msg(this, message, _L("Notice"), wxYES_NO | (m_mode == SingleExtruder ? wxCANCEL : 0));
+ //wxMessageDialog msg(this, message, _L("Notice"), wxYES_NO | (m_mode == SingleExtruder ? wxCANCEL : 0));
+ GUI::MessageDialog msg(this, message, _L("Notice"), wxYES_NO | (m_mode == SingleExtruder ? wxCANCEL : 0));
const int answer = msg.ShowModal();
if (answer == wxID_YES) {
m_ticks.erase_all_ticks_with_code(ToolChange);
diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp
index 59188c037..9d6a19169 100644
--- a/src/slic3r/GUI/ExtraRenderers.cpp
+++ b/src/slic3r/GUI/ExtraRenderers.cpp
@@ -139,7 +139,12 @@ bool BitmapTextRenderer::Render(wxRect rect, wxDC *dc, int state)
}
else
#endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL
+#ifdef _WIN32
+ // workaround for Windows DarkMode : Don't respect to the state & wxDATAVIEW_CELL_SELECTED to avoid update of the text color
+ RenderText(m_value.GetText(), xoffset, rect, dc, state & wxDATAVIEW_CELL_SELECTED ? 0 :state);
+#else
RenderText(m_value.GetText(), xoffset, rect, dc, state);
+#endif
return true;
}
@@ -258,7 +263,12 @@ bool BitmapChoiceRenderer::Render(wxRect rect, wxDC* dc, int state)
rect.height= icon.GetHeight();
}
+#ifdef _WIN32
+ // workaround for Windows DarkMode : Don't respect to the state & wxDATAVIEW_CELL_SELECTED to avoid update of the text color
+ RenderText(m_value.GetText(), xoffset, rect, dc, state & wxDATAVIEW_CELL_SELECTED ? 0 : state);
+#else
RenderText(m_value.GetText(), xoffset, rect, dc, state);
+#endif
return true;
}
diff --git a/src/slic3r/GUI/ExtruderSequenceDialog.cpp b/src/slic3r/GUI/ExtruderSequenceDialog.cpp
index 4a0600e53..21c037c4e 100644
--- a/src/slic3r/GUI/ExtruderSequenceDialog.cpp
+++ b/src/slic3r/GUI/ExtruderSequenceDialog.cpp
@@ -16,6 +16,7 @@
#include "I18N.hpp"
#include "OptionsGroup.hpp"
#include "MainFrame.hpp"
+#include "BitmapComboBox.hpp"
namespace Slic3r {
@@ -26,7 +27,11 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_sequence(sequence)
{
+#ifdef _WIN32
+ wxGetApp().UpdateDarkUI(this);
+#else
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
SetDoubleBuffered(true);
SetFont(wxGetApp().normal_font());
@@ -39,13 +44,14 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
auto option_sizer = new wxBoxSizer(wxVERTICAL);
auto intervals_box = new wxStaticBox(this, wxID_ANY, _(L("Set extruder change for every"))+ ": ");
+ wxGetApp().UpdateDarkUI(intervals_box);
auto intervals_box_sizer = new wxStaticBoxSizer(intervals_box, wxVERTICAL);
m_intervals_grid_sizer = new wxFlexGridSizer(3, 5, em);
auto editor_sz = wxSize(4*em, wxDefaultCoord);
- auto ID_RADIO_BUTTON = wxWindow::NewControlId(1);
+ auto ID_RADIO_BUTTON = wxID_ANY;// wxWindow::NewControlId(1);
wxRadioButton* rb_by_layers = new wxRadioButton(this, ID_RADIO_BUTTON, "", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
rb_by_layers->Bind(wxEVT_RADIOBUTTON, [this](wxCommandEvent& event) { m_sequence.is_mm_intervals = false; });
@@ -54,7 +60,12 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
wxStaticText* st_by_layers = new wxStaticText(this, wxID_ANY, _(L("layers")));
m_interval_by_layers = new wxTextCtrl(this, wxID_ANY,
wxString::Format("%d", m_sequence.interval_by_layers),
- wxDefaultPosition, editor_sz);
+ wxDefaultPosition, editor_sz
+#ifdef _WIN32
+ , wxBORDER_SIMPLE
+#endif
+ );
+ wxGetApp().UpdateDarkUI(m_interval_by_layers);
m_interval_by_layers->Bind(wxEVT_TEXT, [this, rb_by_layers](wxEvent&)
{
wxString str = m_interval_by_layers->GetValue();
@@ -89,7 +100,12 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
wxStaticText* st_by_mm = new wxStaticText(this, wxID_ANY, _(L("mm")));
m_interval_by_mm = new wxTextCtrl(this, wxID_ANY,
double_to_string(sequence.interval_by_mm),
- wxDefaultPosition, editor_sz, wxTE_PROCESS_ENTER);
+ wxDefaultPosition, editor_sz, wxTE_PROCESS_ENTER
+#ifdef _WIN32
+ | wxBORDER_SIMPLE
+#endif
+ );
+ wxGetApp().UpdateDarkUI(m_interval_by_mm);
double min_layer_height = wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_float("layer_height");
auto change_value = [this, min_layer_height]()
@@ -159,6 +175,8 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
m_color_repetition->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent& e) {m_sequence.color_repetition = e.IsChecked(); });
auto extruders_box = new wxStaticBox(this, wxID_ANY, _(L("Set extruder(tool) sequence"))+ ": ");
+ wxGetApp().UpdateDarkUI(extruders_box);
+
auto extruders_box_sizer = new wxStaticBoxSizer(extruders_box, wxVERTICAL);
m_extruders_grid_sizer = new wxFlexGridSizer(3, 5, em);
@@ -173,6 +191,8 @@ ExtruderSequenceDialog::ExtruderSequenceDialog(const DoubleSlider::ExtrudersSequ
main_sizer->Add(option_sizer, 0, wxEXPAND | wxALL, em);
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
+ wxGetApp().UpdateDarkUI(static_cast(this->FindWindowById(wxID_OK, this)));
+ wxGetApp().UpdateDarkUI(static_cast(this->FindWindowById(wxID_CANCEL, this)));
main_sizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, em);
SetSizer(main_sizer);
@@ -195,7 +215,7 @@ void ExtruderSequenceDialog::apply_extruder_sequence()
for (size_t extruder=0; extruder < m_sequence.extruders.size(); ++extruder)
{
- wxBitmapComboBox* extruder_selector = nullptr;
+ BitmapComboBox* extruder_selector = nullptr;
apply_extruder_selector(&extruder_selector, this, "", wxDefaultPosition, wxSize(15*wxGetApp().em_unit(), -1));
extruder_selector->SetSelection(m_sequence.extruders[extruder]);
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 293daacbc..532e44e70 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -13,10 +13,12 @@
#include
#include
#include
+#include
#include
#include
#include "OG_CustomCtrl.hpp"
#include "MsgDialog.hpp"
+#include "BitmapComboBox.hpp"
#ifdef __WXOSX__
#define wxOSX true
@@ -411,6 +413,10 @@ void Field::msw_rescale()
void Field::sys_color_changed()
{
+#ifdef _WIN32
+ if (wxWindow* win = this->getWindow())
+ wxGetApp().UpdateDarkUI(win);
+#endif
}
template
@@ -472,13 +478,17 @@ void TextCtrl::BUILD() {
break;
}
- const long style = m_opt.multiline ? wxTE_MULTILINE : wxTE_PROCESS_ENTER/*0*/;
+ long style = m_opt.multiline ? wxTE_MULTILINE : wxTE_PROCESS_ENTER;
+#ifdef _WIN32
+ style |= wxBORDER_SIMPLE;
+#endif
auto temp = new wxTextCtrl(m_parent, wxID_ANY, text_value, wxDefaultPosition, size, style);
if (parent_is_custom_ctrl && m_opt.height < 0)
opt_height = (double)temp->GetSize().GetHeight()/m_em_unit;
temp->SetFont(m_opt.is_code ?
Slic3r::GUI::wxGetApp().code_font():
Slic3r::GUI::wxGetApp().normal_font());
+ wxGetApp().UpdateDarkUI(temp);
if (! m_opt.multiline && !wxOSX)
// Only disable background refresh for single line input fields, as they are completely painted over by the edit control.
@@ -796,7 +806,12 @@ void SpinCtrl::BUILD() {
const int max_val = m_opt.max < 2147483647 ? m_opt.max : 2147483647;
auto temp = new wxSpinCtrl(m_parent, wxID_ANY, text_value, wxDefaultPosition, size,
- 0|wxTE_PROCESS_ENTER, min_val, max_val, default_value);
+ wxTE_PROCESS_ENTER | wxSP_ARROW_KEYS
+#ifdef _WIN32
+ | wxBORDER_SIMPLE
+#endif
+ , min_val, max_val, default_value);
+
#ifdef __WXGTK3__
wxSize best_sz = temp->GetBestSize();
if (best_sz.x > size.x)
@@ -804,6 +819,7 @@ void SpinCtrl::BUILD() {
#endif //__WXGTK3__
temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
if (!wxOSX) temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
+ wxGetApp().UpdateDarkUI(temp);
if (m_opt.height < 0 && parent_is_custom_ctrl)
opt_height = (double)temp->GetSize().GetHeight() / m_em_unit;
@@ -904,7 +920,11 @@ void SpinCtrl::msw_rescale()
static_assert(wxMAJOR_VERSION >= 3, "Use of wxBitmapComboBox on Settings Tabs requires wxWidgets 3.0 and newer");
using choice_ctrl = wxBitmapComboBox;
#else
+#ifdef _WIN32
+using choice_ctrl = BitmapComboBox;
+#else
using choice_ctrl = wxComboBox;
+#endif
#endif // __WXOSX__
void Choice::BUILD() {
@@ -1299,6 +1319,8 @@ void ColourPicker::BUILD()
temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
if (!wxOSX) temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
+ wxGetApp().UpdateDarkUI(temp->GetPickerCtrl());
+
// // recast as a wxWindow to fit the calling convention
window = dynamic_cast(temp);
@@ -1372,6 +1394,15 @@ void ColourPicker::msw_rescale()
set_undef_value(field);
}
+void ColourPicker::sys_color_changed()
+{
+#ifdef _WIN32
+ if (wxWindow* win = this->getWindow())
+ if (wxColourPickerCtrl* picker = dynamic_cast(win))
+ wxGetApp().UpdateDarkUI(picker->GetPickerCtrl(), true);
+#endif
+}
+
void PointCtrl::BUILD()
{
auto temp = new wxBoxSizer(wxHORIZONTAL);
@@ -1384,8 +1415,12 @@ void PointCtrl::BUILD()
val = default_pt(1);
wxString Y = val - int(val) == 0 ? wxString::Format(_T("%i"), int(val)) : wxNumberFormatter::ToString(val, 2, wxNumberFormatter::Style_None);
- x_textctrl = new wxTextCtrl(m_parent, wxID_ANY, X, wxDefaultPosition, field_size, wxTE_PROCESS_ENTER);
- y_textctrl = new wxTextCtrl(m_parent, wxID_ANY, Y, wxDefaultPosition, field_size, wxTE_PROCESS_ENTER);
+ long style = wxTE_PROCESS_ENTER;
+#ifdef _WIN32
+ style |= wxBORDER_SIMPLE;
+#endif
+ x_textctrl = new wxTextCtrl(m_parent, wxID_ANY, X, wxDefaultPosition, field_size, style);
+ y_textctrl = new wxTextCtrl(m_parent, wxID_ANY, Y, wxDefaultPosition, field_size, style);
if (parent_is_custom_ctrl && m_opt.height < 0)
opt_height = (double)x_textctrl->GetSize().GetHeight() / m_em_unit;
@@ -1401,6 +1436,11 @@ void PointCtrl::BUILD()
static_text_y->SetFont(Slic3r::GUI::wxGetApp().normal_font());
static_text_y->SetBackgroundStyle(wxBG_STYLE_PAINT);
+ wxGetApp().UpdateDarkUI(x_textctrl);
+ wxGetApp().UpdateDarkUI(y_textctrl);
+ wxGetApp().UpdateDarkUI(static_text_x, false, true);
+ wxGetApp().UpdateDarkUI(static_text_y, false, true);
+
temp->Add(static_text_x, 0, wxALIGN_CENTER_VERTICAL, 0);
temp->Add(x_textctrl);
temp->Add(static_text_y, 0, wxALIGN_CENTER_VERTICAL, 0);
@@ -1436,6 +1476,15 @@ void PointCtrl::msw_rescale()
}
}
+void PointCtrl::sys_color_changed()
+{
+#ifdef _WIN32
+ for (wxSizerItem* item: sizer->GetChildren())
+ if (item->IsWindow())
+ wxGetApp().UpdateDarkUI(item->GetWindow());
+#endif
+}
+
bool PointCtrl::value_was_changed(wxTextCtrl* win)
{
if (m_value.empty())
@@ -1519,6 +1568,8 @@ void StaticText::BUILD()
temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
temp->SetFont(wxGetApp().bold_font());
+ wxGetApp().UpdateDarkUI(temp);
+
// // recast as a wxWindow to fit the calling convention
window = dynamic_cast(temp);
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index 1b3503241..0693091ad 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -177,7 +177,7 @@ public:
}
virtual void msw_rescale();
- void sys_color_changed();
+ virtual void sys_color_changed();
bool get_enter_pressed() const { return bEnterPressed; }
void set_enter_pressed(bool pressed) { bEnterPressed = pressed; }
@@ -394,6 +394,7 @@ public:
void set_value(const boost::any& value, bool change_event = false) override;
boost::any& get_value() override;
void msw_rescale() override;
+ void sys_color_changed() override;
void enable() override { dynamic_cast(window)->Enable(); }
void disable() override{ dynamic_cast(window)->Disable(); }
@@ -420,6 +421,7 @@ public:
boost::any& get_value() override;
void msw_rescale() override;
+ void sys_color_changed() override;
void enable() override {
x_textctrl->Enable();
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
index 15f055132..c46dc49bc 100644
--- a/src/slic3r/GUI/FirmwareDialog.cpp
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
@@ -747,7 +747,8 @@ void FirmwareDialog::priv::on_avrdude(const wxCommandEvent &evt)
void FirmwareDialog::priv::on_async_dialog(const wxCommandEvent &evt)
{
- wxMessageDialog dlg(this->q, evt.GetString(), wxMessageBoxCaptionStr, wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
+ //wxMessageDialog dlg(this->q, evt.GetString(), wxMessageBoxCaptionStr, wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
+ GUI::MessageDialog dlg(this->q, evt.GetString(), wxMessageBoxCaptionStr, wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
{
std::lock_guard lock(mutex);
modal_response = dlg.ShowModal();
@@ -863,6 +864,8 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
bsizer->Add(p->btn_flash);
vsizer->Add(bsizer, 0, wxEXPAND);
+ GUI::wxGetApp().UpdateDlgDarkUI(this);
+
auto *topsizer = new wxBoxSizer(wxVERTICAL);
topsizer->Add(panel, 1, wxEXPAND | wxALL, DIALOG_MARGIN);
SetMinSize(wxSize(p->min_width, p->min_height));
@@ -903,7 +906,8 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
p->btn_flash->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {
if (this->p->avrdude) {
// Flashing is in progress, ask the user if they're really sure about canceling it
- wxMessageDialog dlg(this,
+ //wxMessageDialog dlg(this,
+ GUI::MessageDialog dlg(this,
_(L("Are you sure you want to cancel firmware flashing?\nThis could leave your printer in an unusable state!")),
_(L("Confirmation")),
wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index c6cb05fac..2831092da 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -225,7 +225,8 @@ void show_error_id(int id, const std::string& message)
void show_info(wxWindow* parent, const wxString& message, const wxString& title)
{
- wxMessageDialog msg_wingow(parent, message, wxString(SLIC3R_APP_NAME " - ") + (title.empty() ? _L("Notice") : title), wxOK | wxICON_INFORMATION);
+ //wxMessageDialog msg_wingow(parent, message, wxString(SLIC3R_APP_NAME " - ") + (title.empty() ? _L("Notice") : title), wxOK | wxICON_INFORMATION);
+ MessageDialog msg_wingow(parent, message, wxString(SLIC3R_APP_NAME " - ") + (title.empty() ? _L("Notice") : title), wxOK | wxICON_INFORMATION);
msg_wingow.ShowModal();
}
@@ -237,7 +238,8 @@ void show_info(wxWindow* parent, const char* message, const char* title)
void warning_catcher(wxWindow* parent, const wxString& message)
{
- wxMessageDialog msg(parent, message, _L("Warning"), wxOK | wxICON_WARNING);
+ //wxMessageDialog msg(parent, message, _L("Warning"), wxOK | wxICON_WARNING);
+ MessageDialog msg(parent, message, _L("Warning"), wxOK | wxICON_WARNING);
msg.ShowModal();
}
@@ -245,6 +247,7 @@ void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, cons
{
if (comboCtrl == nullptr)
return;
+ wxGetApp().UpdateDarkUI(comboCtrl);
wxCheckListBoxComboPopup* popup = new wxCheckListBoxComboPopup;
if (popup != nullptr) {
@@ -279,6 +282,7 @@ void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, cons
}
comboCtrl->SetMinClientSize(wxSize(max_width, -1));
+ wxGetApp().UpdateDarkUI(popup);
}
}
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 052a782a7..1dd9423f8 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -76,7 +76,10 @@
#ifdef __WXMSW__
#include
#include
-#endif // __WXMSW__
+#ifdef _MSW_DARK_MODE
+#include
+#endif // _MSW_DARK_MODE
+#endif
#if ENABLE_THUMBNAIL_GENERATOR_DEBUG
#include
@@ -816,6 +819,10 @@ bool GUI_App::on_init_inner()
wxInitAllImageHandlers();
+#ifdef _MSW_DARK_MODE
+ if (app_config->get("dark_color_mode") == "1")
+ NppDarkMode::InitDarkMode();
+#endif
SplashScreen* scrn = nullptr;
if (app_config->get("show_splash_screen") == "1") {
// make a bitmap with dark grey banner on the left side
@@ -1015,14 +1022,16 @@ bool GUI_App::dark_mode()
// proper dark mode was first introduced.
return wxPlatformInfo::Get().CheckOSVersion(10, 14) && mac_dark_mode();
#else
- const unsigned luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
- return luma < 128;
+ return wxGetApp().app_config->get("dark_color_mode") == "1" ? true : check_dark_mode();
+ //const unsigned luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ //return luma < 128;
#endif
}
void GUI_App::init_label_colours()
{
- if (dark_mode()) {
+ bool is_dark_mode = dark_mode();
+ if (is_dark_mode) {
m_color_label_modified = wxColour(253, 111, 40);
m_color_label_sys = wxColour(115, 220, 103);
}
@@ -1030,7 +1039,15 @@ void GUI_App::init_label_colours()
m_color_label_modified = wxColour(252, 77, 1);
m_color_label_sys = wxColour(26, 132, 57);
}
+#ifdef _WIN32
+ m_color_label_default = is_dark_mode ? wxColour(250, 250, 250): wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ m_color_highlight_label_default = is_dark_mode ? wxColour(230, 230, 230): wxSystemSettings::GetColour(/*wxSYS_COLOUR_HIGHLIGHTTEXT*/wxSYS_COLOUR_WINDOWTEXT);
+ m_color_highlight_default = is_dark_mode ? wxColour(78, 78, 78) : wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+ m_color_hovered_btn_label = is_dark_mode ? wxColour(253, 111, 40) : wxColour(252, 77, 1);
+#else
m_color_label_default = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+#endif
+ m_color_window_default = is_dark_mode ? wxColour(43, 43, 43) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
}
void GUI_App::update_label_colours_from_appconfig()
@@ -1054,6 +1071,103 @@ void GUI_App::update_label_colours()
tab->update_label_colours();
}
+void GUI_App::UpdateDarkUI(wxWindow* window, bool highlited/* = false*/, bool just_font/* = false*/)
+{
+#ifdef _WIN32
+ if (wxButton* btn = dynamic_cast(window)) {
+ if (!(btn->GetWindowStyle() & wxNO_BORDER)) {
+ btn->SetWindowStyle(btn->GetWindowStyle() | wxNO_BORDER);
+ highlited = true;
+ }
+ // hovering for buttons
+ {
+ auto focus_button = [this, btn](const bool focus) {
+ btn->SetForegroundColour(focus ? m_color_hovered_btn_label : m_color_label_default);
+ btn->Refresh();
+ btn->Update();
+ };
+
+ btn->Bind(wxEVT_ENTER_WINDOW, [focus_button](wxMouseEvent& event) { focus_button(true); event.Skip(); });
+ btn->Bind(wxEVT_LEAVE_WINDOW, [focus_button](wxMouseEvent& event) { focus_button(false); event.Skip(); });
+ }
+ }
+ else if (dark_mode()) {
+ if (wxTextCtrl* text = dynamic_cast(window)) {
+ if (text->GetBorder() != wxBORDER_SIMPLE)
+ text->SetWindowStyle(text->GetWindowStyle() | wxBORDER_SIMPLE);
+ }
+ else if (wxCheckListBox* list = dynamic_cast(window)) {
+ list->SetWindowStyle(list->GetWindowStyle() | wxBORDER_SIMPLE);
+ list->SetBackgroundColour(highlited ? m_color_highlight_default : m_color_window_default);
+ for (size_t i = 0; i < list->GetCount(); i++)
+ if (wxOwnerDrawn* item = list->GetItem(i)) {
+ item->SetBackgroundColour(highlited ? m_color_highlight_default : m_color_window_default);
+ item->SetTextColour(m_color_label_default);
+ }
+ return;
+ }
+ else if (dynamic_cast(window))
+ window->SetWindowStyle(window->GetWindowStyle() | wxBORDER_SIMPLE);
+ }
+
+ if (!just_font)
+ window->SetBackgroundColour(highlited ? m_color_highlight_default : m_color_window_default);
+ window->SetForegroundColour(m_color_label_default);
+#endif
+}
+
+// recursive function for scaling fonts for all controls in Window
+#ifdef _WIN32
+static void update_dark_children_ui(wxWindow* window)
+{
+ bool highlight_btn = dynamic_cast(window) != nullptr;
+ wxGetApp().UpdateDarkUI(window, highlight_btn);
+
+ auto children = window->GetChildren();
+ for (auto child : children) {
+ update_dark_children_ui(child);
+ }
+}
+#endif
+
+void GUI_App::UpdateDlgDarkUI(wxDialog* dlg)
+{
+#ifdef _WIN32
+ update_dark_children_ui(dlg);
+#endif
+}
+void GUI_App::UpdateDVCDarkUI(wxDataViewCtrl* dvc, bool highlited/* = false*/)
+{
+#ifdef _WIN32
+ if (!dark_mode())
+ return;
+ UpdateDarkUI(dvc, highlited);
+ wxItemAttr attr(dark_mode() ? m_color_highlight_default : m_color_label_default,
+ m_color_window_default,
+ m_normal_font);
+ dvc->SetHeaderAttr(attr);
+ if (dvc->HasFlag(wxDV_ROW_LINES))
+ dvc->SetAlternateRowColour(m_color_highlight_default);
+ if (dvc->GetBorder() != wxBORDER_SIMPLE)
+ dvc->SetWindowStyle(dvc->GetWindowStyle() | wxBORDER_SIMPLE);
+#endif
+}
+
+void GUI_App::UpdateAllStaticTextDarkUI(wxWindow* parent)
+{
+#ifdef _WIN32
+ if (!dark_mode())
+ return;
+ wxGetApp().UpdateDarkUI(parent);
+
+ auto children = parent->GetChildren();
+ for (auto child : children) {
+ if (dynamic_cast(child))
+ child->SetForegroundColour(m_color_label_default);
+ }
+#endif
+}
+
void GUI_App::init_fonts()
{
m_small_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
@@ -1169,7 +1283,8 @@ void GUI_App::check_printer_presets()
_L("By default new Printer devices will be named as \"Printer N\" during its creation.\n"
"Note: This name can be changed later from the physical printers settings");
- wxMessageDialog(nullptr, msg_text, _L("Information"), wxOK | wxICON_INFORMATION).ShowModal();
+ //wxMessageDialog(nullptr, msg_text, _L("Information"), wxOK | wxICON_INFORMATION).ShowModal();
+ MessageDialog(nullptr, msg_text, _L("Information"), wxOK | wxICON_INFORMATION).ShowModal();
preset_bundle->physical_printers.load_printers_from_presets(preset_bundle->printers);
}
@@ -1258,6 +1373,16 @@ void GUI_App::update_ui_from_settings()
{
update_label_colours();
mainframe->update_ui_from_settings();
+
+#if 0 //#ifdef _WIN32 // #ysDarkMSW - Use to force dark colors for SystemLightMode
+ if (m_force_sys_colors_update) {
+ m_force_sys_colors_update = false;
+ mainframe->force_sys_color_changed();
+ mainframe->diff_dialog.force_sys_color_changed();
+ if (m_wizard)
+ m_wizard->force_sys_color_changed();
+ }
+#endif
}
void GUI_App::persist_window_geometry(wxTopLevelWindow *window, bool default_maximized)
@@ -1395,6 +1520,22 @@ static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguage
}
#endif
+static int GetSingleChoiceIndex(const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ int initialSelection)
+{
+#ifdef _WIN32
+ wxSingleChoiceDialog dialog(nullptr, message, caption, choices);
+ wxGetApp().UpdateDlgDarkUI(&dialog);
+
+ dialog.SetSelection(initialSelection);
+ return dialog.ShowModal() == wxID_OK ? dialog.GetSelection() : -1;
+#else
+ return wxGetSingleChoiceIndex(message, caption, choices, initialSelection);
+#endif
+}
+
// select language from the list of installed languages
bool GUI_App::select_language()
{
@@ -1438,7 +1579,7 @@ bool GUI_App::select_language()
// This is the language to highlight in the choice dialog initially.
init_selection_default = init_selection;
- const long index = wxGetSingleChoiceIndex(_L("Select the language"), _L("Language"), names, init_selection_default);
+ const long index = GetSingleChoiceIndex(_L("Select the language"), _L("Language"), names, init_selection_default);
// Try to load a new language.
if (index != -1 && (init_selection == -1 || init_selection != index)) {
const wxLanguageInfo *new_language_info = language_infos[index];
@@ -1700,6 +1841,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
if (check_unsaved_changes()) {
#endif // ENABLE_PROJECT_DIRTY_STATE
wxTextEntryDialog dlg(nullptr, _L("Taking configuration snapshot"), _L("Snapshot name"));
+ UpdateDlgDarkUI(&dlg);
// set current normal font for dialog children,
// because of just dlg.SetFont(normal_font()) has no result;
@@ -1753,6 +1895,17 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
if (dlg.seq_top_layer_only_changed())
#endif // ENABLE_GCODE_LINES_ID_IN_H_SLIDER
this->plater_->refresh_print();
+
+ if (dlg.recreate_GUI()) {
+#ifdef _MSW_DARK_MODE
+ if (dlg.color_mode_changed()) {
+ NppDarkMode::SetDarkMode(app_config->get("dark_color_mode") == "1");
+ init_label_colours();
+ }
+#endif
+ recreate_GUI(_L("Restart application") + dots);
+ return;
+ }
#ifdef _WIN32
if (is_editor()) {
if (app_config->get("associate_3mf") == "1")
@@ -1785,7 +1938,8 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
// so we put it into an inner scope
wxString title = is_editor() ? wxString(SLIC3R_APP_NAME) : wxString(GCODEVIEWER_APP_NAME);
title += " - " + _L("Language selection");
- wxMessageDialog dialog(nullptr,
+ //wxMessageDialog dialog(nullptr,
+ MessageDialog dialog(nullptr,
_L("Switching the language will trigger application restart.\n"
"You will lose content of the plater.") + "\n\n" +
_L("Do you want to proceed?"),
@@ -1918,7 +2072,8 @@ bool GUI_App::check_print_host_queue()
}
wxString message;
message += _(L("The uploads are still ongoing")) + ":\n\n" + job_string +"\n" + _(L("Stop them and continue anyway?"));
- wxMessageDialog dialog(mainframe,
+ //wxMessageDialog dialog(mainframe,
+ MessageDialog dialog(mainframe,
message,
wxString(SLIC3R_APP_NAME) + " - " + _(L("Ongoing uploads")),
wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
@@ -2058,8 +2213,7 @@ Model& GUI_App::model()
{
return plater_->model();
}
-
-wxNotebook* GUI_App::tab_panel() const
+wxBookCtrlBase* GUI_App::tab_panel() const
{
return mainframe->m_tabpanel;
}
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index 5027dc1ff..e326b0772 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -20,7 +20,8 @@
class wxMenuItem;
class wxMenuBar;
class wxTopLevelWindow;
-class wxNotebook;
+class wxDataViewCtrl;
+class wxBookCtrlBase;
struct wxLanguageInfo;
namespace Slic3r {
@@ -118,6 +119,13 @@ private:
wxColour m_color_label_modified;
wxColour m_color_label_sys;
wxColour m_color_label_default;
+ wxColour m_color_window_default;
+#ifdef _WIN32
+ wxColour m_color_highlight_label_default;
+ wxColour m_color_hovered_btn_label;
+ wxColour m_color_highlight_default;
+ //bool m_force_sys_colors_update { false }; // #ysDarkMSW - Use to force dark colors for SystemLightMode
+#endif
wxFont m_small_font;
wxFont m_bold_font;
@@ -170,6 +178,14 @@ public:
void init_label_colours();
void update_label_colours_from_appconfig();
void update_label_colours();
+ // update color mode for window
+ void UpdateDarkUI(wxWindow *window, bool highlited = false, bool just_font = false);
+ // update color mode for whole dialog including all children
+ void UpdateDlgDarkUI(wxDialog* dlg);
+ // update color mode for DataViewControl
+ void UpdateDVCDarkUI(wxDataViewCtrl* dvc, bool highlited = false);
+ // update color mode for panel including all static texts controls
+ void UpdateAllStaticTextDarkUI(wxWindow* parent);
void init_fonts();
void update_fonts(const MainFrame *main_frame = nullptr);
void set_label_clr_modified(const wxColour& clr);
@@ -178,6 +194,14 @@ public:
const wxColour& get_label_clr_modified(){ return m_color_label_modified; }
const wxColour& get_label_clr_sys() { return m_color_label_sys; }
const wxColour& get_label_clr_default() { return m_color_label_default; }
+ const wxColour& get_window_default_clr(){ return m_color_window_default; }
+
+
+#ifdef _WIN32
+ const wxColour& get_label_highlight_clr() { return m_color_highlight_label_default; }
+ const wxColour& get_highlight_default_clr() { return m_color_highlight_default; }
+// void force_sys_colors_update() { m_force_sys_colors_update = true; } // #ysDarkMSW - Use to force dark colors for SystemLightMode
+#endif
const wxFont& small_font() { return m_small_font; }
const wxFont& bold_font() { return m_bold_font; }
@@ -256,7 +280,7 @@ public:
PresetUpdater* get_preset_updater() { return preset_updater; }
- wxNotebook* tab_panel() const ;
+ wxBookCtrlBase* tab_panel() const ;
int extruders_cnt() const;
int extruders_edited_cnt() const;
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index b434d6767..aeb2ab7e0 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -138,11 +138,11 @@ std::map SettingsFactory::CATEGORY_ICON =
{ L("Hollowing") , "hollowing" }
};
-wxBitmap SettingsFactory::get_category_bitmap(const std::string& category_name)
+wxBitmap SettingsFactory::get_category_bitmap(const std::string& category_name, bool menu_bmp /*= true*/)
{
if (CATEGORY_ICON.find(category_name) == CATEGORY_ICON.end())
return wxNullBitmap;
- return create_scaled_bitmap(CATEGORY_ICON.at(category_name));
+ return menu_bmp ? create_menu_bitmap(CATEGORY_ICON.at(category_name)) : create_scaled_bitmap(CATEGORY_ICON.at(category_name));
}
@@ -206,6 +206,34 @@ static void get_full_settings_hierarchy(FullSettingsHierarchy& settings_menu, co
}
}
+static int GetSelectedChoices( wxArrayInt& selections,
+ const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices)
+{
+#ifdef _WIN32
+ wxMultiChoiceDialog dialog(nullptr, message, caption, choices);
+ wxGetApp().UpdateDlgDarkUI(&dialog);
+
+ // call this even if selections array is empty and this then (correctly)
+ // deselects the first item which is selected by default
+ dialog.SetSelections(selections);
+
+ if (dialog.ShowModal() != wxID_OK)
+ {
+ // NB: intentionally do not clear the selections array here, the caller
+ // might want to preserve its original contents if the dialog was
+ // cancelled
+ return -1;
+ }
+
+ selections = dialog.GetSelections();
+ return static_cast(selections.GetCount());
+#else
+ return wxGetSelectedChoices(selections, message, caption, choices);
+#endif
+}
+
static wxMenu* create_settings_popupmenu(wxMenu* parent_menu, const bool is_object_settings, wxDataViewItem item/*, ModelConfig& config*/)
{
wxMenu* menu = new wxMenu;
@@ -236,7 +264,7 @@ static wxMenu* create_settings_popupmenu(wxMenu* parent_menu, const bool is_obje
}
if (!category_options.empty() &&
- wxGetSelectedChoices(selections, _L("Select showing settings"), category_name, names) != -1) {
+ GetSelectedChoices(selections, _L("Select showing settings"), category_name, names) != -1) {
for (auto sel : selections)
category_options[sel].second = true;
}
@@ -374,7 +402,7 @@ std::vector MenuFactory::get_volume_bitmaps()
std::vector volume_bmps;
volume_bmps.reserve(ADD_VOLUME_MENU_ITEMS.size());
for (auto item : ADD_VOLUME_MENU_ITEMS)
- volume_bmps.push_back(create_scaled_bitmap(item.second));
+ volume_bmps.push_back(create_menu_bitmap(item.second));
return volume_bmps;
}
@@ -542,7 +570,7 @@ wxMenuItem* MenuFactory::append_menu_item_settings(wxMenu* menu_)
// Add full settings list
auto menu_item = new wxMenuItem(menu, wxID_ANY, menu_name);
- menu_item->SetBitmap(create_scaled_bitmap("cog"));
+ menu_item->SetBitmap(create_menu_bitmap("cog"));
menu_item->SetSubMenu(create_settings_popupmenu(menu, is_object_settings, item));
return menu->Append(menu_item);
@@ -702,7 +730,10 @@ void MenuFactory::append_menu_item_change_extruder(wxMenu* menu)
}
- menu->AppendSubMenu(extruder_selection_menu, name);
+ append_submenu(menu, extruder_selection_menu, wxID_ANY, name, _L("Use another extruder"),
+ "edit_uni"/* : "change_extruder"*/, []() {return true; }, GUI::wxGetApp().plater());
+
+// menu->AppendSubMenu(extruder_selection_menu, name);
}
void MenuFactory::append_menu_item_scale_selection_to_fit_print_volume(wxMenu* menu)
@@ -1046,5 +1077,43 @@ void MenuFactory::msw_rescale()
msw_rescale_menu(dynamic_cast(menu));
}
+#ifdef _WIN32
+// For this class is used code from stackoverflow:
+// https://stackoverflow.com/questions/257288/is-it-possible-to-write-a-template-to-check-for-a-functions-existence
+// Using this code we can to inspect of an existence of IsWheelInverted() function in class T
+template
+class menu_has_update_def_colors
+{
+ typedef char one;
+ struct two { char x[2]; };
+
+ template static one test(decltype(&C::UpdateDefColors));
+ template static two test(...);
+
+public:
+ static constexpr bool value = sizeof(test(0)) == sizeof(char);
+};
+
+template
+static void update_menu_item_def_colors(T* item)
+{
+ if constexpr (menu_has_update_def_colors::value) {
+ item->UpdateDefColors();
+ }
+}
+#endif
+
+void MenuFactory::sys_color_changed()
+{
+ for (MenuWithSeparators* menu : { &m_object_menu, &m_sla_object_menu, &m_part_menu, &m_default_menu }) {
+ msw_rescale_menu(dynamic_cast(menu));// msw_rescale_menu updates just icons, so use it
+#ifdef _WIN32
+ // but under MSW we have to update item's bachground color
+ for (wxMenuItem* item : menu->GetMenuItems())
+ update_menu_item_def_colors(item);
+#endif
+ }
+}
+
} //namespace GUI
} //namespace Slic3r
diff --git a/src/slic3r/GUI/GUI_Factories.hpp b/src/slic3r/GUI/GUI_Factories.hpp
index 7da554de3..2c3e03521 100644
--- a/src/slic3r/GUI/GUI_Factories.hpp
+++ b/src/slic3r/GUI/GUI_Factories.hpp
@@ -25,7 +25,7 @@ struct SettingsFactory
typedef std::map> Bundle;
static std::map CATEGORY_ICON;
- static wxBitmap get_category_bitmap(const std::string& category_name);
+ static wxBitmap get_category_bitmap(const std::string& category_name, bool menu_bmp = true);
static Bundle get_bundle(const DynamicPrintConfig* config, bool is_object_settings);
static std::vector get_options(bool is_part);
};
@@ -42,6 +42,7 @@ public:
void init(wxWindow* parent);
void update_object_menu();
void msw_rescale();
+ void sys_color_changed();
wxMenu* default_menu();
wxMenu* object_menu();
diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp
index 7c13c20d6..c243d88ca 100644
--- a/src/slic3r/GUI/GUI_ObjectLayers.cpp
+++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp
@@ -27,7 +27,7 @@ ObjectLayers::ObjectLayers(wxWindow* parent) :
// Legend for object layers
for (const std::string col : { L("Start at height"), L("Stop at height"), L("Layer height") }) {
- auto temp = new wxStaticText(m_parent, wxID_ANY, _(col), wxDefaultPosition, /*size*/wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
+ auto temp = new wxStaticText(m_parent, wxID_ANY, _(col), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
temp->SetFont(wxGetApp().bold_font());
@@ -276,15 +276,12 @@ void ObjectLayers::sys_color_changed()
m_bmp_delete.msw_rescale();
m_bmp_add.msw_rescale();
- m_grid_sizer->SetHGap(wxGetApp().em_unit());
-
// rescale edit-boxes
const int cells_cnt = m_grid_sizer->GetCols() * m_grid_sizer->GetEffectiveRowsCount();
for (int i = 0; i < cells_cnt; ++i) {
const wxSizerItem* item = m_grid_sizer->GetItem(i);
if (item->IsSizer()) {// case when we have editor with buttons
- const std::vector btns = {2, 3}; // del_btn, add_btn
- for (auto btn : btns) {
+ for (size_t btn : {2, 3}) { // del_btn, add_btn
wxSizerItem* b_item = item->GetSizer()->GetItem(btn);
if (b_item->IsWindow()) {
auto button = dynamic_cast(b_item->GetWindow());
@@ -294,7 +291,24 @@ void ObjectLayers::sys_color_changed()
}
}
}
- m_grid_sizer->Layout();
+
+#ifdef _WIN32
+ m_og->sys_color_changed();
+ for (int i = 0; i < cells_cnt; ++i) {
+ const wxSizerItem* item = m_grid_sizer->GetItem(i);
+ if (item->IsWindow()) {
+ if (LayerRangeEditor* editor = dynamic_cast(item->GetWindow()))
+ wxGetApp().UpdateDarkUI(editor);
+ }
+ else if (item->IsSizer()) {// case when we have editor with buttons
+ if (wxSizerItem* e_item = item->GetSizer()->GetItem(size_t(0)); e_item->IsWindow()) {
+ if (LayerRangeEditor* editor = dynamic_cast(e_item->GetWindow()))
+ wxGetApp().UpdateDarkUI(editor);
+ }
+ }
+ }
+#endif
+
}
void ObjectLayers::reset_selection()
@@ -313,9 +327,14 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
m_type(type),
m_set_focus_data(set_focus_data_fn),
wxTextCtrl(parent->m_parent, wxID_ANY, value, wxDefaultPosition,
- wxSize(8 * em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER)
+ wxSize(8 * em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER
+#ifdef _WIN32
+ | wxBORDER_SIMPLE
+#endif
+ )
{
this->SetFont(wxGetApp().normal_font());
+ wxGetApp().UpdateDarkUI(this);
// Reset m_enter_pressed flag to _false_, when value is editing
this->Bind(wxEVT_TEXT, [this](wxEvent&) { m_enter_pressed = false; }, this->GetId());
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index bd0e4923b..443ef7815 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -7,6 +7,7 @@
#include "GUI_App.hpp"
#include "I18N.hpp"
#include "Plater.hpp"
+#include "BitmapComboBox.hpp"
#if ENABLE_PROJECT_DIRTY_STATE
#include "MainFrame.hpp"
#endif // ENABLE_PROJECT_DIRTY_STATE
@@ -21,6 +22,7 @@
#include
#include
+#include
#include
#include "slic3r/Utils/FixModelByWin10.hpp"
@@ -65,8 +67,14 @@ static void take_snapshot(const wxString& snapshot_name)
}
ObjectList::ObjectList(wxWindow* parent) :
- wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE)
+ wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+#ifdef _WIN32
+ wxBORDER_SIMPLE |
+#endif
+ wxDV_MULTIPLE)
{
+ wxGetApp().UpdateDVCDarkUI(this, true);
+
// create control
create_objects_ctrl();
@@ -3789,10 +3797,9 @@ void ObjectList::msw_rescale()
void ObjectList::sys_color_changed()
{
- // update existing items with bitmaps
- m_objects_model->Rescale();
+ wxGetApp().UpdateDVCDarkUI(this, true);
- Layout();
+ msw_rescale();
}
void ObjectList::ItemValueChanged(wxDataViewEvent &event)
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 43d61d5c7..36b399e51 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -39,6 +39,7 @@ typedef std::map t_layer_config_ranges;
namespace GUI {
wxDECLARE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);
+class BitmapComboBox;
struct ItemForDelete
{
@@ -144,7 +145,7 @@ private:
ModelConfig *m_config {nullptr};
std::vector *m_objects{ nullptr };
- wxBitmapComboBox *m_extruder_editor { nullptr };
+ BitmapComboBox *m_extruder_editor { nullptr };
std::vector m_bmp_vector;
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 701a6daa9..f12adc9d1 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1,6 +1,7 @@
#include "GUI_ObjectManipulation.hpp"
#include "GUI_ObjectList.hpp"
#include "I18N.hpp"
+#include "BitmapComboBox.hpp"
#include "GLCanvas3D.hpp"
#include "OptionsGroup.hpp"
@@ -12,6 +13,7 @@
#include "Selection.hpp"
#include "Plater.hpp"
#include "MainFrame.hpp"
+#include "MsgDialog.hpp"
#include
#include "slic3r/Utils/FixModelByWin10.hpp"
@@ -64,7 +66,7 @@ static choice_ctrl* create_word_local_combo(wxWindow *parent)
temp->SetTextCtrlStyle(wxTE_READONLY);
temp->Create(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr);
#else
- temp = new choice_ctrl(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY);
+ temp = new choice_ctrl(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY | wxBORDER_SIMPLE);
#endif //__WXOSX__
temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
@@ -198,7 +200,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
auto add_label = [this, height](wxStaticText** label, const std::string& name, wxSizer* reciver = nullptr)
{
*label = new wxStaticText(m_parent, wxID_ANY, _(name) + ":");
- set_font_and_background_style(m_move_Label, wxGetApp().normal_font());
+ set_font_and_background_style(*label, wxGetApp().normal_font());
wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->SetMinSize(wxSize(-1, height));
@@ -513,7 +515,14 @@ void ObjectManipulation::update_ui_from_settings()
int axis_id = 0;
for (ManipulationEditor* editor : m_editors) {
// editor->SetForegroundColour(m_use_colors ? wxColour(axes_color_text[axis_id]) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+#ifdef _WIN32
+ if (m_use_colors)
+ editor->SetBackgroundColour(wxColour(axes_color_back[axis_id]));
+ else
+ wxGetApp().UpdateDarkUI(editor);
+#else
editor->SetBackgroundColour(m_use_colors ? wxColour(axes_color_back[axis_id]) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif /* _WIN32 */
if (++axis_id == 3)
axis_id = 0;
}
@@ -949,7 +958,8 @@ void ObjectManipulation::set_uniform_scaling(const bool new_value)
// Is the angle close to a multiple of 90 degrees?
if (! Geometry::is_rotation_ninety_degrees(volume->get_instance_rotation())) {
// Cannot apply scaling in the world coordinate system.
- wxMessageDialog dlg(GUI::wxGetApp().mainframe,
+ //wxMessageDialog dlg(GUI::wxGetApp().mainframe,
+ MessageDialog dlg(GUI::wxGetApp().mainframe,
_L("The currently manipulated object is tilted (rotation angles are not multiples of 90°).\n"
"Non-uniform scaling of tilted objects is only possible in the World coordinate system,\n"
"once the rotation is embedded into the object coordinates.") + "\n" +
@@ -1015,6 +1025,14 @@ void ObjectManipulation::msw_rescale()
void ObjectManipulation::sys_color_changed()
{
+#ifdef _WIN32
+ get_og()->sys_color_changed();
+ wxGetApp().UpdateDarkUI(m_word_local_combo);
+ wxGetApp().UpdateDarkUI(m_check_inch);
+
+ for (ManipulationEditor* editor : m_editors)
+ editor->sys_color_changed(this);
+#endif
// btn...->msw_rescale() updates icon on button, so use it
m_mirror_bitmap_on.msw_rescale();
m_mirror_bitmap_off.msw_rescale();
@@ -1026,8 +1044,6 @@ void ObjectManipulation::sys_color_changed()
for (int id = 0; id < 3; ++id)
m_mirror_buttons[id].first->msw_rescale();
-
- get_og()->sys_color_changed();
}
static const char axes[] = { 'x', 'y', 'z' };
@@ -1035,7 +1051,11 @@ ManipulationEditor::ManipulationEditor(ObjectManipulation* parent,
const std::string& opt_key,
int axis) :
wxTextCtrl(parent->parent(), wxID_ANY, wxEmptyString, wxDefaultPosition,
- wxSize((wxOSX ? 5 : 6)*int(wxGetApp().em_unit()), wxDefaultCoord), wxTE_PROCESS_ENTER),
+ wxSize((wxOSX ? 5 : 6)*int(wxGetApp().em_unit()), wxDefaultCoord), wxTE_PROCESS_ENTER
+#ifdef _WIN32
+ | wxBORDER_SIMPLE
+#endif
+ ),
m_opt_key(opt_key),
m_axis(axis)
{
@@ -1044,8 +1064,9 @@ ManipulationEditor::ManipulationEditor(ObjectManipulation* parent,
this->OSXDisableAllSmartSubstitutions();
#endif // __WXOSX__
if (parent->use_colors()) {
-// this->SetForegroundColour(wxColour(axes_color_text[axis]));
this->SetBackgroundColour(wxColour(axes_color_back[axis]));
+ } else {
+ wxGetApp().UpdateDarkUI(this);
}
// A name used to call handle_sidebar_focus_event()
@@ -1094,6 +1115,12 @@ void ManipulationEditor::msw_rescale()
SetMinSize(wxSize(5 * em, wxDefaultCoord));
}
+void ManipulationEditor::sys_color_changed(ObjectManipulation* parent)
+{
+ if (!parent->use_colors())
+ wxGetApp().UpdateDarkUI(this);
+}
+
double ManipulationEditor::get_value()
{
wxString str = GetValue();
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index bcc0d4123..92ba01775 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -20,11 +20,19 @@ class wxCheckBox;
namespace Slic3r {
namespace GUI {
+#ifdef _WIN32
+class BitmapComboBox;
+#endif
+
#ifdef __WXOSX__
static_assert(wxMAJOR_VERSION >= 3, "Use of wxBitmapComboBox on Manipulation panel requires wxWidgets 3.0 and newer");
using choice_ctrl = wxBitmapComboBox;
+#else
+#ifdef _WIN32
+ using choice_ctrl = BitmapComboBox;
#else
using choice_ctrl = wxComboBox;
+#endif
#endif // __WXOSX__
class Selection;
@@ -44,6 +52,7 @@ public:
~ManipulationEditor() {}
void msw_rescale();
+ void sys_color_changed(ObjectManipulation* parent);
void set_value(const wxString& new_value);
void kill_focus(ObjectManipulation *parent);
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp
index e6689b43c..9409ce6c4 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp
@@ -281,5 +281,13 @@ void ObjectSettings::msw_rescale()
group->msw_rescale();
}
+void ObjectSettings::sys_color_changed()
+{
+ m_og->sys_color_changed();
+
+ for (auto group : m_og_settings)
+ group->sys_color_changed();
+}
+
} //namespace GUI
} //namespace Slic3r
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp
index 91cfe1dda..e5a6937f1 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.hpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp
@@ -57,6 +57,7 @@ public:
void update_config_values(ModelConfig *config);
void UpdateAndShow(const bool show) override;
void msw_rescale();
+ void sys_color_changed();
};
}}
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index c5124cd63..4a95eaedb 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -14,6 +14,7 @@
#include "Plater.hpp"
#include "MainFrame.hpp"
+#include
#include
#include
#include
@@ -28,6 +29,10 @@
#include "libslic3r/SLAPrint.hpp"
#include "NotificationManager.hpp"
+#ifdef _WIN32
+#include "BitmapComboBox.hpp"
+#endif
+
namespace Slic3r {
namespace GUI {
@@ -186,7 +191,7 @@ bool Preview::init(wxWindow* parent, Model* model)
// to match the background of the sliders
#ifdef _WIN32
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ wxGetApp().UpdateDarkUI(this);
#else
SetBackgroundColour(GetParent()->GetBackgroundColour());
#endif // _WIN32
@@ -206,9 +211,13 @@ bool Preview::init(wxWindow* parent, Model* model)
m_layers_slider_sizer = create_layers_slider_sizer();
- m_bottom_toolbar_panel = new wxPanel(this);
+ wxGetApp().UpdateDarkUI(m_bottom_toolbar_panel = new wxPanel(this));
m_label_view_type = new wxStaticText(m_bottom_toolbar_panel, wxID_ANY, _L("View"));
+#ifdef _WIN32
+ wxGetApp().UpdateDarkUI(m_choice_view_type = new BitmapComboBox(m_bottom_toolbar_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY));
+#else
m_choice_view_type = new wxComboBox(m_bottom_toolbar_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+#endif
m_choice_view_type->Append(_L("Feature type"));
m_choice_view_type->Append(_L("Height"));
m_choice_view_type->Append(_L("Width"));
@@ -222,8 +231,13 @@ bool Preview::init(wxWindow* parent, Model* model)
m_label_show = new wxStaticText(m_bottom_toolbar_panel, wxID_ANY, _L("Show"));
+#ifdef _WIN32
+ long combo_style = wxCB_READONLY | wxBORDER_SIMPLE; //set border allows use default color instead of theme color wich is allways light under MSW
+#else
+ long combo_style = wxCB_READONLY;
+#endif
m_combochecklist_features = new wxComboCtrl();
- m_combochecklist_features->Create(m_bottom_toolbar_panel, wxID_ANY, _L("Feature types"), wxDefaultPosition, wxDefaultSize, wxCB_READONLY);
+ m_combochecklist_features->Create(m_bottom_toolbar_panel, wxID_ANY, _L("Feature types"), wxDefaultPosition, wxDefaultSize, combo_style);
std::string feature_items = GUI::into_u8(
_L("Unknown") + "|1|" +
_L("Perimeter") + "|1|" +
@@ -244,7 +258,7 @@ bool Preview::init(wxWindow* parent, Model* model)
Slic3r::GUI::create_combochecklist(m_combochecklist_features, GUI::into_u8(_L("Feature types")), feature_items);
m_combochecklist_options = new wxComboCtrl();
- m_combochecklist_options->Create(m_bottom_toolbar_panel, wxID_ANY, _L("Options"), wxDefaultPosition, wxDefaultSize, wxCB_READONLY);
+ m_combochecklist_options->Create(m_bottom_toolbar_panel, wxID_ANY, _L("Options"), wxDefaultPosition, wxDefaultSize, combo_style);
std::string options_items = GUI::into_u8(
get_option_type_string(OptionType::Travel) + "|0|" +
get_option_type_string(OptionType::Wipe) + "|0|" +
@@ -401,6 +415,17 @@ void Preview::msw_rescale()
void Preview::sys_color_changed()
{
+#ifdef _WIN32
+ wxWindowUpdateLocker noUpdates(this);
+
+ wxGetApp().UpdateAllStaticTextDarkUI(m_bottom_toolbar_panel);
+ wxGetApp().UpdateDarkUI(m_choice_view_type);
+ wxGetApp().UpdateDarkUI(m_combochecklist_features);
+ wxGetApp().UpdateDarkUI(static_cast(m_combochecklist_features->GetPopupControl()));
+ wxGetApp().UpdateDarkUI(m_combochecklist_options);
+ wxGetApp().UpdateDarkUI(static_cast(m_combochecklist_options->GetPopupControl()));
+#endif
+
if (m_layers_slider != nullptr)
m_layers_slider->sys_color_changed();
}
diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp
index d49e6e7ac..7b1fcad19 100644
--- a/src/slic3r/GUI/GUI_Preview.hpp
+++ b/src/slic3r/GUI/GUI_Preview.hpp
@@ -15,7 +15,6 @@ class wxBoxSizer;
class wxStaticText;
class wxComboBox;
class wxComboCtrl;
-class wxBitmapComboBox;
class wxCheckBox;
namespace Slic3r {
@@ -36,6 +35,9 @@ class GLToolbar;
class Bed3D;
struct Camera;
class Plater;
+#ifdef _WIN32
+class BitmapComboBox;
+#endif
class View3D : public wxPanel
{
@@ -82,7 +84,11 @@ class Preview : public wxPanel
wxBoxSizer* m_layers_slider_sizer { nullptr };
wxPanel* m_bottom_toolbar_panel { nullptr };
wxStaticText* m_label_view_type { nullptr };
+#ifdef _WIN32
+ BitmapComboBox* m_choice_view_type { nullptr };
+#else
wxComboBox* m_choice_view_type { nullptr };
+#endif
wxStaticText* m_label_show { nullptr };
wxComboCtrl* m_combochecklist_features { nullptr };
size_t m_combochecklist_features_pos { 0 };
diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp
index adb9633ea..df1161843 100644
--- a/src/slic3r/GUI/GUI_Utils.cpp
+++ b/src/slic3r/GUI/GUI_Utils.cpp
@@ -6,6 +6,8 @@
#ifdef _WIN32
#include
+#include "GUI_App.hpp"
+#include "libslic3r/AppConfig.hpp"
#endif
#include
@@ -14,6 +16,7 @@
#include
#include
#include
+#include
#include "libslic3r/Config.hpp"
@@ -149,6 +152,35 @@ wxFont get_default_font_for_dpi(const wxWindow *window, int dpi)
return wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
+bool check_dark_mode() {
+#if 0 //#ifdef _WIN32 // #ysDarkMSW - Allow it when we deside to support the sustem colors for application
+ wxRegKey rk(wxRegKey::HKCU,
+ "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
+ if (rk.Exists() && rk.HasValue("AppsUseLightTheme")) {
+ long value = -1;
+ rk.QueryValue("AppsUseLightTheme", &value);
+ return value <= 0;
+ }
+#endif
+#if wxCHECK_VERSION(3,1,3)
+ return wxSystemSettings::GetAppearance().IsDark();
+#else
+ const unsigned luma = wxGetApp().get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ return luma < 128;
+#endif
+}
+
+
+#ifdef _WIN32
+void update_dark_ui(wxWindow* window)
+{
+ bool is_dark = wxGetApp().app_config->get("dark_color_mode") == "1" ? true : check_dark_mode();
+ window->SetBackgroundColour(is_dark ? wxColour(43, 43, 43) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ window->SetForegroundColour(is_dark ? wxColour(250, 250, 250) : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+}
+#endif
+
+
CheckboxFileDialog::ExtraPanel::ExtraPanel(wxWindow *parent)
: wxPanel(parent, wxID_ANY)
{
diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp
index 4f02c6c23..66e0ae2aa 100644
--- a/src/slic3r/GUI/GUI_Utils.hpp
+++ b/src/slic3r/GUI/GUI_Utils.hpp
@@ -55,6 +55,11 @@ int get_dpi_for_window(const wxWindow *window);
wxFont get_default_font_for_dpi(const wxWindow* window, int dpi);
inline wxFont get_default_font(const wxWindow* window) { return get_default_font_for_dpi(window, get_dpi_for_window(window)); }
+bool check_dark_mode();
+#ifdef _WIN32
+void update_dark_ui(wxWindow* window);
+#endif
+
#if !wxVERSION_EQUAL_OR_GREATER_THAN(3,1,3)
struct DpiChangedEvent : public wxEvent {
int dpi;
@@ -92,6 +97,9 @@ public:
this->SetFont(m_normal_font);
#endif
this->CenterOnParent();
+#ifdef _WIN32
+ update_dark_ui(this);
+#endif
// Linux specific issue : get_dpi_for_window(this) still doesn't responce to the Display's scale in new wxWidgets(3.1.3).
// So, calculate the m_em_unit value from the font size, as before
@@ -167,6 +175,14 @@ public:
const wxFont& normal_font() const { return m_normal_font; }
void enable_force_rescale() { m_force_rescale = true; }
+#if 0 //#ifdef _WIN32 // #ysDarkMSW - Use to force dark colors for SystemLightMode
+ void force_sys_color_changed()
+ {
+ update_dark_ui(this);
+ on_sys_color_changed();
+ }
+#endif
+
protected:
virtual void on_dpi_changed(const wxRect &suggested_rect) = 0;
virtual void on_sys_color_changed() {};
@@ -243,6 +259,17 @@ private:
m_prev_scale_factor = m_scale_factor;
}
+#if 0 //#ifdef _WIN32 // #ysDarkMSW - Allow it when we deside to support the sustem colors for application
+ bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam) override
+ {
+ update_dark_ui(this);
+ on_sys_color_changed();
+
+ // let the system handle it
+ return false;
+ }
+#endif
+
};
typedef DPIAware DPIFrame;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index 10da6b85c..ad33cdb85 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -17,6 +17,7 @@
#include "slic3r/GUI/GUI_ObjectList.hpp"
#include "slic3r/GUI/Plater.hpp"
#include "slic3r/GUI/NotificationManager.hpp"
+#include "slic3r/GUI/MsgDialog.hpp"
#include "libslic3r/PresetBundle.hpp"
#include "libslic3r/SLAPrint.hpp"
@@ -920,7 +921,8 @@ void GLGizmoSlaSupports::on_set_state()
wxGetApp().CallAfter([this]() {
// Following is called through CallAfter, because otherwise there was a problem
// on OSX with the wxMessageDialog being shown several times when clicked into.
- wxMessageDialog dlg(GUI::wxGetApp().mainframe, _L("Do you want to save your manually "
+ //wxMessageDialog dlg(GUI::wxGetApp().mainframe, _L("Do you want to save your manually "
+ MessageDialog dlg(GUI::wxGetApp().mainframe, _L("Do you want to save your manually "
"edited support points?") + "\n",_L("Save changes?"), wxICON_QUESTION | wxYES | wxNO);
if (dlg.ShowModal() == wxID_YES)
editing_mode_apply_changes();
@@ -1139,7 +1141,8 @@ void GLGizmoSlaSupports::get_data_from_backend()
void GLGizmoSlaSupports::auto_generate()
{
- wxMessageDialog dlg(GUI::wxGetApp().plater(),
+ //wxMessageDialog dlg(GUI::wxGetApp().plater(),
+ MessageDialog dlg(GUI::wxGetApp().plater(),
_L("Autogeneration will erase all manually edited points.") + "\n\n" +
_L("Are you sure you want to do it?") + "\n",
_L("Warning"), wxICON_WARNING | wxYES | wxNO);
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index e72975629..2c7822a9e 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -9,6 +9,7 @@
#include "wxExtensions.hpp"
#include "MainFrame.hpp"
#include
+#include
namespace Slic3r {
namespace GUI {
@@ -17,7 +18,7 @@ KBShortcutsDialog::KBShortcutsDialog()
: DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, wxString(wxGetApp().is_editor() ? SLIC3R_APP_NAME : GCODEVIEWER_APP_NAME) + " - " + _L("Keyboard Shortcuts"),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+// SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
// fonts
const wxFont& font = wxGetApp().normal_font();
@@ -28,7 +29,18 @@ KBShortcutsDialog::KBShortcutsDialog()
main_sizer->Add(create_header(this, bold_font), 0, wxEXPAND | wxALL, 10);
+#ifdef _MSW_DARK_MODE
+ wxBookCtrlBase* book;
+ if (wxGetApp().dark_mode()) {
+ book = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP);
+ wxGetApp().UpdateDarkUI(book);
+ wxGetApp().UpdateDarkUI(dynamic_cast(book)->GetListView());
+ }
+ else
+ book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP);
+#else
wxNotebook* book = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP);
+#endif
main_sizer->Add(book, 1, wxEXPAND | wxALL, 10);
fill_shortcuts();
@@ -39,6 +51,7 @@ KBShortcutsDialog::KBShortcutsDialog()
}
wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
+ wxGetApp().UpdateDarkUI(static_cast(this->FindWindowById(wxID_OK, this)));
this->SetEscapeId(wxID_OK);
main_sizer->Add(buttons, 0, wxEXPAND | wxALL, 5);
@@ -248,6 +261,7 @@ void KBShortcutsDialog::fill_shortcuts()
wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_font)
{
wxPanel* panel = new wxPanel(parent);
+ wxGetApp().UpdateDarkUI(panel);
wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
wxFont header_font = bold_font;
@@ -278,6 +292,7 @@ wxPanel* KBShortcutsDialog::create_header(wxWindow* parent, const wxFont& bold_f
wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& shortcuts, const wxFont& font, const wxFont& bold_font)
{
wxPanel* main_page = new wxPanel(parent);
+ wxGetApp().UpdateDarkUI(main_page);
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
if (!shortcuts.first.second.empty()) {
@@ -294,6 +309,7 @@ wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& s
int columns_count = 1 + static_cast(shortcuts.second.size()) / max_items_per_column;
wxScrolledWindow* scrollable_panel = new wxScrolledWindow(main_page);
+ wxGetApp().UpdateDarkUI(scrollable_panel);
scrollable_panel->SetScrollbars(20, 20, 50, 50);
scrollable_panel->SetInitialSize(wxSize(850, 450));
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index ba3221b83..4832b80b9 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -2,6 +2,8 @@
#include
#include
+#include
+#include
#include
#include
#include
@@ -38,6 +40,7 @@
#include "GUI_App.hpp"
#include "UnsavedChangesDialog.hpp"
+#include "MsgDialog.hpp"
#ifdef _WIN32
#include
@@ -265,6 +268,84 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
}
}
+#ifdef _MSW_DARK_MODE
+static wxString pref() { return " [ "; }
+static wxString suff() { return " ] "; }
+static void append_tab_menu_items_to_menubar(wxMenuBar* bar, PrinterTechnology pt, bool is_mainframe_menu)
+{
+ if (is_mainframe_menu)
+ bar->Append(new wxMenu(), pref() + _L("Plater") + suff());
+ for (const wxString& title : { is_mainframe_menu ? _L("Print Settings") : pref() + _L("Print Settings") + suff(),
+ pt == ptSLA ? _L("Material Settings") : _L("Filament Settings"),
+ _L("Printer Settings") })
+ bar->Append(new wxMenu(), title);
+}
+
+// update markers for selected/unselected menu items
+static void update_marker_for_tabs_menu(wxMenuBar* bar, const wxString& title, bool is_mainframe_menu)
+{
+ if (!bar)
+ return;
+ size_t items_cnt = bar->GetMenuCount();
+ for (size_t id = items_cnt - (is_mainframe_menu ? 4 : 3); id < items_cnt; id++) {
+ wxString label = bar->GetMenuLabel(id);
+ if (label.First(pref()) == 0) {
+ if (label == pref() + title + suff())
+ return;
+ label.Remove(size_t(0), pref().Len());
+ label.RemoveLast(suff().Len());
+ bar->SetMenuLabel(id, label);
+ break;
+ }
+ }
+ if (int id = bar->FindMenu(title); id != wxNOT_FOUND)
+ bar->SetMenuLabel(id, pref() + title + suff());
+}
+
+static void add_tabs_as_menu(wxMenuBar* bar, MainFrame* main_frame, wxWindow* bar_parent)
+{
+ PrinterTechnology pt = main_frame->plater() ? main_frame->plater()->printer_technology() : ptFFF;
+
+ bool is_mainframe_menu = bar_parent == main_frame;
+ if (!is_mainframe_menu)
+ append_tab_menu_items_to_menubar(bar, pt, is_mainframe_menu);
+
+ bar_parent->Bind(wxEVT_MENU_OPEN, [main_frame, bar, is_mainframe_menu](wxMenuEvent& event) {
+ wxMenu* const menu = event.GetMenu();
+ if (!menu || menu->GetMenuItemCount() > 0)
+ return;
+
+ // update tab selection
+
+ const wxString& title = menu->GetTitle();
+ if (title == _L("Plater"))
+ main_frame->select_tab(size_t(0));
+ else if (title == _L("Print Settings"))
+ main_frame->select_tab(wxGetApp().get_tab(main_frame->plater()->printer_technology() == ptFFF ? Preset::TYPE_PRINT : Preset::TYPE_SLA_PRINT));
+ else if (title == _L("Filament Settings"))
+ main_frame->select_tab(wxGetApp().get_tab(Preset::TYPE_FILAMENT));
+ else if (title == _L("Material Settings"))
+ main_frame->select_tab(wxGetApp().get_tab(Preset::TYPE_SLA_MATERIAL));
+ else if (title == _L("Printer Settings"))
+ main_frame->select_tab(wxGetApp().get_tab(Preset::TYPE_PRINTER));
+
+ // update markers for selected/unselected menu items
+ update_marker_for_tabs_menu(bar, title, is_mainframe_menu);
+ });
+}
+
+void MainFrame::show_tabs_menu(bool show)
+{
+ if (show)
+ append_tab_menu_items_to_menubar(m_menubar, plater() ? plater()->printer_technology() : ptFFF, true);
+ else
+ while (m_menubar->GetMenuCount() >= 8) {
+ if (wxMenu* menu = m_menubar->Remove(7))
+ delete menu;
+ }
+}
+#endif // _MSW_DARK_MODE
+
void MainFrame::update_layout()
{
auto restore_to_creation = [this]() {
@@ -305,7 +386,7 @@ void MainFrame::update_layout()
ESettingsLayout layout = wxGetApp().is_gcode_viewer() ? ESettingsLayout::GCodeViewer :
(wxGetApp().app_config->get("old_settings_layout_mode") == "1" ? ESettingsLayout::Old :
- wxGetApp().app_config->get("new_settings_layout_mode") == "1" ? ESettingsLayout::New :
+ wxGetApp().app_config->get("new_settings_layout_mode") == "1" ? ( wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1" ? ESettingsLayout::Old : ESettingsLayout::New) :
wxGetApp().app_config->get("dlg_settings_layout_mode") == "1" ? ESettingsLayout::Dlg : ESettingsLayout::Old);
if (m_layout == layout)
@@ -330,6 +411,7 @@ void MainFrame::update_layout()
layout == ESettingsLayout::Dlg ? State::toDlg : State::noUpdate;
#endif //__WXMSW__
+ ESettingsLayout old_layout = m_layout;
m_layout = layout;
// From the very beginning the Print settings should be selected
@@ -349,6 +431,14 @@ void MainFrame::update_layout()
m_main_sizer->Add(m_tabpanel, 1, wxEXPAND);
m_plater->Show();
m_tabpanel->Show();
+ // update Tabs
+ if (old_layout == ESettingsLayout::Dlg)
+ if (int sel = m_tabpanel->GetSelection(); sel != wxNOT_FOUND)
+ m_tabpanel->SetSelection(sel+1);// call SetSelection to correct layout after switching from Dlg to Old mode
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1")
+ show_tabs_menu(true);
+#endif
break;
}
case ESettingsLayout::New:
@@ -368,6 +458,11 @@ void MainFrame::update_layout()
m_settings_dialog.GetSizer()->Add(m_tabpanel, 1, wxEXPAND);
m_tabpanel->Show();
m_plater->Show();
+
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1")
+ show_tabs_menu(false);
+#endif
break;
}
case ESettingsLayout::GCodeViewer:
@@ -539,21 +634,31 @@ void MainFrame::init_tabpanel()
{
// wxNB_NOPAGETHEME: Disable Windows Vista theme for the Notebook background. The theme performance is terrible on Windows 10
// with multiple high resolution displays connected.
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1") {
+ m_tabpanel = new wxSimplebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
+ wxGetApp().UpdateDarkUI(m_tabpanel);
+ }
+ else
+ m_tabpanel = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
+#else
m_tabpanel = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
+#endif
+
#ifndef __WXOSX__ // Don't call SetFont under OSX to avoid name cutting in ObjectList
m_tabpanel->SetFont(Slic3r::GUI::wxGetApp().normal_font());
-#endif
-#if wxCHECK_VERSION(3,1,3)
- if (wxSystemSettings::GetAppearance().IsDark())
- m_tabpanel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
#endif
m_tabpanel->Hide();
m_settings_dialog.set_tabpanel(m_tabpanel);
+#ifdef __WXMSW__
+ m_tabpanel->Bind(/*wxEVT_LISTBOOK_PAGE_CHANGED*/wxEVT_BOOKCTRL_PAGE_CHANGED, [this](wxBookCtrlEvent& e) {
+#else
m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxBookCtrlEvent& e) {
+#endif
#if ENABLE_VALIDATE_CUSTOM_GCODE
if (int old_selection = e.GetOldSelection();
- old_selection != wxNOT_FOUND && old_selection < static_cast(m_tabpanel->GetPageCount())) {
+ old_selection != wxNOT_FOUND && old_selection < m_tabpanel->GetPageCount()) {
Tab* old_tab = dynamic_cast(m_tabpanel->GetPage(old_selection));
if (old_tab)
old_tab->validate_custom_gcodes();
@@ -896,7 +1001,8 @@ void MainFrame::on_sys_color_changed()
// update label colors in respect to the system mode
wxGetApp().init_label_colours();
#ifdef __WXMSW__
- m_tabpanel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ wxGetApp().UpdateDarkUI(m_tabpanel);
+ m_statusbar->update_dark_ui();
#endif
// update Plater
@@ -910,6 +1016,8 @@ void MainFrame::on_sys_color_changed()
wxMenuBar* menu_bar = this->GetMenuBar();
for (size_t id = 0; id < menu_bar->GetMenuCount(); id++)
msw_rescale_menu(menu_bar->GetMenu(id));
+
+ this->Refresh();
}
#ifdef _MSC_VER
@@ -1012,7 +1120,8 @@ void MainFrame::init_menubar_as_editor()
m_plater->load_project(filename);
else
{
- wxMessageDialog msg(this, _L("The selected project is no longer available.\nDo you want to remove it from the recent projects list?"), _L("Error"), wxYES_NO | wxYES_DEFAULT);
+ //wxMessageDialog msg(this, _L("The selected project is no longer available.\nDo you want to remove it from the recent projects list?"), _L("Error"), wxYES_NO | wxYES_DEFAULT);
+ MessageDialog msg(this, _L("The selected project is no longer available.\nDo you want to remove it from the recent projects list?"), _L("Error"), wxYES_NO | wxYES_DEFAULT);
if (msg.ShowModal() == wxID_YES)
{
m_recent_projects.RemoveFileFromHistory(file_id);
@@ -1305,8 +1414,21 @@ void MainFrame::init_menubar_as_editor()
// Add additional menus from C++
wxGetApp().add_config_menu(m_menubar);
m_menubar->Append(helpMenu, _L("&Help"));
+
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1") {
+ // Add separator
+ m_menubar->Append(new wxMenu(), " ");
+ add_tabs_as_menu(m_menubar, this, this);
+ }
+#endif
SetMenuBar(m_menubar);
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1")
+ m_menubar->EnableTop(6, false);
+#endif
+
#ifdef __APPLE__
// This fixes a bug on Mac OS where the quit command doesn't emit window close events
// wx bug: https://trac.wxwidgets.org/ticket/18328
@@ -1391,9 +1513,9 @@ void MainFrame::update_menubar()
m_changeable_menu_items[miSend] ->SetItemLabel((is_fff ? _L("S&end G-code") : _L("S&end to print")) + dots + "\tCtrl+Shift+G");
m_changeable_menu_items[miMaterialTab] ->SetItemLabel((is_fff ? _L("&Filament Settings Tab") : _L("Mate&rial Settings Tab")) + "\tCtrl+3");
- m_changeable_menu_items[miMaterialTab] ->SetBitmap(create_scaled_bitmap(is_fff ? "spool" : "resin"));
+ m_changeable_menu_items[miMaterialTab] ->SetBitmap(create_menu_bitmap(is_fff ? "spool" : "resin"));
- m_changeable_menu_items[miPrinterTab] ->SetBitmap(create_scaled_bitmap(is_fff ? "printer" : "sla_printer"));
+ m_changeable_menu_items[miPrinterTab] ->SetBitmap(create_menu_bitmap(is_fff ? "printer" : "sla_printer"));
}
// To perform the "Quck Slice", "Quick Slice and Save As", "Repeat last Quick Slice" and "Slice to SVG".
@@ -1424,13 +1546,15 @@ void MainFrame::quick_slice(const int qs)
}
else {
if (m_qs_last_input_file.IsEmpty()) {
- wxMessageDialog dlg(this, _L("No previously sliced file."),
+ //wxMessageDialog dlg(this, _L("No previously sliced file."),
+ MessageDialog dlg(this, _L("No previously sliced file."),
_L("Error"), wxICON_ERROR | wxOK);
dlg.ShowModal();
return;
}
if (std::ifstream(m_qs_last_input_file.ToUTF8().data())) {
- wxMessageDialog dlg(this, _L("Previously sliced file (")+m_qs_last_input_file+_L(") not found."),
+ //wxMessageDialog dlg(this, _L("Previously sliced file (")+m_qs_last_input_file+_L(") not found."),
+ MessageDialog dlg(this, _L("Previously sliced file (")+m_qs_last_input_file+_L(") not found."),
_L("File Not Found"), wxICON_ERROR | wxOK);
dlg.ShowModal();
return;
@@ -1514,7 +1638,8 @@ void MainFrame::quick_slice(const int qs)
auto message = format(_L("%1% was successfully sliced."), input_file_basename);
// wxTheApp->notify(message);
- wxMessageDialog(this, message, _L("Slicing Done!"), wxOK | wxICON_INFORMATION).ShowModal();
+ //wxMessageDialog(this, message, _L("Slicing Done!"), wxOK | wxICON_INFORMATION).ShowModal();
+ MessageDialog(this, message, _L("Slicing Done!"), wxOK | wxICON_INFORMATION).ShowModal();
// };
// Slic3r::GUI::catch_error(this, []() { if (m_progress_dialog) m_progress_dialog->Destroy(); });
}
@@ -1743,6 +1868,16 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/)
if (m_tabpanel->GetSelection() != (int)new_selection)
m_tabpanel->SetSelection(new_selection);
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1") {
+ if (Tab* cur_tab = dynamic_cast(m_tabpanel->GetPage(new_selection)))
+ update_marker_for_tabs_menu((m_layout == ESettingsLayout::Old ? m_menubar : m_settings_dialog.menubar()), cur_tab->title(), m_layout == ESettingsLayout::Old);
+ else if (tab == 0 && m_layout == ESettingsLayout::Old)
+ m_plater->get_current_canvas3D()->render();
+ }
+#endif
+ if (tab == 0 && m_layout == ESettingsLayout::Old)
+ m_plater->canvas3D()->render();
else if (was_hidden) {
Tab* cur_tab = dynamic_cast(m_tabpanel->GetPage(new_selection));
if (cur_tab)
@@ -1781,6 +1916,8 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/)
m_settings_dialog.Show();
}
#endif
+ if (m_settings_dialog.IsIconized())
+ m_settings_dialog.Iconize(false);
}
else if (m_layout == ESettingsLayout::New) {
m_main_sizer->Show(m_plater, tab == 0);
@@ -1884,6 +2021,21 @@ void MainFrame::add_to_recent_projects(const wxString& filename)
}
}
+void MainFrame::technology_changed()
+{
+ // upadte DiffDlg
+ diff_dialog.update_presets();
+
+ // update menu titles
+ PrinterTechnology pt = plater()->printer_technology();
+ if (int id = m_menubar->FindMenu(pt == ptFFF ? _L("Material Settings") : _L("Filament Settings")); id != wxNOT_FOUND)
+ m_menubar->SetMenuLabel(id , pt == ptSLA ? _L("Material Settings") : _L("Filament Settings"));
+
+ //if (wxGetApp().tab_panel()->GetSelection() != wxGetApp().tab_panel()->GetPageCount() - 1)
+ // wxGetApp().tab_panel()->SetSelection(wxGetApp().tab_panel()->GetPageCount() - 1);
+
+}
+
//
// Called after the Preferences dialog is closed and the program settings are saved.
// Update the UI based on the current preferences.
@@ -1920,8 +2072,9 @@ std::string MainFrame::get_dir_name(const wxString &full_name) const
// ----------------------------------------------------------------------------
SettingsDialog::SettingsDialog(MainFrame* mainframe)
-: DPIDialog(mainframe, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _L("Settings"), wxDefaultPosition, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX, "settings_dialog"),
+:DPIFrame(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _L("Settings"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, "settings_dialog"),
+//: DPIDialog(mainframe, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _L("Settings"), wxDefaultPosition, wxDefaultSize,
+// wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX, "settings_dialog"),
m_main_frame(mainframe)
{
if (wxGetApp().is_gcode_viewer())
@@ -1978,6 +2131,18 @@ SettingsDialog::SettingsDialog(MainFrame* mainframe)
}
});
+ //just hide the Frame on closing
+ this->Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent& evt) { this->Hide(); });
+
+#ifdef _MSW_DARK_MODE
+ if (wxGetApp().dark_mode() || wxGetApp().app_config->get("tabs_as_menu") == "1") {
+ // menubar
+ m_menubar = new wxMenuBar();
+ add_tabs_as_menu(m_menubar, mainframe, this);
+ this->SetMenuBar(m_menubar);
+ }
+#endif
+
// initialize layout
auto sizer = new wxBoxSizer(wxVERTICAL);
sizer->SetSizeHints(this);
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index 55fde8a53..40fff23da 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -19,6 +19,7 @@
#include "UnsavedChangesDialog.hpp"
class wxNotebook;
+class wxBookCtrlBase;
class wxProgressDialog;
namespace Slic3r {
@@ -52,14 +53,16 @@ struct PresetTab {
// SettingsDialog
// ----------------------------------------------------------------------------
-class SettingsDialog : public DPIDialog
+class SettingsDialog : public DPIFrame//DPIDialog
{
- wxNotebook* m_tabpanel { nullptr };
- MainFrame* m_main_frame { nullptr };
+ wxBookCtrlBase* m_tabpanel { nullptr };
+ MainFrame* m_main_frame { nullptr };
+ wxMenuBar* m_menubar{ nullptr };
public:
SettingsDialog(MainFrame* mainframe);
~SettingsDialog() = default;
- void set_tabpanel(wxNotebook* tabpanel) { m_tabpanel = tabpanel; }
+ void set_tabpanel(wxBookCtrlBase* tabpanel) { m_tabpanel = tabpanel; }
+ wxMenuBar* menubar() { return m_menubar; }
protected:
void on_dpi_changed(const wxRect& suggested_rect) override;
@@ -80,8 +83,6 @@ class MainFrame : public DPIFrame
wxMenuItem* m_menu_item_reslice_now { nullptr };
wxSizer* m_main_sizer{ nullptr };
-
-
size_t m_last_selected_tab;
std::string get_base_name(const wxString &full_name, const char *extension = nullptr) const;
@@ -161,7 +162,9 @@ public:
void init_menubar_as_editor();
void init_menubar_as_gcodeviewer();
void update_menubar();
-
+#ifdef _WIN32
+ void show_tabs_menu(bool show);
+#endif
void update_ui_from_settings();
bool is_loaded() const { return m_loaded; }
bool is_last_input_file() const { return !m_qs_last_input_file.IsEmpty(); }
@@ -194,11 +197,12 @@ public:
#endif // ENABLE_PROJECT_DIRTY_STATE
void add_to_recent_projects(const wxString& filename);
+ void technology_changed();
PrintHostQueueDialog* printhost_queue_dlg() { return m_printhost_queue_dlg; }
Plater* m_plater { nullptr };
- wxNotebook* m_tabpanel { nullptr };
+ wxBookCtrlBase* m_tabpanel { nullptr };
SettingsDialog m_settings_dialog;
DiffPresetDialog diff_dialog;
wxWindow* m_plater_page{ nullptr };
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index de4c7e00f..0c52d8b58 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -64,6 +64,59 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
SetSizerAndFit(topsizer);
}
+void MsgDialog::add_btn(wxWindowID btn_id, bool set_focus /*= false*/)
+{
+ wxButton* btn = new wxButton(this, btn_id);
+ if (set_focus)
+ btn->SetFocus();
+ btn_sizer->Add(btn, 0, wxRIGHT, HORIZ_SPACING);
+ btn->Bind(wxEVT_BUTTON, [this, btn_id](wxCommandEvent&) { this->EndModal(btn_id); });
+};
+
+// Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
+static void add_msg_content(wxWindow* parent, wxBoxSizer* content_sizer, wxString msg, bool monospaced_font = false)
+{
+ wxHtmlWindow* html = new wxHtmlWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
+
+ // count lines in the message
+ int msg_lines = 0;
+ if (!monospaced_font) {
+ int line_len = 55;// count of symbols in one line
+ int start_line = 0;
+ for (auto i = msg.begin(); i != msg.end(); ++i) {
+ if (*i == '\n') {
+ int cur_line_len = i - msg.begin() - start_line;
+ start_line = i - msg.begin();
+ if (cur_line_len == 0 || line_len > cur_line_len)
+ msg_lines++;
+ else
+ msg_lines += std::lround((double)(cur_line_len) / line_len);
+ }
+ }
+ msg_lines++;
+ }
+
+ html->SetMinSize(wxSize(40 * wxGetApp().em_unit(), monospaced_font ? 30 * wxGetApp().em_unit() : 2 * msg_lines * wxGetApp().em_unit()));
+ wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ wxFont monospace = wxGetApp().code_font();
+ wxColour text_clr = wxGetApp().get_label_clr_default();
+ wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+ auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
+ auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
+ const int font_size = font.GetPointSize();
+ int size[] = { font_size, font_size, font_size, font_size, font_size, font_size, font_size };
+ html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);
+ html->SetBorders(2);
+ std::string msg_escaped = xml_escape(msg.ToUTF8().data());
+ boost::replace_all(msg_escaped, "\r\n", "
");
+ boost::replace_all(msg_escaped, "\n", "
");
+ if (monospaced_font)
+ // Code formatting will be preserved. This is useful for reporting errors from the placeholder parser.
+ msg_escaped = std::string("") + msg_escaped + "
";
+ html->SetPage("" + wxString::FromUTF8(msg_escaped.data()) + "");
+ content_sizer->Add(html, 1, wxEXPAND | wxBOTTOM, 30);
+}
+
// ErrorDialog
ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg, bool monospaced_font)
@@ -72,36 +125,13 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg, bool monospaced_
wxID_NONE)
, msg(msg)
{
- // Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
- wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
- {
- html->SetMinSize(wxSize(40 * wxGetApp().em_unit(), monospaced_font ? 30 * wxGetApp().em_unit() : -1));
- wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- wxFont monospace = wxGetApp().code_font();
- wxColour text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
- wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
- auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
- auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
- const int font_size = font.GetPointSize()-1;
- int size[] = {font_size, font_size, font_size, font_size, font_size, font_size, font_size};
- html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);
- html->SetBorders(2);
- std::string msg_escaped = xml_escape(msg.ToUTF8().data());
- boost::replace_all(msg_escaped, "\r\n", "
");
- boost::replace_all(msg_escaped, "\n", "
");
- if (monospaced_font)
- // Code formatting will be preserved. This is useful for reporting errors from the placeholder parser.
- msg_escaped = std::string("") + msg_escaped + "
";
- html->SetPage("" + wxString::FromUTF8(msg_escaped.data()) + "");
- content_sizer->Add(html, 1, wxEXPAND);
- }
-
- auto *btn_ok = new wxButton(this, wxID_OK);
- btn_ok->SetFocus();
- btn_sizer->Add(btn_ok, 0, wxRIGHT, HORIZ_SPACING);
+ add_msg_content(this, content_sizer, msg, monospaced_font);
+ add_btn(wxID_OK, true);
// Use a small bitmap with monospaced font, as the error text will not be wrapped.
- logo->SetBitmap(create_scaled_bitmap("PrusaSlicer_192px_grayscale.png", this, monospaced_font ? 48 : 192));
+ logo->SetBitmap(create_scaled_bitmap("PrusaSlicer_192px_grayscale.png", this, monospaced_font ? 48 : /*1*/92));
+
+ wxGetApp().UpdateDlgDarkUI(this);
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
Fit();
@@ -115,45 +145,40 @@ WarningDialog::WarningDialog(wxWindow *parent,
long style/* = wxOK*/)
: MsgDialog(parent, caption.IsEmpty() ? wxString::Format(_L("%s warning"), SLIC3R_APP_NAME) : caption,
wxString::Format(_L("%s has a warning")+":", SLIC3R_APP_NAME), wxID_NONE)
- , msg(message)
{
- // Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
- wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
- {
- html->SetMinSize(wxSize(40 * wxGetApp().em_unit(), 10 * wxGetApp().em_unit()));
- wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- wxFont monospace = wxGetApp().code_font();
- wxColour text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
- wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
- auto text_clr_str = wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
- auto bgr_clr_str = wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
- const int font_size = font.GetPointSize();
- int size[] = {font_size, font_size, font_size, font_size, font_size, font_size, font_size};
- html->SetFonts(font.GetFaceName(), monospace.GetFaceName(), size);
- html->SetBorders(2);
- std::string msg_escaped = xml_escape(msg.ToUTF8().data());
- boost::replace_all(msg_escaped, "\r\n", "
");
- boost::replace_all(msg_escaped, "\n", "
");
- html->SetPage("" + wxString::FromUTF8(msg_escaped.data()) + "");
- content_sizer->Add(html, 1, wxEXPAND|wxBOTTOM, BORDER);
- }
+ add_msg_content(this, content_sizer, message);
- auto add_btn = [this](wxWindowID btn_id) {
- auto* btn = new wxButton(this, btn_id);
- btn_sizer->Add(btn, 0, wxRIGHT, HORIZ_SPACING);
- btn->Bind(wxEVT_BUTTON, [this, btn_id](wxCommandEvent&) { this->EndModal(btn_id); });
- };
+ if (style & wxOK) add_btn(wxID_OK, true);
+ if (style & wxYES) add_btn(wxID_YES);
+ if (style & wxNO) add_btn(wxID_NO);
- if (style & wxOK)
- add_btn(wxID_OK);
- if (style & wxYES)
- add_btn(wxID_YES);
- if (style & wxNO)
- add_btn(wxID_NO);
+ logo->SetBitmap(create_scaled_bitmap("PrusaSlicer_192px_grayscale.png", this, 90));
- logo->SetBitmap(create_scaled_bitmap("PrusaSlicer_192px_grayscale.png", this, 150));
+ wxGetApp().UpdateDlgDarkUI(this);
+ Fit();
+}
- SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
+
+// MessageDialog
+
+MessageDialog::MessageDialog(wxWindow* parent,
+ const wxString& message,
+ const wxString& caption/* = wxEmptyString*/,
+ long style/* = wxOK*/)
+ : MsgDialog(parent, caption.IsEmpty() ? wxString::Format(_L("%s info"), SLIC3R_APP_NAME) : caption, wxEmptyString, wxID_NONE)
+{
+ add_msg_content(this, content_sizer, message);
+
+ if (style & wxOK) add_btn(wxID_OK, true);
+ if (style & wxYES) add_btn(wxID_YES);
+ if (style & wxNO) add_btn(wxID_NO);
+ if (style & wxCANCEL) add_btn(wxID_CANCEL);
+
+ logo->SetBitmap(create_scaled_bitmap(style & wxICON_WARNING ? "exclamation" :
+ style & wxICON_INFORMATION ? "info.png" :
+ style & wxICON_QUESTION ? "question" : "PrusaSlicer_192px_grayscale.png", this, 90));
+
+ wxGetApp().UpdateDlgDarkUI(this);
Fit();
}
diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp
index 20d7f8dd5..8c49107d9 100644
--- a/src/slic3r/GUI/MsgDialog.hpp
+++ b/src/slic3r/GUI/MsgDialog.hpp
@@ -31,7 +31,7 @@ struct MsgDialog : wxDialog
protected:
enum {
- CONTENT_WIDTH = 50,
+ CONTENT_WIDTH = 70,//50,
CONTENT_MAX_HEIGHT = 60,
BORDER = 30,
VERT_SPACING = 15,
@@ -41,6 +41,8 @@ protected:
// button_id is an id of a button that can be added by default, use wxID_NONE to disable
MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id = wxID_OK, wxBitmap bitmap = wxNullBitmap);
+ void add_btn(wxWindowID btn_id, bool set_focus = false);
+
wxFont boldfont;
wxBoxSizer *content_sizer;
wxBoxSizer *btn_sizer;
@@ -66,12 +68,10 @@ private:
};
-// Generic error dialog, used for displaying exceptions
+// Generic warning dialog, used for displaying exceptions
class WarningDialog : public MsgDialog
{
public:
- // If monospaced_font is true, the error message is displayed using html |