changeset 33274:a29e8d52c4e8

maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 30 Mar 2024 12:20:55 +0100
parents 59ee9d370307 (current diff) 2bd98dd04bbc (diff)
children b4613ff2dac4
files libgui/src/m-editor/file-editor-tab.cc libgui/src/main-window.cc
diffstat 3 files changed, 39 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS.9.md	Fri Mar 29 14:46:02 2024 -0700
+++ b/etc/NEWS.9.md	Sat Mar 30 12:20:55 2024 +0100
@@ -5,12 +5,29 @@
 
 ### Improvements and fixes
 
+- `hist.m`: Add input validation for `Y` restricting it to 2-D array
+  (bug #65478).
+
 ### GUI
 
+- Use first word for options in right-click menu of command window widget
+  (bug #65518).
+- Set `DontUseNativeDialog` flag as first property in `QFileDialog`.
+
 ### Build system / Tests
 
+- Avoid overriding `save_*` variables from outer scope (bug #65476).
+  This fixes an error that might have lead to overlinking of shared libraries
+  (e.g., `.oct` files). Consider rebuilding shared libraries that have been
+  built with Octave 9.1.0.
+
 ### Documentation
 
+- Describe shape of outputs for `hist` (bug #65471).
+- Simplify programming notes for `patch` objects (bug #65421).
+- `vecnorm.m`: Add missing parenthesis to equation in docstring.
+- Update remaining copyright statements to 2024.
+
 
 Summary of important user-visible changes for version 9 (2024-03-12):
 ---------------------------------------------------------------------
--- a/libgui/src/m-editor/file-editor-tab.cc	Fri Mar 29 14:46:02 2024 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Sat Mar 30 12:20:55 2024 +0100
@@ -2591,6 +2591,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)")
@@ -2627,21 +2642,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	Fri Mar 29 14:46:02 2024 -0700
+++ b/libgui/src/main-window.cc	Sat Mar 30 12:20:55 2024 +0100
@@ -1376,10 +1376,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);
@@ -1387,10 +1394,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);