1 files changed, 339 insertions, 104 deletions

diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 1299d9a48..9c9ea8c4b 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -1,13 +1,16 @@
 #include "Preferences.hpp"
-#include "AppConfig.hpp"
 #include "OptionsGroup.hpp"
+#include "GUI_App.hpp"
+#include "Plater.hpp"
 #include "I18N.hpp"
+#include "libslic3r/AppConfig.hpp"
+#include <wx/notebook.h>
 
 namespace Slic3r {
 namespace GUI {
 
 PreferencesDialog::PreferencesDialog(wxWindow* parent) : 
-    DPIDialog(parent, wxID_ANY, _(L("Preferences")), wxDefaultPosition, 
+    DPIDialog(parent, wxID_ANY, _L("Preferences"), wxDefaultPosition, 
               wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 #ifdef __WXOSX__
@@ -16,89 +19,183 @@ PreferencesDialog::PreferencesDialog(wxWindow* parent) :
 	build();
 }
 
-void PreferencesDialog::build()
+static std::shared_ptr<ConfigOptionsGroup>create_options_tab(const wxString& title, wxNotebook* tabs)
 {
-	auto app_config = get_app_config();
-	m_optgroup_general = std::make_shared<ConfigOptionsGroup>(this, _(L("General")));
-	m_optgroup_general->label_width = 40;
-	m_optgroup_general->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
-		m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
-	};
+	wxPanel* tab = new wxPanel(tabs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
+	tabs->AddPage(tab, title);
+	tab->SetFont(wxGetApp().normal_font());
 
-	// TODO
-//    $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
-//        opt_id = > 'version_check',
-//        type = > 'bool',
-//        label = > 'Check for updates',
-//        tooltip = > 'If this is enabled, Slic3r will check for updates daily and display a reminder if a newer version is available.',
-//        default = > $app_config->get("version_check") // 1,
-//        readonly = > !wxTheApp->have_version_check,
-//    ));
+	wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+	sizer->SetSizeHints(tab);
+	tab->SetSizer(sizer);
 
-	ConfigOptionDef def;
-	def.label = L("Remember output directory");
-	def.type = coBool;
-	def.tooltip = L("If this is enabled, Slic3r will prompt the last output directory "
-					  "instead of the one containing the input files.");
-    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);
+	std::shared_ptr<ConfigOptionsGroup> optgroup = std::make_shared<ConfigOptionsGroup>(tab);
+	optgroup->label_width = 40;
+	return optgroup;
+}
 
-	def.label = L("Auto-center parts");
-	def.type = coBool;
-	def.tooltip = L("If this is enabled, Slic3r will auto-center objects "
-					  "around the print bed center.");
-	def.set_default_value(new ConfigOptionBool{ app_config->get("autocenter") == "1" });
-	option = Option (def,"autocenter");
-	m_optgroup_general->append_single_option_line(option);
+static void activate_options_tab(std::shared_ptr<ConfigOptionsGroup> optgroup)
+{
+	optgroup->activate();
+	optgroup->update_visibility(comSimple);
+	wxBoxSizer* sizer = static_cast<wxBoxSizer*>(static_cast<wxPanel*>(optgroup->parent())->GetSizer());
+	sizer->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 20);
+}
 
-	def.label = L("Background processing");
-	def.type = coBool;
-	def.tooltip = 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.");
-	def.set_default_value(new ConfigOptionBool{ app_config->get("background_processing") == "1" });
-	option = Option (def,"background_processing");
-	m_optgroup_general->append_single_option_line(option);
+void PreferencesDialog::build()
+{
+	SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+	const wxFont& font = wxGetApp().normal_font();
+	SetFont(font);
 
-	// Please keep in sync with ConfigWizard
-	def.label = L("Check for application updates");
-	def.type = coBool;
-	def.tooltip = L("If enabled, PrusaSlicer will check for the new versions of itself online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done.");
-	def.set_default_value(new ConfigOptionBool(app_config->get("version_check") == "1"));
-	option = Option (def, "version_check");
-	m_optgroup_general->append_single_option_line(option);
+	auto app_config = get_app_config();
 
-	// Please keep in sync with ConfigWizard
-	def.label = L("Export sources full pathnames to 3mf and amf");
-	def.type = coBool;
-	def.tooltip = 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"));
-	option = Option(def, "export_sources_full_pathnames");
-	m_optgroup_general->append_single_option_line(option);
+	wxNotebook* tabs = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
 
-	// Please keep in sync with ConfigWizard
-	def.label = L("Update built-in Presets automatically");
-	def.type = coBool;
-	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.");
-	def.set_default_value(new ConfigOptionBool(app_config->get("preset_update") == "1"));
-	option = Option (def, "preset_update");
-	m_optgroup_general->append_single_option_line(option);
+	// 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 (opt_key == "default_action_on_close_application" || opt_key == "default_action_on_select_preset")
+			m_values[opt_key] = boost::any_cast<bool>(value) ? "none" : "discard";
+		else
+		    m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
+	};
 
-	def.label = L("Suppress \" - default - \" presets");
-	def.type = coBool;
-	def.tooltip = L("Suppress \" - default - \" presets in the Print / Filament / Printer "
-					  "selections once there are any other valid presets available.");
-	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);
+	bool is_editor = wxGetApp().is_editor();
 
