Mercurial > octave
comparison libgui/src/dialog.cc @ 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 | 5322aed1304c |
comparison
equal
deleted
inserted
replaced
| 28495:bc521cd24922 | 28497:2813ac10ca1e |
|---|---|
| 666 setDirectory (dirname); | 666 setDirectory (dirname); |
| 667 | 667 |
| 668 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. | 668 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. |
| 669 resource_manager& rmgr = oct_qobj.get_resource_manager (); | 669 resource_manager& rmgr = oct_qobj.get_resource_manager (); |
| 670 gui_settings *settings = rmgr.get_settings (); | 670 gui_settings *settings = rmgr.get_settings (); |
| 671 if (! settings->value (global_use_native_dialogs.key, | 671 if (! settings->value (global_use_native_dialogs).toBool ()) |
| 672 global_use_native_dialogs.def).toBool ()) | |
| 673 setOption(QFileDialog::DontUseNativeDialog); | 672 setOption(QFileDialog::DontUseNativeDialog); |
| 674 | 673 |
| 675 if (multimode == "on") // uigetfile multiselect=on | 674 if (multimode == "on") // uigetfile multiselect=on |
| 676 { | 675 { |
| 677 setFileMode (QFileDialog::ExistingFiles); | 676 setFileMode (QFileDialog::ExistingFiles); |