Mercurial > octave
changeset 30725:0cf772732981
maint: Merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Tue, 08 Feb 2022 11:55:29 +0100 |
| parents | 53b125563b49 (current diff) 0a082e1b7422 (diff) |
| children | 4feb63a3a51c |
| files | libgui/src/main-window.cc |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Tue Feb 08 11:54:36 2022 +0100 +++ b/libgui/src/main-window.cc Tue Feb 08 11:55:29 2022 +0100 @@ -467,6 +467,11 @@ // close the main window without exiting the application. connect (qApp, &QApplication::aboutToQuit, dw, &octave_dock_widget::save_settings); + + // The following is required when the exp. terminal widget is used + // and the main window is closed (no exit via interpreter) + connect (this, &main_window::close_gui_signal, + dw, &octave_dock_widget::save_settings); } bool main_window::command_window_has_focus (void) const
--- a/libgui/src/octave-dock-widget.h Tue Feb 08 11:54:36 2022 +0100 +++ b/libgui/src/octave-dock-widget.h Tue Feb 08 11:55:29 2022 +0100 @@ -128,14 +128,14 @@ virtual void notice_settings (const gui_settings *) { } + virtual void save_settings (void); + void init_window_menu_entry (void); void handle_settings (const gui_settings *); void handle_active_dock_changed (octave_dock_widget *, octave_dock_widget *); - void save_settings (void); - void moveEvent (QMoveEvent *event); void resizeEvent (QResizeEvent *event);