Preferences Dialog: Revert values, when "Cancel" button is clicked ([SPE-1230|https://dev.prusa3d.com/browse/SPE-1230])

+ Fixed bug: If change "dark mode" checkbox and "Settings layout mode", than dark mode wouldn't processed.
+ Code refactoring for create_settings_mode_widget()

src/slic3r/GUI/Preferences.cpp

@@ -173,6 +173,10 @@ void PreferencesDialog::build()
 	// Add "General" tab
 	m_optgroup_general = create_options_tab(L("General"), tabs);
 	m_optgroup_general->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
+		if (auto it = m_values.find(opt_key); it != m_values.end()) {
+			m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
+			return;
+		}
 		if (opt_key == "default_action_on_close_application" || opt_key == "default_action_on_select_preset" || opt_key == "default_action_on_new_project")
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "none" : "discard";
 		else if (opt_key == "default_action_on_dirty_project")
@@ -335,6 +339,10 @@ void PreferencesDialog::build()
 	// Add "Camera" tab
 	m_optgroup_camera = create_options_tab(L("Camera"), tabs);
 	m_optgroup_camera->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
+		if (auto it = m_values.find(opt_key);it != m_values.end()) {
+			m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
+			return;
+		}
 		m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 	};
 
@@ -358,25 +366,38 @@ void PreferencesDialog::build()
 	// Add "GUI" tab
 	m_optgroup_gui = create_options_tab(L("GUI"), tabs);
 	m_optgroup_gui->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
-        if (opt_key == "suppress_hyperlinks")
+		if (opt_key == "notify_release") {
-            m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "";
-		else if (opt_key == "notify_release") {
 			int val_int = boost::any_cast<int>(value);
 			for (const auto& item : s_keys_map_NotifyReleaseMode) {
 				if (item.second == val_int) {
 					m_values[opt_key] = item.first;
-					break;
+					return;
 				}
 			}
-		} else
+		}
-            m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
-
 		if (opt_key == "use_custom_toolbar_size") {
 			m_icon_size_sizer->ShowItems(boost::any_cast<bool>(value));
-			m_optgroup_gui->parent()->Layout();
+			refresh_og(m_optgroup_gui);
-			tabs->Layout();
-			this->layout();
 		}
+		if (opt_key == "tabs_as_menu") {
+			bool disable_new_layout = boost::any_cast<bool>(value);
+			m_rb_new_settings_layout_mode->Show(!disable_new_layout);
+			if (disable_new_layout && m_rb_new_settings_layout_mode->GetValue()) {
+				m_rb_new_settings_layout_mode->SetValue(false);
+				m_rb_old_settings_layout_mode->SetValue(true);
+			}
+			refresh_og(m_optgroup_gui);
+		}
+
+		if (auto it = m_values.find(opt_key); it != m_values.end()) {
+			m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
+			return;
+		}
+
+		if (opt_key == "suppress_hyperlinks")
+			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "";
+		else
+			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 	};
 
 	append_bool_option(m_optgroup_gui, "seq_top_layer_only",
@@ -464,6 +485,10 @@ void PreferencesDialog::build()
 		// Add "Render" tab
 		m_optgroup_render = create_options_tab(L("Render"), tabs);
 		m_optgroup_render->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
+			if (auto it = m_values.find(opt_key); it != m_values.end()) {
+				m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
+				return;
+			}
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 		};
 
@@ -479,6 +504,10 @@ void PreferencesDialog::build()
 		// Add "Dark Mode" tab
 		m_optgroup_dark_mode = create_options_tab(_L("Dark mode (experimental)"), tabs);
 		m_optgroup_dark_mode->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
+			if (auto it = m_values.find(opt_key); it != m_values.end()) {
+				m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
+				return;
+			}
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 		};
 
@@ -509,6 +538,7 @@ void PreferencesDialog::build()
 
 	auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
 	this->Bind(wxEVT_BUTTON, &PreferencesDialog::accept, this, wxID_OK);
+	this->Bind(wxEVT_BUTTON, &PreferencesDialog::revert, this, wxID_CANCEL);
 
 	for (int id : {wxID_OK, wxID_CANCEL})
 		wxGetApp().UpdateDarkUI(static_cast<wxButton*>(FindWindowById(id, this)));
@@ -592,19 +622,6 @@ void PreferencesDialog::accept(wxEvent&)
 	    }
 	}
 
