1. ExtrusionCut: Apply Sketch button(in tool bar) should be applyed only to the sketc...

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 0f01b6230aeed45618294de77543c9c292b5389f..875b58e63aee23d1720d86cb80b7bdf57f0c7f52 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -660,18 +660,7 @@ void XGUI_Workshop::onUndo(int theTimes)
     aMgr->undo();
   }
   updateCompositeActionState();
-}
-
-//******************************************************
-void XGUI_Workshop::updateCompositeActionState()
-{
-  // in order to apply is enabled only if there are modifications in the model
-  // e.g. sketch can be applyed only if at least one nested element create is finished
-  bool aCanUndo = ModelAPI_Session::get()->canUndo();
-  bool aParentValid = operationMgr()->isParentOperationValid();
-
-  QAction* aAcceptAllAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll);
-  aAcceptAllAct->setEnabled(aParentValid && aCanUndo);
+  updateCommandStatus();
 }
 
 //******************************************************
@@ -690,6 +679,7 @@ void XGUI_Workshop::onRedo(int theTimes)
   for (int i = 0; i < theTimes; ++i) {
     aMgr->redo();
   }
+  updateCompositeActionState();
   updateCommandStatus();
 
   // unblock the viewer update functionality and make update on purpose
@@ -852,6 +842,18 @@ void XGUI_Workshop::updateCommandStatus()
   emit commandStatusUpdated();
 }
 
+//******************************************************
+void XGUI_Workshop::updateCompositeActionState()
+{
+  // in order to apply is enabled only if there are modifications in the model
+  // e.g. sketch can be applyed only if at least one nested element create is finished
+  bool aCanUndo = ModelAPI_Session::get()->canUndo();
+  bool aParentValid = operationMgr()->isParentOperationValid();
+
+  QAction* aAcceptAllAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll);
+  aAcceptAllAct->setEnabled(aParentValid && aCanUndo);
+}
+
 void XGUI_Workshop::updateHistory()
 {
   std::list<std::string> aUndoList = ModelAPI_Session::get()->undoList();

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index cb7a51dca2cad2d5eb41917c0819ada5b019b070..92be69c9d8c708ac15f9530581e804959510db68 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -252,6 +252,10 @@ signals:
    /// Update of commands status
   void updateCommandStatus();
 
+  // Update enable state of accept all button. It is enabled if the the parent operation is
+  // valid and there are modifications in sesstion(undo can be performed).
+  void updateCompositeActionState();
+
   /// update history list (undo/redo commands)
   void updateHistory();
 
@@ -279,10 +283,6 @@ signals:
   /// Rebuild data tree
   void onRebuild();
 
-  // Update enable state of accept all button. It is enabled if the the parent operation is
-  // valid and there are modifications in sesstion(undo can be performed).
-  void updateCompositeActionState();
-
   /// Open preferences dialog box
   void onPreferences();