Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

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

diff --git a/src/XGUI/XGUI_OperationMgr.h b/src/XGUI/XGUI_OperationMgr.h
index 04505fed023b8cd29576f60dae71a8e308734a81..eb0e7541a753675a929521bc09d0342576d81937 100644 (file)
--- a/src/XGUI/XGUI_OperationMgr.h
+++ b/src/XGUI/XGUI_OperationMgr.h
@@ -50,6 +50,9 @@ Q_OBJECT
   /// Returns true is operation manager has an operation with given Id.
   bool hasOperation(const QString& theId) const;
 
+  /// Returns true if the operation can be aborted
+  bool canStopOperation();
+
   /// Find and return operation by its Id.
   ModuleBase_Operation* findOperation(const QString& theId) const;
 
@@ -71,9 +74,6 @@ Q_OBJECT
   /// \return the state whether the current operation is started
   bool startOperation(ModuleBase_Operation* theOperation);
 
-  /// Abort all operations
-  bool abortAllOperations();
-
   /// Returns whether the operation can be started. Check if there is already started operation and
   /// the granted parameter of the launched operation
   /// \param theId id of the operation which is going to start
@@ -101,6 +101,10 @@ Q_OBJECT
   void onAbortOperation();
   /// Slot that validates the current operation using the validateOperation method.
   void onValidateOperation();
+  /// Commit all operations
+  bool commitAllOperations();
+  /// Abort all operations
+  bool abortAllOperations();
 
 signals:
   /// Signal about an operation is started. It is emitted after the start() of operation is done.
@@ -120,7 +124,10 @@ signals:
   void operationAborted(ModuleBase_Operation* theOperation);
 
   /// Signal is emitted after the apply enable state changed.
-  void applyEnableChanged(bool);
+  void validationStateChanged(bool);
+
+  /// Signal is emitted after the apply enable state changed.
+  void nestedStateChanged(bool);
 
   /// Signal is emitted after the current operation is filled with existing preselection.
   void operationActivatedByPreselection();
@@ -128,11 +135,7 @@ signals:
   /// Signal is emitted after the key released click.
   void keyEnterReleased();
 
-
  protected:
-  /// Returns true if the operation can be aborted
-  bool canStopOperation();
-
   /// Commits the current operatin if it is valid
   bool commitOperation();