From 5d02e9824afbc67d431e3d3e59797425f91cddcd Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Tue, 6 Sep 2011 05:07:35 +0000 Subject: [PATCH] Add new application icons The new icon is works better with different background colors, it also avoids using flat background colors or borders. The small icons (less than 32) pixels do not includes the sun in the background because it is difficult to see at such small sizes and just add clutter. The old icon is kept as logo.svg and is used in the about dialog. It may be converted to use the new icon eventually as well. --- aweather.nsi | 2 +- data/.gitignore | 1 - data/Makefile.am | 24 ++- data/aweather.desktop | 2 +- data/icons/16x16/aweather.png | Bin 0 -> 720 bytes data/icons/16x16/aweather.xcf | Bin 0 -> 4791 bytes data/icons/22x22/aweather.png | Bin 0 -> 917 bytes data/icons/22x22/aweather.xcf | Bin 0 -> 4420 bytes data/icons/24x24/aweather.png | Bin 0 -> 941 bytes data/icons/24x24/aweather.xcf | Bin 0 -> 4744 bytes data/icons/32x32/aweather.png | Bin 0 -> 1408 bytes data/icons/32x32/aweather.xcf | Bin 0 -> 10300 bytes data/icons/48x48/aweather.png | Bin 0 -> 1864 bytes data/icons/48x48/aweather.xcf | Bin 0 -> 10652 bytes data/icons/scalable/aweather.svg | 279 +++++++++++++++++++++++++++++++ data/{aweather.svg => logo.svg} | 0 data/main.ui.in | 1 + src/Makefile.am | 1 + src/aweather-gui.c | 22 +++ 19 files changed, 324 insertions(+), 8 deletions(-) create mode 100644 data/icons/16x16/aweather.png create mode 100644 data/icons/16x16/aweather.xcf create mode 100644 data/icons/22x22/aweather.png create mode 100644 data/icons/22x22/aweather.xcf create mode 100644 data/icons/24x24/aweather.png create mode 100644 data/icons/24x24/aweather.xcf create mode 100644 data/icons/32x32/aweather.png create mode 100644 data/icons/32x32/aweather.xcf create mode 100644 data/icons/48x48/aweather.png create mode 100644 data/icons/48x48/aweather.xcf create mode 100644 data/icons/scalable/aweather.svg rename data/{aweather.svg => logo.svg} (100%) diff --git a/aweather.nsi b/aweather.nsi index c897f01..5db4eec 100644 --- a/aweather.nsi +++ b/aweather.nsi @@ -23,7 +23,7 @@ name "AWeather" outFile "aweather-${VERSION}.exe" !endif installDir AWeather -Icon "data/aweather.ico" +Icon "data/icons/48x48/aweather.ico" !define MUI_ABORTWARNING diff --git a/data/.gitignore b/data/.gitignore index 0b45144..27de9f1 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,4 +1,3 @@ -*.png *.ico aweather main.ui diff --git a/data/Makefile.am b/data/Makefile.am index ad651d1..f644750 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,24 +4,38 @@ dist_gtkbuilder_DATA = main.ui configdir = $(datadir)/aweather/ dist_config_DATA = defaults.ini +logodir = $(datadir)/aweather/ +logo_DATA = logo.svg + colordir = $(datadir)/aweather/colors/ dist_color_DATA = colors/*.clr if WIN32 -noinst_DATA = aweather.ico +noinst_DATA = icons/48x48/aweather.ico else desktopdir = $(datadir)/applications dist_desktop_DATA = aweather.desktop -pixmapdir = $(datadir)/pixmaps -dist_pixmap_DATA = aweather.png +icon16dir = $(datadir)/icons/hicolor/16x16/apps/ +icon22dir = $(datadir)/icons/hicolor/22x22/apps/ +icon24dir = $(datadir)/icons/hicolor/24x24/apps/ +icon32dir = $(datadir)/icons/hicolor/32x32/apps/ +icon48dir = $(datadir)/icons/hicolor/48x48/apps/ +iconSCdir = $(datadir)/icons/hicolor/scalable/apps + +icon16_DATA = icons/16x16/aweather.png +icon22_DATA = icons/22x22/aweather.png +icon24_DATA = icons/24x24/aweather.png +icon32_DATA = icons/32x32/aweather.png +iconSC_DATA = icons/scalable/aweather.svg + +install-data-hook: + gtk-update-icon-cache -f -t $(datadir)/icons/hicolor endif glade: GLADE_CATALOG_PATH=. glade-3 main.ui.in -.svg.png: - rsvg -w 48 -h 48 $< $@ .png.ico: icotool -c $< -o $@ diff --git a/data/aweather.desktop b/data/aweather.desktop index 7019aca..d06877b 100644 --- a/data/aweather.desktop +++ b/data/aweather.desktop @@ -4,5 +4,5 @@ Name=AWeather Comment=Advanced weather reporting program Exec=aweather Terminal=false -Icon=aweather.png +Icon=aweather Categories=Education;Science;Geoscience diff --git a/data/icons/16x16/aweather.png b/data/icons/16x16/aweather.png new file mode 100644 index 0000000000000000000000000000000000000000..de90ffc633209f17e99dc01ecc09ddb07eeca392 GIT binary patch literal 720 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 literal 0 HcmV?d00001 diff --git a/data/icons/22x22/aweather.xcf b/data/icons/22x22/aweather.xcf new file mode 100644 index 0000000000000000000000000000000000000000..74e3a5cfa3312663b7e2f77152776fadec8e5153 GIT binary patch literal 4420 zcmd5=YitzP6+U-ocJ1|Z7pG~ZB4PCx{GcL@RMa0547L$0>nTneIuS|918n2AP_=53sLZQib2G#I#!z)t`GT)6$g~-RCvsEs(6xF7S9iYr!2-Fijjpb$2{(kwpK$MmU~DEZ zhs|$p2sf378){b6Mae(1e0j94>284JeLs{%rn?dkxyD{Y+U6szqX0!a0ZNVol(uCj z1F@Wu`!I-GZ*`=;iEvMD(uX4v&#~v{WHR*UWE`Miid;BFE}9}2PmxPernTIbhXUP$ zTJE94{;Wz@&oepM4HRuXKbeksR*>ETpMWy}KDzi}tnZ(Qi$^q!LL zyD`qj(>Dg77)JYs?~MO@;DdK9=)$lUWUByLM|9Ib@ zvPvP`9)N+r{Ea3`U}7L+Q3{jS2?zkQ9CFA+WKu*XMRdOJ=E%rrADCtjMbz`ra7Ia? zl1^E}Y&dP16jADNqJ`)3&aw;VI=i1FtLQC0LS5sh6OkT!EWUoS7p2mGXD4+-3LvD=BufXG}qG8{a=;h0lIm% zi673_&Mn!FwGZdnzIR?;7u)l;qTY4U46eZu4yl7;3dTT>!15SynN|m z_YRE^rVYlg4_#A$4BWmhQU(pvAR#>Ka=8;SDp{y{*1>={{|Zro~x&q`mWx zZ@+aRb+%(mTjEHotTAl^9E&HfU3u^HsW;8!nNzzG?T6c5-6d=BbA7n##nZn#+tu+( z{K(<9J-c-6$MMuV?^tgkcIrgpH^!lZ`}geHxwSIhb@9y<+I1X1`Z{{I>RUIptbHNg z(Q~e=<5)ay9BO;@CH4hvM))8O2FTr$2CBF1TmandauD9sK zm!5F>I&=Y#1$K~tH_J+D;2lS|}Cs<VK)pa_<*X|5ouPAyVnc=IO_-b|edOk4|U(Y3G;;Sk#6JO8iiTn9dHd4%or|{L- zP^+x}7N(+a*S2nMS=(42dO;BsTL*>sGLSDL%a`ginCi3;U#ekd>g%+jsxg)LQjL^b zUz$n?QwNQEd~H&f?70k}8me*L<*R$k%IYP1)CN^Gm@#tXRF1FB2aXxLC6%ejmvI*P zI(3rx>e!jBFG)4dX87v3fVK3p%h!*L^E1@fVxx10`dVh3oT0uJtHy8dt1szAiutuE zd_^O*(%L666?MzzjW7Kwx++w?L=q%h1qpYiPR!g{#J$|9z`f6YiaS}^4`~$h2+jki zf)|j4rWL%HJKx7M1Ui-QafesHA~Xzey8;Jvcla!B6I8+{9R6K+3LPdL&cA~`>4J=V z1>U!t_5gR2$ZlhF1|f8&ZH(|o{foMUZjx>O{W-yn5VtY^iRqZ%B;6hZ7-M68*%9#- zy)!mCdP|l~uj!E;0n2e>Y;?kw%{ajC zD2pTrbP>_bn}t#HnM^Lb+ie-hz_DzP%`6dd22A#t%pzT&07N{b;9%Jd5wDz&zq!m7 ztu$E3CBlL&SOp*;C|HF!I=1Dpiomu2EWs)T(F!0M#674GY&;CbSj?|v^Nck&w<=1n zx7VX&^Ng(-_>a8WHO zB95s^o+Ja(h3viY5lU#m5b;WQoT;1zB6e1Zr-4eS1|Rr%apnL~zzd*|=R*k>A;>*Y z#vS0#(`6QFLGFcO?ng^HV`R@60-i2BnT`uS;CNB8A{<&#UK43(YOIQ8PQG9Ce$w0g zC{Da|3eL6SZ{~z4?`QG%renoFBmK)@k1pJX$0z#=zeFdsD`}2HdLgIN*>2p4cEEHR zkY9e64&3J$8BV>-p+%b?`l4UKpdNOh(~E-&r1+s0N8p*N#+BuZs%ln-8Y9gOwZ!-r zl?T~8it^Y?3ujxYoD-&$M`?IER+{;`Yhj;&+rP@4L3~y4@)-S$wXk2)H=Vl#Rdw(O z_%1a4pXBR)fMQ&MZ%@w+e~BRQ)9F|slRxH)iQVgH<0e=t)z#P4G=(D#<%_GLE6E#| z$u#$owxIT)Z`=}`BYWa0fL*|j&HY>@IM)KhD7be;JeV_eu^|1=K_5*#56jhuJs*m& W)81BuSbz(ePJ7%e&a(Sl5&ti6pGpw` literal 0 HcmV?d00001 diff --git a/data/icons/24x24/aweather.png b/data/icons/24x24/aweather.png new file mode 100644 index 0000000000000000000000000000000000000000..3ca86959325b58b05d6051f61fc600b0874a722d GIT binary patch literal 941 zcmV;e15*5nP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipk- z0Xh>rgN|_k00S*aL_t(Y$E8(UOH@%9UHcp-9d$IA3d8;3g z^b|pl6$DX)VLtQ^il~>0UU~@ZqRC{Gga&D87S=d3U2MF<%$&3LKJFg$40CBN)`Ii! zoxQ)czWuFzA;^Qyu8sq$ru5_*4~HWAE}XmgG9L%YL%v_tl)l>4KGE2?kub)<7z5`V zoO4Wuf`}y+3W`X%22@SyTjQw}_4N(JFbo)m0ZM7|^SHfmRJb6Q$brtTj=d`quoCL) z8wjN|i`UvyZa`G7UAEfYa%O;?t6(spPt@V{B{`ZjT$TY7ZD=n4O;%{rxXVOUw48 zFC>-RUF{X?>edsBXfhmxSX_kLw20vWfZU9yn-bnEgRb7s`3g| zsUy0s!!p(DUJW7>aBik}z%UsO!dI&z9*-l_BhENlns;Dua3}x(CCOc*Xv8p#w0?8W zVUtUdNW_z|X_}CTj94s|)wa~wLQ=q5YUX5e(%2XuI=%zSXr{VysD(iTU$wJUrKkDo#=vqOEG%Rf@UJ_Xj9Q; z%)Nzix+xReO#?OqW1$COXM0zac`9dn>bwnpFWtY?3JRaJdu!-E9b`%%b5#=9~P=_c#}h4YCf?IOy5AC!F=d`~hbo&Qc7 zSr3D`wJrD8HZX2S2l=F<=cHveU}wg;<)T~iGcc36`{ z;&;=sl^|@zpNz-EWvn*|PSX03GcI|Q>brGcxIZ@XkN!Sr_j*6Qe}8!N?@;pTe&1&g zKioYRVPBHcFz?%ck6Io{1mXYatBJ9j^fcX7n- z8@DZau&WnFjMGuhs_Vv`+t=c4hgDNce17+{JA;?hw>his;jZq1flKNUjuEHMcMKU> z#m`*;h^*pliLB0HKvrt2k=55|WOGkf`>F5H6dGB2=G2L{c?7Rl+FMV2lZ9v7j_s^a9d6x}>KxoeD@! zk6M{7>xGn~=MzLbj2wCqX__wZFb6|1C0leIQ3ZV(!IyW=gF?Yu&t6{ZZ>(TcXj=0^gKG&zTDwodII@4w&aE(Bzc$dg%Ilhs zd=A0*AdFjJyl%}4_5K=H({r3?Xzzi&ySKHxYQnw>*P8h*RB|~q+~}(=fBvV6OL8Sc zCRr}G#nM8;Pl{0i_@LagInFwFdNwcmC# zr{Uq%D{HELvG`fH&5M)k+ z>O)S~Gjc1ac3PaaZKzqkWXmPyG^h$HINg6N&FRbA55L*01bsw7wF8_UJIb84zGm)I zCAfmr4ujLyGaV<7{l?-{sU$UHpEg^ZD%GTBky+n|w;wOnEY;AUYVH zL|Uny%Mumw+V7HZfTUO#}B z_7q}`X}bP>giGa?qPp6fCkQvMZNZ5)*Jv;6)S?LeiGNM?WD0%qI!Dm?)sp z1W_WH5E4$36GecFNlZ+I8B9nDINT;L0iu8q(A+(?9>Hz$5@>8}arZb_H+TuG>i>_s zCkHxs35+%N|C2S@4PF9T3u=YE2mT`F!Al_E?vYqGE;7KR1V}bbfZGA3fE4ja*+<-( z;iBG@ZVIXdOOqEjf~q$~U}BHR*@7206acatyg(9FIIGNyD%`ZG;6;@I;-;aCDtJ+e z)SIfHf)^FMsNh8fFEDYCL%~9Mq$x35OkjBujxtKjVJZ$vKK+am%Ynw?LKbC3Ce4YL z+a80LXc{5~B_=UoTx6h0iIkXZ+5oo$N&zYQAEOZkF0@EmB#>l<78C@fMItaUCUTNs zL4g85R`M|7ZqQ|8#EEGU)!^3b`V`}km8<8`WIdM(bUQh9nTmDsLFuqc$TVQZm~-k5 z%7?wpIH2*#%sib*IFpG+$5M|uloeEaJ=G=UeqTdfS^Z;wIq++0)ef#S6Y((V2=y>IIDZpPp2^Gl1wQ0nPU#p@^L0MhHltMTA_>RThkW3f z2{Wv?+-6K5$})nqYB}jFX|*mXNpo; zTUp-V_4`VGTvlJh-uQ$Y&3dFw&>r{aLILL3o^QPnT|!5*{wH8K-HMh$urdW+WR#(Y LSkVSHPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipk- z0~jl?x1^x}00jU^L_t(o!>yLzZxmG&$3N3DnDc{&T8$?xY2LMSPdgc!@>uY* z82lGNA4qV-ySEu=19<1{chPknP1DeI9VsPu2clf*{AN(P4p_~-hyj7hj0v)J@^+y|)uN^K?i^8=haxtg`FHBw$y zfvT!VDG@?AhUqKz2LQ-afgGpipiGvK-_(SsrIGxX-ojP69f0z(3JXlv^)v!@UpyXX z-~PQuCIp-cgsv zK2ZFS8vvyMfX2r4B$G*tfRxe^e>(w}%f-;hAY)@=Z2w@J;dZ-;#bQiMJR}^h`(oG5 zJs+hdVf-wH(Fd;jH@U?oPMnK5ST0|_g7U=`4g%)M&ABC&HW7tj{2Ye*|9W?`B6t*WYa01S@|(GY&cvCe)=Outzz z&2X41xB%uAc+fP>iuueq+BfnP6r!rCm59NTU>f+$N@>mw!*Kj-5qR(*MqXZ?MZhqO zv?MhBc3GvA6cl)@t7xv9txgCbtoK4nNl#A?$z*cB3ux}VcDXImum%O?k+;CyJmfx1 zvF`#U74K0L+61U52tWdY!LE;)80!Jx$BUm?{&DrMP)uFxs|gVTmI~ z_8gE>vc&f#0Q0EFgi=bpUhi2)KQOb?DJ}}&@pv7f zcy;MEe1QnTnjK)uZU_du_gUcIp5N_ATwT{mBoa(cP9hN)(m+ZGu&n9Bwq7$F8B2mz$U z7(@rhQ4t>z6e0r(3J3_|B-1)lx+5+E0?DZBy;^IyE@dXH6Oqo$Fg@M(`+Isqvc9VB zEgxIAQ)kY9{{Q^v{O9qV|L@bOty^$=$?}@HC3EZM&mlY|R$_WEk|5w`2$JhpYl%4F z8Hyx9wg&m|EKOW*7 zTU)bm{=&s2Wo9;YaqZ2sOQ!v7n)!SU@pDTw8LBsbjcQI_^34RRE^oMfc1>MXu>;07oQ+14QDG&dd8|e4LK*CW6!m7?kKrtwmfGs3mr&U2`WKySv1#jTQoBA z^rQ3o(fR%8f`0TM&@RI;lAJ(0`^j=Ee+_unBVJ_@IV)k0c>O@0xPZ$|g3lO7gMP%s z7BpdQ%=DA62Gf$8H(odU%?syaH=JKs1N0BLu=FH%o_(YV7LhX$3oBhdkSG0y%T2cT zC==~W2njJMq_oax6dO|L(4w(KQpj<}lMqdJCX&gNRRxTWbToFJF#$ESPP5#LHb8Jo zqq8lsT0ia>)YUsvVoL9f+M{|qfzgqP#!xHA8B1c+l|r?48VjKwP1#b(bLq7Dw`eF|w3$!gd1sTc;lGX$yTEk6Y!oI2sHcG0Tc# zb_0u)p2Iyo%7qW^QG}ket*;#0vojtyJ7gPeS$lK6Vtv{ao1*PS zCCiX;WLFY7eg2Mgt<44=5ez=#tmJJdm=o7o0_CsFa?IoxQN_HAf3j=a6lI`nQxR( z0TReOV?5;>rKF!R?8YS0PZ^R?Ms_6q0mEiYCVjgh8dFF=W(dY5q@6MhbR`&5NjK2Z z(|l0nPBH>GyPp}s-nR)_lv$)So`kxyUQXlpDaNwsN%QSeE=0%%GoWLEl?*_IWM zsM@ooMYcuxC^!98kjU-!Yke*Bl{@gqmx+2`|F zQkL5w7c`GA_SVUd{`0*PM-ROndDFLYMOMAiXZH!PLf3pA-{+lw{qX(vci%bqr#B8X zu3WYZ%?m!g(&zB$q}tSc-|7GQu;ciVKmX}K_|?$ME9Naig-V~BrJ|bW>wdfA#Nk74 zy%7$zz7pCvuTLzH0Nw6=?;bfAIq>Q$FYn#+#L{)!wmfrRC7UNzilnPPr|(qj(P+Ex zRW$Hg+rE9f*Dl?@_1R79pL}xVBA*SlY~=8r{LA~%_M?a24*K>e!F{`*TKYVyw5)&P zv9)Vfz!V26*?pa_zt?f%-FN;Rd2_3;_2oS~?%ej=mcYiRAAj_bhaX(sSL@{a?Z?s5 zTW=f)`}V)|;v);5-Mp#gsVCR2dC0%|-iAsinv#5-uXY?e!Y#f2TIhwnyIzpD1fJRW zbn~MRKY0KBt5)7^)%qmz?xDBe!lZVr zeG)trdGn0}O56T@dv|T$y7{T6);;+IYOP+?gj#=`j;(_pU+1~qzi;=hozHK1=4n)b zMZWu1-o4_^J8u6CU1h&Y_Yt>ta`OSD701?#J6?Ep(}wlt=pOLibN7nncPzQ#Dollg zD+MvxJ28)ejq9Iy_NRiZHm=JnM2EdiMP_#+Rj#<1>^ z?`XJve$C9P>t=F2q zhy(dJl(V@Qv1{%K90JNN5l-Lb=Ef6w1YZpimy_2MXokexOhmyNdk! zswP_#P$=8F2BYAY{6L{Bp^#bSUv66t6w3B&slnC&6v~b+r$39rHoxdkt@1a_zoiO# zKp|Rm`@7%Hq3~tD-;%N%D3paRk3V+sJPQ4*8nfzEe!Cwil=UvZ$KM}?O{|OU-#-9_jq@8&p~~-OsVL|9yASn4;WP95#6Tf*yZ84);W9>{w~Eb^s(?b- z@ARK)0}B1&910&@mP28K--cR1p+AShR{u+k!VSy%p%A7xP|5B;kHT&Kub{B6RzDQ_ zfx@*52cWRZiKZlf=WFLtxC1C$F%X4Tt?xi#)$bj@=f=JRh2@Mwzi{BczYT>~+ppIB zj6(m(E#HE|t1%Toq5s=ZSXEgiRiQDU(Es%)oLN=*AJe7jr~?%G)m4r1!ufM=ym96q zs|r~WC}bw(nEA{E3IonAdjKd5IFJK{RxSqYUG4x-h_Va081O(26k546AfXHt25iWI z!hnbzC^U1RFd(1|6bAIJfCR!7015*@VE`x$0EGddFp!}DP*_a)-V!SEj-g`jC>rX$ zkcNAQkyu{j)f?}$-8qD8<%2O9i*3gJ>LFEyR)&O0SyaY zy~6A8+F|(sm@TiZhqS`$_DYn8Zu?U8~VWuCOFWJ-P;+?Il1S&Ux8O&t$y(G0$yuw z8vw5gCz_JHoyvK5Jr8)@F%Vu>t$&2qBLkgW#dODXZtRm+zSYTH&G7Pmhm*U~ex>eZ zczI6-z6D-aVk!VH@3+CL;tv&41sVgqyr-W0IwyBs#8aWSrPDJCgqs<%)Ee{<=F9N!mckb16@X*@`*@5K=~AG>`SmeIbDjKh)}m2q3*vT zJwZ-GpMlU^pMlUC)Oe;mOqC#vo?u4Rg@~++4gDcp;z2l^sbU&s==-RM8K7p+AR1%n zNh)N<7-JBPv(i{2bB{;`*?O6e{sk3B8+uz-bEKg!!u8=OV;E&-JY=Ac`|(<*i+B|^ zgV|hk%W=5Wu(X~7+8-rmLEy6(}6FXW}W)f~tR^iJERGZYW8rhH8k5d(Wt6dSaSp7>ZL7 z@v`cKEFF&}SeQD~n@skoctLU~0=X3lT_<3armDSZ&8F!I#N84^c?$3V`%^JBsj6ws zq3KCgP;C$uKx9*s@mNevsH&C+B?WK%q!dDME*@inpk~e{F$BRFfF=Us?5>1w2s7Xz*SduCl z0$xs7$3-yK&{WKX!x*NxF%xd18L!cLs99*v$aTEu!tkXbU9J=BGSw8$3y(liYp$!S7OQnRoFB%{3!STz z!H}J@J3N@U5!O$)91OOA=Lr{4!sN-ZShvuv#oAhANzMxoBB41EdU#pv%$L2r2{EDd z_I%zVw6LJ3Ike^Ww$oqsCUB3p4l9Gb_&GW&px#h(vs`zuTjd+SL}=aJNl1;bn_CN| znq|2<*c}o>y_+{awzN8#FpRJ>j7=JL(&^9^R;_O74(-_S^y88D-&`Q`J`H1^h9!!H zwuGRLVZ=h40-wd=XS-vqs}X@psE`-NmTW#_ji4Ix>|18 zp=9kAljjmVqOcIwDO`veXX>iCh8)^(>i2j912lJZbMIJ?~ymefiFnXxRl5WT3}*t-2%WU$!zR))OX0q8(YsNQ^_Uq zi2+v_n>;K8vNSe%7(A1YO%6WOPV5)_g2E>MDTHvpCRgwx$`8UZ1xv{t96{-kmtQgx zA0Iry;gq;xR!z-Kv!;zCL`A_NbY{p6&+LBV;5)d3cxyxBNMR&1&rZ8_*MURFjvtqf z9p!_mF_<4Lrk=}d+72CWe~$*cKKS6MVg%hmIHgN!;P(@QizNEss9^-1LF~m~A!SD1 zL;@uX#{P2p6-2xXgV=?^0{U_mzI0Vzzozx3S(mv1KMDN2U_PCh26oPre}}FOf`VWk zB}UROvgQcKQ^$_5l|dn>Q?L+PJy&itZTk3cAHY=fUkr^eUBBG;+L06Qb#{Tx`zvTC zeHxlPE76#TUOU#_+11&_+l%=;5y@G~u@6534|@xZrY_rm?Bs`^@%9Kh=&%;w; z(%4d%FPBMUOM%a{GdK$23WD_iZOF2gFX}FZQIl}{hdp540%p>mB8YJtdJ37xm`Hhu zT|A};kr8hFGDh0G?@NE0!r+?hm$7@!`S0vKAAe(H?$<>a%y%Qf)0@xt@Ue`lt+tVk zS!U5W3(@Zw|3Kat^Qtl%Vc1m!^9U~-szCX0Oq>@Ys_-B$GQ$Z`6Q~%WgoHai_~Ic5 z3HW+XprK|&f%t)xVTd01UJqokDaXwR4YGm+zSI-pGjWY!g$D5d(08H)Uui`Innt9! zP~?=21XzR?ow*P|R8cZnBiQ$=P?)6HY4U*Npfbflli;OG;hOW{fB%X7vQ3_XyB@3% zoUud33gJ}cyb#{kgS-fCm+ybDLU6Vc?t9>IhQKBA)elw(6kq#*ISek8?|eWOn{vDr z(;&-3@`Vpp2&H_>DN4BF!3v>-gWmLllB{(RgL}fP~q`X*~&Tl$vUyb;f@0=WQN7jo5LLjv|{OQlT*dpHg%(1{uTYLZirh z%_}hqiPLza04bkJ4JS=DB)S9&Q{g&(hBVcrMY`0mf&Y(5qA939*}y2FTWYxJA|sC` zpv|$y1$YhRFFF&B zvxF9JqWM1BL}?5UZ7*sM>Eod<6zYzn;DLwvu1XuDPvt@xrC`xA0#3 zvBIFot&NVXw9%sb0ipEKfxObqT<-gC9l*2+0iwRrn8iO$&dvOpHmA?v9efQSzvKrT zECSAN`UfezBJ@3z=2>LUSfGB=-2-`(_+ROGu>9{yeF>}*D-EicGk;FalDdWUCDUg& z+y-u6$eLTvCh)%LUxf;-`aDlXNH!!qeBT9Y@RHH@lrgWwO5m5}?!PQvnR)-!B$4qy D-$RUM literal 0 HcmV?d00001 diff --git a/data/icons/48x48/aweather.png b/data/icons/48x48/aweather.png new file mode 100644 index 0000000000000000000000000000000000000000..2b30a1c17395b4a8fe2848f13da1f08ac13e112f GIT binary patch literal 1864 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 + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/aweather.svg b/data/logo.svg similarity index 100% rename from data/aweather.svg rename to data/logo.svg diff --git a/data/main.ui.in b/data/main.ui.in index 0aeb93d..34fbbe9 100644 --- a/data/main.ui.in +++ b/data/main.ui.in @@ -320,6 +320,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. Andy Spencer <andy753421@gmail.com> + logo.svg True diff --git a/src/Makefile.am b/src/Makefile.am index 7203aa0..d3861eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ aweather_SOURCES = main.c \ aweather-location.c aweather-location.h aweather_CPPFLAGS = \ -DHTMLDIR="\"$(dots)$(htmldir)\"" \ + -DICONDIR="\"$(dots)$(datadir)/icons\"" \ -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \ -DPLUGINSDIR="\"$(dots)$(pkglibdir)\"" aweather_LDADD = $(GRITS_LIBS) diff --git a/src/aweather-gui.c b/src/aweather-gui.c index c349d12..6d8e423 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -441,6 +441,27 @@ static void time_setup(AWeatherGui *self) G_CALLBACK(update_time_widget), self); } +static void icons_setup(AWeatherGui *self) +{ + gchar *icons[] = { + ICONDIR "/hicolor/16x16/apps/aweather.png", + ICONDIR "/hicolor/22x22/apps/aweather.png", + ICONDIR "/hicolor/24x24/apps/aweather.png", + ICONDIR "/hicolor/32x32/apps/aweather.png", + ICONDIR "/hicolor/48x48/apps/aweather.png", + ICONDIR "/hicolor/scalable/apps/aweather.svg", + }; + GList *list = NULL; + for (int i = 0; i < G_N_ELEMENTS(icons); i++) { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(icons[i], NULL); + if (!pixbuf) + g_warning("AWeatherGui: icons_setup - %s failed", icons[i]); + list = g_list_prepend(list, pixbuf); + } + gtk_window_set_default_icon_list(list); + g_list_free(list); +} + /*********** * Methods * @@ -549,6 +570,7 @@ static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builde site_setup(self); time_setup(self); prefs_setup(self); + icons_setup(self); /* Connect signals */ gtk_builder_connect_signals(self->builder, self); -- 2.43.2