bos #26805: regressions in tests

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

diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp
index d444524752d4f50aaa1bf68d7a6059945c588981..eb51b8758e7e3af5ba697523554d3a8ef4b1eb30 100644 (file)
--- a/src/ModuleBase/ModuleBase_ActionInfo.cpp
+++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp
@@ -1,13 +1,25 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-/*
- * ModuleBase_ActionInfo.cpp
- *
- *  Created on: Feb 4, 2015
- *      Author: sbh
- */
+// Copyright (C) 2014-2021  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);