Options from the "Preferences" dialog added to the Search

Some code refactoring:
* use GUI_App::open_preferences() on all places where it's needed
* Preferences Dialog is an attribute of a ManeFrame class and created just ones during the MainFrame creation now.
* Created class Highlighter. Use it in Preferences and Tab

resources/data/hints.ini

@@ -34,7 +34,7 @@
 #
 # Open preferences (might add item to highlight)
 # hypertext_type = preferences
-# hypertext_preferences_page = 2 (values 0-2 according to prefernces tab to be opened)
+# hypertext_preferences_page = name of the prefernces tab
 # hypertext_preferences_item = show_collapse_button (name of variable saved in prusaslicer.ini connected to the setting in preferences)
 #
 # Open gallery (no aditional var)
@@ -97,7 +97,7 @@ documentation_link = https://help.prusa3d.com/en/article/reload-from-disk_120427
 [hint:Hiding sidebar]
 text = Hiding sidebar\nDid you know that you can hide the right sidebar using the shortcut <b>Shift+Tab</b>? You can also enable the icon for this from the<a>Preferences</a>.
 hypertext_type = preferences
-hypertext_preferences_page = 2
+hypertext_preferences_page = GUI
 hypertext_preferences_item = show_collapse_button
 
 [hint:Perspective camera]
@@ -214,7 +214,7 @@ disabled_tags = SLA
 [hint:Settings in non-modal window]
 text = Settings in non-modal window\nDid you know that you can open the Settings in a new non-modal window? This means you can have settings open on one screen and the G-code Preview on the other. Go to the<a>Preferences</a>and select Settings in non-modal window.
 hypertext_type = preferences
-hypertext_preferences_page = 2
+hypertext_preferences_page = GUI
 hypertext_preferences_item = dlg_settings_layout_mode
 
 [hint:Adaptive infills]

src/libslic3r/Preset.hpp

@@ -116,6 +116,8 @@ public:
         // This type is here to support PresetConfigSubstitutions for physical printers, however it does not belong to the Preset class,
         // PhysicalPrinter class is used instead.
         TYPE_PHYSICAL_PRINTER,
+        // This type is here to support search through the Preferences
+        TYPE_PREFERENCES,
     };
 
     Type                type        = TYPE_INVALID;

src/slic3r/GUI/GLCanvas3D.cpp

@@ -4010,8 +4010,11 @@ bool GLCanvas3D::_render_search_list(float pos_x)
             action_taken = true;
         else
             sidebar.jump_to_option(selected);*/
-        if (selected != 9999)
+        if (selected != 9999) {
+            imgui->end(); // end imgui before the jump to option
             sidebar.jump_to_option(selected);
+            return true;
+        }
         action_taken = true;
     }
 

src/slic3r/GUI/GUI_App.cpp

@@ -1735,6 +1735,7 @@ void GUI_App::update_ui_from_settings()
         m_force_colors_update = false;
         mainframe->force_color_changed();
         mainframe->diff_dialog.force_color_changed();
+        mainframe->preferences_dialog->force_color_changed();
         mainframe->printhost_queue_dlg()->force_color_changed();
 #ifdef _MSW_DARK_MODE
         update_scrolls(mainframe);
@@ -2255,40 +2256,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
             break;
         case ConfigMenuPreferences:
         {
-            bool app_layout_changed = false;
+            open_preferences();
-            {
-                // the dialog needs to be destroyed before the call to recreate_GUI()
-                // or sometimes the application crashes into wxDialogBase() destructor
-                // so we put it into an inner scope
-                PreferencesDialog dlg(mainframe);
-                dlg.ShowModal();
-                app_layout_changed = dlg.settings_layout_changed();
-                if (dlg.seq_top_layer_only_changed())
-                    this->plater_->refresh_print();
-
-                if (dlg.recreate_GUI()) {
-                    recreate_GUI(_L("Restart application") + dots);
-                    return;
-                }
-#ifdef _WIN32
-                if (is_editor()) {
-                    if (app_config->get("associate_3mf") == "1")
-                        associate_3mf_files();
-                    if (app_config->get("associate_stl") == "1")
-                        associate_stl_files();
-                }
-                else {
-                    if (app_config->get("associate_gcode") == "1")
-                        associate_gcode_files();
-                }
-#endif // _WIN32
-            }
-            if (app_layout_changed) {
-                // hide full main_sizer for mainFrame
-                mainframe->GetSizer()->Show(false);
-                mainframe->update_layout();
-                mainframe->select_tab(size_t(0));
-            }
             break;
         }
         case ConfigMenuLanguage:
@@ -2336,22 +2304,20 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
     menu->Append(local_menu, _L("&Configuration"));
 }
 
