diff libgui/src/gui-settings.h @ 28497:2813ac10ca1e stable

force non-native file dialogs on Mac ignoring current user pref (bug #52840) * gui-preferences-global.h: for MacOS, use the new third parameter of the gui_pref constructor for global_use_native_dialog indicating that the pref will be ignored and the default value (no nativ file dialogs) will always be taken * gui-preferences.h (gui_pref): struct with a new boolean ignore key, which is false when not given in the constructor; (value): if ignore flag is true, just return the defaut and ignore the value from the settings file * dialog.cc (FileDialog): use reimplemented value method from gui_settings, not the one from QSettings * find-files-dialog.cc (browse_folders): dito * file-editor-tab.cc (save_file_as): dito * main-window.cc (handle_save_workspace_request): dito; (handle_load_workspace_request): dito; (browse_for_directory): dito: (request_open_file): dito; * shortcut-manager.cc (import_export): dito
author Torsten Lilge <ttl-octave@mailbox.org>
date Mon, 22 Jun 2020 20:43:00 +0200
parents bd51beb6205e
children 0a5b15007766
line wrap: on
line diff
--- a/libgui/src/gui-settings.h	Mon Jun 22 14:11:53 2020 +0900
+++ b/libgui/src/gui-settings.h	Mon Jun 22 20:43:00 2020 +0200
@@ -62,6 +62,9 @@
 
     QVariant value (const gui_pref& pref) const
     {
+      if (pref.ignore)
+        return pref.def;  // ignore the current pref and always use default
+
       return value (pref.key, pref.def);
     }