liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-11-02 13:32:07 +01:00
parent 53ba84f699 7ded0536b9
commit 0a65cb40c4
46 changed files with 369 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/preferences.h
View File

@@ -89,15 +89,15 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::RadioButton* sdlast;
Gtk::RadioButton* sdhome;
Gtk::RadioButton* sdother;
Gtk::FileChooserButton* gimpDir;
Gtk::FileChooserButton* psDir;
MyFileChooserButton* gimpDir;
MyFileChooserButton* psDir;
Gtk::Entry* editorToSendTo;
Gtk::RadioButton* edGimp;
Gtk::RadioButton* edPS;
Gtk::RadioButton* edOther;
Gtk::FileChooserButton* darkFrameDir;
Gtk::FileChooserButton* flatFieldDir;
Gtk::FileChooserButton* clutsDir;
MyFileChooserButton* darkFrameDir;
MyFileChooserButton* flatFieldDir;
MyFileChooserButton* clutsDir;
Gtk::Label *dfLabel;
Gtk::Label *ffLabel;
@@ -105,7 +105,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::CheckButton* showBasicExif;
Gtk::CheckButton* showExpComp;
Gtk::FileChooserButton* iccDir;
MyFileChooserButton* iccDir;
Gtk::ComboBoxText* prtProfile;
Gtk::ComboBoxText* prtIntent;
Gtk::CheckButton* prtBPC;