-void GUI_App::open_preferences(size_t open_on_tab, const std::string& highlight_option)
+void GUI_App::open_preferences(const std::string& highlight_option /*= std::string()*/, const std::string& tab_name/*= std::string()*/)
 {
-    bool app_layout_changed = false;
+    mainframe->preferences_dialog->show(highlight_option, tab_name);
-    {
+
-        // the dialog needs to be destroyed before the call to recreate_GUI()
+    if (mainframe->preferences_dialog->recreate_GUI())
-        // or sometimes the application crashes into wxDialogBase() destructor
+        recreate_GUI(_L("Restart application") + dots);
-        // so we put it into an inner scope
+
-        PreferencesDialog dlg(mainframe, open_on_tab, highlight_option);
-        dlg.ShowModal();
-        app_layout_changed = dlg.settings_layout_changed();
 #if ENABLE_GCODE_LINES_ID_IN_H_SLIDER
     if (dlg.seq_top_layer_only_changed() || dlg.seq_seq_top_gcode_indices_changed())
 #else
-        if (dlg.seq_top_layer_only_changed())
+    if (mainframe->preferences_dialog->seq_top_layer_only_changed())
 #endif // ENABLE_GCODE_LINES_ID_IN_H_SLIDER
         this->plater_->refresh_print();
+
 #ifdef _WIN32
     if (is_editor()) {
         if (app_config->get("associate_3mf") == "1")
@@ -2364,8 +2330,8 @@ void GUI_App::open_preferences(size_t open_on_tab, const std::string& highlight_
             associate_gcode_files();
     }
 #endif // _WIN32
-    }
+
-    if (app_layout_changed) {
+    if (mainframe->preferences_dialog->settings_layout_changed()) {
         // hide full main_sizer for mainFrame
         mainframe->GetSizer()->Show(false);
         mainframe->update_layout();

src/slic3r/GUI/GUI_App.hpp

@@ -264,7 +264,7 @@ public:
     wxString 		current_language_code_safe() const;
     bool            is_localized() const { return m_wxLocale->GetLocale() != "English"; }
 
-    void            open_preferences(size_t open_on_tab = 0, const std::string& highlight_option = std::string());
+    void            open_preferences(const std::string& highlight_option = std::string(), const std::string& tab_name = std::string());
 
     virtual bool OnExceptionInMainLoop() override;
     // Calls wxLaunchDefaultBrowser if user confirms in dialog.

src/slic3r/GUI/HintNotification.cpp

@@ -417,9 +417,9 @@ void HintDatabase::load_hints_from_file(const boost::filesystem::path& path)
 					m_loaded_hints.emplace_back(hint_data);
 				// open preferences
 				} else if(dict["hypertext_type"] == "preferences") {
-					int			page = static_cast<Preset::Type>(std::atoi(dict["hypertext_preferences_page"].c_str()));
+					std::string	page = dict["hypertext_preferences_page"];
 					std::string	item = dict["hypertext_preferences_item"];
-					HintData	hint_data{ id_string, text1, weight, was_displayed, hypertext_text, follow_text, disabled_tags, enabled_tags, false, documentation_link, [page, item]() { wxGetApp().open_preferences(page, item); } };
+					HintData	hint_data{ id_string, text1, weight, was_displayed, hypertext_text, follow_text, disabled_tags, enabled_tags, false, documentation_link, [page, item]() { wxGetApp().open_preferences(item, page); } };
 					m_loaded_hints.emplace_back(hint_data);
 				} else if (dict["hypertext_type"] == "plater") {
 					std::string	item = dict["hypertext_plater_item"];
@@ -924,7 +924,7 @@ void NotificationManager::HintNotification::render_preferences_button(ImGuiWrapp
 	}
 	if (imgui.button(button_text.c_str(), button_size.x, button_size.y))
 	{
-		wxGetApp().open_preferences(2, "show_hints");
+		wxGetApp().open_preferences("show_hints", "GUI");
 	}
 
 	ImGui::PopStyleColor(5);

src/slic3r/GUI/MainFrame.cpp

@@ -47,6 +47,7 @@
 #include "GUI_ObjectList.hpp"
 #include "GalleryDialog.hpp"
 #include "NotificationManager.hpp"
+#include "Preferences.hpp"
 
 #ifdef _WIN32
 #include <dbt.h>
@@ -272,6 +273,8 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
     if (m_plater != nullptr) {
         m_plater->get_collapse_toolbar().set_enabled(wxGetApp().app_config->get("show_collapse_button") == "1");
         m_plater->show_action_buttons(true);
+
+        preferences_dialog = new PreferencesDialog(this);
     }
 }
 

src/slic3r/GUI/MainFrame.hpp

@@ -32,6 +32,7 @@ class Tab;
 class PrintHostQueueDialog;
 class Plater;
 class MainFrame;
+class PreferencesDialog;
 
 enum QuickSlice
 {
@@ -203,6 +204,7 @@ public:
     DiffPresetDialog      diff_dialog;
     wxWindow*             m_plater_page{ nullptr };
 //    wxProgressDialog*     m_progress_dialog { nullptr };
+    PreferencesDialog*    preferences_dialog { nullptr };
     PrintHostQueueDialog* m_printhost_queue_dlg;
 //    std::shared_ptr<ProgressStatusBar>  m_statusbar;
 

src/slic3r/GUI/OptionsGroup.hpp

@@ -74,6 +74,12 @@ public:
 		label(_(label)), label_tooltip(_(tooltip)) {}
 	Line() : m_is_separator(true) {}
 
+	Line(const std::string& opt_key, const wxString& label, const wxString& tooltip) :
+		label(_(label)), label_tooltip(_(tooltip))
+	{
+		m_options.push_back(Option({ opt_key, coNone }, opt_key));
+	}
+
 	bool is_separator() const { return m_is_separator; }
 
     const std::vector<widget_t>&	get_extra_widgets() const {return m_extra_widgets;}
@@ -180,6 +186,8 @@ public:
 	// if we have to set the same control alignment for different option groups, 
     // we have to set same max contrtol width to all of them
 	void				set_max_win_width(int max_win_width);
+	void				set_use_custom_ctrl(bool use_custom_ctrl) { m_use_custom_ctrl = use_custom_ctrl; }
+	const std::map<t_config_option_key, Option>& get_optioms_map() { return m_options; }
 
 	bool				is_activated() { return sizer != nullptr; }
 

src/slic3r/GUI/Plater.cpp

@@ -1185,10 +1185,10 @@ void Sidebar::jump_to_option(const std::string& opt_key, Preset::Type type, cons
 void Sidebar::jump_to_option(size_t selected)
 {
     const Search::Option& opt = p->searcher.get_option(selected);
+    if (opt.type == Preset::TYPE_PREFERENCES)
+        wxGetApp().open_preferences(opt.opt_key(), boost::nowide::narrow(opt.group));
+    else
         wxGetApp().get_tab(opt.type)->activate_option(opt.opt_key(), boost::nowide::narrow(opt.category));
-
-    // Switch to the Settings NotePad
-//    wxGetApp().mainframe->select_tab();
 }
 
 ObjectManipulation* Sidebar::obj_manipul()

src/slic3r/GUI/Preferences.cpp

@@ -42,22 +42,40 @@ namespace Slic3r {
 
 namespace GUI {
 
-PreferencesDialog::PreferencesDialog(wxWindow* parent, int selected_tab, const std::string& highlight_opt_key) :
+PreferencesDialog::PreferencesDialog(wxWindow* parent) :
     DPIDialog(parent, wxID_ANY, _L("Preferences"), wxDefaultPosition, 
               wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 #ifdef __WXOSX__
     isOSX = true;
 #endif
-	build(selected_tab);
+	build();
+
+	m_highlighter.set_timer_owner(this, 0);
+	this->Bind(wxEVT_TIMER, [this](wxTimerEvent&) {
+		m_highlighter.blink();
+	});
+}
+
+void PreferencesDialog::show(const std::string& highlight_opt_key /*= std::string()*/, const std::string& tab_name/*= std::string()*/)
+{
+	int selected_tab = 0;
+	for (selected_tab; selected_tab < tabs->GetPageCount(); selected_tab++)
+		if (tabs->GetPageText(selected_tab) == _(tab_name))
+			break;
+	if (selected_tab < tabs->GetPageCount())
+		tabs->SetSelection(selected_tab);
+
 	if (!highlight_opt_key.empty())
 		init_highlighter(highlight_opt_key);
+
+	this->ShowModal();
 }
 
 static std::shared_ptr<ConfigOptionsGroup>create_options_tab(const wxString& title, wxBookCtrlBase* tabs)
 {
 	wxPanel* tab = new wxPanel(tabs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
-	tabs->AddPage(tab, title);
+	tabs->AddPage(tab, _(title));
 	tab->SetFont(wxGetApp().normal_font());
 
 	wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
@@ -66,6 +84,7 @@ static std::shared_ptr<ConfigOptionsGroup>create_options_tab(const wxString& tit
 
 	std::shared_ptr<ConfigOptionsGroup> optgroup = std::make_shared<ConfigOptionsGroup>(tab);
 	optgroup->label_width = 40;
+	optgroup->set_config_category_and_type(title, int(Preset::TYPE_PREFERENCES));
 	return optgroup;
 }
 
@@ -75,9 +94,67 @@ static void activate_options_tab(std::shared_ptr<ConfigOptionsGroup> optgroup)
 	optgroup->update_visibility(comSimple);
 	wxBoxSizer* sizer = static_cast<wxBoxSizer*>(static_cast<wxPanel*>(optgroup->parent())->GetSizer());
 	sizer->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 10);
+
+	// apply sercher
+	wxGetApp().sidebar().get_searcher().append_preferences_options(optgroup->get_lines());
 }
 
-void PreferencesDialog::build(size_t selected_tab)
+static void append_bool_option( std::shared_ptr<ConfigOptionsGroup> optgroup,
+								const std::string& opt_key,
+								const std::string& label,
+								const std::string& tooltip,
+								bool def_val,
+								ConfigOptionMode mode = comSimple)
+{
+	ConfigOptionDef def = {opt_key, coBool};
+	def.label = label;
+	def.tooltip = tooltip;
+	def.mode = mode;
+	def.set_default_value(new ConfigOptionBool{ def_val });
+	Option option(def, opt_key);
+	optgroup->append_single_option_line(option);
+
+	// fill data to the Search Dialog
+	wxGetApp().sidebar().get_searcher().add_key(opt_key, Preset::TYPE_PREFERENCES, optgroup->config_category(), L("Preferences"));
+}
+
+static void append_enum_option( std::shared_ptr<ConfigOptionsGroup> optgroup,
+								const std::string& opt_key,
+								const std::string& label,
+								const std::string& tooltip,
+								const ConfigOption* def_val,
+								const t_config_enum_values *enum_keys_map,
+								std::initializer_list<std::string> enum_values,
+								std::initializer_list<std::string> enum_labels,
+								ConfigOptionMode mode = comSimple)
+{
+	ConfigOptionDef def = {opt_key, coEnum };
+	def.label = label;
+	def.tooltip = tooltip;
+	def.mode = mode;
+	def.enum_keys_map = enum_keys_map;
+	def.enum_values = std::vector<std::string>(enum_values);
+	def.enum_labels = std::vector<std::string>(enum_labels);
+
+	def.set_default_value(def_val);
+	Option option(def, opt_key);
+	optgroup->append_single_option_line(option);
+
+	// fill data to the Search Dialog
+	wxGetApp().sidebar().get_searcher().add_key(opt_key, Preset::TYPE_PREFERENCES, optgroup->config_category(), L("Preferences"));
+}
+
+static void append_preferences_option_to_searcer(std::shared_ptr<ConfigOptionsGroup> optgroup,
+												const std::string& opt_key,
+												const wxString& label)
+{
+	// fill data to the Search Dialog
+	wxGetApp().sidebar().get_searcher().add_key(opt_key, Preset::TYPE_PREFERENCES, optgroup->config_category(), L("Preferences"));
+	// apply sercher
+	wxGetApp().sidebar().get_searcher().append_preferences_option(Line(opt_key, label, ""));
+}
+
+void PreferencesDialog::build()
 {
 #ifdef _WIN32
 	wxGetApp().UpdateDarkUI(this);
@@ -90,20 +167,14 @@ void PreferencesDialog::build(size_t selected_tab)
 	auto app_config = get_app_config();
 
 #ifdef _MSW_DARK_MODE
-	wxBookCtrlBase* tabs;
-//	if (wxGetApp().dark_mode())
 	tabs = new Notebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME | wxNB_DEFAULT);
-/*	else {
-		tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME | wxNB_DEFAULT);
-		tabs->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-	}*/
 #else
-    wxNotebook* tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL  |wxNB_NOPAGETHEME | wxNB_DEFAULT );
+    tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL  |wxNB_NOPAGETHEME | wxNB_DEFAULT );
 	tabs->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 #endif
 
 	// Add "General" tab
-	m_optgroup_general = create_options_tab(_L("General"), tabs);
+	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 (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";
@@ -113,215 +184,167 @@ void PreferencesDialog::build(size_t selected_tab)
 
 	bool is_editor = wxGetApp().is_editor();
 
-	ConfigOptionDef def;
-	Option option(def, "");
 	if (is_editor) {
-		def.label = L("Remember output directory");
+		append_bool_option(m_optgroup_general, "remember_output_path", 
-		def.type = coBool;
+			L("Remember output directory"),
-		def.tooltip = L("If this is enabled, Slic3r will prompt the last output directory "
+			L("If this is enabled, Slic3r will prompt the last output directory instead of the one containing the input files."),
-			"instead of the one containing the input files.");
+			app_config->has("remember_output_path") ? app_config->get("remember_output_path") == "1" : true);
-		def.set_default_value(new ConfigOptionBool{ app_config->has("remember_output_path") ? app_config->get("remember_output_path") == "1" : true });
-		option = Option(def, "remember_output_path");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Auto-center parts");
+		append_bool_option(m_optgroup_general, "autocenter", 
-		def.type = coBool;
+			L("Auto-center parts"),
-		def.tooltip = L("If this is enabled, Slic3r will auto-center objects "
+			L("If this is enabled, Slic3r will auto-center objects around the print bed center."),
-			"around the print bed center.");
+			app_config->get("autocenter") == "1");
-		def.set_default_value(new ConfigOptionBool{ app_config->get("autocenter") == "1" });
-		option = Option(def, "autocenter");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Background processing");
+		append_bool_option(m_optgroup_general, "background_processing", 
-		def.type = coBool;
+			L("Background processing"),
-		def.tooltip = L("If this is enabled, Slic3r will pre-process objects as soon "
+			L("If this is enabled, Slic3r will pre-process objects as soon "
-			"as they\'re loaded in order to save time when exporting G-code.");
+				"as they\'re loaded in order to save time when exporting G-code."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("background_processing") == "1" });
+			app_config->get("background_processing") == "1");
-		option = Option(def, "background_processing");
-		m_optgroup_general->append_single_option_line(option);
 
 		m_optgroup_general->append_separator();
 
 		// Please keep in sync with ConfigWizard
-		def.label = L("Export sources full pathnames to 3mf and amf");
+		append_bool_option(m_optgroup_general, "export_sources_full_pathnames",
-		def.type = coBool;
+			L("Export sources full pathnames to 3mf and amf"),
-		def.tooltip = L("If enabled, allows the Reload from disk command to automatically find and load the files when invoked.");
+			L("If enabled, allows the Reload from disk command to automatically find and load the files when invoked."),
-		def.set_default_value(new ConfigOptionBool(app_config->get("export_sources_full_pathnames") == "1"));
+			app_config->get("export_sources_full_pathnames") == "1");
-		option = Option(def, "export_sources_full_pathnames");
-		m_optgroup_general->append_single_option_line(option);
 
 #ifdef _WIN32
 		// Please keep in sync with ConfigWizard
-		def.label = L("Associate .3mf files to PrusaSlicer");
+		append_bool_option(m_optgroup_general, "associate_3mf",
-		def.type = coBool;
+			L("Associate .3mf files to PrusaSlicer"),
-		def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .3mf files.");
+			L("If enabled, sets PrusaSlicer as default application to open .3mf files."),
-		def.set_default_value(new ConfigOptionBool(app_config->get("associate_3mf") == "1"));
+			app_config->get("associate_3mf") == "1");
-		option = Option(def, "associate_3mf");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Associate .stl files to PrusaSlicer");
+		append_bool_option(m_optgroup_general, "associate_stl",
-		def.type = coBool;
+			L("Associate .stl files to PrusaSlicer"),
-		def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .stl files.");
+			L("If enabled, sets PrusaSlicer as default application to open .stl files."),
-		def.set_default_value(new ConfigOptionBool(app_config->get("associate_stl") == "1"));
+			app_config->get("associate_stl") == "1");
-		option = Option(def, "associate_stl");
-		m_optgroup_general->append_single_option_line(option);
 #endif // _WIN32
 
 		m_optgroup_general->append_separator();
 
 		// Please keep in sync with ConfigWizard
-		def.label = L("Update built-in Presets automatically");
+		append_bool_option(m_optgroup_general, "preset_update",
-		def.type = coBool;
+			L("Update built-in Presets automatically"),
-		def.tooltip = L("If enabled, Slic3r downloads updates of built-in system presets in the background. These updates are downloaded into a separate temporary location. When a new preset version becomes available it is offered at application startup.");
+			L("If enabled, Slic3r downloads updates of built-in system presets in the background. These updates are downloaded "
-		def.set_default_value(new ConfigOptionBool(app_config->get("preset_update") == "1"));
+			  "into a separate temporary location. When a new preset version becomes available it is offered at application startup."),
-		option = Option(def, "preset_update");
+			app_config->get("preset_update") == "1");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Suppress \" - default - \" presets");
+		append_bool_option(m_optgroup_general, "no_defaults",
-		def.type = coBool;
+			L("Suppress \" - default - \" presets"),
-		def.tooltip = L("Suppress \" - default - \" presets in the Print / Filament / Printer "
+			L("Suppress \" - default - \" presets in the Print / Filament / Printer selections once there are any other valid presets available."),
-			"selections once there are any other valid presets available.");
+			app_config->get("no_defaults") == "1");
-		def.set_default_value(new ConfigOptionBool{ app_config->get("no_defaults") == "1" });
-		option = Option(def, "no_defaults");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Show incompatible print and filament presets");
+		append_bool_option(m_optgroup_general, "show_incompatible_presets",
-		def.type = coBool;
+			L("Show incompatible print and filament presets"),
-		def.tooltip = L("When checked, the print and filament presets are shown in the preset editor "
+			L("When checked, the print and filament presets are shown in the preset editor "
-			"even if they are marked as incompatible with the active printer");
+			"even if they are marked as incompatible with the active printer"),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("show_incompatible_presets") == "1" });
+			app_config->get("show_incompatible_presets") == "1");
-		option = Option(def, "show_incompatible_presets");
-		m_optgroup_general->append_single_option_line(option);
 
 		m_optgroup_general->append_separator();
 
-		def.label = L("Show drop project dialog");
+		append_bool_option(m_optgroup_general, "show_drop_project_dialog",
-		def.type = coBool;
+			L("Show drop project dialog"),
-		def.tooltip = L("When checked, whenever dragging and dropping a project file on the application, shows a dialog asking to select the action to take on the file to load.");
+			L("When checked, whenever dragging and dropping a project file on the application, shows a dialog asking to select the action to take on the file to load."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("show_drop_project_dialog") == "1" });
+			app_config->get("show_drop_project_dialog") == "1");
-		option = Option(def, "show_drop_project_dialog");
-		m_optgroup_general->append_single_option_line(option);
 
+		append_bool_option(m_optgroup_general, "single_instance",
 #if __APPLE__
-		def.label = L("Allow just a single PrusaSlicer instance");
+			L("Allow just a single PrusaSlicer instance"),
-		def.type = coBool;
+			L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances "
-		def.tooltip = L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances of same app from the command line. In such case this settings will allow only one instance.");
+			  "of same app from the command line. In such case this settings will allow only one instance."),
 #else
-		def.label = L("Allow just a single PrusaSlicer instance");
+			L("Allow just a single PrusaSlicer instance"),
-		def.type = coBool;
+			L("If this is enabled, when starting PrusaSlicer and another instance of the same PrusaSlicer is already running, that instance will be reactivated instead."),
-		def.tooltip = L("If this is enabled, when starting PrusaSlicer and another instance of the same PrusaSlicer is already running, that instance will be reactivated instead.");
 #endif
-		def.set_default_value(new ConfigOptionBool{ app_config->has("single_instance") ? app_config->get("single_instance") == "1" : false });
+		app_config->has("single_instance") ? app_config->get("single_instance") == "1" : false );
-		option = Option(def, "single_instance");
-		m_optgroup_general->append_single_option_line(option);
 
 		m_optgroup_general->append_separator();
 
-		def.label = L("Ask to save unsaved changes when closing the application or when loading a new project");
+		append_bool_option(m_optgroup_general, "default_action_on_close_application",
-		def.type = coBool;
+			L("Ask to save unsaved changes when closing the application or when loading a new project"),
-		def.tooltip = L("Always ask for unsaved changes, when: \n"
+			L("Always ask for unsaved changes, when: \n"
 						"- Closing PrusaSlicer while some presets are modified,\n"
-						"- Loading a new project while some presets are modified");
+						"- Loading a new project while some presets are modified"),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_close_application") == "none" });
+			app_config->get("default_action_on_close_application") == "none");
-		option = Option(def, "default_action_on_close_application");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Ask for unsaved changes when selecting new preset");
+		append_bool_option(m_optgroup_general, "default_action_on_select_preset",
-		def.type = coBool;
+			L("Ask for unsaved changes when selecting new preset"),
-		def.tooltip = L("Always ask for unsaved changes when selecting new preset or resetting a preset");
+			L("Always ask for unsaved changes when selecting new preset or resetting a preset"),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_select_preset") == "none" });
+			app_config->get("default_action_on_select_preset") == "none");
-		option = Option(def, "default_action_on_select_preset");
-		m_optgroup_general->append_single_option_line(option);
 
-		def.label = L("Ask for unsaved changes when creating new project");
+		append_bool_option(m_optgroup_general, "default_action_on_new_project",
-		def.type = coBool;
+			L("Ask for unsaved changes when creating new project"),
-		def.tooltip = L("Always ask for unsaved changes when creating new project");
+			L("Always ask for unsaved changes when creating new project"),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_new_project") == "none" });
+			app_config->get("default_action_on_new_project") == "none");
-		option = Option(def, "default_action_on_new_project");
-		m_optgroup_general->append_single_option_line(option);
 	}
 #ifdef _WIN32
 	else {
-		def.label = L("Associate .gcode files to PrusaSlicer G-code Viewer");
+		append_bool_option(m_optgroup_general, "associate_gcode",
-		def.type = coBool;
+			L("Associate .gcode files to PrusaSlicer G-code Viewer"),
-		def.tooltip = L("If enabled, sets PrusaSlicer G-code Viewer as default application to open .gcode files.");
+			L("If enabled, sets PrusaSlicer G-code Viewer as default application to open .gcode files."),
-		def.set_default_value(new ConfigOptionBool(app_config->get("associate_gcode") == "1"));
+			app_config->get("associate_gcode") == "1");
-		option = Option(def, "associate_gcode");
-		m_optgroup_general->append_single_option_line(option);
 	}
 #endif // _WIN32
 
 #if __APPLE__
