From 6d92130ba46d94f089ec678d335051fecb623a63 Mon Sep 17 00:00:00 2001
From: daid303 <daid303@gmail.com>
Date: Thu, 4 Oct 2012 15:26:38 +0200
Subject: [PATCH] New icon for Cura, less ugly

---
 Cura/cura.ico               | Bin 0 -> 4286 bytes
 scripts/win32/cura.ico      | Bin 4286 -> 0 bytes
 scripts/win32/installer.nsi |   5 ++---
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 Cura/cura.ico
 delete mode 100644 scripts/win32/cura.ico

diff --git a/Cura/cura.ico b/Cura/cura.ico
new file mode 100644
index 0000000000000000000000000000000000000000..add601aa56ba6533ca40302dce4decd176ac0ec3
GIT binary patch
literal 4286
zcmeH~YfzL`7{`~unraF^lwYb@yfjo;=5%KqF*Q&TXq>T`zBJoR1RuJLHKR?IiG-pq
z5{h;+wNW#R;!c==3k$Kpa?J&n1>NN$mt|p*mfOPq`yb~$%}ztkIIDbUe3;)p&-=X3
zd;aH~ecm&RO6AADpdgj_RQ)(#rCOj;sU9Otsa6q@pKE)3UqyIua(T(4yURxwf38oQ
zEB$2$t3#eltvVf&V(=WOwd1{lPK2cxz&T_r+EupvR?XwNuWJ`P^QAFqd3w!og1!gF
zzX1I(u&1#bd+VHd<75k#B<V*NC6=WGC6qpNv*xkl`-VG1kJrb(c(l&)$ptGaho)h?
z3Y_T!4p}`|b*}ds$u)gQ(Alx+NCP+r>%xT6ch#Sj-s9^$!cH}v-&)j;lAbYG#sJ+A
zaH<D5)<u1r2e0S`u=0EtRu}hSMNT`CD(v_$ryJ{2tFdrbS*fr3FQ55yve)fFhtTGJ
z7ubQHxb~CXz+vh~P|sU`b>0<(XI;TA{h;WH319WsoW1Dm9Gk|)QJ~5R6gz;N0U)Cn
z*lwnN<uF$32mV>V)K98(fbRx;)ep}wUDI!2zt!=3H*gQmaSzfgZfw?#Afj{<p+!!F
zmk(lXQ9q>qp6Ve4@2&7ze_duX^=HsVeG~Vfh}y}fal}`-5SiN#ZJQhW+kpuEBwolL
zL_|p+qJQth{st$W&{jHqUH^vc7H8+g%(eZ`?4CkW{Rnn6xUh{xW_3g4^80~rY{0f=
z55kIESdrI{RMQBS9x(W<zcIJfZJY3*);@`}CI=FYJabBVusO?u&_f2)4Nk%A0t(p^
z>6bm&YU2CB-b`$F<EgYNx3BAuE-)Y8m}mB!GCR;@ccJ)_1L;+lkX&ZL`@c0KzOVzS
zEiUY+cj2gI0%yCXkXSv4S5KS3v+4(5^~Lj?LwHo4x$M&lD;kH!!B-JZ4^ZQ9BPOE_
z`&!0v);5Xs=Bs!!+X9|d2A-EuH$z*F5na$WFDl<08=2c`NvrR{m5FI|jd}2E$5mu^
zk7LUP8&;ldwDP=shv((p@;NX62;*a<gG`YI@&%C=&Y*_4$TSgk9}|BfY#q`01<b1m
zJCdKuz8wD6G=M$EUabAuG^&nytI*FspqVwj<QMXhs3*eKkTD|OM{i_*F8WvAyJj!%
z3DXdnSF<leHe|PEuFq^Kx_@!VKCgSSMtZSsyVrd&j{<U;NPRI^Ss%kVh?td}Sd%af
zku_?OP%MC6uC1SOJc%P>Y*Bw$@gn|?+)JcwQi8AO#r;8fgFao!4J$c~axLnDm7H)(
ziO31I6KMw-h@4UJlk~Io1=A|2FTOizqBq3zv*~{zi|8L#>O}1cA}ybR$c-po^wWRY
zjq1;EAknMU%7Cr(LQ7yEm0s6>D6#12Kr)-%sD3sF5n6I@o@P9x<m5aY%5{oYK9jNh
zZ6w~SSR(8tq9LylY0opzkk^&O66IRt?jxZ@^qI5=8EhfRB!(;_8u9?K5jigp<60u-
zF8iP1EwyJky69~=2kGZZUo37u*-a`)7bzs-e7kM8ci{F8{7-iP@Pq*qYQTCI|AX=e
vPoC=|YMg;qoAnNz?rqghW1Kcn8+TN#jnk^Nnw>-!2#oIpM<e{%eO>z-!$wr#

literal 0
HcmV?d00001

diff --git a/scripts/win32/cura.ico b/scripts/win32/cura.ico
deleted file mode 100644
index 1919bfe1f26e3d1ed97fe83baceed526b5a7299b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmc(iYfzL`7{?DRH!Hkx2@DG&EgUc{4a!RxpoB??nNn2JQ2N0EW^B?%NUkfOkX+<0
zDVNr~g4h}vm&Ij8ATB8gL!(V8g68zGnLhOIoP~3E-^B%mom%GE_v|^(oZtU>p7TCu
zAjFLRxw;beO^(kd#E}s40yR2Ce5tW{{fDllT8`Mr1R?))?)vlZpOv>vVSjZiZ}sX@
z?zA<f3=g*}2PfN;v+w`Xis@Kaw+7)AM_`?l2ofJJY-UO_!pcif(NKdG`PstO7Uv=F
zhqK`Nro(RUY=nKPQZS|biN-cbNf;W<(RBE}g}H*QNJxOkp$x1l$ie&rX)ve1jcM@7
z%bIrl!vj}jIj_=Qkk#?#bsgfWRI>am{OTYEdbE1KN6r6@-a2U7D$&?hA<RBCS;UxF
zQvhwd3b*>2WIFn<X@!qxR;E~c6n?t;bDB?cx(_k1*Tvo>{!2RE3`K%BRE_1({Zx;$
zG$)xCP6?l>@;4s~G~jX_3Oc`0>~E~ze159@j_xYFUl9zyqF1prXOYn2l;(gp3VpCR
zD;QRZUrefFs{A|GTcG>C9$IxBPHXZ6e{0!#QBQUrTRR$1*;s>p)yEM_&t7)z8RTC)
zD|C51V*R@`8ic-81cie36*6LqXCnmPX3I-(uvcR4;uI|M%RqBOz0kwoYo>+gKd>ZE
ztWS3S`dhWIx1+sflq;UD+XSD4ECE?gbxHaj>qp*)v*2HJ7|!XbvbDHs)kE{Qh8D}%
z?rsMV6p#<6SGLRf0dl@ni*&p!_YemATPEb+rRy0<d$4AuH_iDj!B?1j;Te~C*s?JQ
zS*qAEeyjzJ|83Z=PDZ5aYkiNOqfC*-%yPiu{+0G4UK92-%>TJ>3gGFnfHDa+OKST@
z`Ai3W_x1C1&6S!#AFzJ!Mf}#+DE9BU+JxGc^W&Jt_@|HNz|72Sj6rNh+3|R6MhvwX
zAa<0yjM|3re5S|kpbL^}Vo;+iMCj4Aut-pV^$jUgI_B~BU#W$ogPmYM|C}2NGt&j%
z(<1}7`!2yzNqr3BCed?1_R?G#&X4|frv2gGz*x;6#Ah|-xm~{03qyT6+~{bQ@rMR<
zcrwj?JcphCInl8CnAXiegLR@6${P+$8voNS&U(J3g$1rPf2a31<TKs<J+&yU-;aap
zJ;I3FM|z#C2b{c=ji{3!Ah389cAf}Fd)FDGY_=cE|6o(>Adj7$JvPsJo%-8aS^Uzx
z{V~vr?j{WyYkm|yj4$<hm@(sDJQ8`A^WO<xr{8z>EPAI(dJe0<bidtEm9ll_J5|2A
zFybEPZw+0K^Qy79xdtzfu{)dTSp8a#$@rSG9U}hVKtFw)ai6IW99W1q{qyy<BjT7W
z{-*PF2;W>H)|p?}rV^QtG+)NXEdTc}@4L<4`vvZ<54Fc||7G0l9DmOk;~1Og@4xH(
zr)WM2?YHLW(o|2VfxVmTeX)Jwahy4pJE5;JE}!RoR(E~|0(@6YxMyk3e&M?_GJHZ`
z&N24n{9c_Jvu4_gecufUdSHGVs>|Rq&q?@g3kx*~pXtlqPwzBZ18xrXa}g5ck3G?!
zg6WZRxsNINOhfYC7+70b2@RZM>>0iNLzBhNYot}HuxyDZ%*`eDEzOIKjWt&Kyo}vZ
zpJ3C5b?{i|j)rsPCg*b<zhBkh!if@nU20F2>hC1JW~wJUfBb)7eir}BCu7sv{;!{Z
E0W(u3@&Et;

diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi
index e0f0f82..1c0617c 100644
--- a/scripts/win32/installer.nsi
+++ b/scripts/win32/installer.nsi
@@ -26,7 +26,7 @@ SetCompressor /SOLID lzma
 !include "MUI2.nsh"
 !include Library.nsh
 
-!define MUI_ICON "cura.ico"
+!define MUI_ICON "dist/Cura/cura.ico"
 !define MUI_BGCOLOR FFFFFF
 
 ; Directory page defines
@@ -65,7 +65,6 @@ SetCompressor /SOLID lzma
 ; Reserve Files
 !insertmacro MUI_RESERVEFILE_LANGDLL
 ReserveFile '${NSISDIR}\Plugins\InstallOptions.dll'
-ReserveFile "cura.ico"
 ReserveFile "header.bmp"
 
 ;--------------------------------
@@ -93,7 +92,7 @@ Section "Cura ${VERSION}"
   
   CreateDirectory "$SMPROGRAMS\Cura ${VERSION}"
   CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Uninstall Cura ${VERSION}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '"$INSTDIR\Cura\cura.py"' "$INSTDIR\Cura\stl.ico" 0
+  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '"$INSTDIR\Cura\cura.py"' "$INSTDIR\Cura\cura.ico" 0
   
   ; Give all users write permissions in the install directory, so they can read/write profile and preferences files.
   AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "FullAccess"