Merge branch 'master' of newgeom:newgeom.git

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

diff --git a/src/XGUI/XGUI_MainMenu.h b/src/XGUI/XGUI_MainMenu.h
index 29b87063f602f1289d15ce4e23851c7e1086be77..50c19c8a985e6c2b6ccc54f0f16dbe6d407044b0 100644 (file)
--- a/src/XGUI/XGUI_MainMenu.h
+++ b/src/XGUI/XGUI_MainMenu.h
@@ -22,19 +22,11 @@ class QEvent;
  * \ingroup GUI
  * \brief Class for creation of main menu (set of workbenches)
  */
-class XGUI_EXPORT XGUI_MainMenu: public QWidget
+class XGUI_EXPORT XGUI_MainMenu : public QWidget
 {
-  Q_OBJECT
+Q_OBJECT
 
-  //! Size of menu item
-  //TODO(sbh, vsv): Move to the settings
-  //enum ItemSize {
-  //  Small = 20,
-  //  Medium = 25,
-  //  Large = 30
-  //};
-
-public:
+ public:
   XGUI_MainMenu(XGUI_MainWindow *parent);
   virtual ~XGUI_MainMenu();
 
@@ -42,10 +34,13 @@ public:
   XGUI_Workbench* addWorkbench(const QString& theId, const QString& theText = "");
 
   //! Returns workbench (menu group) by the given name.
-  XGUI_Workbench* findWorkbench(const QString& theId)  const;
+  XGUI_Workbench* findWorkbench(const QString& theId) const;
 
   //! Returns General page (predefined workbench)
-  XGUI_MenuGroupPanel* generalPage() const { return myGeneralPage; }
+  XGUI_MenuGroupPanel* generalPage() const
+  {
+    return myGeneralPage;
+  }
 
   //! Rerturns last created workbench in dock widget container
   //QDockWidget* getLastDockWindow() const;
@@ -74,10 +69,11 @@ public:
 
   void updateFromResources();
 
-private:
+ private:
   XGUI_MainWindow* myDesktop;
   QTabWidget* myMenuTabs;
   XGUI_MenuGroupPanel* myGeneralPage;
+  QList<XGUI_Workbench*> myWorkbenches;
 
   QMap<XGUI_Command*, bool> myCommandState;
 };