-	def.label = L("Use Retina resolution for the 3D scene");
+	append_bool_option(m_optgroup_general, "use_retina_opengl",
-	def.type = coBool;
+		L("Use Retina resolution for the 3D scene"),
-	def.tooltip = L("If enabled, the 3D scene will be rendered in Retina resolution. "
+		L("If enabled, the 3D scene will be rendered in Retina resolution. "
-	                "If you are experiencing 3D performance problems, disabling this option may help.");
+	      "If you are experiencing 3D performance problems, disabling this option may help."),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("use_retina_opengl") == "1" });
+		app_config->get("use_retina_opengl") == "1");
-	option = Option (def, "use_retina_opengl");
-	m_optgroup_general->append_single_option_line(option);
 #endif
 
 	m_optgroup_general->append_separator();
 
     // Show/Hide splash screen
-	def.label = L("Show splash screen");
+	append_bool_option(m_optgroup_general, "show_splash_screen",
-	def.type = coBool;
+		L("Show splash screen"),
-	def.tooltip = L("Show splash screen");
+		L("Show splash screen"),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("show_splash_screen") == "1" });
+		app_config->get("show_splash_screen") == "1");
-	option = Option(def, "show_splash_screen");
-	m_optgroup_general->append_single_option_line(option);
 
     // Clear Undo / Redo stack on new project
