Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators

xs/xsp/GUI.xsp

@@ -9,6 +9,9 @@
 
 %package{Slic3r::GUI};
 
+void about()
+    %code{% Slic3r::GUI::about(); %};
+
 void disable_screensaver()
     %code{% Slic3r::GUI::disable_screensaver(); %};
 
@@ -32,13 +35,16 @@ void set_main_frame(SV *ui)
 
 void set_tab_panel(SV *ui)
     %code%{ Slic3r::GUI::set_tab_panel((wxNotebook*)wxPli_sv_2_object(aTHX_ ui, "Wx::Notebook")); %};
-    
-void add_debug_menu(SV *ui, int event_language_change)
-    %code%{ Slic3r::GUI::add_debug_menu((wxMenuBar*)wxPli_sv_2_object(aTHX_ ui, "Wx::MenuBar"), event_language_change); %};
+
+void add_config_menu(SV *ui, int event_preferences_changed, int event_language_change)    
+    %code%{ Slic3r::GUI::add_config_menu((wxMenuBar*)wxPli_sv_2_object(aTHX_ ui, "Wx::MenuBar"), event_preferences_changed, event_language_change); %};
 
 void create_preset_tabs(bool no_controller, int event_value_change, int event_presets_changed)
     %code%{ Slic3r::GUI::create_preset_tabs(no_controller, event_value_change, event_presets_changed); %};
 
+void show_error_id(int id, std::string msg)
+    %code%{ Slic3r::GUI::show_error_id(id, msg); %};
+
 TabIface* get_preset_tab(char *name)
     %code%{ RETVAL=Slic3r::GUI::get_preset_tab_iface(name); %};
 
@@ -54,12 +60,27 @@ int combochecklist_get_flags(SV *ui)
 void set_app_config(AppConfig *app_config)
     %code%{ Slic3r::GUI::set_app_config(app_config); %};
 
+bool check_unsaved_changes()
+    %code%{ RETVAL=Slic3r::GUI::check_unsaved_changes(); %};
+
+bool config_wizard_startup(int app_config_exists)
+    %code%{
+        try {
+            RETVAL=Slic3r::GUI::config_wizard_startup(app_config_exists != 0);
+        } catch (std::exception& e) {
+            croak("%s\n", e.what());
+        }
+    %};
+
 void open_preferences_dialog(int preferences_event)
     %code%{ Slic3r::GUI::open_preferences_dialog(preferences_event); %};
 
 void set_preset_bundle(PresetBundle *preset_bundle)
     %code%{ Slic3r::GUI::set_preset_bundle(preset_bundle); %};
 