-	for (const std::string& key : {	"default_action_on_close_application", 
-									"default_action_on_select_preset", 
-									"default_action_on_new_project" }) {
-	    auto it = m_values.find(key);
-		if (it != m_values.end() && it->second != "none" && app_config->get(key) != "none")
-			m_values.erase(it); // we shouldn't change value, if some of those parameters were selected, and then deselected
-	}
-	{
-	    auto it = m_values.find("default_action_on_dirty_project");
-		if (it != m_values.end() && !it->second.empty() && !app_config->get("default_action_on_dirty_project").empty())
-			m_values.erase(it); // we shouldn't change value, if this parameter was selected, and then deselected
-	}
-
 #if 0 //#ifdef _WIN32 // #ysDarkMSW - Allow it when we deside to support the sustem colors for application
 	if (m_values.find("always_dark_color_mode") != m_values.end())
 		wxGetApp().force_sys_colors_update();
@@ -629,11 +646,85 @@ void PreferencesDialog::accept(wxEvent&)
 		wxGetApp().force_menu_update();
 #endif //_MSW_DARK_MODE
 #endif // _WIN32
-	if (m_settings_layout_changed)
+	
-		;// application will be recreated after Preference dialog will be destroyed
+	wxGetApp().update_ui_from_settings();
-	else
+	m_values.clear();
-	    // Nothify the UI to update itself from the ini file.
+}
-        wxGetApp().update_ui_from_settings();
+
+void PreferencesDialog::revert(wxEvent&)
+{
+	auto app_config = get_app_config();
+
+	for (auto value : m_values) {
+		bool reverted = false;
+		const std::string& key = value.first;
+
+		if (key == "default_action_on_dirty_project") {
+			m_optgroup_general->set_value(key, app_config->get(key).empty());
+			continue;
+		}
+		if (key == "default_action_on_close_application" || key == "default_action_on_select_preset" || key == "default_action_on_new_project") {
+			m_optgroup_general->set_value(key, app_config->get(key) == "none");
+			continue;
+		}
+		if (key == "notify_release") {
+			m_optgroup_gui->set_value(key, s_keys_map_NotifyReleaseMode.at(app_config->get(key)));
+			continue;
+		}
+		if (key == "custom_toolbar_size") {
+			m_icon_size_slider->SetValue(atoi(app_config->get("custom_toolbar_size").c_str()));
+			continue;
+		}
+		if (key == "old_settings_layout_mode") {
+			m_rb_old_settings_layout_mode->SetValue(app_config->get(key) == "1");
+			continue;
+		}
+		if (key == "new_settings_layout_mode") {
+			m_rb_new_settings_layout_mode->SetValue(app_config->get(key) == "1");
+			continue;
+		}
+		if (key == "dlg_settings_layout_mode") {
+			m_rb_dlg_settings_layout_mode->SetValue(app_config->get(key) == "1");
+			continue;
+		}
+
+		for (auto opt_group : { m_optgroup_general, m_optgroup_camera, m_optgroup_gui
+#ifdef _WIN32
+			, m_optgroup_dark_mode
+#endif // _WIN32
+#if ENABLE_ENVIRONMENT_MAP
+			, m_optgroup_render
+#endif // ENABLE_ENVIRONMENT_MAP
+			}) {
+			if (reverted = opt_group->set_value(key, app_config->get(key) == "1"))
+				break;
+		}
+		if (!reverted)
+			int i=0;
+		if (key == "tabs_as_menu") {
+			m_rb_new_settings_layout_mode->Show(app_config->get(key) != "1");
+			refresh_og(m_optgroup_gui);
+			continue;
+		}
+
+		if (key == "use_custom_toolbar_size") {
+			m_icon_size_sizer->ShowItems(app_config->get(key) == "1");
+			refresh_og(m_optgroup_gui);
+		}
+	}
+
+	m_values.clear();
+
+	auto revert_colors = [](wxColourPickerCtrl* color_pckr, const wxColour& color) {
+		if (color_pckr->GetColour() != color) {
+			color_pckr->SetColour(color);
+			wxPostEvent(color_pckr, wxCommandEvent(wxEVT_COLOURPICKER_CHANGED));
+		}
+	};
+	revert_colors(m_sys_colour, wxGetApp().get_label_clr_sys());
+	revert_colors(m_mod_colour, wxGetApp().get_label_clr_modified());
+
+	EndModal(wxID_CANCEL);
 }
 
 void PreferencesDialog::msw_rescale()
