X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_MainMenu.h;h=50c19c8a985e6c2b6ccc54f0f16dbe6d407044b0;hb=19bc85698899d6bee8704e7b0953ee045b0eb66f;hp=945ddcb8d9f890b6d90811986f280805c69dfb01;hpb=12621bb509825d0eb1fb0847a7f9c8011021ca5a;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_MainMenu.h b/src/XGUI/XGUI_MainMenu.h
index 945ddcb8d..50c19c8a9 100644
--- a/src/XGUI/XGUI_MainMenu.h
+++ b/src/XGUI/XGUI_MainMenu.h
@@ -5,6 +5,7 @@
 #include <QObject>
 #include <QList>
 #include <QMap>
+#include <QWidget>
 
 class XGUI_Command;
 class XGUI_MainWindow;
@@ -17,15 +18,15 @@ class QAction;
 class QDockWidget;
 class QEvent;
 
-
 /**\class XGUI_MainMenu
  * \ingroup GUI
  * \brief Class for creation of main menu (set of workbenches)
  */
-class XGUI_EXPORT XGUI_MainMenu: public QObject
+class XGUI_EXPORT XGUI_MainMenu : public QWidget
 {
 Q_OBJECT
-public:
+
+ public:
   XGUI_MainMenu(XGUI_MainWindow *parent);
   virtual ~XGUI_MainMenu();
 
@@ -33,13 +34,16 @@ 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_Workbench* generalPage() const { return myGeneralPage; }
+  XGUI_MenuGroupPanel* generalPage() const
+  {
+    return myGeneralPage;
+  }
 
   //! Rerturns last created workbench in dock widget container
-  QDockWidget* getLastDockWindow() const { return myMenuTabs.last(); }
+  //QDockWidget* getLastDockWindow() const;
 
   //! Returns already created command by its ID
   XGUI_Command* feature(const QString& theId) const;
@@ -47,14 +51,29 @@ public:
   //! Returns list of created commands
   QList<XGUI_Command*> features() const;
 
-  QList<XGUI_Workbench*> workbenches() const;
-
   virtual bool eventFilter(QObject *theWatched, QEvent *theEvent);
 
-private:
+  //! Displays given console as a tab in the workbench
+  void insertConsole(QWidget*);
+  //! Removes already created tab with python console
+  void removeConsole();
+
+  //! Defines size of menu item.
+  //! In the future this value should be extracted from the preferences.
+  int menuItemSize() const;
+  //! Defines number of menu item rows.
+  //! In the future this value should be extracted from the preferences.
+  int menuItemRowsCount() const;
+  //! Defines height of the main menu. (Number of rows * row height)
+  int menuHeight() const;
+
+  void updateFromResources();
+
+ private:
   XGUI_MainWindow* myDesktop;
-  QList<QDockWidget*> myMenuTabs;
-  XGUI_Workbench* myGeneralPage;
+  QTabWidget* myMenuTabs;
+  XGUI_MenuGroupPanel* myGeneralPage;
+  QList<XGUI_Workbench*> myWorkbenches;
 
   QMap<XGUI_Command*, bool> myCommandState;
 };