Mercurial > octave
changeset 33272:c61aadb5b676 stable
set DontUseNativeDialog flag as first property in QFileDialog
* file-editor-tab.cc (save_file_as): set DontUseNativeDialog before
all other properties of the file dialogs
* main-window.cc (request_open_file): dito
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sat, 30 Mar 2024 09:21:53 +0100 |
| parents | 7cef76b2d1da |
| children | 2bd98dd04bbc |
| files | libgui/src/m-editor/file-editor-tab.cc libgui/src/main-window.cc |
| diffstat | 2 files changed, 22 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Thu Mar 28 16:25:33 2024 +0100 +++ b/libgui/src/m-editor/file-editor-tab.cc Sat Mar 30 09:21:53 2024 +0100 @@ -2519,6 +2519,21 @@ else fileDialog = new QFileDialog (this); + gui_settings settings; + + if (! settings.bool_value (global_use_native_dialogs)) + { + // Qt file dialogs + fileDialog->setOption(QFileDialog::DontUseNativeDialog); + } + else + { + // Native file dialogs: Test for already existing files is done manually + // since native file dialogs might not consider the automatically + // appended default extension when checking if the file already exists + fileDialog->setOption(QFileDialog::DontConfirmOverwrite); + } + // add the possible filters and the default suffix QStringList filters; filters << tr ("Octave Files (*.m)") @@ -2555,21 +2570,6 @@ // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. - gui_settings settings; - - if (! settings.bool_value (global_use_native_dialogs)) - { - // Qt file dialogs - fileDialog->setOption(QFileDialog::DontUseNativeDialog); - } - else - { - // Native file dialogs: Test for already existing files is done manually - // since native file dialogs might not consider the automatically - // appended default extension when checking if the file already exists - fileDialog->setOption(QFileDialog::DontConfirmOverwrite); - } - connect (fileDialog, &QFileDialog::filterSelected, this, &file_editor_tab::handle_save_as_filter_selected);
--- a/libgui/src/main-window.cc Thu Mar 28 16:25:33 2024 +0100 +++ b/libgui/src/main-window.cc Sat Mar 30 09:21:53 2024 +0100 @@ -1323,10 +1323,17 @@ global_use_custom_editor.def ()).toBool (); // Create a NonModal message. + QWidget *p = this; if (is_internal) p = m_editor_window; + QFileDialog *fileDialog = new QFileDialog (p); + + // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. + if (! settings.bool_value (global_use_native_dialogs)) + fileDialog->setOption(QFileDialog::DontUseNativeDialog); + fileDialog->setNameFilter (tr ("Octave Files (*.m);;All Files (*)")); fileDialog->setAcceptMode (QFileDialog::AcceptOpen); @@ -1334,10 +1341,6 @@ fileDialog->setFileMode (QFileDialog::ExistingFiles); fileDialog->setDirectory (m_current_directory_combo_box->itemText (0)); - // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. - if (! settings.bool_value (global_use_native_dialogs)) - fileDialog->setOption(QFileDialog::DontUseNativeDialog); - connect (fileDialog, &QFileDialog::filesSelected, this, &main_window::request_open_files);