Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Translation of sketch operations
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetChoice.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetChoice.cpp
b/src/ModuleBase/ModuleBase_WidgetChoice.cpp
index e35f3c2128ca4cd19e6c6b2f65a10f8632e14335..5797e7cc8de201b0882d34a9a37610fe44bdf8cd 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetChoice.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetChoice.cpp
@@
-5,7
+5,8
@@
// Author: Vitaly Smetannikov
#include "ModuleBase_WidgetChoice.h"
// Author: Vitaly Smetannikov
#include "ModuleBase_WidgetChoice.h"
-#include <ModuleBase_Tools.h>
+#include "ModuleBase_Tools.h"
+#include "ModuleBase_IconFactory.h"
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_Data.h>
@@
-62,7
+63,7
@@
ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent,
aBtn->setCheckable(true);
aBtn->setToolTip(aBtnTxt);
aBtn->setCheckable(true);
aBtn->setToolTip(aBtnTxt);
- QPixmap aIcon(aIconList.at(aId));
+ QPixmap aIcon
= ModuleBase_IconFactory::loadPixmap
(aIconList.at(aId));
aBtn->setIcon(aIcon);
aBtn->setIconSize(aIcon.size());
aBtn->setIcon(aIcon);
aBtn->setIconSize(aIcon.size());
@@
-83,7
+84,7
@@
ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent,
} else {
myLabel = new QLabel(aLabelText, this);
if (!aLabelIcon.isEmpty())
} else {
myLabel = new QLabel(aLabelText, this);
if (!aLabelIcon.isEmpty())
- myLabel->setPixmap(
Q
Pixmap(aLabelIcon));
+ myLabel->setPixmap(
ModuleBase_IconFactory::load
Pixmap(aLabelIcon));
aLayout->addWidget(myLabel);
std::string aToolstr = theData->widgetTooltip();
aLayout->addWidget(myLabel);
std::string aToolstr = theData->widgetTooltip();