Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt branch: Add application icon. Closes ticket:2465

master
Per Inge Mathisen 2011-01-29 20:22:43 +01:00
parent d025ff4c95
commit e86b70ade1
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/base/images/warzone2100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

21
lib/framework/wzapp.cpp
View File

@ -28,6 +28,7 @@
#include <QtGui/QMouseEvent>
#include <QtGui/QDesktopWidget>
#include <QtGui/QMessageBox>
#include <QtGui/QIcon>
// Get platform defines before checking for them.
// Qt headers MUST come before platform specific stuff!
@ -151,10 +152,24 @@ WzMainWindow::WzMainWindow(const QGLFormat &format, QWidget *parent) : QGLWidget
setAutoBufferSwap(false);
setMouseTracking(true);
UDWORD size = 0;
char *bytes = NULL;
if (!loadFile("images/warzone2100.png", &bytes, &size))
{
debug(LOG_ERROR, "Icon file not found!");
abort();
}
setWindowIcon(QIcon(QPixmap::fromImage(QImage::fromData((uchar *)bytes, size, "PNG"))));
free(bytes);
bytes = NULL;
// Load coloured image cursors
UDWORD size;
char *bytes;
loadFile("images/intfac5.png", &bytes, &size);
if (!loadFile("images/intfac5.png", &bytes, &size))
{
debug(LOG_ERROR, "Cursor file not found!");
abort();
}
QByteArray array(bytes, size);
if ((unsigned)array.size() != size)
{