Merge branch 'master' into gtk3

2016-09-02 17:51:45 +02:00
parent a6179ef969 db6b43e3c0
commit 9380034b19
8 changed files with 193 additions and 90 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -86,6 +86,13 @@ private:
                    const Glib::ustring& entryName, Glib::ustring& destination);

 public:
+
+    enum class NavigatorUnit {
+        PERCENT,
+        R0_255,
+        R0_1,
+        _COUNT
+    };
    bool savesParamsAtExit;
    SaveFormat saveFormat, saveFormatBatch;
    Glib::ustring savePathTemplate;
@@ -133,6 +140,8 @@ public:
    bool fbShowExpComp;
    bool fbShowHidden;
    int  fbArrangement;
+    NavigatorUnit navRGBUnit;
+    NavigatorUnit navHSVUnit;
    bool multiUser;
    static Glib::ustring rtdir;
    Glib::ustring version;