-	def.label = L("Clear Undo / Redo stack on new project");
+	append_bool_option(m_optgroup_general, "clear_undo_redo_stack_on_new_project",
-	def.type = coBool;
+		L("Clear Undo / Redo stack on new project"),
-	def.tooltip = L("Clear Undo / Redo stack on new project or when an existing project is loaded.");
+		L("Clear Undo / Redo stack on new project or when an existing project is loaded."),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("clear_undo_redo_stack_on_new_project") == "1" });
+		app_config->get("clear_undo_redo_stack_on_new_project") == "1");
-	option = Option(def, "clear_undo_redo_stack_on_new_project");
-	m_optgroup_general->append_single_option_line(option);
 
 #if defined(_WIN32) || defined(__APPLE__)
-	def.label = L("Enable support for legacy 3DConnexion devices");
+	append_bool_option(m_optgroup_general, "use_legacy_3DConnexion",
-	def.type = coBool;
+		L("Enable support for legacy 3DConnexion devices"),
-	def.tooltip = L("If enabled, the legacy 3DConnexion devices settings dialog is available by pressing CTRL+M");
+		L("If enabled, the legacy 3DConnexion devices settings dialog is available by pressing CTRL+M"),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("use_legacy_3DConnexion") == "1" });
+		app_config->get("use_legacy_3DConnexion") == "1");
-	option = Option(def, "use_legacy_3DConnexion");
-	m_optgroup_general->append_single_option_line(option);
 #endif // _WIN32 || __APPLE__
 
 	activate_options_tab(m_optgroup_general);
 
 	// Add "Camera" tab
-	m_optgroup_camera = create_options_tab(_L("Camera"), tabs);
+	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) {
 		m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 	};
 
-	def.label = L("Use perspective camera");
+	append_bool_option(m_optgroup_camera, "use_perspective_camera",
-	def.type = coBool;
+		L("Use perspective camera"),
-	def.tooltip = L("If enabled, use perspective camera. If not enabled, use orthographic camera.");
+		L("If enabled, use perspective camera. If not enabled, use orthographic camera."),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("use_perspective_camera") == "1" });
+		app_config->get("use_perspective_camera") == "1");
-	option = Option(def, "use_perspective_camera");
-	m_optgroup_camera->append_single_option_line(option);
 
-	def.label = L("Use free camera");
+	append_bool_option(m_optgroup_camera, "use_free_camera",
-	def.type = coBool;
+		L("Use free camera"),
-	def.tooltip = L("If enabled, use free camera. If not enabled, use constrained camera.");
+		L("If enabled, use free camera. If not enabled, use constrained camera."),
-	def.set_default_value(new ConfigOptionBool(app_config->get("use_free_camera") == "1"));
+		app_config->get("use_free_camera") == "1");
-	option = Option(def, "use_free_camera");
-	m_optgroup_camera->append_single_option_line(option);
 
-	def.label = L("Reverse direction of zoom with mouse wheel");
+	append_bool_option(m_optgroup_camera, "reverse_mouse_wheel_zoom",
-	def.type = coBool;
+		L("Reverse direction of zoom with mouse wheel"),
-	def.tooltip = L("If enabled, reverses the direction of zoom with mouse wheel");
+		L("If enabled, reverses the direction of zoom with mouse wheel"),
-	def.set_default_value(new ConfigOptionBool(app_config->get("reverse_mouse_wheel_zoom") == "1"));
+		app_config->get("reverse_mouse_wheel_zoom") == "1");
-	option = Option(def, "reverse_mouse_wheel_zoom");
-	m_optgroup_camera->append_single_option_line(option);
 
 	activate_options_tab(m_optgroup_camera);
 
 	// Add "GUI" tab
-	m_optgroup_gui = create_options_tab(_L("GUI"), tabs);
+	m_optgroup_gui = create_options_tab(L("GUI"), tabs);
-	m_optgroup_gui->m_on_change = [this, tabs](t_config_option_key opt_key, boost::any value) {
+	m_optgroup_gui->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
         if (opt_key == "suppress_hyperlinks")
             m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "";
 		else if (opt_key == "notify_release") {
@@ -343,165 +366,123 @@ void PreferencesDialog::build(size_t selected_tab)
 		}
 	};
 
