Merge with 'Beep6581/dev'

2024-03-06 19:10:49 +01:00
parent 3eb73fb225 619b1866fb
commit 7e63892628
107 changed files with 5295 additions and 3817 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -238,6 +238,8 @@ class Preferences final :
    Gtk::ComboBoxText *cropGuidesCombo;
    Gtk::CheckButton *cropAutoFitCB;

+    Gtk::ComboBoxText *maxZoomCombo;
+
    Gtk::ComboBoxText *metadataSyncCombo;
    Gtk::ComboBoxText *xmpSidecarCombo;