X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_ActionInfo.cpp;h=8a40f176a55bb75ea6ef84a73d21b6f8f0b5e6d2;hb=b8b95142d694359c9c4fbd2766f04815ad4aa4d6;hp=7966f3461b86b5ee28f88a46406507dbf4e35b3a;hpb=66d913fb8f4a0b7764fbb79a4139785db4b3b346;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp
index 7966f3461..8a40f176a 100644
--- a/src/ModuleBase/ModuleBase_ActionInfo.cpp
+++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp
@@ -1,13 +1,25 @@
-// TEMPORARY COMMIT
-/*
- * ModuleBase_ActionInfo.cpp
- *
- *  Created on: Feb 4, 2015
- *      Author: sbh
- */
+// 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
+//
 
 #include <ModuleBase_ActionInfo.h>
 #include <ModuleBase_IconFactory.h>
+#include <ModuleBase_Tools.h>
 
 ModuleBase_ActionInfo::ModuleBase_ActionInfo()
 {
@@ -17,6 +29,7 @@ ModuleBase_ActionInfo::ModuleBase_ActionInfo()
 ModuleBase_ActionInfo::ModuleBase_ActionInfo(const QString &theText)
 {
   initDefault();
+  text = theText;
 }
 
 ModuleBase_ActionInfo::ModuleBase_ActionInfo(const QIcon & theIcon, const QString &theText)
@@ -57,8 +70,9 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr<Config_FeatureMessage> theM
   if (!iconFile.isEmpty()) {
     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());
+  toolBar = QString::fromStdString(theMessage->toolBarId());
   QString aShortcutStr = QString::fromStdString(theMessage->keysequence());
   if (!aShortcutStr.isEmpty()) {
     shortcut = QKeySequence(aShortcutStr);
@@ -69,24 +83,6 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr<Config_FeatureMessage> theM
   modal = theMessage->isModal();
 }
 
-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;
-}
-
 void ModuleBase_ActionInfo::initDefault()
 {
   id = QString();