merge with dev

2018-03-27 17:18:32 +02:00
parent 75fb5a697e c9fa7b055c
commit c74cdb922f
16 changed files with 275 additions and 29 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -169,6 +169,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::SpinButton*  rgbDenoiseTreadLimitSB;
    Gtk::SpinButton*  clutCacheSizeSB;
    Gtk::SpinButton*  maxInspectorBuffersSB;
+    Gtk::ComboBoxText *thumbnailInspectorMode;

    Gtk::CheckButton* ckbmenuGroupRank;
    Gtk::CheckButton* ckbmenuGroupLabel;