From abc80ebf47a0cbfb664769ecd2c7675cbf5c3603 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Tue, 7 Aug 2012 19:38:33 +0000
Subject: [PATCH] To help with windows build, embed pre-rendered versions of
 main icon.

---
 ChangeLog           |   1 +
 cantata_qt.qrc      |   5 +++++
 gui/mainwindow.cpp  |  14 ++++++++++----
 gui/mainwindow.h    |   3 +++
 icons/cantata16.png | Bin 0 -> 759 bytes
 icons/cantata22.png | Bin 0 -> 1150 bytes
 icons/cantata32.png | Bin 0 -> 1942 bytes
 icons/cantata48.png | Bin 0 -> 3117 bytes
 icons/cantata64.png | Bin 0 -> 4333 bytes
 9 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 icons/cantata16.png
 create mode 100644 icons/cantata22.png
 create mode 100644 icons/cantata32.png
 create mode 100644 icons/cantata48.png
 create mode 100644 icons/cantata64.png

diff --git a/ChangeLog b/ChangeLog
index 4ba5adc10..64977086e 100644
--- a/ChangeLog
+++ b/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
 -----
diff --git a/cantata_qt.qrc b/cantata_qt.qrc
index 86aaf8468..f46473d72 100644
--- a/cantata_qt.qrc
+++ b/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>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 10c8279af..ec4d277d3 100644
--- a/gui/mainwindow.cpp
+++ b/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)));
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 05da5443f..39b8862f8 100644
--- a/gui/mainwindow.h
+++ b/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;
diff --git a/icons/cantata16.png b/icons/cantata16.png
new file mode 100644
index 0000000000000000000000000000000000000000..158d1100561dc9c6cde4f4dda060849a2d992186
GIT binary patch
literal 759
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*T=3*z$5DpHG+YkL8FfcH1
z7I;J!GcYjj24P04H;*4NFfd4#xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk
z#lXNA6W|l#`v3ob1_p-z|Nn=FhZhwUwY9Z{g@r{#M3k16*45R;#Kh#}<b;NXMn^~I
z=H|Avv;+qS$HvB{q@*-7G=zqRR#a331qH>%#wH{r)YsPs1qFqMhUVntR8>_mICrtS
z^{{*N3iwYH37jkzJVi2es#44>&BVF-sq+oe7no%)wkufXRJ_8eWQAM#Dt~|ffPjF&
z`t>0pA<@y%vF%&qI<_QqZA(l{Ozhs4l$4a*vpp>>Ej>LwCnqN_FE4M(p8Wj$f+>57
zii(P+?<+1YE-5J~nR%eJw6v_Oth~Iua?YWed57!j>e}1edsZIr>+74i?#!e~lcsGv
zw_xYxMZ2!-Irreu#fOJ4+&gyc*ohM-&Ye4V;lhQBx1QX8{^8-nhmW4UeEj(FvuDqq
zKY#x6_1jmkUcG+(`u+R&??3<e@a4y+PoKVg`SR`Cx9{J-fB*UW$B!RBfByXS>(}q!
zzyJLC^Y`!H|NsB{wrn(EU|^6d3GxeOU}RKNQ!6YiENp0KY;0`Yx^?T;ZQGtdfByX2
zw{PE;%&gU6U|@Lc>Eak7A<25s+W)YD2-}78-?k>JJFe)uY9zub#>OUKy??)S508%x
z%POaUkcrdd4WAn@Oi<PQVZqA4^PqLFppfF;vOLyC)9q=CUHkf`P1oaou{$k1v(_e$
zca>Surq-)&olhS>IJZ<a?p^t+1c&H2yUlO+Jx~!bWSF<Ec)iQPsf^4F`t_5=+yea?
ze&_U>f7@ue)ThqpVde+B>!r5KF9!42{m~WF*vKY7$D?O{tk23F`=g%!{QKHv<>tT7
z9KFsYzHHayTvI4p`YCVby}Etu1`VFsD-TKR)=M#95NH#rnIqg#|9?@g4~NRj1O^5M
N22WQ%mvv4FO#p%!X2t*j

literal 0
HcmV?d00001

diff --git a/icons/cantata22.png b/icons/cantata22.png
new file mode 100644
index 0000000000000000000000000000000000000000..b862c7bf1933013db83684c50ce0ea69facc119f
GIT binary patch
literal 1150
zcmeAS@N?(olHy`uVBq!ia0y~yU=Rag4rT@hhR<1ZI2jlin2Vh}LpV4%Za?&Yz`(%3
zS>O>_%)r2u2*Qj94MKl0Ffd4#xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk
z#lXNMAK(+>`v3p`=;-L&+}wtShN!5hii(QR(9oEen7q8a=;-L2oSfFy*08X!$jHdz
z;^KyehOn@(xVX5itgP7B*v!n#wzjtL@bI#-vYMKj(9qDt#Kg3;G>DeU%1VexQc_ZK
za&k&aN^5ItXlQ6;WMp1mUSne;gL4<7OBa(%H?wOut6LAdM=zi61b)8>0{#;P{U-?p
zOcD;9EEYUPI()iJ#B|y4>9P^im11UTCeGDOnWvvR-#BxjdCp?1yrnkz%bZJAx|gr^
z^z`)d^75)$<KyGw>+9?9?;jKt6x6UjBqSs>G&HnveQ4vxu&}U*h={1DsHoP>@$vBq
zom&zU6O+2PLtL2NzcV8vBcp#uW@ctyUS8gmJ^A_h1qB6#)Akik-&a&rR9swKUS3{R
zRaH|{Q(s@-(9qDd_*m<bqit<%?d|Oy%TIK6cJ}x8Pn<Y$(xge#r%#{0>HLcQ*H`Yp
zzUI))4I4IWIC5*_#*LdcZQ6A7#^%kNw;aE{b?eq`+qP}rzJ1r3`+Lvc-Fxog(aVod
zUVnD#`r~sq9-qJQ=+dQ2moHzwa{u+Uhi|T5zkc)P&6|(kK6vop;nP=-9zA;e>eJJw
zPoF=3{^G@p7q8yDeEIU_`>(HFy?Xun_3L*Z-@JMA=Hs__pT56;|Ng^=4<A2%{QUXz
zmoHzweE;?J>({T}e}4P+?fdudKYsl9`Sa(mU%!6;{{068{{H>@_us#N|NsBrddJg*
zfq_A@B*-tAfsc<*P|(A}!_(6<ARr*1wzjseu5QVaB^x(x-1zX}Q!se`{Q2{vf%P{S
z7#Qbxx;TbNNU|Q>oqySZ;lRWDKhK@tv#Ld7tw3*+!$U>G1*^Qp)owT>Jzf9iz#%4X
z=A5MtSJ@g_0(n+>X1=*$H~;P9-z*F#6h1L~&7IE6z|?T?-sEdiF%S22uV-X=&=>b&
z+vS%xb9R^hdAy&EWk<FD_Q{zKEZ43){dE4h**6pt|C~9KZk_l<|Gxk4y9PTq-%)yL
zfBxP3^4j}T#pC_m%%?`#{#m!wSoZxr?%Hs!!i^>SmTX>dD<#~o;6U#AV5SqF7Qejt
zI%7Wb`A(nxuQeGbME*4TvGLn)wW2?}!Xp_S!phfd4Ey@(!be|)4Gd4h_WC|I7M$U*
zRjgrhsNt!P^1gj0H^M?iw(0dvzEyMT<MPkjwy{QKPQ7;a=c!q~%`#4xudLJx(GyyG
zH+$-KgO?Yj)(THNz3ip&j1%+Oj;*iC4PA17(r53~$L!sW#Xo+Oo6Su0+1V*R_lDQ1
zuWMCGt`?LBOt<n6pMSJnTjfQ~pVhp+p(3gCbp7UDJ}t($;$h<3dp9^W{;Rsx##~om
xc=7J;*4*ZjBTDBOSQt3WxolS{nTs|2_n&;~*{7KK9t;c&44$rjF6*2UngC|-PxJr)

literal 0
HcmV?d00001

diff --git a/icons/cantata32.png b/icons/cantata32.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9036c4ccee63f4850a8f01e8c31fbe0ab0bae64
GIT binary patch
literal 1942
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

literal 0
HcmV?d00001

diff --git a/icons/cantata48.png b/icons/cantata48.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d6744bba47fcd244f4cd0b3d59463254df4d6e
GIT binary patch
literal 3117
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
GLK6Urboev?

literal 0
HcmV?d00001

diff --git a/icons/cantata64.png b/icons/cantata64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1571ccaff17be4f688c251a7b862d0347c608af
GIT binary patch
literal 4333
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

literal 0
HcmV?d00001