Changed: Use all existing icons for Ryzom

This commit is contained in:
kervala 2011-10-08 11:13:38 +02:00
parent 312fc3eb74
commit a634acc541

View file

@ -921,21 +921,33 @@ void prelogInit()
Driver->setWindowTitle(CI18N::get("TheSagaOfRyzom")); Driver->setWindowTitle(CI18N::get("TheSagaOfRyzom"));
#if defined(NL_OS_UNIX) && !defined(NL_OS_MAC) #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
// add all existing icons
vector<string> filenames;
filenames.push_back("/usr/share/icons/hicolor/128x128/apps/ryzom.png");
filenames.push_back("/usr/share/icons/hicolor/48x48/apps/ryzom.png");
filenames.push_back("/usr/share/icons/hicolor/32x32/apps/ryzom.png");
filenames.push_back("/usr/share/icons/hicolor/24x24/apps/ryzom.png");
filenames.push_back("/usr/share/icons/hicolor/22x22/apps/ryzom.png");
filenames.push_back("/usr/share/icons/hicolor/16x16/apps/ryzom.png");
filenames.push_back("/usr/share/pixmaps/ryzom.png");
// check if an icon is present in registered paths
if(CPath::exists("ryzom.png"))
filenames.push_back(CPath::lookup("ryzom.png"));
vector<CBitmap> bitmaps; vector<CBitmap> bitmaps;
string fileName = "/usr/share/pixmaps/ryzom.png"; for(size_t i = 0; i < filenames.size(); ++i)
{
if(CPath::exists("ryzom.png"))
fileName = CPath::lookup("ryzom.png");
CIFile file; CIFile file;
if (file.open(fileName)) if (CFile::fileExists(filenames[i]) && file.open(filenames[i]))
{ {
CBitmap bitmap; CBitmap bitmap;
if (bitmap.load(file)) if (bitmap.load(file))
bitmaps.push_back(bitmap); bitmaps.push_back(bitmap);
} }
}
Driver->setWindowIcon(bitmaps); Driver->setWindowIcon(bitmaps);
#endif #endif