X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ActionsMgr.cpp;h=2c2b87f4c8d7df3b455baf1f843369b8c135c28c;hb=227323fca46747847e850a1d6e3bdaac882e209e;hp=510c56c33d90bc991813dfaada5b92b7c0ceb787;hpb=dc0cabde0516396f5f4458574d1d56c857478200;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 510c56c33..2c2b87f4c 100644
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -1,4 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2019  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
+//
 
 #ifndef HAVE_SALOME
 #include <AppElements_Command.h>
@@ -101,20 +118,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);
@@ -234,26 +251,28 @@ QAction* XGUI_ActionsMgr::operationStateAction(OperationStateActionId theId)
       case Accept:
       case AcceptAll: {
         aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_ok.png"),
-                            "Apply" /*empty to show error*/, aParent);
+                            tr("Apply"), aParent);
+      }
+      break;
+      case AcceptPlus: {
+        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_ok-plus.png"),
+                            tr("Apply and continue"), aParent);
       }
       break;
       case Abort:
       case AbortAll: {
-        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_cancel.png"), "Cancel",
+        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_cancel.png"), tr("Cancel"),
                                                  aParent);
-        if (theId == Abort) {
-          aResult->setShortcut(QKeySequence(Qt::Key_Escape));
-        }
       }
       break;
       case Help: {
-        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_help.png"), "Help",
+        aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_help.png"), tr("Help"),
                                                  aParent);
       }
       break;
       case Preview: {
-        aResult = ModuleBase_Tools::createAction(QIcon(), tr("See preview"), 
-                                                 aParent, 0, 0, "Compute preview");
+        aResult = ModuleBase_Tools::createAction(QIcon(), tr("See preview"),
+                                                 aParent, 0, 0, tr("Compute preview"));
         aResult->setStatusTip(aResult->toolTip());
       }
       break;
@@ -315,7 +334,7 @@ void XGUI_ActionsMgr::setNestedCommandsEnabled(bool theEnabled, const QString& t
 
 void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
 {
-  ModuleBase_OperationFeature* anOperation = 
+  ModuleBase_OperationFeature* anOperation =
     dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if(!anOperation || !anOperation->feature())
     return;
@@ -330,7 +349,7 @@ void XGUI_ActionsMgr::setNestedStackEnabled(ModuleBase_Operation* theOperation)
 QStringList XGUI_ActionsMgr::allNestedCommands(ModuleBase_Operation* theOperation)
 {
   QStringList aFeatures;
-  ModuleBase_OperationFeature* anOperation = 
+  ModuleBase_OperationFeature* anOperation =
     dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if(!anOperation || !anOperation->feature())
     return aFeatures;