Mercurial > octave
comparison libgui/src/find-files-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 | f1844e33f621 |
| children | 7a640885171a 0a5b15007766 |
comparison
equal
deleted
inserted
replaced
| 28495:bc521cd24922 | 28497:2813ac10ca1e |
|---|---|
| 314 { | 314 { |
| 315 int opts = 0; // No options by default. | 315 int opts = 0; // No options by default. |
| 316 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. | 316 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. |
| 317 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); | 317 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
| 318 gui_settings *settings = rmgr.get_settings (); | 318 gui_settings *settings = rmgr.get_settings (); |
| 319 if (! settings->value (global_use_native_dialogs.key, | 319 if (! settings->value (global_use_native_dialogs).toBool ()) |
| 320 global_use_native_dialogs.def).toBool ()) | |
| 321 opts = QFileDialog::DontUseNativeDialog; | 320 opts = QFileDialog::DontUseNativeDialog; |
| 322 | 321 |
| 323 QString dir = | 322 QString dir = |
| 324 QFileDialog::getExistingDirectory (this, tr ("Set search directory"), | 323 QFileDialog::getExistingDirectory (this, tr ("Set search directory"), |
| 325 m_start_dir_edit->text (), | 324 m_start_dir_edit->text (), |