Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-02-05 12:29:58 -08:00
278 changed files with 74278 additions and 13534 deletions

View File

@@ -26,6 +26,7 @@
#include "options.h"
#include "../rtengine/profilestore.h"
class ExternalEditorPreferences;
class RTWindow;
class Splash;
@@ -101,6 +102,15 @@ class Preferences final :
Gtk::RadioButton* edGimp;
Gtk::RadioButton* edPS;
Gtk::RadioButton* edOther;
ExternalEditorPreferences *externalEditors;
Gtk::RadioButton *editor_dir_temp;
Gtk::RadioButton *editor_dir_current;
Gtk::RadioButton *editor_dir_custom;
MyFileChooserButton *editor_dir_custom_path;
Gtk::CheckButton *editor_float32;
Gtk::CheckButton *editor_bypass_output_profile;
MyFileChooserButton* darkFrameDir;
MyFileChooserButton* flatFieldDir;
MyFileChooserButton* clutsDir;
@@ -117,6 +127,7 @@ class Preferences final :
Gtk::CheckButton* prtBPC;
Gtk::ComboBoxText* monProfile;
Gtk::ComboBoxText* monIntent;
Gtk::CheckButton* mcie;
Gtk::CheckButton* monBPC;
Gtk::CheckButton* cbAutoMonProfile;
//Gtk::CheckButton* cbAutocielab;