Issue #1005: To improve user-friendship of error-messages for features and attributes

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

diff --git a/src/ModuleBase/ModuleBase_WidgetAction.cpp b/src/ModuleBase/ModuleBase_WidgetAction.cpp
index 3d9c616ff29a36e9b52fa4bc2e0f1fc6b083c1c5..a5ddbbe9660e1a88905316cee155c71e50a7d362 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetAction.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetAction.cpp
@@ -6,6 +6,7 @@
 
 #include <ModuleBase_WidgetAction.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <Config_WidgetAPI.h>
 
@@ -17,25 +18,25 @@
 
 ModuleBase_WidgetAction::ModuleBase_WidgetAction(QWidget* theParent,
                                                  const Config_WidgetAPI* theData)
-: ModuleBase_ModelWidget(theParent, theData)
+: ModuleBase_ModelWidget(theParent, theData),
+  myActionID(attributeID())
 {
+  setAttributeID(""); // To prevent errors. Action not stored as attribtue in feature.
   QHBoxLayout* aControlLay = new QHBoxLayout(this);
   ModuleBase_Tools::adjustMargins(aControlLay);
 
-  myActionID = attributeID();
-  setAttributeID("");
-
-  QString aText = QString::fromStdString(theData->widgetLabel());
-  QString aToolTip = ModuleBase_Tools::wrapTextByWords(
-              QString::fromStdString(theData->widgetTooltip()), myButton, DEFAULT_TOOL_TIP_WIDTH);
-
   myButton = new QToolButton(this);
+  QString aText = translate(theData->widgetLabel());
+  QString aToolTip = ModuleBase_Tools::wrapTextByWords(translate(theData->widgetTooltip()),
+                                                       myButton,
+                                                       DEFAULT_TOOL_TIP_WIDTH);
+
   myButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
   aControlLay->addWidget(myButton);
 
   QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
   if (!aLabelIcon.isEmpty())
-    myButton->setIcon(QPixmap(aLabelIcon));
+    myButton->setIcon(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
   else
     myButton->setText(aText);
   myButton->setToolTip(aToolTip);
@@ -47,6 +48,11 @@ ModuleBase_WidgetAction::~ModuleBase_WidgetAction()
 {
 }
 
+bool ModuleBase_WidgetAction::focusTo()
+{
+  return false;
+}
+
 QList<QWidget*> ModuleBase_WidgetAction::getControls() const
 {
   QList<QWidget*> aList;