Derive Fl_Zenity_Native_File_Chooser_Driver from Fl_Kdialog_Native_…

Also add Fl::option(OPTION_FNFC_USES_ZENITY)

1 files changed, 41 insertions, 10 deletions

diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 45077424a..4e016220e 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -524,7 +524,8 @@ wShowTooltips->value(opt[Fl::OPTION_SHOW_TOOLTIPS][mode]);
 wDNDText->value(opt[Fl::OPTION_DND_TEXT][mode]);
 wGTKText->value(opt[Fl::OPTION_FNFC_USES_GTK][mode]);
 wPrintGTKText->value(opt[Fl::OPTION_PRINTER_USES_GTK][mode]);
-wShowZoomFactor->value(opt[Fl::OPTION_SHOW_SCALING][mode]);} {}
+wShowZoomFactor->value(opt[Fl::OPTION_SHOW_SCALING][mode]);
+wUseZenity->value(opt[Fl::OPTION_FNFC_USES_ZENITY][mode]);} {}
 }
 
 Function {readPrefs()} {
@@ -541,6 +542,7 @@ Function {readPrefs()} {
   opt_prefs.get("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK ][1], 2);
   opt_prefs.get("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK ][1], 2);
   opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][1], 2);
+  opt_prefs.get("UseZenity", opt[Fl::OPTION_FNFC_USES_ZENITY ][1], 2);
 }
 {
   Fl_Preferences prefs(Fl_Preferences::USER_L, "fltk.org", "fltk");
@@ -552,6 +554,7 @@ Function {readPrefs()} {
   opt_prefs.get("FNFCUsesGTK", opt[Fl::OPTION_FNFC_USES_GTK ][0], 2);
   opt_prefs.get("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK ][0], 2);
   opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][0], 2);
+  opt_prefs.get("UseZenity", opt[Fl::OPTION_FNFC_USES_ZENITY ][0], 2);
 }
 refreshUI();} {}
 }
@@ -577,6 +580,8 @@ Function {writePrefs()} {
   else opt_prefs.set("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK][1]);
   if (opt[Fl::OPTION_SHOW_SCALING][1]==2) opt_prefs.deleteEntry("ShowZoomFactor");
   else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][1]);
+  if (opt[Fl::OPTION_FNFC_USES_ZENITY][1]==2) opt_prefs.deleteEntry("UseZenity");
+  else opt_prefs.set("UseZenity", opt[Fl::OPTION_FNFC_USES_ZENITY][1]);
 }
 {
   Fl_Preferences prefs(Fl_Preferences::USER_L, "fltk.org", "fltk");
@@ -595,6 +600,8 @@ Function {writePrefs()} {
   else opt_prefs.set("PrintUsesGTK", opt[Fl::OPTION_PRINTER_USES_GTK][0]);
   if (opt[Fl::OPTION_SHOW_SCALING][0]==2) opt_prefs.deleteEntry("ShowZoomFactor");
   else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][0]);
+  if (opt[Fl::OPTION_FNFC_USES_ZENITY][0]==2) opt_prefs.deleteEntry("UseZenity");
+  else opt_prefs.set("UseZenity", opt[Fl::OPTION_FNFC_USES_ZENITY][0]);
 }} {}
 }
 
@@ -617,7 +624,7 @@ global_settings_window->show();} {}
 Function {make_global_settings_window()} {} {
   Fl_Window global_settings_window {
     label {FLTK Preferences} open
-    xywh {715 96 400 531} type Double color 50 hide
+    xywh {817 110 400 572} type Double color 50 hide
   } {
     Fl_Group {} {
       label {Keyboard Focus Options} open
@@ -740,7 +747,7 @@ Default is on.} xywh {245 225 100 25} down_box BORDER_BOX
     }
     Fl_Group {} {
       label {Native File Chooser Options} open
-      xywh {10 269 380 66} box GTK_DOWN_BOX labelfont 2 align 21
+      xywh {10 269 380 104} box GTK_DOWN_BOX labelfont 2 align 21
     } {
       Fl_Choice wGTKText {
         label {Native File Chooser uses GTK:}
@@ -770,10 +777,34 @@ Default is on.} xywh {245 300 100 25} down_box BORDER_BOX
           xywh {30 30 31 20}
         }
       }
