Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon

Browse source
This commit is contained in:
dnk-88 2011-05-07 18:23:23 +03:00
parent a3d7d31bad
commit c4ce6dcdcc
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp
View file

@ -222,7 +222,7 @@ namespace NLQT
{ {
COFile file; COFile file;
std::string s = CPath::lookup(loadedForm.toStdString()); std::string s = CPath::lookup(loadedForm.toStdString(), false);
if (file.open (s)) if (file.open (s))
{ {
try try
@ -323,6 +323,8 @@ namespace NLQT
path, path,
"Images (*.png *.tga)" "Images (*.png *.tga)"
); );
if (file.isNull())
return;
QFileInfo info = QFileInfo(file); QFileInfo info = QFileInfo(file);
// TODO? // TODO?

13
code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp
View file

@ -184,10 +184,17 @@ namespace NLQT
if (Modules::objViewInt()) if (Modules::objViewInt())
{ {
QIcon *icon = Modules::objViewInt()->saveOneImage(value.toStdString()); QIcon *icon = Modules::objViewInt()->saveOneImage(value.toStdString());
if (icon->isNull()) if (icon)
return QIcon(":/images/pqrticles.png"); {
if(icon->isNull())
return QIcon(":/images/pqrticles.png");
else
return QIcon(*icon);
}
else else
return QIcon(*icon); {
return QIcon();
}
} }
} }
else if(value.contains(".tga") || value.contains(".png")) else if(value.contains(".tga") || value.contains(".png"))