changeset 29269:d8cb0f06ffb1

use file editors shortcut for saving a variable in variable editor * variable-editor.cc: include gui-preferences-sc.h; (variable_editor::notice_settings): set file save shortcut to the action for saving a variable; (variable_editor::construct_tool_bar): use a class variable for storing the save action, do not set the hard coded shortcut here * variable-editor.h: new class variable m_save_action
author Torsten Lilge <ttl-octave@mailbox.org>
date Tue, 05 Jan 2021 22:10:29 +0100
parents d4d56704978e
children 6570a35920c4
files libgui/src/variable-editor.cc libgui/src/variable-editor.h
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/variable-editor.cc	Tue Jan 05 20:48:18 2021 +0100
+++ b/libgui/src/variable-editor.cc	Tue Jan 05 22:10:29 2021 +0100
@@ -52,6 +52,7 @@
 #include "dw-main-window.h"
 #include "gui-preferences-cs.h"
 #include "gui-preferences-global.h"
+#include "gui-preferences-sc.h"
 #include "gui-preferences-ve.h"
 #include "octave-qobject.h"
 #include "ovl.h"
@@ -1439,6 +1440,10 @@
     QStyle *st = style ();
     int icon_size = st->pixelMetric (global_icon_sizes[size_idx]);
     m_tool_bar->setIconSize (QSize (icon_size, icon_size));
+
+    // Shortcuts (same as file editor)
+    shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager ();
+    scmgr.set_shortcut (m_save_action, sc_edit_file_save);
   }
 
   void
@@ -1627,15 +1632,13 @@
 
     resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
 
-    QAction *action;
-    action = add_tool_bar_button (rmgr.icon ("document-save"), tr ("Save"),
+    m_save_action = add_tool_bar_button (rmgr.icon ("document-save"), tr ("Save"),
                                   this, SLOT (save ()));
-    addAction (action);
-    action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
-    action->setShortcuts (QKeySequence::Save);
-    action->setStatusTip(tr("Save variable to a file"));
+    addAction (m_save_action);
+    m_save_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
+    m_save_action->setStatusTip(tr("Save variable to a file"));
 
-    action = new QAction (rmgr.icon ("document-save-as"), tr ("Save in format ..."), m_tool_bar);
+    QAction *action = new QAction (rmgr.icon ("document-save-as"), tr ("Save in format ..."), m_tool_bar);
 
     QToolButton *save_tool_button = new HoverToolButton (m_tool_bar);
     save_tool_button->setDefaultAction (action);
--- a/libgui/src/variable-editor.h	Tue Jan 05 20:48:18 2021 +0100
+++ b/libgui/src/variable-editor.h	Tue Jan 05 22:10:29 2021 +0100
@@ -360,6 +360,7 @@
     dw_main_window *m_main;
 
     QToolBar *m_tool_bar;
+    QAction *m_save_action;
 
     int m_default_width;