merge with dev

2017-04-18 17:02:46 +02:00
parent 9feecf4f1d e33457cb6e
commit 1d1e378858
6 changed files with 27 additions and 26 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -179,8 +179,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::Button*      behSetAll;
    Gtk::CheckButton* chOverwriteOutputFile;

-    Gtk::CheckButton* saveParamsFile;
-    Gtk::CheckButton* saveParamsCache;
+    Gtk::ComboBoxText* saveParamsPreference;
    Gtk::CheckButton* useBundledProfiles;
    Gtk::ComboBoxText* loadParamsPreference;
    Gtk::ComboBoxText* editorLayout;