diff libgui/src/main-window.h @ 16459:cbc39a3d0c42

improve encapsulation of workspace window object * workspace-view.h, workspace-view.cc (workspace_view::handle_visibility_changed): Delete. (workspace_view::workspace_view): Set status tip. Don't connect workspace_view::visibilityChanged signal to workspace_view::handle_visibility_changed. (workspace_view::connect_visibility_changed, workspace_view::focus, workspace_view::handle_visibility): New functions. * main-window.h, main-window.cc (main_window::workspace_window): Rename from _workspace_view. Change all uses. (main_window::main_window): Initialize it. (main_window::focus_workspace, main_window::handle_workspace_visible): Delete. (main_window::connect_visibility_changed): Call workspace_window->connect_visibility_changed. (main_window::construct): Don't create _workspace_view. Connect workspace_action::triggered directly to workspace_window::focus.
author John W. Eaton <jwe@octave.org>
date Sun, 07 Apr 2013 11:52:09 -0400
parents 10edb6f1ae98
children 4d4e7c6f839d
line wrap: on
line diff
--- a/libgui/src/main-window.h	Sun Apr 07 06:04:37 2013 -0400
+++ b/libgui/src/main-window.h	Sun Apr 07 11:52:09 2013 -0400
@@ -104,9 +104,6 @@
 
   void handle_command_double_clicked (const QString& command);
 
-  void focus_workspace (void);
-  void handle_workspace_visible (bool);
-
   void handle_enter_debugger (void);
   void handle_exit_debugger (void);
   void debug_continue (void);
@@ -184,6 +181,7 @@
   files_dock_widget *file_browser_window;
   documentation_dock_widget *doc_browser_window;
   file_editor_interface *editor_window;
+  workspace_view *workspace_window;
 
   QMenu *_debug_menu;
 
@@ -202,9 +200,6 @@
   QAction *_undo_action;
   QAction *_redo_action;
 
-  // Dock widgets.
-  workspace_view *_workspace_view;
-
   // Toolbars.
   QComboBox *_current_directory_combo_box;
   static const int current_directory_width = 300;