suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ return 0 for empty icon names of Python commands

Browse Source
This commit is contained in:
wmayer 2015-06-27 19:24:11 +02:00
parent 882ecd3ce3
commit eaa5b15291
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/Command.cpp
View File

@ -937,7 +937,8 @@ const char* PythonCommand::getStatusTip() const
const char* PythonCommand::getPixmap() const
{
return getResource("Pixmap");
const char* ret = getResource("Pixmap");
return (ret && ret[0] != '\0') ? ret : 0;
}
const char* PythonCommand::getAccel() const
@ -1086,6 +1087,9 @@ Action * PythonGroupCommand::createAction(void)
}
else {
QList<QAction*> a = pcAction->actions();
// if out of range then set to 0
if (defaultId < 0 || defaultId >= a.size())
defaultId = 0;
if (a.size() > defaultId)
pcAction->setIcon(a[defaultId]->icon());
}
@ -1169,7 +1173,8 @@ const char* PythonGroupCommand::getStatusTip() const
const char* PythonGroupCommand::getPixmap() const
{
return getResource("Pixmap");
const char* ret = getResource("Pixmap");
return (ret && ret[0] != '\0') ? ret : 0;
}
const char* PythonGroupCommand::getAccel() const