merged dev into locallab_dev

2017-03-20 15:22:01 +01:00
parent 0464babf36 2228159ff8
commit 04bdea0b84
85 changed files with 5889 additions and 1899 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -40,7 +40,7 @@
 // Profile name to use for internal values' profile
 #define DEFPROFILE_INTERNAL "Neutral"
 // Special name for the Dynamic profile
-#define DEFPROFILE_DYNAMIC "Dynamic"
+#define DEFPROFILE_DYNAMIC  "Dynamic"

 struct SaveFormat {
    SaveFormat() :
@@ -320,7 +320,7 @@ public:
    void        setDefaults     ();
    int         readFromFile    (Glib::ustring fname);
    int         saveToFile      (Glib::ustring fname);
-    static bool load            ();
+    static bool load            (bool lightweight = false);
    static void save            ();

    // if multiUser=false, send back the global profile path