Merge branch 'master' into softproofing

2016-10-16 01:45:52 +02:00
parent 81c5b1ca41 29d5329f3f
commit 50165dab20
159 changed files with 15819 additions and 2723 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -132,6 +132,7 @@ protected:
    Gtk::HBox* hbtheme;
    Gtk::CheckButton* chUseSystemTheme;
    Gtk::FontButton* fontbutton;
+    Gtk::FontButton* colorPickerFontButton;
    Gtk::ColorButton* butCropCol;
    Gtk::ColorButton* butNavGuideCol;

@@ -230,7 +231,7 @@ protected:
    Gtk::Widget* getSoundPanel ();

 public:
-    Preferences (RTWindow *rtwindow);
+    explicit Preferences (RTWindow *rtwindow);
    ~Preferences ();

    void savePressed ();