Merge branch 'dev' into metadata-exiv2

This commit is contained in:
Lawrence Lee
2023-03-22 23:01:40 -07:00
43 changed files with 1185 additions and 333 deletions

View File

@@ -135,6 +135,15 @@ class Preferences final :
Gtk::CheckButton* cbdaubech;
Gtk::SpinButton* hlThresh;
Gtk::SpinButton* shThresh;
// Gtk::CheckButton* mwbacorr;
// Gtk::CheckButton* mwbaforc;
// Gtk::CheckButton* mwbanopurp;
// Gtk::CheckButton* mwbasort;
// Gtk::SpinButton* wbacorrnb;
// Gtk::SpinButton* wbaprecis;
// Gtk::SpinButton* wbasizeref;
// Gtk::SpinButton* wbagreendelta;
Gtk::SpinButton* panFactor;
Gtk::CheckButton* rememberZoomPanCheckbutton;
@@ -243,7 +252,7 @@ class Preferences final :
Options moptions;
sigc::connection tconn, sconn, fconn, cpfconn, addc, setc, dfconn, ffconn, bpconn, rpconn, ipconn;
sigc::connection autoMonProfileConn, sndEnableConn, langAutoDetectConn, autocielabConn;
sigc::connection autoMonProfileConn, sndEnableConn, langAutoDetectConn, autocielabConn, observer10Conn;
Glib::ustring initialTheme;
Glib::ustring initialFontFamily;
int initialFontSize;
@@ -308,6 +317,7 @@ public:
void sndEnableToggled ();
void langAutoDetectToggled ();
void autocielabToggled ();
void observer10Toggled ();
void selectStartupDir ();
void addExtPressed ();