Issue #18755 (Tuleap): Do not process key events if a modal window is displayed

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

diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp
index 02d718b3af5204ba15e818a1358aa33ffcab59d6..0df32aa366746b7a4d24e28f61e87ddd7c5b57ff 100644 (file)
--- 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-2019  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,18 +12,11 @@
 //
 // 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-/*
- * ModuleBase_ActionInfo.cpp
- *
- *  Created on: Feb 4, 2015
- *      Author: sbh
- */
-
 #include <ModuleBase_ActionInfo.h>
 #include <ModuleBase_IconFactory.h>
 #include <ModuleBase_Tools.h>
@@ -78,6 +71,7 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr<Config_FeatureMessage> 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);