-	def.label = L("Sequential slider applied only to top layer");
+	append_bool_option(m_optgroup_gui, "seq_top_layer_only",
-	def.type = coBool;
+		L("Sequential slider applied only to top layer"),
-	def.tooltip = L("If enabled, changes made using the sequential slider, in preview, apply only to gcode top layer. "
+		L("If enabled, changes made using the sequential slider, in preview, apply only to gcode top layer."
-					"If disabled, changes made using the sequential slider, in preview, apply to the whole gcode.");
+		  "If disabled, changes made using the sequential slider, in preview, apply to the whole gcode."),
-	def.set_default_value(new ConfigOptionBool{ app_config->get("seq_top_layer_only") == "1" });
+		app_config->get("seq_top_layer_only") == "1");
-	option = Option(def, "seq_top_layer_only");
-	m_optgroup_gui->append_single_option_line(option);
 
 	if (is_editor) {
-		def.label = L("Show sidebar collapse/expand button");
+		append_bool_option(m_optgroup_gui, "show_collapse_button",
-		def.type = coBool;
+			L("Show sidebar collapse/expand button"),
-		def.tooltip = L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene");
+			L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene"),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("show_collapse_button") == "1" });
+			app_config->get("show_collapse_button") == "1");
-		option = Option(def, "show_collapse_button");
-		m_optgroup_gui->append_single_option_line(option);
 
-		def.label = L("Suppress to open hyperlink in browser");
+		append_bool_option(m_optgroup_gui, "suppress_hyperlinks",
-		def.type = coBool;
+			L("Suppress to open hyperlink in browser"),
-		def.tooltip = L("If enabled, the descriptions of configuration parameters in settings tabs wouldn't work as hyperlinks. "
+			L("If enabled, the descriptions of configuration parameters in settings tabs wouldn't work as hyperlinks. "
-			"If disabled, the descriptions of configuration parameters in settings tabs will work as hyperlinks.");
+			  "If disabled, the descriptions of configuration parameters in settings tabs will work as hyperlinks."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("suppress_hyperlinks") == "1" });
+			app_config->get("suppress_hyperlinks") == "1");
-		option = Option(def, "suppress_hyperlinks");
-		m_optgroup_gui->append_single_option_line(option);
 
-		def.label = L("Use colors for axes values in Manipulation panel");
+		append_bool_option(m_optgroup_gui, "color_mapinulation_panel",
-		def.type = coBool;
+			L("Use colors for axes values in Manipulation panel"),
-		def.tooltip = L("If enabled, the axes names and axes values will be colorized according to the axes colors. "
+			L("If enabled, the axes names and axes values will be colorized according to the axes colors. "
-						"If disabled, old UI will be used.");
+			  "If disabled, old UI will be used."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("color_mapinulation_panel") == "1" });
+			app_config->get("color_mapinulation_panel") == "1");
-		option = Option(def, "color_mapinulation_panel");
-		m_optgroup_gui->append_single_option_line(option);
 
-		def.label = L("Order object volumes by types");
+		append_bool_option(m_optgroup_gui, "order_volumes",
-		def.type = coBool;
+			L("Order object volumes by types"),
-		def.tooltip = L("If enabled, volumes will be always ordered inside the object. Correct order is Model Part, Negative Volume, Modifier, Support Blocker and Support Enforcer. "
+			L("If enabled, volumes will be always ordered inside the object. Correct order is Model Part, Negative Volume, Modifier, Support Blocker and Support Enforcer. "
-						"If disabled, you can reorder Model Parts, Negative Volumes and Modifiers. But one of the model parts have to be on the first place.");
+			  "If disabled, you can reorder Model Parts, Negative Volumes and Modifiers. But one of the model parts have to be on the first place."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("order_volumes") == "1" });
+			app_config->get("order_volumes") == "1");
-		option = Option(def, "order_volumes");
-		m_optgroup_gui->append_single_option_line(option);
 
 #ifdef _MSW_DARK_MODE
-		def.label = L("Set settings tabs as menu items (experimental)");
+		append_bool_option(m_optgroup_gui, "tabs_as_menu",
-		def.type = coBool;
+			L("Set settings tabs as menu items (experimental)"),
-		def.tooltip = L("If enabled, Settings Tabs will be placed as menu items. "
+			L("If enabled, Settings Tabs will be placed as menu items. If disabled, old UI will be used."),
-			            "If disabled, old UI will be used.");
+			app_config->get("tabs_as_menu") == "1");
-		def.set_default_value(new ConfigOptionBool{ app_config->get("tabs_as_menu") == "1" });
-		option = Option(def, "tabs_as_menu");
-		m_optgroup_gui->append_single_option_line(option);
 #endif
 
 		m_optgroup_gui->append_separator();
 
-		def.label = L("Show \"Tip of the day\" notification after start");
+		append_bool_option(m_optgroup_gui, "show_hints",
-		def.type = coBool;
+			L("Show \"Tip of the day\" notification after start"),
-		def.tooltip = L("If enabled, useful hints are displayed at startup.");
+			L("If enabled, useful hints are displayed at startup."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("show_hints") == "1" });
+			app_config->get("show_hints") == "1");
-		option = Option(def, "show_hints");
-		m_optgroup_gui->append_single_option_line(option);
 
-		ConfigOptionDef def_enum;
+		append_enum_option(m_optgroup_gui, "notify_release",
-		def_enum.label = L("Notify about new releases");
+			L("Notify about new releases"),
-		def_enum.type = coEnum;
+			L("You will be notified about new release after startup acordingly: All = Regular release and alpha / beta releases. Release only = regular release."),
-		def_enum.tooltip = L("You will be notified about new release after startup acordingly: All = Regular release and alpha / beta releases. Release only = regular release.");
+			new ConfigOptionEnum<NotifyReleaseMode>(static_cast<NotifyReleaseMode>(s_keys_map_NotifyReleaseMode.at(app_config->get("notify_release")))),
-		def_enum.enum_keys_map = &ConfigOptionEnum<NotifyReleaseMode>::get_enum_values();
+			&ConfigOptionEnum<NotifyReleaseMode>::get_enum_values(),
-		def_enum.enum_values.push_back("all");
+			{"all", "release", "none"},
-		def_enum.enum_values.push_back("release");
+			{L("All"), L("Release only"), L("None")});
-		def_enum.enum_values.push_back("none");
-		def_enum.enum_labels.push_back(L("All"));
-		def_enum.enum_labels.push_back(L("Release only"));
-		def_enum.enum_labels.push_back(L("None"));
-		def_enum.mode = comSimple;
-		def_enum.set_default_value(new ConfigOptionEnum<NotifyReleaseMode>(static_cast<NotifyReleaseMode>(s_keys_map_NotifyReleaseMode.at(app_config->get("notify_release")))));
-		option = Option(def_enum, "notify_release");
-		m_optgroup_gui->append_single_option_line(option);
 
 		m_optgroup_gui->append_separator();
 
-		def.label = L("Use custom size for toolbar icons");
+		append_bool_option(m_optgroup_gui, "use_custom_toolbar_size",
-		def.type = coBool;
+			L("Use custom size for toolbar icons"),
-		def.tooltip = L("If enabled, you can change size of toolbar icons manually.");
+			L("If enabled, you can change size of toolbar icons manually."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("use_custom_toolbar_size") == "1" });
+			app_config->get("use_custom_toolbar_size") == "1");
-		option = Option(def, "use_custom_toolbar_size");
-		m_optgroup_gui->append_single_option_line(option);	
-
 	}
 
 	activate_options_tab(m_optgroup_gui);
-	// set Field for notify_release to its value to activate the object
-	if (is_editor) {
-		boost::any val = s_keys_map_NotifyReleaseMode.at(app_config->get("notify_release"));
-		m_optgroup_gui->get_field("notify_release")->set_value(val, false);
-	}
 
 	if (is_editor) {
+		// set Field for notify_release to its value to activate the object
+		boost::any val = s_keys_map_NotifyReleaseMode.at(app_config->get("notify_release"));
+		m_optgroup_gui->get_field("notify_release")->set_value(val, false);
+
 		create_icon_size_slider();
 		m_icon_size_sizer->ShowItems(app_config->get("use_custom_toolbar_size") == "1");
 
 		create_settings_mode_widget();
 		create_settings_text_color_widget();
-	}
 
 #if ENABLE_ENVIRONMENT_MAP
