[PATCH 2 of 2] (issue50) Add window icon and icon for 48x48px

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1409230206 -7200
# Node ID c80777457133776acde014dc0e051df4b1eb63fa
# Parent  c096881e8ed08e88893ec2fd5b6d3ac707a4a870
(issue50) Add window icon and icon for 48x48px

diff -r c096881e8ed0 -r c80777457133 ui/icons.qrc
--- a/ui/icons.qrc	Thu Aug 28 14:43:47 2014 +0200
+++ b/ui/icons.qrc	Thu Aug 28 14:50:06 2014 +0200
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file>img/tray_22.png</file>
+    <file>img/tray_48.png</file>
     <file>img/logo.png</file>
     <file>img/list-add.png</file>
     <file>img/list-remove.png</file>
diff -r c096881e8ed0 -r c80777457133 ui/img/tray_48.png
Binary file ui/img/tray_48.png has changed
diff -r c096881e8ed0 -r c80777457133 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Thu Aug 28 14:43:47 2014 +0200
+++ b/ui/mainwindow.cpp	Thu Aug 28 14:50:06 2014 +0200
@@ -468,6 +468,7 @@
 void MainWindow::createTrayIcon()
 {
     QIcon trayImg(":/img/tray_22.png");
+    trayImg.addFile(":/img/tray_48.png", QSize(48,48));
 
     mTrayMenu = new QMenu(this);
     mTrayMenu->addAction(mCheckUpdates);
diff -r c096881e8ed0 -r c80777457133 ui/trayicon.cpp
--- a/ui/trayicon.cpp	Thu Aug 28 14:43:47 2014 +0200
+++ b/ui/trayicon.cpp	Thu Aug 28 14:50:06 2014 +0200
@@ -49,7 +49,8 @@
         connect(mMessageBox->button(QMessageBox::Ok), SIGNAL(clicked()), this, SIGNAL(messageClicked()));
         connect(mMessageBox, SIGNAL(destroyed()), this, SLOT(messageDestroyed()));
     }
-    mMessageBox->setIconPixmap (icon().pixmap(mMessageBox->iconPixmap().size()));
+    mMessageBox->setIconPixmap(icon().pixmap(mMessageBox->iconPixmap().size()));
+    mMessageBox->setWindowIcon(icon());
     mMessageBox->button(QMessageBox::Ok)->setText (tr("Install update"));
     mMessageBox->button(QMessageBox::No)->setText (tr("Remind me later"));
     mMessageBox->show();