Mercurial > octave

diff libgui/src/octave-dock-widget.cc @ 27937:8dc5b36f1245

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include new undock/dock actions into the shortcut manager * gui-preferences-sc.h: add new symbolic constant for new action shortcuts * octave-dock-widget.cc: (octave_dock_widget): replace hard coded shortcuts by the ones configured by the user and use only one shortcut for undock and dock; (make_window, make_widget): do not reconfigure the dock action shortcut; * shortcut-manager.cc (init_data): initialize new shortcuts; (fill_treewidget): new category for dock widgets in the shortcut preferences dialog
author Torsten Lilge <ttl-octave@mailbox.org>
date Tue, 14 Jan 2020 21:51:13 +0100
parents 106c8ba2f13c
children 4ee66fda87fb
line wrap: on
line diff
--- a/libgui/src/octave-dock-widget.cc	Sun Jun 10 01:40:36 2018 -0500
+++ b/libgui/src/octave-dock-widget.cc	Tue Jan 14 21:51:13 2020 +0100
@@ -39,6 +39,7 @@
 #include "gui-preferences-dw.h"
 #include "gui-preferences-global.h"
 #include "gui-preferences-mw.h"
+#include "gui-preferences-sc.h"
 #include "gui-settings.h"
 #include "octave-dock-widget.h"
 #include "octave-qobject.h"
@@ -213,12 +214,14 @@
     connect (this, SIGNAL (queue_make_widget ()),
              this, SLOT (make_widget ()), Qt::QueuedConnection);
 
-    m_dock_action->setShortcut (QKeySequence (Qt::CTRL + Qt::ALT + Qt::Key_U));
+    shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager ();
+    scmgr.set_shortcut (m_dock_action, sc_dock_widget_dock);
     m_dock_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
     addAction (m_dock_action);
     connect (m_dock_action, SIGNAL (triggered (bool)),
              this, SLOT (make_window (bool)));
-    m_close_action->setShortcut (QKeySequence (Qt::CTRL + Qt::ALT + Qt::Key_C));
+
+    scmgr.set_shortcut (m_close_action, sc_dock_widget_close);
     m_close_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
     addAction (m_close_action);
     connect (m_close_action, SIGNAL (triggered (bool)),
@@ -299,11 +302,12 @@
                                            : m_recent_float_geom;
     setGeometry (geom);
 
-    // adjust the (un)dock icon
-    m_dock_action->setShortcut (QKeySequence (Qt::CTRL + Qt::ALT + Qt::Key_D));
+    // adjust the (un)dock action
     disconnect (m_dock_action, 0, this, 0);
     connect (m_dock_action, SIGNAL (triggered (bool)),
              this, SLOT (make_widget (bool)));
+
+    // adjust the (un)dock icon
     if (titleBarWidget ())
       {
         m_dock_action->setIcon (QIcon (":/actions/icons/widget-dock"
@@ -350,8 +354,6 @@
     setFloating (false);
 
     // adjust the (un)dock icon
-    m_dock_action->setShortcut (QKeySequence (Qt::CTRL + Qt::ALT + Qt::Key_U));
-    m_dock_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
     connect (m_dock_action, SIGNAL (triggered (bool)),
              this, SLOT (make_window (bool)));
     if (titleBarWidget ())