-	if (is_editor) {
 		// Add "Render" tab
-		m_optgroup_render = create_options_tab(_L("Render"), tabs);
+		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) {
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 		};
 
-		def.label = L("Use environment map");
+		append_bool_option(m_optgroup_render, "use_environment_map",
-		def.type = coBool;
+			L("Use environment map"),
-		def.tooltip = L("If enabled, renders object using the environment map.");
+			L("If enabled, renders object using the environment map."),
-		def.set_default_value(new ConfigOptionBool{ app_config->get("use_environment_map") == "1" });
+			app_config->get("use_environment_map") == "1");
-		option = Option(def, "use_environment_map");
-		m_optgroup_render->append_single_option_line(option);
 
 		activate_options_tab(m_optgroup_render);
-	}
 #endif // ENABLE_ENVIRONMENT_MAP
 
 #ifdef _WIN32
-	// Add "Dark Mode" tab
-	{
 		// 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) {
 			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 		};
 
-		def.label = L("Enable dark mode");
+		append_bool_option(m_optgroup_dark_mode, "dark_color_mode",
-		def.type = coBool;
+			L("Enable dark mode"),
-		def.tooltip = L("If enabled, UI will use Dark mode colors. "
+			L("If enabled, UI will use Dark mode colors. If disabled, old UI will be used."),
-			"If disabled, old UI will be used.");
+			app_config->get("dark_color_mode") == "1");
-		def.set_default_value(new ConfigOptionBool{ app_config->get("dark_color_mode") == "1" });
-		option = Option(def, "dark_color_mode");
-		m_optgroup_dark_mode->append_single_option_line(option);
 
 		if (wxPlatformInfo::Get().GetOSMajorVersion() >= 10) // Use system menu just for Window newer then Windows 10
 															 // Use menu with ownerdrawn items by default on systems older then Windows 10
 		{
-			def.label = L("Use system menu for application");
+		append_bool_option(m_optgroup_dark_mode, "sys_menu_enabled",
-			def.type = coBool;
+			L("Use system menu for application"),
-			def.tooltip = L("If enabled, application will use the standard Windows system menu,\n"
+			L("If enabled, application will use the standart Windows system menu,\n"
-				"but on some combination of display scales it can looks ugly. If disabled, old UI will be used.");
+			"but on some combination od display scales it can look ugly. If disabled, old UI will be used."),
-			def.set_default_value(new ConfigOptionBool{ app_config->get("sys_menu_enabled") == "1" });
+			app_config->get("sys_menu_enabled") == "1");
-			option = Option(def, "sys_menu_enabled");
-			m_optgroup_dark_mode->append_single_option_line(option);
 		}
 
 		activate_options_tab(m_optgroup_dark_mode);
-	}
 #endif //_WIN32
+	}
 
 	// update alignment of the controls for all tabs
 	update_ctrls_alignment();
 
-	if (selected_tab < tabs->GetPageCount())
-		tabs->SetSelection(selected_tab);
-
 	auto sizer = new wxBoxSizer(wxVERTICAL);
 	sizer->Add(tabs, 1, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5);
 
@@ -526,6 +507,9 @@ std::vector<ConfigOptionsGroup*> PreferencesDialog::optgroups()
 #ifdef _WIN32
 		, m_optgroup_dark_mode.get()
 #endif // _WIN32
+#if ENABLE_ENVIRONMENT_MAP
+		, m_optgroup_render.get()
+#endif // ENABLE_ENVIRONMENT_MAP
 	})
 		if (opt)
 			out.emplace_back(opt);
@@ -546,9 +530,6 @@ void PreferencesDialog::update_ctrls_alignment()
 
 void PreferencesDialog::accept(wxEvent&)
 {
-//	if (m_values.find("no_defaults") != m_values.end()
-//		warning_catcher(this, wxString::Format(_L("You need to restart %s to make the changes effective."), SLIC3R_APP_NAME));
-
 	std::vector<std::string> options_to_recreate_GUI = { "no_defaults", "tabs_as_menu", "sys_menu_enabled" };
 
 	for (const std::string& option : options_to_recreate_GUI) {
@@ -627,16 +608,29 @@ void PreferencesDialog::accept(wxEvent&)
         wxGetApp().update_ui_from_settings();
 }
 
-void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect)
+void PreferencesDialog::msw_rescale()
 {
 	for (ConfigOptionsGroup* og : this->optgroups())
 		og->msw_rescale();
+#ifdef _WIN32
+	m_optgroup_dark_mode->msw_rescale();
+#endif //_WIN32
+#if ENABLE_ENVIRONMENT_MAP
+	m_optgroup_render->msw_rescale();
+#endif // ENABLE_ENVIRONMENT_MAP
 
     msw_buttons_rescale(this, em_unit(), { wxID_OK, wxID_CANCEL });
 
     layout();
 }
 
+void PreferencesDialog::on_sys_color_changed()
+{
+#ifdef _WIN32
+	wxGetApp().UpdateDlgDarkUI(this);
+#endif
+}
+
 void PreferencesDialog::layout()
 {
     const int em = em_unit();
@@ -732,7 +726,8 @@ void PreferencesDialog::create_settings_mode_widget()
 	wxWindow* parent = m_optgroup_gui->parent();
 	wxGetApp().UpdateDarkUI(parent);
 
-    wxStaticBox* stb = new wxStaticBox(parent, wxID_ANY, _L("Layout Options"));
+	wxString title = L("Layout Options");
+    wxStaticBox* stb = new wxStaticBox(parent, wxID_ANY, _(title));
 	wxGetApp().UpdateDarkUI(stb);
 	if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
 	stb->SetFont(wxGetApp().normal_font());
@@ -766,36 +761,58 @@ void PreferencesDialog::create_settings_mode_widget()
 		id++;
 	}
 
+	std::string opt_key = "settings_layout_mode";
+	m_blinkers[opt_key] = new BlinkingBitmap(this);
+
 	auto sizer = new wxBoxSizer(wxHORIZONTAL);
+	sizer->Add(m_blinkers[opt_key], 0, wxALIGN_CENTER_VERTICAL);
 	sizer->Add(stb_sizer, 1, wxALIGN_CENTER_VERTICAL);
 	m_optgroup_gui->sizer->Add(sizer, 0, wxEXPAND | wxTOP, em_unit());
+
+	append_preferences_option_to_searcer(m_optgroup_gui, opt_key, title);
 }
 
 void PreferencesDialog::create_settings_text_color_widget()
 {
 	wxWindow* parent = m_optgroup_gui->parent();
 
-	wxStaticBox* stb = new wxStaticBox(parent, wxID_ANY, _L("Text colors"));
+	wxString title = L("Text colors");
+	wxStaticBox* stb = new wxStaticBox(parent, wxID_ANY, _(title));
 	wxGetApp().UpdateDarkUI(stb);
 	if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT);
 
-	wxSizer* sizer = new wxStaticBoxSizer(stb, wxVERTICAL);
+	std::string opt_key = "text_colors";
-	ButtonsDescription::FillSizerWithTextColorDescriptions(sizer, parent, &m_sys_colour, &m_mod_colour);
+	m_blinkers[opt_key] = new BlinkingBitmap(this);
+
+	wxSizer* stb_sizer = new wxStaticBoxSizer(stb, wxVERTICAL);
+	ButtonsDescription::FillSizerWithTextColorDescriptions(stb_sizer, parent, &m_sys_colour, &m_mod_colour);
+
+	auto sizer = new wxBoxSizer(wxHORIZONTAL);
+	sizer->Add(m_blinkers[opt_key], 0, wxALIGN_CENTER_VERTICAL);
+	sizer->Add(stb_sizer, 1, wxALIGN_CENTER_VERTICAL);
 
 	m_optgroup_gui->sizer->Add(sizer, 0, wxEXPAND | wxTOP, em_unit());
