From 76d0109dc847bdcc3d808783903c9b0cab2d945e Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Tue, 4 Sep 2012 22:22:50 -0700
Subject: [PATCH] win: Custom toolbar icons, refs #21

---
 dist/win/about.ico  | Bin 0 -> 2462 bytes
 dist/win/bundle.sh  |   1 +
 dist/win/open.ico   | Bin 0 -> 2462 bytes
 dist/win/save.ico   | Bin 0 -> 2462 bytes
 dist/win/spek.rc    |   3 +++
 src/spek-artwork.cc |  17 +++++++++++++----
 6 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 dist/win/about.ico
 create mode 100644 dist/win/open.ico
 create mode 100644 dist/win/save.ico

diff --git a/dist/win/about.ico b/dist/win/about.ico
new file mode 100644
index 0000000000000000000000000000000000000000..48f2c18867e2e5c0b768f2d34b94f5e9cf4adaa0
GIT binary patch
literal 2462
zcmd6odrXye7{?z30YxAnj98X)Oo*J}NV~V4TsdcJ`A4~0t;=jH=NwthT8p&OVdc6Q
z9u6G9F%6|`Rx2w_9VmGrJxvIem6R5Wp@3Wuob&DT0y!Hj9HXs=ea?H{-|xKN=lXjw
z3*j#*$@rXXIpfSGnpqmKWEtSB|IaLhc)}nOCO|C2Ln1igUkPy#1LGka#=zxRnB__K
z?%6$d>*KR|ARVSc3Z%lcfouPL)WqqwtTMarnfa>{*c;wYp=xZC0#*>{wAX7lTFPzr
z^4#q(6K;eI8#`{6Wo>`O-2O9G80hNL&&(Xl-tgvC?kzt_Pqau$JAz%7AGlyEkH2Nt
z&Pcb&$SL-6)w7n@b85oIVEY{hq&Wx4H_u;-uv4qy&8?@W?^VabcIhE}%snYx^+mA5
zJb_ko2U=oFgYC1bSU)P=eMFkM3;hq;K0?^(Ni;-2C=6|D&bpGf23r@jN@E(NG<djC
zns=O7(R=WOl+HD*Qp)&2n)<mqY|Z&4h(!St+&33a&xbaz;=>EoopnJ9`JLG6rO-Mw
ze?|`<VQAVusF3dQNmrMu#olSW3o$2VXZD6SuUZ!WDJ7gj2VJ8URt<-Nn%iF3Ej`Lw
zq*s0`lv9_>voeJ<4?QnZmvl#;*o}VMk3ik+dm#3ha_K2&&6(%ra?Z=}R;)<#YUd*d
z)m7RiCI8B^PVCg%4#6d{NAHxD)=E>##Ej`n^XT8_vqVwkx$jAzy0>*oFEo)qIV3vz
zm&Q)q_8ojf?YB#d*}Gv2J<iux=Hxz<c@%3!I{Zwv{N>%!sut-b^q)H;EuzOR`Z|f)
z$55MSY7<ZGClP-de&%q$nmjT;RVTIjc94$`l|W67u0EmOW4%%Vb$Pp4dK3L@=5pB|
z`1uV#zeo%5^H>e%g1LEsb2XP4osF;i;eC2^Q@@WL|M21T2ezJ*4s}R%eyN5WD*3*R
z87*=AoWxJPltr%>5o-=J<>nj|;IkM?xG!OEEx!Buou{UYWm=~@>CN-hegpVI3e=if
zCjWwRwZB%Q?rP5Qdh&RKUcZV?HadIoxn#e3=6$WUX&<XCu2{Y3o&z6RTez;cs6W(~
zb&BJ6H}kuSr9Sl>AdmORfg0+w)5L#7J?vMRTlZP6t~Y1yMq))u9AB*VW8|<I-9pYo
zHSdjUHZU)o^N~mndM01F)VbG34*SpJqmJ0~lr!jeBVAal<djl%HqrOSE-7^ru{-q}
zP4lRzx>><pr|F|dD@RkhPs^>zGd|&6T+08oVqG!n`i`JS4b<KHpJ<OzRJ>Zc>^fJo
rMR1KBAcU(!gsYdm{{2{2J@>mU)U}+wzj5|ua%sf?6<i$}0PVj3=tKm<

literal 0
HcmV?d00001

diff --git a/dist/win/bundle.sh b/dist/win/bundle.sh
index ffe0a1f..6b80784 100755
--- a/dist/win/bundle.sh
+++ b/dist/win/bundle.sh
@@ -19,6 +19,7 @@ cd $(dirname $0)/../..
 rm -fr dist/win/build && mkdir dist/win/build
 
 # Compile the resource file
+rm -f dist/win/spek.res
 "$WINDRES" dist/win/spek.rc -O coff -o dist/win/spek.res
 mkdir -p src/dist/win && cp dist/win/spek.res src/dist/win/
 
diff --git a/dist/win/open.ico b/dist/win/open.ico
new file mode 100644
index 0000000000000000000000000000000000000000..ec70e8d7dae49e5ab1a05937f101661da6da5dad
GIT binary patch
literal 2462
zcmds(dsNe97{}k=#zYTV*@dI0va(~*Ni$Q28w}XgqvpZv26@yJH8~<AT6&Vx6d8=$
zxQV71NHaC%E_eZSGQvY3;02897)%yg9^Hg;8=>Ex=^3eUQvR%G=d<6t_kH&LefR8n
z-;FVj9%IHZdVZP3j9|=_G3G|l6nmSn&;JL4BacpmGvPu!L5wDzBAz5h62l2T@wj2v
zvuiy=j3veq<LMR?*bB40*~HIQuqm6AoLF&;^H6rM84B>k+rFTje+wQh+I`r4xw02$
zPG@cb%h=>~F`T>nI46$m;6zb2o-E1A_uX@AnE%0k!Qw0kmga%CBp;klqKPrsKkGlk
zeT$R{<r{e7h#xr5s76i_YvpDo+xWie7AOBh{lh=a$EcNs7`?g(&xe%YwJ*ysIqVEP
zB5EN~)L>*l0i2{NGZRKmdsv+38MT)4inF;c&FXt4q!_Pn)L_!)G6=U;z*~71v*XVb
z4Uk0t43Fq$Opk2B<nTtkA-@D6jVEnB1L?+ta9Nmfi-{D059){Wc%IQW{L&h+DW?mo
z)CTx{YrwqJPDoVkct@#&TX-v8mA4FvEJ=^CLB|lH*oCoyN5Pjw?|(pF93gso!EUp%
z<Qm>o8sHW+G#2dX#_;6@2vfvkmg)kWykc7)&=*C9`l@RBHWXgRTZvbP#FXT#_%QPd
zT$blSm6U>Yhg-mjqik$yn!s@nzE^BoXqFKnMZK8zjrp+<?lMEP+l)Ei-NZ+kMvM>2
zhFYyga?u3{WJx{DT`|F-FOaIrw^#m-pc6L8_FEuPTOi6D94}h4=gdBEk45=b`0wk2
za6=Xf3JQ>2T!B&VWtf;~+spxd?|6M)b3X!0fQ9+@@XZ6>%>m|Q19OS_xqq)Ya_rZ&
zrvQI-7v_AO4UI;F;?h%aU7Fj=W<)M?=<~hfu4p>%U`;9DcVuXU{Rn)Vp~Ir6TvSz6
zp+uv_w6KcXOcc3gKwlDfz3%EA1d;xdqeCOM8hC$q6M|C;QD0w=vdXjY+i?+muegC8
zrGD+zn{n6wiW9(K1kn6oq@JU?k>1vf6126op}w&N>kqX;;G?Q^_#fdDYq?<o3Uxqs
zGoZc%q+bMf(t8tYfH?A~s08E{z-Fok9Sc~e0fJ8gdmHGxNv=a`b~%hjBaFXvBm9US
z0`G)IhyE~$5(z)qkWy{M&gxsptnEQ&wF&C8CLE|W;qdvJ$ZP0DQR5#t-eSQ?oei3f
zKAi6CM@83d$YQHdcF_Q<)e4izgzcKkq#ti^=<_{eP77oSb+iw<nMX8259<)8K92Bx
zTCCbp2EPO?=Es%8N1?@3c^TX`ox-@#Qal@U0xm0yz!vA>*PB+@qo=0_`zno8|JZ8|
z{ekPe?auZyeCnD*y@AOmEnlUd`BRlshxFnG<W@A}G<mGP)Peez4z%d>Xw|i&sjUM|
z?U&K4H=@<h4PCpQ@-BnUv)%#S`v>-YCsfF&zZOvsf6l~_3ch!|nqK!w<mLVLx`$BD
z2T|=;7gJA{^kWU}d&&Boz7L|cwt$^A@Jp$M-RJ$Xj~t7mCO$Ve0m0w5A}qfPiqhYZ
zRMCsHS{pt|tm>oRopVeS5lrVo1o_#^iIqi<)O<L>T@k?Zh)#8qCKL#K5^AW&4Lr}7
yp1WSf;r723|GS`;l0xe&y~CWPX2zFx5?UgB0FK6wrjv5a1hhowOVYc#r2QA%tM$_W

literal 0
HcmV?d00001

diff --git a/dist/win/save.ico b/dist/win/save.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bc46843d01ac80d078f039186ac8a65145acb808
GIT binary patch
literal 2462
zcmdUwdrVVj7{<##Iuz$F*<?tRO&3_it(%!kwjmV8;&c?9WO50}WmG^U$^el&>I8K#
zvT!F*D7XT{3({6Zz;cHP6bQ7Xav4Y+gb|>W0tI>Yos)FIEE)8lB|9fi&&kR6{@(X{
zzOUcQU>K0w*qA|n%@~P>491%b2E&4gd}1((sPF%`D>*sYFg-opiYO{OJG(w3BLhUU
z<XuKok(rqptk0ZMQ&V3jEH+^zllb1OtSoI&QISd{5^0;7n$XkJgNTR-#KpxSAt3=|
zEdGs8c)Qcm(mV*Ofaocawydm7Ra;y8yrZK7GMNm0eSI`nB9TBYmm?@B2)4GiaCdiK
zmrvyv2n6c3wl+F;XlMu&x1pf{VzC&_&CTfS>_mHeJ1vDm0WU8vn46o!+1YtR{PFQ|
z^!N9J&*vjAFAv01Bqb$*c#qQ3Qc%9=atsU%=*^#;oJ4tfIa*s=A(cvz%u9!9J{yrK
zm+3r0p%9ceRF2`{VZHfNQ&V)^N~IEt!6&f0eFn^8cUb0~#P#GG^n9o}bai!MbaWKn
z-rjooGd(>GE|-hh*;xeFr@+7dI?lJI&^Zogou=ndQ&U5)F;#<)j}I&?EH>=FN~J<&
zWhJ6+-T+$|3fIP1Fa;j)X}pSec}@uUIRaHxRp{;Q1+`W>zKe^?hSpc3(V(uo1)r39
zBeW|OCKV2N`Ia4yh=cL%qe#4+e;g&E+w}gT*2>q{m#%-K{P_h9?C+k%#jbQ5Z1BN0
zp)I!Ev&F0B_TW5Dgq<i5*2NqQ3=M+vQpb07b=^??R~~c0X-b4=-(?t8vtU$Z3#0oa
z2gzf4pN$JWX*hVx3vu;X^crzE9J+otH@9{97c#HF>h5V|J-dU8!x@Mk%Ep1;JYiJB
zf=ychLS?B)Q1Eb7o{v36PG}sFAS5INc6N5~^z>YpPwjKFg5x+^{XM=AoJH(l4jg(z
zu(h6rGx8sCs^b!D?)byH!jJw>P~)kyCpI<~F)=ag@}n~oP^XljcC;NIkUh`oO~hC7
z^Vrg2gG(cMI4JVMcMq;Wq-cb&zX2V8$PgbNkHEk{dLC=fx0m=fW<~-V%T4!K`*e!V
zNkFZ<<+)ljkB`bu;hM4#`=l<|(|rPoN*?y!bVC2cFsMB|Gc$w5#YLPucMkja?}xv?
z{|ogS7ku4fC_1FrTxBKI$>@Rg;4Z$ylpi;0f_cjWxziQc+Gm5nu_QQ3!f>oI4D<8z
zP^;CLo14SZ(h|*QGMWG2Q{KH%XurDo=Eqp8?S<B>CWQ{qI0M&Ky(fNv^=JUn{w#w<
z$w^4YWLQ~Q!SeDlUAtDRMR<5PtgNi)b7-wUJ9+E@D#t6SpJCH=%fIzn#vy$Akh5Am
zUyUOZ!6;Q#<3pi`+B)C+*PNW3Djtuw*xlW|K<$0XAF8iJMn)nmEbIk;ObgiWQ~W{I
z82E|@cq`i;JGh78B#uDmk{rdFhq$Y%$LAuyrJY6WpLBhR^sp_Y4>^+F!zTjKbZ%~L
z2YGTy{a(6p)RV;daq1FRMm6IYT2SK2;#0`ABaki(BVL+|_e!0YP4gXs*2d`jzAOLO
zfp>oS=FZXk!L#m<;x+byv+BJiC%Q}u90PXnzTB!W@4pxifQ1zU7Q_au6^8zbBQY;%
QlL1S-9jxDX6E0!@1q1Q$n*aa+

literal 0
HcmV?d00001

diff --git a/dist/win/spek.rc b/dist/win/spek.rc
index 3c9cf68..574e44e 100644
--- a/dist/win/spek.rc
+++ b/dist/win/spek.rc
@@ -1 +1,4 @@
 aaaa ICON "spek.ico"
+about ICON "about.ico"
+open ICON "open.ico"
+save ICON "save.ico"
diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc
index d4907c6..bfa4f84 100644
--- a/src/spek-artwork.cc
+++ b/src/spek-artwork.cc
@@ -36,21 +36,30 @@ wxBitmap SpekArtProvider::CreateBitmap(
     if (id == ART_SPEK) {
 #ifdef OS_UNIX
         return wxArtProvider::GetBitmap(wxT("spek"), client, size);
+#endif
+    }
+    if (id == ART_ABOUT) {
+#ifdef OS_UNIX
+        return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size);
+#endif
+#ifdef OS_WIN
+        return wxIcon(wxT("about"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
 #endif
     }
     if (id == ART_OPEN) {
 #ifdef OS_UNIX
         return wxArtProvider::GetBitmap(wxT("gtk-open"), client, size);
+#endif
+#ifdef OS_WIN
+        return wxIcon(wxT("open"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
 #endif
     }
     if (id == ART_SAVE) {
 #ifdef OS_UNIX
         return wxArtProvider::GetBitmap(wxT("gtk-save"), client, size);
 #endif
-    }
-    if (id == ART_ABOUT) {
-#ifdef OS_UNIX
-        return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size);
+#ifdef OS_WIN
+        return wxIcon(wxT("save"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24);
 #endif
     }
     return wxNullBitmap;