Mercurial > octave

diff libgui/src/history-dock-widget.cc @ 27629:8b6e928e0705

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
in GUI objects, store reference to base_qobject instead of resource_manager We'll need access to both the resource_manager and the shortcut_manager in many objects. The shortcut_manager will be moved to be a member of the base_qobject class instead of being a singleton, so this change will make it easier to access both of these as well as any other core GUI properties in any of the Octave-specific widgets that make up the GUI. Once again, may files are affecte but the changes are straightforward: store a reference to the base_qobject object and access the resource_manager object from that instead of storing a reference to the resource_manager directly.
author John W. Eaton <jwe@octave.org>
date Mon, 04 Nov 2019 13:34:44 -0500
parents 45bb5bbaf291
children a36443e94f8a
line wrap: on
line diff
--- a/libgui/src/history-dock-widget.cc	Mon Nov 04 11:18:28 2019 -0500
+++ b/libgui/src/history-dock-widget.cc	Mon Nov 04 13:34:44 2019 -0500
@@ -36,7 +36,7 @@
 #include "gui-preferences-global.h"
 #include "gui-preferences-hw.h"
 #include "history-dock-widget.h"
-#include "resource-manager.h"
+#include "octave-qobject.h"
 
 #include "cmd-hist.h"
 
@@ -44,8 +44,8 @@
 
 namespace octave
 {
-  history_dock_widget::history_dock_widget (QWidget *p, resource_manager& rmgr)
-    : octave_dock_widget ("HistoryDockWidget", p, rmgr)
+  history_dock_widget::history_dock_widget (QWidget *p, base_qobject& oct_qobj)
+    : octave_dock_widget ("HistoryDockWidget", p, oct_qobj)
   {
     setStatusTip (tr ("Browse and search the command history."));
 
@@ -90,7 +90,8 @@
 
   void history_dock_widget::save_settings (void)
   {
-    gui_settings *settings = m_resource_manager.get_settings ();
+    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+    gui_settings *settings = rmgr.get_settings ();
 
     if (! settings)
       return;
@@ -139,12 +140,13 @@
 
     if (index.isValid () && index.column () == 0)
       {
-        menu.addAction (m_resource_manager.icon ("edit-copy"),
-                        tr ("Copy"), this, SLOT (handle_contextmenu_copy (bool)));
+        resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+
+        menu.addAction (rmgr.icon ("edit-copy"), tr ("Copy"), this,
+                        SLOT (handle_contextmenu_copy (bool)));
         menu.addAction (tr ("Evaluate"), this,
                         SLOT (handle_contextmenu_evaluate (bool)));
-        menu.addAction (m_resource_manager.icon ("document-new"),
-                        tr ("Create script"), this,
+        menu.addAction (rmgr.icon ("document-new"), tr ("Create script"), this,
                         SLOT (handle_contextmenu_create_script (bool)));
       }
     if (m_filter_shown)
@@ -315,7 +317,8 @@
     widget ()->setLayout (hist_layout);
 
     // Init state of the filter
-    gui_settings *settings = m_resource_manager.get_settings ();
+    resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
+    gui_settings *settings = rmgr.get_settings ();
 
     m_filter_shown
       = settings->value (hw_filter_shown.key, hw_filter_shown.def).toBool ();