Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

[modules/shaper.git] / src / XGUI / XGUI_MainWindow.h

diff --git a/src/XGUI/XGUI_MainWindow.h b/src/XGUI/XGUI_MainWindow.h
index 186b3b87d6f60728651eea3f382dee0dd281b1ab..9b29ec3ea17d48f77809ee283684e1e94e2b1b76 100644 (file)
--- a/src/XGUI/XGUI_MainWindow.h
+++ b/src/XGUI/XGUI_MainWindow.h
@@ -6,8 +6,10 @@
 
 class XGUI_MainMenu;
 class XGUI_Viewer;
-class XGUI_ObjectsBrowser;
+class XGUI_ActionsMgr;
+class XGUI_ViewWindow;
 class QMdiArea;
+class QMdiSubWindow;
 class PyConsole_EnhConsole;
 
 /**\class XGUI_MainWindow
@@ -29,12 +31,6 @@ public:
     return myMenuBar;
   }
 
-  //! Returns Object browser
-  XGUI_ObjectsBrowser* objectBrowser() const
-  {
-    return myObjectBrowser;
-  }
-
   //! Returns MDI area
   QMdiArea* mdiArea() const;
 
@@ -44,25 +40,21 @@ public:
     return myViewer;
   }
 
-  // Creates Dock widgets: Object broewser and Property panel
-  void createDockWidgets();
-
 public slots:
   void showPythonConsole();
   void hidePythonConsole();
-  void showPropertyPanel();
-  void hidePropertyPanel();
-  void showObjectBrowser();
-  void hideObjectBrowser();
 
-private:
-  QDockWidget* createObjectBrowser();
-  QDockWidget* createPropertyPanel();
+  void createSubWindow();
+  
+private slots:
+  void cascadeWindows();
+  void onViewCreated(XGUI_ViewWindow* theWindow);
+  void onDeleteView(XGUI_ViewWindow* theWindow);
+  void activateView();
+  void onViewActivated(QMdiSubWindow* theSubWnd);
 
+private:
   XGUI_MainMenu* myMenuBar;
-  XGUI_ObjectsBrowser* myObjectBrowser;
-  QDockWidget* myPropertyPanelDock;
-
   XGUI_Viewer* myViewer;
 
   PyConsole_EnhConsole* myPythonConsole;