-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2020 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>
#include <XGUI_SelectionMgr.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Events.h>
#include <ModuleBase_Operation.h>
#include <ModuleBase_OperationFeature.h>
#include <ModuleBase_SelectionValidator.h>
+#include <ModuleBase_Tools.h>
#include <QAction>
+#include <QMainWindow>
#ifdef _DEBUG
#include <iostream>
myActions.insert(aId, theCmd);
#ifdef HAVE_SALOME
XGUI_Workshop* aWorkshop = static_cast<XGUI_Workshop*>(parent());
- myNestedActions[aId] = aWorkshop->salomeConnector()->nestedActions(aId);
+ const std::shared_ptr<Config_FeatureMessage>& anInfo =
+ aWorkshop->salomeConnector()->featureInfo(aId);
+ if (anInfo.get())
+ myNestedActions[aId] = QString::fromStdString(anInfo->nestedFeatures())
+ .split(" ", QString::SkipEmptyParts);
#else
AppElements_Command* aXCmd = dynamic_cast<AppElements_Command*>(theCmd);
myNestedActions[aId] = aXCmd->nestedCommands();
void XGUI_ActionsMgr::updateCommandsStatus()
{
- setAllEnabled(true);
+ 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);
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));
}
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);
}
}
-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 = new QAction(QIcon(":pictures/button_ok.png"), "", theParent);
- aResult->setToolTip("Apply");
+ aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_ok.png"),
+ 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 = new QAction(QIcon(":pictures/button_cancel.png"), "", theParent);
- aResult->setToolTip("Cancel");
- if (theId == Abort) {
- aResult->setShortcut(QKeySequence(Qt::Key_Escape));
- }
+ aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_cancel.png"), tr("Cancel"),
+ aParent);
}
break;
case Help: {
- aResult = new QAction(QIcon(":pictures/button_help.png"), "", theParent);
- aResult->setToolTip("Help");
+ aResult = ModuleBase_Tools::createAction(QIcon(":pictures/button_help.png"), tr("Help"),
+ aParent);
}
break;
case Preview: {
- aResult = new QAction("See the preview", theParent);
- aResult->setToolTip("Compute preview");
+ aResult = ModuleBase_Tools::createAction(QIcon(), tr("See preview"),
+ aParent, 0, 0, tr("Compute preview"));
+ aResult->setStatusTip(aResult->toolTip());
}
break;
default:
return aResult;
}
-void XGUI_ActionsMgr::setAllEnabled(bool isEnabled)
+void XGUI_ActionsMgr::setAllEnabled()
{
foreach(QString eachAction, myActions.keys()) {
- setActionEnabled(eachAction, isEnabled);
+ if (myActions.contains(eachAction)) {
+ QAction* aAction = myActions[eachAction];
+ aAction->setEnabled(true);
+ }
}
}
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();
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();
#ifdef HAVE_SALOME
QString aId = eachAction->data().toString();
if (!aId.isEmpty()) {
- aCmdDocKind = aWorkshop->salomeConnector()->documentKind(aId);
+ aCmdDocKind = QString::fromStdString(
+ aWorkshop->salomeConnector()->featureInfo(aId)->documentKind());
}
#else
AppElements_Command* aCmd = dynamic_cast<AppElements_Command*>(eachAction);
- aCmdDocKind = aCmd->documentKind();
+ aCmdDocKind = QString::fromStdString(aCmd->featureMessage()->documentKind());
#endif
if(!aCmdDocKind.isEmpty() && aCmdDocKind != aDocKind) {
eachAction->setEnabled(false);
