Issue #2063 crash during trim: it was corrected with #2065 issue, TestTrimLine02...

[modules/shaper.git] / src / ModuleBase / ModuleBase_ActionInfo.cpp

diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp
index 9089ecaf020b43c4a38f5b63556d4379530786a9..0d4a3a974bb731e916dd6e3369cb09ba8c1f7c32 100644 (file)
--- a/src/ModuleBase/ModuleBase_ActionInfo.cpp
+++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp
@@ -1,3 +1,4 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 /*
  * ModuleBase_ActionInfo.cpp
  *
@@ -6,6 +7,8 @@
  */
 
 #include <ModuleBase_ActionInfo.h>
+#include <ModuleBase_IconFactory.h>
+#include <ModuleBase_Tools.h>
 
 ModuleBase_ActionInfo::ModuleBase_ActionInfo()
 {
@@ -53,34 +56,18 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr<Config_FeatureMessage> theM
   id = QString::fromStdString(theMessage->id());
   iconFile = QString::fromStdString(theMessage->icon());
   if (!iconFile.isEmpty()) {
-    icon = QIcon(iconFile);
+    icon = ModuleBase_IconFactory::loadIcon(iconFile);
   }
-  text = QString::fromStdString(theMessage->text());
-  toolTip = QString::fromStdString(theMessage->tooltip());
+  text = QString::fromUtf8(theMessage->text().c_str());
+  toolTip = QString::fromUtf8(theMessage->tooltip().c_str());
   QString aShortcutStr = QString::fromStdString(theMessage->keysequence());
   if (!aShortcutStr.isEmpty()) {
     shortcut = QKeySequence(aShortcutStr);
   }
   // If feature requires PropertyPannel for input, it should be checkable
   checkable = theMessage->isUseInput();
-}
-
-QAction* ModuleBase_ActionInfo::makeAction(QObject* theParent)
-{
-  QAction* aResult = new QAction(icon, text, theParent);
-  aResult->setCheckable(checkable);
-  aResult->setChecked(checked);
-  aResult->setEnabled(enabled);
-  aResult->setVisible(visible);
-  aResult->setIconText(iconText);
-  aResult->setToolTip(toolTip);
-  // aResult->setStatusTip(statusTip);
-  // aResult->setWhatsThis(whatsThis);
-  aResult->setShortcut(shortcut);
-  aResult->setFont(font);
-  // By convenience, QAction for a feature keeps feature's id as data (QVariant);
-  aResult->setData(id);
-  return aResult;
+  // If Feature requires modal Dialog box for input
+  modal = theMessage->isModal();
 }
 
 void ModuleBase_ActionInfo::initDefault()