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

xs/src/slic3r/GUI/PresetBundle.hpp

@@ -4,8 +4,14 @@
 #include "AppConfig.hpp"
 #include "Preset.hpp"
 
+#include <set>
+
 namespace Slic3r {
 
+namespace GUI {
+    class BitmapCache;
+};
+
 class PlaceholderParser;
 
 // Bundle of Print + Filament + Printer presets.
@@ -22,11 +28,10 @@ public:
     void            setup_directories();
 
     // Load ini files of all types (print, filament, printer) from Slic3r::data_dir() / presets.
-    void            load_presets();
-
     // Load selections (current print, current filaments, current printer) from config.ini
     // This is done just once on application start up.
-    void            load_selections(const AppConfig &config);
+    void            load_presets(const AppConfig &config);
+
     // Export selections (current print, current filaments, current printer) into config.ini
     void            export_selections(AppConfig &config);
     // Export selections (current print, current filaments, current printer) into a placeholder parser.
@@ -39,6 +44,10 @@ public:
     // extruders.size() should be the same as printers.get_edited_preset().config.nozzle_diameter.size()
     std::vector<std::string>    filament_presets;
 
+    // There will be an entry for each system profile loaded, 
+    // and the system profiles will point to the VendorProfile instances owned by PresetBundle::vendors.
+    std::set<VendorProfile>     vendors;
+
     bool                        has_defauls_only() const 
         { return prints.size() <= 1 && filaments.size() <= 1 && printers.size() <= 1; }
 
@@ -69,11 +78,16 @@ public:
         // Save the profiles, which have been loaded.
         LOAD_CFGBNDLE_SAVE = 1, 
         // Delete all old config profiles before loading.
-        LOAD_CFGBNDLE_RESET_USER_PROFILE = 2
+        LOAD_CFGBNDLE_RESET_USER_PROFILE = 2,
+        // Load a system config bundle.
+        LOAD_CFGBNDLE_SYSTEM = 4,
     };
     // Load the config bundle, store it to the user profile directory by default.
     size_t                      load_configbundle(const std::string &path, unsigned int flags = LOAD_CFGBNDLE_SAVE);
 
+    // Install the Vendor specific config bundle into user's directory.
+    void                        install_vendor_configbundle(const std::string &src_path);
+
     // Export a config bundle file containing all the presets and the names of the active presets.
     void                        export_configbundle(const std::string &path); // , const DynamicPrintConfig &settings);
 
@@ -101,6 +115,17 @@ public:
     static bool parse_color(const std::string &scolor, unsigned char *rgb_out);
 
 private:
+    std::string                 load_system_presets();
+
+    // Set the "enabled" flag for printer vendors, printer models and printer variants
+    // based on the user configuration.
+    // If the "vendor" section is missing, enable all models and variants of the particular vendor.
+    void                        load_installed_printers(const AppConfig &config);
+
+    // Load selections (current print, current filaments, current printer) from config.ini
+    // This is done just once on application start up.
+    void                        load_selections(const AppConfig &config);
+
     // Load print, filament & printer presets from a config. If it is an external config, then the name is extracted from the external path.
     // and the external config is just referenced, not stored into user profile directory.
     // If it is not an external config, then the config will be stored into the user profile directory.
@@ -112,8 +137,12 @@ private:
     wxBitmap                            *m_bitmapCompatible;
     // Indicator, that the preset is NOT compatible with the selected printer.
     wxBitmap                            *m_bitmapIncompatible;
-    // Caching color bitmaps for the 
-    std::map<std::string, wxBitmap*>     m_mapColorToBitmap;
+    // Indicator, that the preset is system and not modified.
+    wxBitmap                            *m_bitmapLock;
+    // Indicator, that the preset is system and user modified.
+    wxBitmap                            *m_bitmapLockOpen;
+    // Caching color bitmaps for the filament combo box.
+    GUI::BitmapCache                    *m_bitmapCache;
 };
 
 } // namespace Slic3r