Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/XGUI/XGUI_Command.h b/src/XGUI/XGUI_Command.h
index 380b64ae4b8ce90eb1761995cc724d67dc5f81ca..4247a7ca4b8be681ee54c0649bd5aea6f4cbdadd 100644 (file)
--- a/src/XGUI/XGUI_Command.h
+++ b/src/XGUI/XGUI_Command.h
@@ -4,8 +4,8 @@
 #include "XGUI.h"
 #include <QWidgetAction>
 
-#define MIN_BUTTON_HEIGHT 18
-#define MIN_BUTTON_WIDTH 40
+#define MIN_BUTTON_HEIGHT 25
+#define MIN_BUTTON_WIDTH 60
 
 /**\class XGUI_Command
  * \ingroup GUI
@@ -19,23 +19,14 @@ public:
   XGUI_Command(const QString& theId, const QIcon& icon, const QString& text, QObject* parent, bool isCheckable = false);
   ~XGUI_Command();
 
-  //! Returns true if the command is enabled
-  virtual bool enabled() const;
-
-  //! Set the command enabled
-  virtual void enable();
-
-  //! Set the command disabled
-  virtual void disable();
-
-  //! Returns Id of the command
-  virtual QString id() const
+  //VSV: Don't use this method for compatibility with SALOME. Use the construction below
+  /*virtual QString id() const
   {
-    return myId;
-  }
+    return data().toString();
+  }*/
 
-  const QStringList& unblockableCommands() const;
-  void setUnblockableCommands(const QStringList& myUnblockableCommands);
+  const QStringList& nestedCommands() const;
+  void setNestedCommands(const QStringList& myUnblockableCommands);
 
   //! Connect the command to a slot
   virtual void connectTo(const QObject* theResiver, const char* theSlot);
@@ -45,10 +36,9 @@ protected:
   virtual QWidget* createWidget(QWidget* theParent);
 
 private:
-  QString myId;
   bool myCheckable;
   //! List of Ids of commands which WILL NOT be blocked when the command is on.
-  QStringList myUnblockableCommands;
+  QStringList myNestedCommands;
 };
 
 #endif