+void set_preset_updater(PresetUpdater* updater)
+    %code%{ Slic3r::GUI::set_preset_updater(updater); %};
+
 void add_frequently_changed_parameters(SV *ui_parent, SV *ui_sizer, SV *ui_p_sizer)
     %code%{ Slic3r::GUI::add_frequently_changed_parameters((wxWindow*)wxPli_sv_2_object(aTHX_ ui_parent, "Wx::Window"),
                                                            (wxBoxSizer*)wxPli_sv_2_object(aTHX_ ui_sizer, "Wx::BoxSizer"),

xs/xsp/GUI_Preset.xsp

@@ -44,9 +44,6 @@
 
     Ref<Preset>             find_preset(char *name, bool first_visible_if_not_found = false) %code%{ RETVAL = THIS->find_preset(name, first_visible_if_not_found); %};
 
-    bool                    current_is_dirty();
-    std::vector<std::string> current_dirty_options();
-
     void                    update_tab_ui(SV *ui, bool show_incompatible)
         %code%{ auto cb = (wxBitmapComboBox*)wxPli_sv_2_object( aTHX_ ui, "Wx::BitmapComboBox" ); 
                 THIS->update_tab_ui(cb, show_incompatible); %};
@@ -55,30 +52,6 @@
         %code%{ auto cb = (wxBitmapComboBox*)wxPli_sv_2_object( aTHX_ ui, "Wx::BitmapComboBox" ); 
                 THIS->update_platter_ui(cb); %};
 
-    bool                    update_dirty_ui(SV *ui)
-        %code%{ RETVAL = THIS->update_dirty_ui((wxBitmapComboBox*)wxPli_sv_2_object(aTHX_ ui, "Wx::BitmapComboBox")); %};
-
-    void                    select_preset(int idx);
-    bool                    select_preset_by_name(char *name) %code%{ RETVAL = THIS->select_preset_by_name(name, true); %};
-    void                    discard_current_changes();
-
-    void                    save_current_preset(char *new_name)
-        %code%{
-            try {
-                THIS->save_current_preset(new_name);
-            } catch (std::exception& e) {
-                croak("Error saving a preset %s:\n%s\n", new_name, e.what());
-            }
-        %};
-    void                    delete_current_preset()
-        %code%{
-            try {
-                THIS->delete_current_preset();
-            } catch (std::exception& e) {
-                croak("Error deleting a preset file %s:\n%s\n", THIS->get_selected_preset().file.c_str(), e.what());
-            }
-        %};
-
 %{
 
 SV*
@@ -144,14 +117,6 @@ PresetCollection::arrayref()
                 croak("Loading of a config bundle %s failed:\n%s\n", path, e.what());
             }
         %};
-    void                        install_vendor_configbundle(const char *path)
-        %code%{
-            try {
-                THIS->install_vendor_configbundle(path);
-            } catch (std::exception& e) {
-                croak("Installing a vendor config bundle %s failed:\n%s\n", path, e.what());
-            }
-        %};
     void                        export_configbundle(char *path)
         %code%{
             try {
@@ -175,9 +140,6 @@ PresetCollection::arrayref()
 
     std::vector<std::string>    filament_presets() %code%{ RETVAL = THIS->filament_presets; %};
     void                        set_filament_preset(int idx, const char *name);
-    void                        update_multi_material_filament_presets();
-
-    void                        update_compatible_with_printer(bool select_other_if_incompatible);
 
     Clone<DynamicPrintConfig>   full_config() %code%{ RETVAL = THIS->full_config();  %};
 
@@ -185,15 +147,3 @@ PresetCollection::arrayref()
         %code%{ auto cb = (wxBitmapComboBox*)wxPli_sv_2_object(aTHX_ ui, "Wx::BitmapComboBox");
                 THIS->update_platter_filament_ui(extruder_idx, cb); %};
 };
-
-%name{Slic3r::GUI::PresetHints} class PresetHints {
-    PresetHints();
-    ~PresetHints();
-
-    static std::string cooling_description(Preset *preset) 
-        %code%{ RETVAL = PresetHints::cooling_description(*preset); %};
-    static std::string maximum_volumetric_flow_description(PresetBundle *preset) 
-        %code%{ RETVAL = PresetHints::maximum_volumetric_flow_description(*preset); %};
-    static std::string recommended_thin_wall_thickness(PresetBundle *preset)
-        %code%{ RETVAL = PresetHints::recommended_thin_wall_thickness(*preset); %};
-};

xs/xsp/GUI_Tab.xsp

@@ -16,6 +16,7 @@
 	bool		current_preset_is_dirty();
 	void		load_key_value(char* opt_key, char* value);
 	void		OnActivate();
+	size_t		get_selected_preset_item();
 	std::string	title();
 	Ref<DynamicPrintConfig>		get_config();
 	Ref<PresetCollection>		get_presets();

xs/xsp/Utils_PresetUpdater.xsp

@@ -0,0 +1,13 @@
+%module{Slic3r::XS};
+
+%{
+#include <xsinit.h>
+#include "slic3r/Utils/PresetUpdater.hpp"
+%}
+
+%name{Slic3r::PresetUpdater} class PresetUpdater {
+    PresetUpdater(int version_online_event);
+    void sync(PresetBundle* preset_bundle);
+    void slic3r_update_notify();
+    bool config_update();
+};

xs/xsp/my.map

@@ -231,11 +231,12 @@ PresetCollection*	      	O_OBJECT_SLIC3R
 Ref<PresetCollection>      	O_OBJECT_SLIC3R_T
 PresetBundle*	    		O_OBJECT_SLIC3R
 Ref<PresetBundle>    		O_OBJECT_SLIC3R_T
-PresetHints*	    		O_OBJECT_SLIC3R
-Ref<PresetHints>    		O_OBJECT_SLIC3R_T
 TabIface*	   				O_OBJECT_SLIC3R
 Ref<TabIface> 				O_OBJECT_SLIC3R_T
 
+PresetUpdater*              O_OBJECT_SLIC3R
+Ref<PresetUpdater>          O_OBJECT_SLIC3R_T
+
 OctoPrint*                  O_OBJECT_SLIC3R
 Ref<OctoPrint>              O_OBJECT_SLIC3R_T
 Clone<OctoPrint>            O_OBJECT_SLIC3R_T

xs/xsp/typemap.xspt

@@ -208,6 +208,8 @@
 %typemap{Ref<PresetCollection>}{simple};
 %typemap{PresetBundle*};
 %typemap{Ref<PresetBundle>}{simple};
+%typemap{PresetUpdater*};
+%typemap{Ref<PresetUpdater>}{simple};
 %typemap{PresetHints*};
 %typemap{Ref<PresetHints>}{simple};
 %typemap{TabIface*};