To help with windows build, embed pre-rendered versions of main icon.

ChangeLog

@@ -7,6 +7,7 @@
 3. Fix multiple downlod attempts when getting covers from HTTP.
 4. With KDE builds (4.7 or later), and Windows Qt builds, reconnect to MPD when
    system is resumed.
+5. To help with windows build, embed pre-rendered versions of main icon.
 
 0.8.2
 -----

cantata_qt.qrc

@@ -1,6 +1,11 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
 <file alias="cantata.svg">icons/cantata.svg</file>
+<file alias="cantata16.png">icons/cantata16.png</file>
+<file alias="cantata22.png">icons/cantata22.png</file>
+<file alias="cantata32.png">icons/cantata32.png</file>
+<file alias="cantata48.png">icons/cantata48.png</file>
+<file alias="cantata64.png">icons/cantata64.png</file>
 <file alias="consume16.png">icons/hi16-action-cantata-view-media-consume.png</file>
 <file alias="consume22.png">icons/hi22-action-cantata-view-media-consume.png</file>
 <file alias="repeat16.png">icons/hi16-action-cantata-view-media-repeat.png</file>

gui/mainwindow.cpp

@@ -385,7 +385,13 @@ MainWindow::MainWindow(QWidget *parent)
     MPDParseUtils::setGroupMultiple(Settings::self()->groupMultiple());
 
     #ifndef ENABLE_KDE_SUPPORT
-    setWindowIcon(QIcon(":/cantata.svg"));
+    appIcon=QIcon(":cantata.svg");
+    appIcon.addFile(":cantata16.png");
+    appIcon.addFile(":cantata22.png");
+    appIcon.addFile(":cantata32.png");
+    appIcon.addFile(":cantata48.png");
+    appIcon.addFile(":cantata64.png");
+    setWindowIcon(appIcon);
     QNetworkProxyFactory::setApplicationProxyFactory(NetworkProxyFactory::Instance());
     #endif
 
@@ -1038,7 +1044,7 @@ MainWindow::MainWindow(QWidget *parent)
 //     QMenu *menu=new QMenu(tr("Help"), this);
 //     QAction *menuAct=menu->addAction(tr("About Cantata..."), this, SLOT(showAboutDialog()));
     menuAct=mainMenu->addAction(tr("About Cantata..."), this, SLOT(showAboutDialog()));
-    menuAct->setIcon(windowIcon());
+    menuAct->setIcon(appIcon);
 //     mainMenu->addMenu(menu);
     #endif
     mainMenu->addSeparator();
@@ -2496,7 +2502,7 @@ void MainWindow::updateStatus()
             trayItem->setIconByName("cantata");
             trayItem->setToolTip("cantata", i18n("Cantata"), "<i>Playback stopped</i>");
             #else
-            trayItem->setIcon(windowIcon());
+            trayItem->setIcon(appIcon);
             #endif
         }
         #endif
@@ -2893,7 +2899,7 @@ void MainWindow::setupTrayIcon()
     trayItemMenu->addSeparator();
     trayItemMenu->addAction(quitAction);
     trayItem->setContextMenu(trayItemMenu);
-    trayItem->setIcon(windowIcon());
+    trayItem->setIcon(appIcon);
     trayItem->setToolTip(tr("Cantata"));
     trayItem->show();
     connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason)));

gui/mainwindow.h

@@ -396,6 +396,9 @@ private:
     bool autoScrollPlayQueue;
     QIcon playbackPause;
     QIcon playbackPlay;
+    #ifndef ENABLE_KDE_SUPPORT
+    QIcon appIcon;
+    #endif
     VolumeSliderEventHandler *volumeSliderEventHandler;
     VolumeControl *volumeControl;
     Action *prefAction;