X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ActionInfo.cpp;h=eb51b8758e7e3af5ba697523554d3a8ef4b1eb30;hb=374a366d81778aa27ed32cc080c0f95bdb03f1c5;hp=427b7d93e312eb4e0c8c50569ce585e348411f29;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp index 427b7d93e..eb51b8758 100644 --- a/src/ModuleBase/ModuleBase_ActionInfo.cpp +++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -30,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) @@ -72,6 +72,7 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr theM } 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);