X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.h;h=cc5dcf614996f9f1522201ca9a7ea56a5497b839;hb=d4b0a5cb916f4eccf4a0bce02e43a54c7a67cb93;hp=805b376ef4fc159ce9c38e0accd568e87d673224;hpb=58185df5c4d0877054ea33a0fe8ebded75bd9d7b;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ContextMenuMgr.h b/src/XGUI/XGUI_ContextMenuMgr.h
index 805b376ef..cc5dcf614 100644
--- a/src/XGUI/XGUI_ContextMenuMgr.h
+++ b/src/XGUI/XGUI_ContextMenuMgr.h
@@ -1,4 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef XGUI_ContextMenuMgr_H
 #define XGUI_ContextMenuMgr_H
@@ -12,10 +30,11 @@ class XGUI_Workshop;
 class QAction;
 class QContextMenuEvent;
 class QMenu;
+class QActionGroup;
 
 /**
  * \ingroup GUI
- * A claas wihich provides manement of context menu
+ * A class wihich provides managent of context menu
  */
 class XGUI_EXPORT XGUI_ContextMenuMgr : public QObject
 {
@@ -33,6 +52,8 @@ Q_OBJECT
   /// \param theId an id of an action
   QAction* action(const QString& theId) const;
 
+  /// Returns action object by its Id (name)
+  /// \param theName is an Id of the action
   QAction* actionByName(const QString& theName) const;
 
   /// Returns list of registered actions Ids
@@ -42,14 +63,27 @@ Q_OBJECT
   void updateCommandsStatus();
 
   /// Connect to object browser from workshop. Has to called at creation of viewer.
-  void connectObjectBrowser() const;
+  void connectObjectBrowser();
 
   /// Connect to viewer from workshop. Has to called at creation of viewer.
-  void connectViewer() const;
+  void connectViewer();
 
-  /// Add menu atems for viewer into the given menu (used in SALOME mode)
-  /// \param theMenu a popup menu to be shown in the viewer
-  void addViewerItems(QMenu* theMenu) const;
+  /// Add menu items for Object browser pop-up
+  void addObjBrowserMenu(QMenu*) const;
+
+  /// Add menu items for Viewer pop-up
+  void addViewerMenu(QMenu*) const;
+
+  /// Returns a list of object group names of the action
+  /// \param theName a name of the action
+  /// \return a list of group names
+  QStringList actionObjectGroups(const QString& theName);
+
+  /// Updates menu for object browser
+  void updateObjectBrowserMenu();
+
+  /// Updates menu for viewer
+  void updateViewerMenu();
 
 signals:
   /// Signal aabout triggered action
@@ -57,7 +91,10 @@ signals:
   /// \param isChecked is checked flag
   void actionTriggered(const QString& theId, bool isChecked);
 
+  /// A signal which is sent before context menu show
   void beforeContextMenu();
+
+  /// A signal which is sent after context menu show
   void afterContextMenu();
 
  private slots:
@@ -69,6 +106,14 @@ signals:
   /// \param theEvent a context menu event
   void onContextMenuRequest(QContextMenuEvent* theEvent);
 
+  void onRename();
+
+  /// Slot called on Result selection menu press
+  void onResultSelection(bool theChecked);
+
+  /// Slot called on any shape selection menu press
+  void onShapeSelection(bool theChecked);
+
  private:
   /** 
    * Add action
@@ -77,17 +122,29 @@ signals:
    */
   void addAction(const QString& theId, QAction* theAction);
 
+  void addFeatures(QMenu* theMenu) const;
+
   /// Creates menu for object browser
-  QMenu* objectBrowserMenu() const;
+  void buildObjBrowserMenu();
 
   /// Creates menu for viewer
-  QMenu* viewerMenu() const;
+  void buildViewerMenu();
 
   /// Map of created actions [id : Action]
   QMap<QString, QAction*> myActions;
 
   /// Reference to workshop
   XGUI_Workshop* myWorkshop;
+
+  typedef QList<QAction*> QActionsList;
+  QMap<std::string, QActionsList> myObjBrowserMenus;
+  QMap<std::string, QActionsList> myViewerMenu;
+
+  //QActionGroup* mySelectActions;
+
+  QAction* mySeparator1;
+  QAction* mySeparator2;
+  QAction* mySeparator3;
 };
 
 #endif