-	def.label = L("Show incompatible print and filament presets");
-	def.type = coBool;
-	def.tooltip = 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");
-	def.set_default_value(new ConfigOptionBool{ app_config->get("show_incompatible_presets") == "1" });
-	option = Option (def,"show_incompatible_presets");
-	m_optgroup_general->append_single_option_line(option);
+	ConfigOptionDef def;
+	Option option(def, "");
+	if (is_editor) {
+		def.label = L("Remember output directory");
+		def.type = coBool;
+		def.tooltip = L("If this is enabled, Slic3r will prompt the last output directory "
+			"instead of the one containing the input files.");
+		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");
+		def.type = coBool;
+		def.tooltip = L("If this is enabled, Slic3r will auto-center objects "
+			"around the print bed center.");
+		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");
+		def.type = coBool;
+		def.tooltip = 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.");
+		def.set_default_value(new ConfigOptionBool{ app_config->get("background_processing") == "1" });
+		option = Option(def, "background_processing");
+		m_optgroup_general->append_single_option_line(option);
+
+		// Please keep in sync with ConfigWizard
+		def.label = L("Check for application updates");
+		def.type = coBool;
+		def.tooltip = L("If enabled, PrusaSlicer will check for the new versions of itself online. When a new version becomes available a notification is displayed at the next application startup (never during program usage). This is only a notification mechanisms, no automatic installation is done.");
+		def.set_default_value(new ConfigOptionBool(app_config->get("version_check") == "1"));
+		option = Option(def, "version_check");
+		m_optgroup_general->append_single_option_line(option);
+
+		// Please keep in sync with ConfigWizard
+		def.label = L("Export sources full pathnames to 3mf and amf");
+		def.type = coBool;
+		def.tooltip = 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"));
+		option = Option(def, "export_sources_full_pathnames");
+		m_optgroup_general->append_single_option_line(option);
+
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+#ifdef _WIN32
+		// Please keep in sync with ConfigWizard
+		def.label = L("Associate .3mf files to PrusaSlicer");
+		def.type = coBool;
+		def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .3mf files.");
+		def.set_default_value(new ConfigOptionBool(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");
+		def.type = coBool;
+		def.tooltip = L("If enabled, sets PrusaSlicer as default application to open .stl files.");
+		def.set_default_value(new ConfigOptionBool(app_config->get("associate_stl") == "1"));
+		option = Option(def, "associate_stl");
+		m_optgroup_general->append_single_option_line(option);
+#endif // _WIN32
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+
+		// Please keep in sync with ConfigWizard
+		def.label = L("Update built-in Presets automatically");
+		def.type = coBool;
+		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.");
+		def.set_default_value(new ConfigOptionBool(app_config->get("preset_update") == "1"));
+		option = Option(def, "preset_update");
+		m_optgroup_general->append_single_option_line(option);
+
+		def.label = L("Suppress \" - default - \" presets");
+		def.type = coBool;
+		def.tooltip = L("Suppress \" - default - \" presets in the Print / Filament / Printer "
+			"selections once there are any other valid presets available.");
+		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");
+		def.type = coBool;
+		def.tooltip = 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");
+		def.set_default_value(new ConfigOptionBool{ app_config->get("show_incompatible_presets") == "1" });
+		option = Option(def, "show_incompatible_presets");
+		m_optgroup_general->append_single_option_line(option);
+
+		def.label = L("Show drop project dialog");
+		def.type = coBool;
+		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.");
+		def.set_default_value(new ConfigOptionBool{ app_config->get("show_drop_project_dialog") == "1" });
+		option = Option(def, "show_drop_project_dialog");
+		m_optgroup_general->append_single_option_line(option);
+
+		
+#if __APPLE__
+		def.label = L("Allow just a single PrusaSlicer instance");
+		def.type = coBool;
+		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.");
+#else
+		def.label = L("Allow just a single PrusaSlicer instance");
+		def.type = coBool;
+		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 });
+		option = Option(def, "single_instance");
+		m_optgroup_general->append_single_option_line(option);
+
+		def.label = L("Ask for unsaved changes when closing application");
+		def.type = coBool;
+		def.tooltip = L("When closing the application, always ask for unsaved changes");
+		def.set_default_value(new ConfigOptionBool{ 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");
+		def.type = coBool;
+		def.tooltip = L("Always ask for unsaved changes when selecting new preset");
+		def.set_default_value(new ConfigOptionBool{ 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);
+	}
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+#ifdef _WIN32
+	else {
+		def.label = L("Associate .gcode files to PrusaSlicer G-code Viewer");
+		def.type = coBool;
+		def.tooltip = 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"));
+		option = Option(def, "associate_gcode");
+		m_optgroup_general->append_single_option_line(option);
+	}
+#endif // _WIN32
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
 
 #if __APPLE__
 	def.label = L("Use Retina resolution for the 3D scene");
@@ -110,8 +207,29 @@ void PreferencesDialog::build()
 	m_optgroup_general->append_single_option_line(option);
 #endif
 
-	m_optgroup_camera = std::make_shared<ConfigOptionsGroup>(this, _(L("Camera")));
-	m_optgroup_camera->label_width = 40;
+    // Show/Hide splash screen
+	def.label = L("Show splash screen");
+	def.type = coBool;
+	def.tooltip = L("Show splash screen");
+	def.set_default_value(new ConfigOptionBool{ app_config->get("show_splash_screen") == "1" });
+	option = Option(def, "show_splash_screen");
+	m_optgroup_general->append_single_option_line(option);
+
+#if ENABLE_CTRL_M_ON_WINDOWS
+#if defined(_WIN32) || defined(__APPLE__)
+	def.label = L("Enable support for legacy 3DConnexion devices");
+	def.type = coBool;
+	def.tooltip = 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" });
+	option = Option(def, "use_legacy_3DConnexion");
+	m_optgroup_general->append_single_option_line(option);
+#endif // _WIN32 || __APPLE__
+#endif // ENABLE_CTRL_M_ON_WINDOWS
+
+	activate_options_tab(m_optgroup_general);
+
+	// 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) {
 		m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 	};
@@ -130,57 +248,144 @@ void PreferencesDialog::build()
 	option = Option(def, "use_free_camera");
 	m_optgroup_camera->append_single_option_line(option);
 
-	m_optgroup_gui = std::make_shared<ConfigOptionsGroup>(this, _(L("GUI")));
-	m_optgroup_gui->label_width = 40;
-	m_optgroup_gui->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("Reverse direction of zoom with mouse wheel");
+	def.type = coBool;
+	def.tooltip = 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"));
+	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->m_on_change = [this, tabs](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
+            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();
+			tabs->Layout();
 			this->layout();
 		}
 	};
 
-	def.label = L("Use custom size for toolbar icons");
+	def.label = L("Sequential slider applied only to top layer");
 	def.type = coBool;
-	def.tooltip = 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" });
-	option = Option(def, "use_custom_toolbar_size");
+	def.tooltip = 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.");
+	def.set_default_value(new ConfigOptionBool{ app_config->get("seq_top_layer_only") == "1" });
+	option = Option(def, "seq_top_layer_only");
 	m_optgroup_gui->append_single_option_line(option);
 
-	create_icon_size_slider();
-	m_icon_size_sizer->ShowItems(app_config->get("use_custom_toolbar_size") == "1");
+	if (is_editor) {
+		def.label = L("Show sidebar collapse/expand button");
+		def.type = coBool;
+		def.tooltip = 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" });
+		option = Option(def, "show_collapse_button");
+		m_optgroup_gui->append_single_option_line(option);
+
+		def.label = L("Suppress to open hyperlink in browser");
+		def.type = coBool;
+		def.tooltip = 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.");
+		def.set_default_value(new ConfigOptionBool{ app_config->get("suppress_hyperlinks") == "1" });
+		option = Option(def, "suppress_hyperlinks");
+		m_optgroup_gui->append_single_option_line(option);
+
+		def.label = L("Use custom size for toolbar icons");
+		def.type = coBool;
+		def.tooltip = 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" });
+		option = Option(def, "use_custom_toolbar_size");
+		m_optgroup_gui->append_single_option_line(option);
+	}
+
+	activate_options_tab(m_optgroup_gui);
 
-	auto sizer = new wxBoxSizer(wxVERTICAL);
-	sizer->Add(m_optgroup_general->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
-	sizer->Add(m_optgroup_camera->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
-	sizer->Add(m_optgroup_gui->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
+	if (is_editor) {
+		create_icon_size_slider();
+		m_icon_size_sizer->ShowItems(app_config->get("use_custom_toolbar_size") == "1");
+
+		create_settings_mode_widget();
+	}
 
-    SetFont(wxGetApp().normal_font());
+#if ENABLE_ENVIRONMENT_MAP
+	if (is_editor) {
+		// 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) {
+			m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
+		};
+
+		def.label = L("Use environment map");
+		def.type = coBool;
+		def.tooltip = L("If enabled, renders object using the environment map.");
+		def.set_default_value(new ConfigOptionBool{ 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
+
+	auto sizer = new wxBoxSizer(wxVERTICAL);
+	sizer->Add(tabs, 1, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5);
 
 	auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
 	wxButton* btn = static_cast<wxButton*>(FindWindowById(wxID_OK, this));
 	btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { accept(); });
-	sizer->Add(buttons, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, 10);
+	sizer->Add(buttons, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP, 10);
 
 	SetSizer(sizer);
 	sizer->SetSizeHints(this);
+	this->CenterOnParent();
 }
 
 void PreferencesDialog::accept()
 {
-    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));
+    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));
+
+    auto app_config = get_app_config();
+
+	m_seq_top_layer_only_changed = false;
+	if (auto it = m_values.find("seq_top_layer_only"); it != m_values.end())
+		m_seq_top_layer_only_changed = app_config->get("seq_top_layer_only") != it->second;
+
+	m_settings_layout_changed = false;
+	for (const std::string& key : { "old_settings_layout_mode",
+								    "new_settings_layout_mode",
+								    "dlg_settings_layout_mode" })
+	{
+	    auto it = m_values.find(key);
+	    if (it != m_values.end() && app_config->get(key) != it->second) {
+			m_settings_layout_changed = true;
+			break;
+	    }
 	}
 
-	auto app_config = get_app_config();
-	for (std::map<std::string, std::string>::iterator it = m_values.begin(); it != m_values.end(); ++it) {
-		app_config->set(it->first, it->second);
+	for (const std::string& key : {"default_action_on_close_application", "default_action_on_select_preset"}) {
+	    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 was selected, and then deselected
 	}
 
+	for (std::map<std::string, std::string>::iterator it = m_values.begin(); it != m_values.end(); ++it)
+		app_config->set(it->first, it->second);
+
+	app_config->save();
 	EndModal(wxID_OK);
 
-	// Nothify the UI to update itself from the ini file.
-    wxGetApp().update_ui_from_settings();
+	if (m_settings_layout_changed)
+		;// application will be recreated after Preference dialog will be destroyed
+	else
+	    // Nothify the UI to update itself from the ini file.
+        wxGetApp().update_ui_from_settings();
 }
 
 void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect)
