Merge branch 'master' into gtk3

2017-01-02 02:48:45 +01:00
parent e9db962a5f d29a94c2a7
commit d702156f8a
20 changed files with 444 additions and 219 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -105,6 +105,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::CheckButton* showExpComp;

    Gtk::FileChooserButton* iccDir;
+    Gtk::ComboBoxText* prtProfile;
+    Gtk::ComboBoxText* prtIntent;
+    Gtk::CheckButton* prtBPC;
    Gtk::ComboBoxText* monProfile;
    Gtk::ComboBoxText* monIntent;
    Gtk::CheckButton* monBPC;