Merge with b989fba4c24c34873648df6871da4d0d8cb0a6d1

2014-02-06 20:51:21 +01:00
parent d8e5bc8bd9
commit 6398f6bf66
86 changed files with 3159 additions and 2519 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -106,6 +106,8 @@ class Options {
    int toolPanelWidth;
    int browserToolPanelWidth;
    int browserToolPanelHeight;
+    bool browserToolPanelOpened;
+    bool browserDirPanelOpened;
    int historyPanelWidth;
    Glib::ustring font;
    int windowWidth;
@@ -266,7 +268,7 @@ class Options {
    void        setDefaults     ();
    int         readFromFile    (Glib::ustring fname);
    int         saveToFile      (Glib::ustring fname);
-    static void load            ();
+    static bool load            ();
    static void save            ();

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