@@ -212,14 +417,14 @@ void PreferencesDialog::create_icon_size_slider()
 
     m_icon_size_sizer = new wxBoxSizer(wxHORIZONTAL);
 
-	wxWindow* parent = m_optgroup_gui->ctrl_parent();
+	wxWindow* parent = m_optgroup_gui->parent();
 
     if (isOSX)
         // For correct rendering of the slider and value label under OSX
         // we should use system default background
         parent->SetBackgroundStyle(wxBG_STYLE_ERASE);
 
-    auto label = new wxStaticText(parent, wxID_ANY, _(L("Icon size in a respect to the default size")) + " (%) :");
+    auto label = new wxStaticText(parent, wxID_ANY, _L("Icon size in a respect to the default size") + " (%) :");
 
     m_icon_size_sizer->Add(label, 0, wxALIGN_CENTER_VERTICAL| wxRIGHT | (isOSX ? 0 : wxLEFT), em);
 
@@ -234,7 +439,7 @@ void PreferencesDialog::create_icon_size_slider()
 
     slider->SetTickFreq(10);
     slider->SetPageSize(10);
-    slider->SetToolTip(_(L("Select toolbar icon size in respect to the default one.")));
+    slider->SetToolTip(_L("Select toolbar icon size in respect to the default one."));
 
     m_icon_size_sizer->Add(slider, 1, wxEXPAND);
 
