Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon
This commit is contained in:
parent
1af3224bc9
commit
dc07038a82
2 changed files with 13 additions and 4 deletions
code/ryzom/tools/leveldesign/georges_editor_qt/src
|
@ -222,7 +222,7 @@ namespace NLQT
|
|||
{
|
||||
|
||||
COFile file;
|
||||
std::string s = CPath::lookup(loadedForm.toStdString());
|
||||
std::string s = CPath::lookup(loadedForm.toStdString(), false);
|
||||
if (file.open (s))
|
||||
{
|
||||
try
|
||||
|
@ -323,6 +323,8 @@ namespace NLQT
|
|||
path,
|
||||
"Images (*.png *.tga)"
|
||||
);
|
||||
if (file.isNull())
|
||||
return;
|
||||
QFileInfo info = QFileInfo(file);
|
||||
|
||||
// TODO?
|
||||
|
|
|
@ -184,10 +184,17 @@ namespace NLQT
|
|||
if (Modules::objViewInt())
|
||||
{
|
||||
QIcon *icon = Modules::objViewInt()->saveOneImage(value.toStdString());
|
||||
if (icon->isNull())
|
||||
return QIcon(":/images/pqrticles.png");
|
||||
if (icon)
|
||||
{
|
||||
if(icon->isNull())
|
||||
return QIcon(":/images/pqrticles.png");
|
||||
else
|
||||
return QIcon(*icon);
|
||||
}
|
||||
else
|
||||
return QIcon(*icon);
|
||||
{
|
||||
return QIcon();
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(value.contains(".tga") || value.contains(".png"))
|
||||
|
|
Loading…
Reference in a new issue