X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ActionsMgr.cpp;h=0d7a57d33a3d337f815ac27dc47066eaf13d84ea;hb=b303db5dadecd329d1b9749110dd08ebff2294ab;hp=70a274c8e06d85b4842664f231b2aa50c2ccf92d;hpb=73502ac782ffc45a3acf665ded34f582b07ec4d5;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 70a274c8e..0d7a57d33 100644
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -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 HAVE_SALOME
 #include <AppElements_Command.h>
@@ -12,7 +30,7 @@
 #include <XGUI_SelectionMgr.h>
 
 #include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Events.h>
@@ -24,6 +42,7 @@
 
 
 #include <QAction>
+#include <QMainWindow>
 
 #ifdef _DEBUG
 #include <iostream>
@@ -100,20 +119,20 @@ void XGUI_ActionsMgr::updateCommandsStatus()
 {
   setAllEnabled();
   XGUI_Selection* aSelection = myWorkshop->selector()->selection();
-  if (aSelection->getSelected(ModuleBase_ISelection::Viewer).size() > 0)
+  if (aSelection->getSelected(ModuleBase_ISelection::AllControls).size() > 0)
     updateOnViewSelection();
 
   FeaturePtr anActiveFeature = FeaturePtr();
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
                                                          (myOperationMgr->currentOperation());
   if (aFOperation) {
-    anActiveFeature = aFOperation->feature();  
+    anActiveFeature = aFOperation->feature();
     QStringList aNested = allNestedCommands(aFOperation);
     foreach(QString aAction, myActions.keys()) {
       if (!aNested.contains(aAction))
         setActionEnabled(aAction, false);
     }
-  } else 
+  } else
     setNestedCommandsEnabled(false);
 
   updateByPlugins(anActiveFeature);
@@ -158,7 +177,8 @@ void XGUI_ActionsMgr::updateOnViewSelection()
       ModelAPI_ValidatorsFactory::Validators::iterator aValidatorIt = aValidators.begin();
       for (; aValidatorIt != aValidators.end(); ++aValidatorIt) {
         const ModuleBase_SelectionValidator* aSelValidator =
-            dynamic_cast<const ModuleBase_SelectionValidator*>(aFactory->validator(aValidatorIt->first));
+            dynamic_cast<const ModuleBase_SelectionValidator*>
+            (aFactory->validator(aValidatorIt->first));
         if (aSelValidator)
           setActionEnabled(aId, aSelValidator->isValid(aSelection, theOperation));
       }
@@ -174,7 +194,7 @@ QKeySequence XGUI_ActionsMgr::registerShortcut(const QKeySequence& theKeySequenc
   if (myShortcuts.contains(theKeySequence)) {
     QString aMessage = tr("Shortcut %1 is already defined. Ignore.");
     aMessage = aMessage.arg(theKeySequence.toString());
-    Events_Error::send(aMessage.toStdString());
+    Events_InfoMessage("XGUI_ActionsMgr", aMessage.toStdString()).send();
     return QKeySequence();
   }
   myShortcuts.append(theKeySequence);
@@ -218,38 +238,42 @@ void XGUI_ActionsMgr::processEvent(const std::shared_ptr<Events_Message>& theMes
   }
 }
 
-QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId, QObject* theParent)
+QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId)
 {
   QAction* aResult = NULL;
   if (myOperationActions.contains(theId)) {
     aResult = myOperationActions.value(theId);
-    if (theParent && aResult->parent() != theParent) {
-      aResult->setParent(theParent);
-    }
+    //if (theParent && aResult->parent() != theParent) {
+    //  aResult->setParent(theParent);
+    //}
   } else {
+    QWidget* aParent = myWorkshop->desktop();
     switch (theId) {
       case Accept:
       case AcceptAll: {
         aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_ok.png"),
-                            "" /*empty to show error*/, theParent);
+                            "Apply" /*empty to show error*/, aParent);
+      }
+      break;
+      case AcceptPlus: {
+        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_ok-plus.png"),
+                            "Apply and continue" /*empty to show error*/, aParent);
       }
       break;
       case Abort:
       case AbortAll: {
         aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_cancel.png"), "Cancel",
-                                                 theParent);
-        if (theId == Abort) {
-          aResult->setShortcut(QKeySequence(Qt::Key_Escape));
-        }
+                                                 aParent);
       }
       break;
       case Help: {
         aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_help.png"), "Help",
-                                                 theParent);
+                                                 aParent);
       }
       break;
       case Preview: {
-        aResult = ModuleBase_Tools::createAction(QIcon(), tr("See preview"), theParent, 0, 0, "Compute preview");
+        aResult = ModuleBase_Tools::createAction(QIcon(), tr("See preview"),
+                                                 aParent, 0, 0, "Compute preview");
         aResult->setStatusTip(aResult->toolTip());
       }
       break;
@@ -311,7 +335,8 @@ void XGUI_ActionsMgr::setNestedCommandsEnabled(bool theEnabled, const QString& t
 
 void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
 {
-  ModuleBase_OperationFeature* anOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+  ModuleBase_OperationFeature* anOperation =
+    dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if(!anOperation || !anOperation->feature())
     return;
   FeaturePtr aFeature = anOperation->feature();
@@ -325,7 +350,8 @@ void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
 QStringList XGUI_ActionsMgr::allNestedCommands(ModuleBase_Operation* theOperation)
 {
   QStringList aFeatures;
-  ModuleBase_OperationFeature* anOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+  ModuleBase_OperationFeature* anOperation =
+    dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if(!anOperation || !anOperation->feature())
     return aFeatures;
   FeaturePtr aFeature = anOperation->feature();