Mercurial > octave
changeset 29780:d79f65e37e89
provide shortcuts in widgets launched from the cli
* octave-dock-widget.cc (label_dock_widget::label_dock_widget):
prevent warnings (OCTAVE_SHOW_GUI_MESSAGES=1) from unconnected
signals if there is no main window
* octave-qobject.cc (base_qobject::base_qobject):
initialize the data for the shortcut manager if gui is not started
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Fri, 18 Jun 2021 22:07:54 +0200 |
| parents | 58e7df720752 |
| children | 6cbd169e391b |
| files | libgui/src/octave-dock-widget.cc libgui/src/octave-qobject.cc |
| diffstat | 2 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc Fri Jun 18 21:22:21 2021 +0200 +++ b/libgui/src/octave-dock-widget.cc Fri Jun 18 22:07:54 2021 +0200 @@ -103,16 +103,20 @@ m_title_widget->setLayout (h_layout); - // copy & paste handling - connect (p, SIGNAL (copyClipboard_signal ()), - this, SLOT (copyClipboard ())); - connect (p, SIGNAL (pasteClipboard_signal ()), - this, SLOT (pasteClipboard ())); - connect (p, SIGNAL (selectAll_signal ()), - this, SLOT (selectAll ())); + if (p) + { + // Only connect the when a parent (main window) is given + // copy & paste handling + connect (p, SIGNAL (copyClipboard_signal ()), + this, SLOT (copyClipboard ())); + connect (p, SIGNAL (pasteClipboard_signal ()), + this, SLOT (pasteClipboard ())); + connect (p, SIGNAL (selectAll_signal ()), + this, SLOT (selectAll ())); - // undo handling - connect (p, SIGNAL (undo_signal ()), this, SLOT (do_undo ())); + // undo handling + connect (p, SIGNAL (undo_signal ()), this, SLOT (do_undo ())); + } } // set the title in the dockwidgets title bar
--- a/libgui/src/octave-qobject.cc Fri Jun 18 21:22:21 2021 +0200 +++ b/libgui/src/octave-qobject.cc Fri Jun 18 22:07:54 2021 +0200 @@ -293,6 +293,9 @@ // After settings. config_translators (); + // Initilize the shortcut-manager + m_shortcut_manager.init_data (); + m_qapplication->setQuitOnLastWindowClosed (false); } }