Merge branch 'master' of newgeom:newgeom.git

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

diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h
index f6e89cf17fe5da5f3639a29771eaff0a0fc2f7df..48bb6e10f7515f81768dc034740762af94b3d2e5 100644 (file)
--- a/src/XGUI/XGUI_SalomeConnector.h
+++ b/src/XGUI/XGUI_SalomeConnector.h
@@ -3,11 +3,11 @@
 
 #include "XGUI.h"
 
-#include <AIS_InteractiveContext.hxx>
 #include <QString>
 #include <QStringList>
 
 class QMainWindow;
+class XGUI_SalomeViewer;
 
 /**
 * An interface which provides a connection of XGUI functionality 
@@ -23,18 +23,15 @@ public:
   //! \param theTip - a tooltip string (help)
   //! \param theIcon - icon
   //! \param isCheckable - is checkable or not
-  //! \param reciever - QObject which will react on the command call
-  //! \param member - a method of receiver which will be called on the command
   //! \param theKeys - hot keys
-  virtual void addFeature(const QString& theWBName,
-                          const QString& theId, 
-                          const QString& theTitle, 
-                          const QString& theTip,
-                          const QIcon& theIcon, 
-                          bool isCheckable,
-                          QObject* reciever,
-                          const char* member,
-                          const QKeySequence& theKeys) = 0;
+  //! returns created action
+  virtual QAction* addFeature(const QString& theWBName,
+                              const QString& theId, 
+                              const QString& theTitle, 
+                              const QString& theTip,
+                              const QIcon& theIcon, 
+                              const QKeySequence& theKeys,
+                              bool isCheckable) = 0;
 
   //! Creates a command in Edit menu of SALOME desktop
   //! \param theId - an id of the feature
@@ -42,17 +39,14 @@ public:
   //! \param theTip - a tooltip string (help)
   //! \param theIcon - icon
   //! \param isCheckable - is checkable or not
-  //! \param reciever - QObject which will react on the command call
-  //! \param member - a method of receiver which will be called on the command
   //! \param theKeys - hot keys
-  virtual void addEditCommand(const QString& theId,
-                              const QString& theTitle,
-                              const QString& theTip,
-                              const QIcon& theIcon, 
-                              bool isCheckable,
-                              QObject* reciever,
-                              const char* member,
-                              const QKeySequence& theKeys) = 0;
+  //! returns created action
+  virtual QAction* addEditCommand(const QString& theId,
+                                  const QString& theTitle,
+                                  const QString& theTip,
+                                  const QIcon& theIcon, 
+                                  const QKeySequence& theKeys,
+                                  bool isCheckable) = 0;
 
   //! Insert separator into Edit menu of SALOME desktop
   virtual void addEditMenuSeparator() = 0;
@@ -66,6 +60,12 @@ public:
   //! Returns QAction instance by command string Id
   virtual QAction* command(const QString& theId) const = 0;
 
+  //! Returns list of defined actions (just by NewGeom module)
+  virtual QList<QAction*> commandList() const = 0;
+
+  //! Returns list of Ids of defined actions (just by NewGeom module)
+  virtual QStringList commandIdList() const = 0;
+
   //! Set nested actions dependent on command Id
   //! \param theId - the command ID
   //! \param theActions - the list of nested actions
@@ -73,9 +73,9 @@ public:
 
   //! Returns list of nested actions according to the given command ID
   virtual QStringList nestedActions(const QString& theId) const = 0;
-  
-  //! Returns AIS_InteractiveContext from current OCCViewer
-  virtual Handle(AIS_InteractiveContext) AISContext() const = 0;
+
+  //! Returns interface to Salome viewer
+  virtual XGUI_SalomeViewer* viewer() const = 0;
 };
 
 #endif
\ No newline at end of file