@@ -669,6 +760,13 @@ void PreferencesDialog::layout()
     Refresh();
 }
 
+void PreferencesDialog::refresh_og(std::shared_ptr<ConfigOptionsGroup> og)
+{
+	og->parent()->Layout();
+	tabs->Layout();
+	this->layout();
+}
+
 void PreferencesDialog::create_icon_size_slider()
 {
     const auto app_config = get_app_config();
@@ -695,14 +793,14 @@ void PreferencesDialog::create_icon_size_slider()
     if (!isOSX)
         style |= wxSL_LABELS | wxSL_AUTOTICKS;
 
-    auto slider = new wxSlider(parent, wxID_ANY, def_val, 30, 100, 
+    m_icon_size_slider = new wxSlider(parent, wxID_ANY, def_val, 30, 100, 
                                wxDefaultPosition, wxDefaultSize, style);
 
-    slider->SetTickFreq(10);
+    m_icon_size_slider->SetTickFreq(10);
-    slider->SetPageSize(10);
+    m_icon_size_slider->SetPageSize(10);
-    slider->SetToolTip(_L("Select toolbar icon size in respect to the default one."));
+    m_icon_size_slider->SetToolTip(_L("Select toolbar icon size in respect to the default one."));
 
-    m_icon_size_sizer->Add(slider, 1, wxEXPAND);
+    m_icon_size_sizer->Add(m_icon_size_slider, 1, wxEXPAND);
 
     wxStaticText* val_label{ nullptr };
     if (isOSX) {
@@ -710,15 +808,15 @@ void PreferencesDialog::create_icon_size_slider()
         m_icon_size_sizer->Add(val_label, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, em);
     }
 
-    slider->Bind(wxEVT_SLIDER, ([this, slider, val_label](wxCommandEvent e) {
+    m_icon_size_slider->Bind(wxEVT_SLIDER, ([this, val_label](wxCommandEvent e) {
-        auto val = slider->GetValue();
+        auto val = m_icon_size_slider->GetValue();
         m_values["custom_toolbar_size"] = (boost::format("%d") % val).str();
 
         if (val_label)
             val_label->SetLabelText(wxString::Format("%d", val));
-    }), slider->GetId());
+    }), m_icon_size_slider->GetId());
 
-    for (wxWindow* win : std::vector<wxWindow*>{ slider, label, val_label }) {
+    for (wxWindow* win : std::vector<wxWindow*>{ m_icon_size_slider, label, val_label }) {
         if (!win) continue;         
         win->SetFont(wxGetApp().normal_font());
 
@@ -731,26 +829,6 @@ void PreferencesDialog::create_icon_size_slider()
 
 void PreferencesDialog::create_settings_mode_widget()
 {
-#ifdef _MSW_DARK_MODE
-	bool disable_new_layout = wxGetApp().tabs_as_menu();
-#endif
-	std::vector<wxString> choices = {  _L("Old regular layout with the tab bar"),
-                                       _L("New layout, access via settings button in the top menu"),
-                                       _L("Settings in non-modal window") };
-
-	auto app_config = get_app_config();
-    int selection = app_config->get("old_settings_layout_mode") == "1" ? 0 :
-                    app_config->get("new_settings_layout_mode") == "1" ? 1 :
-                    app_config->get("dlg_settings_layout_mode") == "1" ? 2 : 0;
-
-#ifdef _MSW_DARK_MODE
-	if (disable_new_layout) {
-		choices = { _L("Old regular layout with the tab bar"),
-					_L("Settings in non-modal window") };
-		selection = app_config->get("dlg_settings_layout_mode") == "1" ? 1 : 0;
-	}
-#endif
-
 	wxWindow* parent = m_optgroup_gui->parent();
 	wxGetApp().UpdateDarkUI(parent);
 
@@ -762,32 +840,35 @@ void PreferencesDialog::create_settings_mode_widget()
 
 	wxSizer* stb_sizer = new wxStaticBoxSizer(stb, wxVERTICAL);
 
-	int id = 0;
+	auto app_config = get_app_config();
-	for (const wxString& label : choices) {
+	std::vector<wxString> choices = {	_L("Old regular layout with the tab bar"),
-		wxRadioButton* btn = new wxRadioButton(parent, wxID_ANY, label, wxDefaultPosition, wxDefaultSize, id==0 ? wxRB_GROUP : 0);
+										_L("New layout, access via settings button in the top menu"),
-		stb_sizer->Add(btn);
+										_L("Settings in non-modal window") };
-		btn->SetValue(id == selection);
+	int id = -1;
-
+	auto add_radio = [this, parent, stb_sizer, choices](wxRadioButton** rb, int id, bool select) {
-        int dlg_id = 2;
+		*rb = new wxRadioButton(parent, wxID_ANY, choices[id], wxDefaultPosition, wxDefaultSize, id == 0 ? wxRB_GROUP : 0);
-#ifdef _MSW_DARK_MODE
+		stb_sizer->Add(*rb);
-		if (disable_new_layout)
+		(*rb)->SetValue(select);
-			dlg_id = 1;
+		(*rb)->Bind(wxEVT_RADIOBUTTON, [this, id](wxCommandEvent&) {
-#endif
+			m_values["old_settings_layout_mode"] = (id == 0) ? "1" : "0";
-
+			m_values["new_settings_layout_mode"] = (id == 1) ? "1" : "0";
-        btn->Bind(wxEVT_RADIOBUTTON, [this, id, dlg_id
+			m_values["dlg_settings_layout_mode"] = (id == 2) ? "1" : "0";
-#ifdef _MSW_DARK_MODE
-			, disable_new_layout
-#endif
-		](wxCommandEvent& ) {
-            m_values["old_settings_layout_mode"] = (id == 0) ? "1" : "0";
-#ifdef _MSW_DARK_MODE
-			if (!disable_new_layout)
-#endif
-            m_values["new_settings_layout_mode"] = (id == 1) ? "1" : "0";
-            m_values["dlg_settings_layout_mode"] = (id == dlg_id) ? "1" : "0";
 		});
-		id++;
+	};
+
+	add_radio(&m_rb_old_settings_layout_mode, ++id, app_config->get("old_settings_layout_mode") == "1");
+	add_radio(&m_rb_new_settings_layout_mode, ++id, app_config->get("new_settings_layout_mode") == "1");
+	add_radio(&m_rb_dlg_settings_layout_mode, ++id, app_config->get("dlg_settings_layout_mode") == "1");
+
+#ifdef _MSW_DARK_MODE
+	if (app_config->get("tabs_as_menu") == "1") {
+		m_rb_new_settings_layout_mode->Hide();
+		if (m_rb_new_settings_layout_mode->GetValue()) {
+			m_rb_new_settings_layout_mode->SetValue(false);
+			m_rb_old_settings_layout_mode->SetValue(true);
+		}
 	}
+#endif
 
 	std::string opt_key = "settings_layout_mode";
 	m_blinkers[opt_key] = new BlinkingBitmap(parent);

src/slic3r/GUI/Preferences.hpp

@@ -12,6 +12,8 @@
 
 class wxColourPickerCtrl;
 class wxBookCtrlBase;
+class wxSlider;
+class wxRadioButton;
 
 namespace Slic3r {
 
@@ -39,6 +41,11 @@ class PreferencesDialog : public DPIDialog
 	std::shared_ptr<ConfigOptionsGroup>	m_optgroup_render;
 #endif // ENABLE_ENVIRONMENT_MAP
 	wxSizer*                            m_icon_size_sizer;
+	wxSlider*							m_icon_size_slider {nullptr};
+	wxRadioButton*						m_rb_old_settings_layout_mode {nullptr};
+	wxRadioButton*						m_rb_new_settings_layout_mode {nullptr};
+	wxRadioButton*						m_rb_dlg_settings_layout_mode {nullptr};
+
 	wxColourPickerCtrl*					m_sys_colour {nullptr};
 	wxColourPickerCtrl*					m_mod_colour {nullptr};
 	wxBookCtrlBase*						tabs {nullptr};
@@ -58,6 +65,7 @@ public:
 	void	build();
 	void	update_ctrls_alignment();
 	void	accept(wxEvent&);
+	void    revert(wxEvent&);
 	void	show(const std::string& highlight_option = std::string(), const std::string& tab_name = std::string());
 
 protected:
@@ -65,6 +73,7 @@ protected:
 	void on_dpi_changed(const wxRect& suggested_rect) override { msw_rescale(); }
 	void on_sys_color_changed() override;
     void layout();
+	void refresh_og(std::shared_ptr<ConfigOptionsGroup> og);
     void create_icon_size_slider();
     void create_settings_mode_widget();
     void create_settings_text_color_widget();