+
+	append_preferences_option_to_searcer(m_optgroup_gui, opt_key, title);
 }
 
 void PreferencesDialog::init_highlighter(const t_config_option_key& opt_key)
 {
-	m_highlighter.set_timer_owner(this, 0);
+	if (m_blinkers.find(opt_key) != m_blinkers.end())
-	this->Bind(wxEVT_TIMER, [this](wxTimerEvent&)
+		if (BlinkingBitmap* blinker = m_blinkers.at(opt_key); blinker) {
-		{
+			m_highlighter.init(blinker);
-			m_highlighter.blink();
+			return;
-		});
+		}
 
-	std::pair<OG_CustomCtrl*, bool*> ctrl = { nullptr, nullptr };
+	for (auto opt_group : { m_optgroup_general, m_optgroup_camera, m_optgroup_gui
-	for (ConfigOptionsGroup* opt_group : this->optgroups()) {
+#ifdef _WIN32
-		ctrl = opt_group->get_custom_ctrl_with_blinking_ptr(opt_key, -1);
+		, m_optgroup_dark_mode
+#endif // _WIN32
+#if ENABLE_ENVIRONMENT_MAP
+		, m_optgroup_render
+#endif // ENABLE_ENVIRONMENT_MAP
+		}) {
+		std::pair<OG_CustomCtrl*, bool*> ctrl = opt_group->get_custom_ctrl_with_blinking_ptr(opt_key, -1);
 		if (ctrl.first && ctrl.second) {
 			m_highlighter.init(ctrl);
 			break;
@@ -803,53 +820,5 @@ void PreferencesDialog::init_highlighter(const t_config_option_key& opt_key)
 	}
 }
 
-void PreferencesDialog::PreferencesHighlighter::set_timer_owner(wxEvtHandler* owner, int timerid/* = wxID_ANY*/)
-{
-	m_timer.SetOwner(owner, timerid);
-}
-
-void PreferencesDialog::PreferencesHighlighter::init(std::pair<OG_CustomCtrl*, bool*> params)
-{
-	if (m_timer.IsRunning())
-		invalidate();
-	if (!params.first || !params.second)
-		return;
-
-	m_timer.Start(300, false);
-
-	m_custom_ctrl = params.first;
-	m_show_blink_ptr = params.second;
-
-	*m_show_blink_ptr = true;
-	m_custom_ctrl->Refresh();
-}
-
-void PreferencesDialog::PreferencesHighlighter::invalidate()
-{
-	m_timer.Stop();
-
-	if (m_custom_ctrl && m_show_blink_ptr) {
-		*m_show_blink_ptr = false;
-		m_custom_ctrl->Refresh();
-		m_show_blink_ptr = nullptr;
-		m_custom_ctrl = nullptr;
-	}
-
-	m_blink_counter = 0;
-}
-
-void PreferencesDialog::PreferencesHighlighter::blink()
-{
-	if (m_custom_ctrl && m_show_blink_ptr) {
-		*m_show_blink_ptr = !*m_show_blink_ptr;
-		m_custom_ctrl->Refresh();
-	}
-	else
-		return;
-
-	if ((++m_blink_counter) == 11)
-		invalidate();
-}
-
 } // GUI
 } // Slic3r

src/slic3r/GUI/Preferences.hpp

@@ -3,6 +3,7 @@
 
 #include "GUI.hpp"
 #include "GUI_Utils.hpp"
+#include "wxExtensions.hpp"
 
 #include <wx/dialog.h>
 #include <wx/timer.h>
@@ -10,6 +11,7 @@
 #include <map>
 
 class wxColourPickerCtrl;
+class wxBookCtrlBase;
 
 namespace Slic3r {
 
@@ -39,24 +41,29 @@ class PreferencesDialog : public DPIDialog
 	wxSizer*                            m_icon_size_sizer;
 	wxColourPickerCtrl*					m_sys_colour {nullptr};
 	wxColourPickerCtrl*					m_mod_colour {nullptr};
+	wxBookCtrlBase*						tabs {nullptr};
+
     bool                                isOSX {false};
 	bool								m_settings_layout_changed {false};
 	bool								m_seq_top_layer_only_changed{ false };
 	bool								m_recreate_GUI{false};
 
 public:
-	explicit PreferencesDialog(wxWindow* parent, int selected_tab = 0, const std::string& highlight_opt_key = std::string());
+	explicit PreferencesDialog(wxWindow* paren);
 	~PreferencesDialog() = default;
 
 	bool settings_layout_changed() const { return m_settings_layout_changed; }
 	bool seq_top_layer_only_changed() const { return m_seq_top_layer_only_changed; }
 	bool recreate_GUI() const { return m_recreate_GUI; }
-	void	build(size_t selected_tab = 0);
+	void	build();
 	void	update_ctrls_alignment();
 	void	accept(wxEvent&);
+	void	show(const std::string& highlight_option = std::string(), const std::string& tab_name = std::string());
 
 protected:
-    void on_dpi_changed(const wxRect &suggested_rect) override;
+	void msw_rescale();
+	void on_dpi_changed(const wxRect& suggested_rect) override { msw_rescale(); }
+	void on_sys_color_changed() override;
     void layout();
     void create_icon_size_slider();
     void create_settings_mode_widget();
@@ -64,20 +71,9 @@ protected:
 	void init_highlighter(const t_config_option_key& opt_key);
 	std::vector<ConfigOptionsGroup*> optgroups();
 
-	struct PreferencesHighlighter
+	Highlighter m_highlighter;
-	{
-		void set_timer_owner(wxEvtHandler* owner, int timerid = wxID_ANY);
-		void init(std::pair<OG_CustomCtrl*, bool*>);
-		void blink();
-		void invalidate();
 
-	private:
+	std::map<std::string, BlinkingBitmap*> m_blinkers;
-		OG_CustomCtrl* m_custom_ctrl{ nullptr };
-		bool* m_show_blink_ptr{ nullptr };
-		int				m_blink_counter{ 0 };
-		wxTimer         m_timer;
-	}
-	m_highlighter;
 };
 
 } // GUI

src/slic3r/GUI/Search.cpp

@@ -43,6 +43,8 @@ static char marker_by_type(Preset::Type type, PrinterTechnology pt)
         return ImGui::MaterialIconMarker;
     case Preset::TYPE_PRINTER:
         return pt == ptSLA ? ImGui::PrinterSlaIconMarker : ImGui::PrinterIconMarker;
+    case Preset::TYPE_PREFERENCES:
+        return ImGui::PreferencesButton;
     default:
         return ' ';
 	}
@@ -302,6 +304,9 @@ void OptionsSearcher::init(std::vector<InputInfo> input_values)
     options.clear();
     for (auto i : input_values)
         append_options(i.config, i.type, i.mode);
+
+    options.insert(options.end(), preferences_options.begin(), preferences_options.end());
+
     sort_options();
 
     search(search_line, true);
@@ -323,6 +328,47 @@ void OptionsSearcher::apply(DynamicPrintConfig* config, Preset::Type type, Confi
     search(search_line, true);
 }
 