+      Fl_Choice wUseZenity {
+        label {Native File Chooser uses Zenity:}
+        callback {int mode = wUserOrSystem->value();
+opt[Fl::OPTION_FNFC_USES_ZENITY ][mode] = wUseZenity->value();}
+        tooltip {OPTION_FNFC_USES_ZENITY
+
+If 'Native File Chooser uses Zenity' is enabled, the library uses a Zenity-based file dialog to open/save files when possible. If disabled, the GTK-based dialog is used. Default is on. Meaningful only with Wayland/X11 platforms.} xywh {245 334 100 26} down_box BORDER_BOX
+      } {
+        MenuItem {} {
+          label off
+          user_data 0 user_data_type long
+          xywh {545 545 31 20}
+        }
+        MenuItem {} {
+          label on
+          user_data 1 user_data_type long
+          xywh {545 545 31 20} divider
+        }
+        MenuItem {} {
+          label default
+          user_data 2 user_data_type long
+          xywh {545 545 31 20}
+        }
+      }
     }
     Fl_Group {} {
       label {Print dialog Options} open
-      xywh {10 345 380 66} box GTK_DOWN_BOX labelfont 2 align 21
+      xywh {10 384 380 66} box GTK_DOWN_BOX labelfont 2 align 21
     } {
       Fl_Choice wPrintGTKText {
         label {Print dialog uses GTK:}
@@ -785,7 +816,7 @@ If 'Print dialog uses GTK' is enabled, the Fl_Printer class
 calls the GTK print dialog when it's available on the platfom. If disabled, the Fl_Printer class
 always uses FLTK's own print dialog even if GTK is available.
 
-Default is on.} xywh {245 366 100 25} down_box BORDER_BOX
+Default is on.} xywh {245 405 100 25} down_box BORDER_BOX
       } {
         MenuItem {} {
           label off
@@ -806,7 +837,7 @@ Default is on.} xywh {245 366 100 25} down_box BORDER_BOX
     }
     Fl_Group {} {
       label {Scaling Factor Options} open
-      xywh {10 421 380 66} box GTK_DOWN_BOX labelfont 2 align 21
+      xywh {10 459 380 66} box GTK_DOWN_BOX labelfont 2 align 21
     } {
       Fl_Choice wShowZoomFactor {
         label {Transiently show scaling factor:}
@@ -817,7 +848,7 @@ opt[Fl::OPTION_SHOW_SCALING ][mode] = wShowZoomFactor->value();} open
 If 'Transiently show scaling factor' is enabled, the library shows in a transient yellow window the display
 scaling factor value when it is changed. If disabled, no such transient window is used.
 
-Default is on.} xywh {245 442 100 25} down_box BORDER_BOX
+Default is on.} xywh {245 483 100 25} down_box BORDER_BOX
       } {
         MenuItem {} {
           label off
@@ -838,7 +869,7 @@ Default is on.} xywh {245 442 100 25} down_box BORDER_BOX
     }
     Fl_Choice wUserOrSystem {
       callback {refreshUI();} open
-      tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default').} xywh {10 496 141 25} down_box BORDER_BOX
+      tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default').} xywh {10 535 141 25} down_box BORDER_BOX
     } {
       MenuItem {} {
         label {User Settings}
@@ -854,13 +885,13 @@ Default is on.} xywh {245 442 100 25} down_box BORDER_BOX
     Fl_Button {} {
       label Cancel
       callback {global_settings_window->hide();}
-      xywh {230 496 75 25}
+      xywh {230 535 75 25}
     }
     Fl_Button {} {
       label OK
       callback {writePrefs();
 global_settings_window->hide();}
-      xywh {315 496 75 25}
+      xywh {315 535 75 25}
     }
   }
   code {readPrefs();