@@ -263,6 +468,36 @@ void PreferencesDialog::create_icon_size_slider()
 	m_optgroup_gui->sizer->Add(m_icon_size_sizer, 0, wxEXPAND | wxALL, em);
 }
 
+void PreferencesDialog::create_settings_mode_widget()
+{
+	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;
+
+	wxWindow* parent = m_optgroup_gui->parent();
+
+	m_layout_mode_box = new wxRadioBox(parent, wxID_ANY, _L("Layout Options"), wxDefaultPosition, wxDefaultSize,
+		WXSIZEOF(choices), choices, 3, wxRA_SPECIFY_ROWS);
+	m_layout_mode_box->SetFont(wxGetApp().normal_font());
+	m_layout_mode_box->SetSelection(selection);
+
+	m_layout_mode_box->Bind(wxEVT_RADIOBOX, [this](wxCommandEvent& e) {
+		int selection = e.GetSelection();
+		m_values["old_settings_layout_mode"] = boost::any_cast<bool>(selection == 0) ? "1" : "0";
+		m_values["new_settings_layout_mode"] = boost::any_cast<bool>(selection == 1) ? "1" : "0";
+		m_values["dlg_settings_layout_mode"] = boost::any_cast<bool>(selection == 2) ? "1" : "0";
+	});
+
+	auto sizer = new wxBoxSizer(wxHORIZONTAL);
+	sizer->Add(m_layout_mode_box, 1, wxALIGN_CENTER_VERTICAL);
+	m_optgroup_gui->sizer->Add(sizer, 0, wxEXPAND);
+}
+
 
 } // GUI
-} // Slic3r
\ No newline at end of file
+} // Slic3r