+void OptionsSearcher::append_preferences_option(const GUI::Line& opt_line)
+{
+    Preset::Type type = Preset::TYPE_PREFERENCES;
+    wxString label = opt_line.label;
+    if (label.IsEmpty())
+        return;
+
+    std::string key = get_key(opt_line.get_options().front().opt_id, type);
+    const GroupAndCategory& gc = groups_and_categories[key];
+    if (gc.group.IsEmpty() || gc.category.IsEmpty())
+        return;        
+        
+    preferences_options.emplace_back(Search::Option{ boost::nowide::widen(key), type,
+                                label.ToStdWstring(), _(label).ToStdWstring(),
+                                gc.group.ToStdWstring(), _(gc.group).ToStdWstring(),
+                                gc.category.ToStdWstring(), _(gc.category).ToStdWstring() });
+}
+
+void OptionsSearcher::append_preferences_options(const std::vector<GUI::Line>& opt_lines)
+{
+    //Preset::Type type = Preset::TYPE_PREFERENCES;
+    for (const GUI::Line& line : opt_lines) {
+        if (line.is_separator())
+            continue;
+        append_preferences_option(line);
+        //wxString label = line.label;
+        //if (label.IsEmpty())
+        //    continue;
+
+        //std::string key = get_key(line.get_options().front().opt_id, type);        
+        //const GroupAndCategory& gc = groups_and_categories[key];
+        //if (gc.group.IsEmpty() || gc.category.IsEmpty())
+        //    continue;        
+        //
+        //preferences_options.emplace_back(Search::Option{ boost::nowide::widen(key), type,
+        //                            label.ToStdWstring(), _(label).ToStdWstring(),
+        //                            gc.group.ToStdWstring(), _(gc.group).ToStdWstring(),
+        //                            gc.category.ToStdWstring(), _(gc.category).ToStdWstring() });
+    }
+}
+
 const Option& OptionsSearcher::get_option(size_t pos_in_filter) const
 {
     assert(pos_in_filter != size_t(-1) && found[pos_in_filter].option_idx != size_t(-1));
@@ -429,6 +475,7 @@ static const std::map<const char, int> icon_idxs = {
     {ImGui::PrinterSlaIconMarker, 2},
     {ImGui::FilamentIconMarker  , 3},
     {ImGui::MaterialIconMarker  , 4},
+    {ImGui::PreferencesButton   , 5},
 };
 
 SearchDialog::SearchDialog(OptionsSearcher* searcher)
@@ -717,7 +764,7 @@ void SearchDialog::on_sys_color_changed()
 SearchListModel::SearchListModel(wxWindow* parent) : wxDataViewVirtualListModel(0)
 {
     int icon_id = 0;
-    for (const std::string& icon : { "cog", "printer", "sla_printer", "spool", "resin" })
+    for (const std::string& icon : { "cog", "printer", "sla_printer", "spool", "resin", "notification_preferences" })
         m_icon[icon_id++] = ScalableBitmap(parent, icon);    
 }
 

src/slic3r/GUI/Search.hpp

@@ -17,6 +17,7 @@
 
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
+#include "OptionsGroup.hpp"
 #include "libslic3r/Preset.hpp"
 
 
@@ -85,6 +86,7 @@ class OptionsSearcher
     PrinterTechnology                       printer_technology;
 
     std::vector<Option>                     options {};
+    std::vector<Option>                     preferences_options {};
     std::vector<FoundOption>                found {};
 
     void append_options(DynamicPrintConfig* config, Preset::Type type, ConfigOptionMode mode);
@@ -113,6 +115,8 @@ public:
     void apply(DynamicPrintConfig *config,
                Preset::Type        type,
                ConfigOptionMode    mode);
+    void append_preferences_option(const GUI::Line& opt_line);
+    void append_preferences_options(const std::vector<GUI::Line>& opt_lines);
     bool search();
     bool search(const std::string& search, bool force = false);
 
@@ -197,7 +201,7 @@ protected:
 class SearchListModel : public wxDataViewVirtualListModel
 {
     std::vector<std::pair<wxString, int>>   m_values;
-    ScalableBitmap                          m_icon[5];
+    ScalableBitmap                          m_icon[6];
 
 public:
     enum {

src/slic3r/GUI/Tab.cpp

@@ -51,55 +51,6 @@
 namespace Slic3r {
 namespace GUI {
 
-
-void Tab::Highlighter::set_timer_owner(wxEvtHandler* owner, int timerid/* = wxID_ANY*/)
-{
-    m_timer.SetOwner(owner, timerid);
-}
-
-void Tab::Highlighter::init(std::pair<OG_CustomCtrl*, bool*> params)
-{
-    if (m_timer.IsRunning())
-        invalidate();
-    if (!params.first || !params.second)
-        return;
-
-    m_timer.Start(300, false);
-
-    m_custom_ctrl = params.first;
-    m_show_blink_ptr = params.second;
-
-    *m_show_blink_ptr = true;
-    m_custom_ctrl->Refresh();
-}
-
-void Tab::Highlighter::invalidate()
-{
-    m_timer.Stop();
-
-    if (m_custom_ctrl && m_show_blink_ptr) {
-        *m_show_blink_ptr = false;
-        m_custom_ctrl->Refresh();
-        m_show_blink_ptr = nullptr;
-        m_custom_ctrl = nullptr;
-    }
-
-    m_blink_counter = 0;
-}
-
-void Tab::Highlighter::blink()
-{
-    if (m_custom_ctrl && m_show_blink_ptr) {
-        *m_show_blink_ptr = !*m_show_blink_ptr;
-        m_custom_ctrl->Refresh();
-    }
-    else
-        return;
-
-    if ((++m_blink_counter) == 11)
-        invalidate();
-}
-
 Tab::Tab(wxBookCtrlBase* parent, const wxString& title, Preset::Type type) :
     m_parent(parent), m_title(title), m_type(type)
 {

src/slic3r/GUI/Tab.hpp

@@ -218,20 +218,7 @@ protected:
     bool                m_completed { false };
     ConfigOptionMode    m_mode = comExpert; // to correct first Tab update_visibility() set mode to Expert
 
-	struct Highlighter
+	Highlighter			m_highlighter;
-	{
-		void set_timer_owner(wxEvtHandler* owner, int timerid = wxID_ANY);
-		void init(std::pair<OG_CustomCtrl*, bool*>);
-		void blink();
-		void invalidate();
-
-	private:
-		OG_CustomCtrl*	m_custom_ctrl	{nullptr};
-		bool*			m_show_blink_ptr{nullptr};
-		int				m_blink_counter	{0};
-	    wxTimer         m_timer;
-	} 
-    m_highlighter;
 
 	DynamicPrintConfig 	m_cache_config;
 

src/slic3r/GUI/wxExtensions.cpp

@@ -16,6 +16,7 @@
 #include "Plater.hpp"
 #include "../Utils/MacDarkMode.hpp"
 #include "BitmapComboBox.hpp"
+#include "OG_CustomCtrl.hpp"
 
 #ifndef __linux__
 // msw_menuitem_bitmaps is used for MSW and OSX
@@ -979,6 +980,79 @@ void BlinkingBitmap::blink()
     this->SetBitmap(show ? bmp.bmp() : wxNullBitmap);
 }
 
+namespace Slic3r {
+namespace GUI {
+
+void Highlighter::set_timer_owner(wxEvtHandler* owner, int timerid/* = wxID_ANY*/)
+{
+    m_timer.SetOwner(owner, timerid);
+}
+
+void Highlighter::init(std::pair<OG_CustomCtrl*, bool*> params)
+{
+    if (m_timer.IsRunning())
+        invalidate();
+    if (!params.first || !params.second)
+        return;
+
+    m_timer.Start(300, false);
+
+    m_custom_ctrl = params.first;
+    m_show_blink_ptr = params.second;
+
+    *m_show_blink_ptr = true;
+    m_custom_ctrl->Refresh();
+}
+
+void Highlighter::init(BlinkingBitmap* blinking_bmp)
+{
+    if (m_timer.IsRunning())
+        invalidate();
+    if (!blinking_bmp)
+        return;
+
+    m_timer.Start(300, false);
+
+    m_blinking_bitmap = blinking_bmp;
+    m_blinking_bitmap->activate();
+}
+
+void Highlighter::invalidate()
+{
+    m_timer.Stop();
+
+    if (m_custom_ctrl && m_show_blink_ptr) {
+        *m_show_blink_ptr = false;
+        m_custom_ctrl->Refresh();
+        m_show_blink_ptr = nullptr;
+        m_custom_ctrl = nullptr;
+    }
+    else if (m_blinking_bitmap) {
+        m_blinking_bitmap->invalidate();
+        m_blinking_bitmap = nullptr;
+    }
+
+    m_blink_counter = 0;
+}
+
+void Highlighter::blink()
+{
+    if (m_custom_ctrl && m_show_blink_ptr) {
+        *m_show_blink_ptr = !*m_show_blink_ptr;
+        m_custom_ctrl->Refresh();
+    }
+    else if (m_blinking_bitmap)
+        m_blinking_bitmap->blink();
+    else
+        return;
+
+    if ((++m_blink_counter) == 11)
+        invalidate();
+}
+
+}// GUI
+}//Slicer
+
 
 
 

src/slic3r/GUI/wxExtensions.hpp

@@ -374,6 +374,34 @@ private:
     bool            show {false};
 };
 
+// ----------------------------------------------------------------------------
+// Highlighter
+// ----------------------------------------------------------------------------
+
+namespace Slic3r {
+namespace GUI {
+
+class OG_CustomCtrl;
+class Highlighter
+{
+    OG_CustomCtrl*  m_custom_ctrl{ nullptr };
+    bool*           m_show_blink_ptr{ nullptr };
+    BlinkingBitmap* m_blinking_bitmap{ nullptr };
+
+    int				m_blink_counter{ 0 };
+    wxTimer         m_timer;
+
+public:
+    void set_timer_owner(wxEvtHandler* owner, int timerid = wxID_ANY);
+    void init(std::pair<OG_CustomCtrl*, bool*>);
+    void init(BlinkingBitmap* blinking_bitmap);
+    void blink();
+    void invalidate();
+};
+
+} // GUI
+} // Slic3r
+
 
 
 #endif // slic3r_GUI_wxExtensions_hpp_