From 8b3d28af547ed58a8613aebf6b9df22171332e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 4 Aug 2015 16:08:25 +0200 Subject: [PATCH] Use PNG format for volume control icons on Windows --- gtk/main.c | 11 ----------- pixmaps/CMakeLists.txt | 12 ++++++++++-- pixmaps/Makefile.am | 15 ++++++++++++--- pixmaps/linphone-micro-enabled.png | Bin 0 -> 1714 bytes pixmaps/linphone-micro-muted.png | Bin 0 -> 1745 bytes pixmaps/linphone-speaker-enabled.png | Bin 0 -> 1294 bytes pixmaps/linphone-speaker-muted.png | Bin 0 -> 1976 bytes 7 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pixmaps/linphone-micro-enabled.png create mode 100644 pixmaps/linphone-micro-muted.png create mode 100644 pixmaps/linphone-speaker-enabled.png create mode 100644 pixmaps/linphone-speaker-muted.png diff --git a/gtk/main.c b/gtk/main.c index 5a03ac033..f9bc2722d 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2124,17 +2124,6 @@ int main(int argc, char *argv[]){ /*for pulseaudio:*/ g_setenv("PULSE_PROP_media.role", "phone", TRUE); #endif - - /* Add the data directory of Linphone to XDG_DATA_DIRS to enable GTK+ to find - the Linphone specific icons */ - tmp = g_getenv("XDG_DATA_DIRS"); - if(tmp && strlen(tmp) > 0) { - char *xdg_data_dirs = g_strdup_printf("%s:%s", tmp, PACKAGE_DATA_DIR "/linphone"); - g_setenv("XDG_DATA_DIRS", xdg_data_dirs, TRUE); - g_free(xdg_data_dirs); - } else { - g_setenv("XDG_DATA_DIRS", PACKAGE_DATA_DIR "/linphone", FALSE); - } lang=linphone_gtk_get_lang(config_file); if (lang == NULL || lang[0]=='\0'){ diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index cae9128b7..595130e14 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -20,7 +20,7 @@ # ############################################################################ -set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/linphone/icons/hicolor) +set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/icons/hicolor) file(GLOB PIXMAPS "*.png" "linphone.icns") @@ -37,7 +37,15 @@ install(FILES svg/linphone-micro-muted.svg PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) +install(FILES linphone-micro-muted.png + linphone-speaker-muted.png + linphone-micro-enabled.png + linphone-speaker-enabled.png + DESTINATION ${ICONS_INSTALL_DIR}/48x48/status + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ +) + install(FILES linphone.png - DESTINATION ${PACKAGE_DATA_DIR}/icons/hicolor/48x48/apps + DESTINATION ${ICONS_INSTALL_DIR}/48x48/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 708ce8587..5fc6a5a52 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -17,12 +17,21 @@ dist_pixmap_DATA= \ dialer.png \ notok.png -appicondir=$(datadir)/icons/hicolor/48x48/apps -dist_appicon_DATA= linphone.png +iconsdir=$(datadir)/icons/hicolor +appiconsdir=$(iconsdir)/48x48/apps +dist_appicons_DATA= linphone.png -statusiconsdir=$(datadir)/linphone/icons/hicolor/scalable/status +sacalable-status-iconsdir=$(iconsdir)/scalable/status dist_statusicons_DATA= \ svg/linphone-micro-muted.svg \ svg/linphone-speaker-muted.svg \ svg/linphone-micro-enabled.svg \ svg/linphone-speaker-enabled.svg + +status-iconsdir=$(iconsdir)/48x48/status +dist_status-icons_DATA= \ + svg/linphone-micro-muted.png \ + svg/linphone-speaker-muted.png \ + svg/linphone-micro-enabled.png \ + svg/linphone-speaker-enabled.png + \ No newline at end of file diff --git a/pixmaps/linphone-micro-enabled.png b/pixmaps/linphone-micro-enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..44ba551af7084db8c39cbea485bbc828142ef9a9 GIT binary patch literal 1714 zcmV;j22J^iP))U^fGB$&onkfsSV*br1CslDbhLGFsM3n`n#EENj|gY1t%2}&dqPJ4U%CoRjmljMl1ZY3!IR8^Nr9y7-Lad~<9*GG;Vc{QkhtssO9 z4Go1mJ3GH&S=M(+CIM7PzO1T8NxlXkMDlu)S;uj<#bUAI%*@Q0jRIiBx8BEXnti{3w8){{H@{+1c3(S6qeC>Ga1f%la9~s{uSw zE|(wA=kw>@4m6X=+(GjDBnON!j~ZjXGd@1n%!rc^4erJYyX*p*6!R}5eylqNtEpb5~px7ik?_Zn0`4FO~_nGbYybUc#D zWWIPgS1p}R-w=sJewfK*KG!Hjqk~D1{ECQ-rqk)jWm5-{VG+4cL~c)|Qtd$kw5)nw zmO|3;KejeEaTA~k&;ut;*+uGXJVlKshnouaD zbqR)=`7AFkE}FmqNM2A?mt>dgx|`}=tpF$k*i@}n8zM-j(NT}`*L7b5@H&8A5gBSkmgjk0s=5P!NAg51t&&J2TKse* zRJC~G#EEi{dteU0agyDR!>V zMVjl6*1HJ#gT_fq7Lu3_w&hyKC33Za+XT8DpLS@H)xSNF;K9GMU`;PI7kd z-u(%ZUj+~b@Z8+o+zWNDvjDCEaJ*8fOg9S9XhuL|v6x44FUjj#T3SvPi^XX_wK5Zl zL?R?dNZ#x?PFFMg&Z{8y!qat!2$I0POcX@6oZb zvA@?;c<0WYUl5Up0NBQuALVkn=hku#tU1EkvuDrUmSsH*V5_P=S*cVW&*$_1uE|TK zQhlwhtsn9&%@&f&08WX>^!)t%%Y{OrTATTfj*h!YeiOhp08f_7<$d{letu0Z_$5S5 zwr$&A1F#Q3x2pcd81vJGg@uE)!PUtYe>Uq6C60`YYz9ufI6fGw)}8&&;wE|)vG z<{08qj{JB$9_sDw{gQ}0NOBOstg8OO^SnQmN~NPyQ&aP+)gYNnwuVBXm~Gp80epsJ z3P4p=f91OFV-ph-$1f=eT2BC#&1P=_a4&#cNNxgf&fkbf0n7nd0${6ZuZUa+;DZ3R z1F!)cQ`KL1p0|H|eEgCxI)b?1*eW8olKeD)B*`w{IGDOssGT>DVeP6BwbTrU6f@ZrOA>m7LD0IOs&lgT_F zB98&cm&@hRd_I2x0bjAg*Tulydf)Y~)V^DmRlOX8Z-$gjfDO0@SQkV5x3XHTvhLl+ z{I5hZne1+DZM~Ibj~|96N#3TaMF784)iTKyW6V^YGq-U7vf1osN&dVpFegdNcg5X0 zxBTgqm6Zo3Cnpy+lnSZpzeqj>ptr7W_0L=Y<{9 literal 0 HcmV?d00001 diff --git a/pixmaps/linphone-micro-muted.png b/pixmaps/linphone-micro-muted.png new file mode 100644 index 0000000000000000000000000000000000000000..cf666ebd0299b35902c8d94bf579df82b50e13f1 GIT binary patch literal 1745 zcmV;?1}^!DP)7_h-#I)m zTWuHH_11S&dtUC|IrH)V&zy7S%(*Kxp`=o&E@RB+MP#Ef=8~$O48!mxK;xcE;v6iO z%k`@20pL!+)QP8nA9Qwh9vm7Pnq6@Oa=F|Cs`^+B@P7jTcJH?Wt*-tVRoz`Gl`gIr z0-opX1AYu3BEur`9pCp~s>%z6!rDru@-5(D;2PkMmoHyVPfku=`Opbuv)Sz;avVqk zkB4D+|3bR%dEOm>545Z5qoq>mq2Jhjv$JLM;y6ntli6g9DFfSq3nJnLLGah6dZ8wO{{(O$kx0BR_!UE7KJdk2 z@o!h<9Ec(C+x$VnuLJ_?lgXs-z`rRXg+{>RPS6jtc)p>Kr(BjAN}O@e8{94^z}(#2g+w9& zux8JmJ*_h{GwYqJ{5WtP$d*c_7w0)wHmE8ha=z}s+$bWo^To3R#+cI%bZa`D-d?kk zr+~KsGd(@Mw;p^LhA+;mAF6k{=kYqx4p;wbtOSb1;xzDQfMhbcyIMasHujE){K2j2 z6At_v#+b}P;IrB6J-{}gVvPA+?Im7BdfkHg&G16Mb*ppV;NW0wzb9%8{E{&yTbq@e zCkb}Qy&m#?|Bb3_c6N5JyCa_tf}kn)fnNi&z>e|p@x9JfZdKKv*0fn`t^H78UDJ0& zWL#CN$=#j6CMSCtD1>47ubQ3tk%;UE&bPF*+&nxye5ol1nK9-O=Tf&io9G74scI$+ z!vWwv;1qC;s^)+_z*ijjimD!LYirwC3*Pg*uQ~7l4>tn7;T>=j4ggP9J)f%XER{;n zRpo<&gJyhuyvG=Go3-}c4;;W)7=|--LEc_fJq)x1N8KXOGy?to{Wn!Am9mK3R8##z zB9Rzqt%AJbzY1zNe~>0&CrgdL)XXAC}AI zT4oW41(Z!V*FaUAc1T)`$-WQ zb-MbBwKhFEI(n)BZ}kn}u!#IA2!h+2b?-0>c^eTKap2FWYJVf(uV$H-Koms-z!uk*4iiIRH6R@LrST!l;n!500000NkvXXu0mjf-q~JO literal 0 HcmV?d00001 diff --git a/pixmaps/linphone-speaker-enabled.png b/pixmaps/linphone-speaker-enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..0c8d7a9513ae0e4da6a0008cfcff5fe425178127 GIT binary patch literal 1294 zcmV+p1@ZccP)wfTIBJ`D^)!ZZGw{T9tx-8o-1ae7U6307wY&Du8|fw@4e8a{{A+ zo3+6(jKcsPRm|T2I0WFmNUwkpVzpry6Ke28H0b+&oSDx?nnIRkJq}9u=#ry*^KjApe zkCn_4B~z%gv-9pkp^z&Ie#kVqY)mYFXCXaLX>i^ci@Y`O*j5q)Rdw)0;$DDilFsjll? zK@c4GJntd^WV6|`$z*af5uK1RZ?r5cY1_7|A!1^hrbk2{8;0?vN)^|2Z2)g8d+^Pw zmD7u13o|d1^kpm#*s4{-A$oG>nULHvRnxCq|<4QhIAtdZ(u5Cq4HR$zm&0;eJe zfSGqF>gx-qF#x1esTO8VEii30SwCje#dbRs?-X@@PN{;4tkz&vFRO~XIm@zInYmA;Rwk1< zbG>qUm;5cJt+X{w+aizoN=Y65zDXZ&9A~exskKWba@GohU?P!7G*>Em+qS`tfCVO7eG5;Mja5w#N0gt96-bGh8-@p!x;@&M%0{%RP; zdS>od_C>d07~?{S)sY7v)7}-Cw|fCBH2C)c_&SwJ^+X8!y}eu z?W_p^5=2JV^@jm`ztH(H^FATOCv9zQvB(3Ez3Z7mp|B2sno_sc)z#$yG({eOEQ_ao z-+zjk52`&Z5gn)r007{5p6|NuEAs074{5%sW&kMX#Q-x40Ox9A58UX`3&U_NfYVBQ zSn@YBy_&UtKA)d%YHIpO)3iDO=b3p=KA)e&|5C&9Cr0Gc;U5Q&egFUf07*qoM6N<$ Ef<7)!_y7O^ literal 0 HcmV?d00001 diff --git a/pixmaps/linphone-speaker-muted.png b/pixmaps/linphone-speaker-muted.png new file mode 100644 index 0000000000000000000000000000000000000000..91e96eddb08dd036e31714fbd9d9198a1c8a7cdc GIT binary patch literal 1976 zcmV;p2S@mcP)NQJ7eN~HrB3PYqqzyuj%aURKvr=Cuyz$BoYZL5{cZ; z%*&Kg_Y{l8f7H6Sx3{--baZqNGiL#m0W7oT5_~$Hz6`)_W=;WsVHjrsY^-H(JRYA{ zE|&)Y+!&IghGASfX9C!^{Yd~X0qCgEi0Fg0?Ct64iH(hoNDIWg*FD=DVbn&jWzbWb94 z`+kC%|6T+5Yl!HG2L3F7tPtWr_1cCD;5g1L0A2;q8Ilwc-RHXQ?VjhIoo;_7lewOV zJOGPA(&-SqH`)3|3P6tIY+>fT0Op0XQ$*D3y6)CmeBW`LxKb()AQqDTWf(?E2r)R- zo`%Fgc)&cz%%9iDe`My>LWn=tXt@kC?*q^pl1?zQT__ZeU1;B|Es#p3K2|Q5OI6_a zMD&UFejUWh;Qp#h~?KNiU?>8ET@fv_nX(@7REEfA*E|)u9BaijW zyc@tJA!#@Wg6_kI5C5r_{g!Rp^O^ZUB3fLR!xIrR_W+27q%iSWWU@%z1D7@2%N|917FY&QD= z-}j$l<_{Z&v8hlf{8e|M56vp|5FI6=t{H&W$15!@Ey+Tm@b+YrzVEMM<_!Q=DW&$u zGU&1^yP5jde?P#Hmfd5r_+xU(bqKEThVB=V_;z5J*@<}+%(NqK@c49JnvoY zbasg7U`6RfWV@~_n_bKS0Q&m+4BNJ!tO5@rD(T<>AQFjqM6}bgtY7J_BBgWzd|$KN z_vWG+MIw=~1_uXs0{F@#)2iA^%)BssUJ;E(f2dEIrui6vQ{n4%$z*b=(PZ!~rfKd4 zuujvud!gh8;BHN@yOPP|(#m8$pZ_<2{hC0%O%q_{%9YVbB(j%?dNs3e4}#$F3+)Rl z&Rvx}VVdTxRY9NEUaxJ60P%QyUTbUXp|JU`X#TrW%FRSnOGERL_Iyp%+=%wv-tdMd zolajyM2GZ4DlDhB){&l1D)ry+m|r!0N_(E)Pzz+U*@dBxcWFNT^?JYqKoA6-+UuKD z!Y$Mk^H#$INTpI&OiWB10dQ?4!!YwEA;c5)rd%T0sQLVn^U{`5%eA>TtOkK!685iG zR!)Ba8>Ey!ua{S;RO-`|@JRmKtWZj2DxNkmF>%P4CHU&*yG%r@X9_+PU{CnDLkO{5cP*vVwo2&@V2|f{Cuc0c zB+d63BFeh1dvG>Nky5UYL?ZL0lwZ{Q=)u9kM*!FrE1RbI?fAQpw z4{JefoSr4~2!Lmk$>j28p?6*Pmqhdh0N*%w?%a8FvTb`afM>Pz^}6r-pDq@Qf0I%U5m6Tr9jzD&z?M>}^ov9y zvEZT$;5g2A0BqAV|2xAl(w^tNshRelmSug0nRjSGp0zCNRok|&zGwp2w*4qGKd6z0 zeBYn+<{+2LjfHu8V^~H2z*PWV$z(FUb1eX+)9EJwY|+mb!!R8ESf8R9c^bgY0Nx2n zmnx<9IgYcXSpt~Vm7rx=PZH54jhv50qpNed+hJFl zX2aa`JYPz=IlOwWSn-l(1hEeOneOiHJL|kIoUX#$6~@GgW@VuV0Q`lS9}+@rY{n@n zr5sX9T?gPbtvx(DTfP_Lw-POuWjzAm<4UP-6^q4T{C~WU$A186t`#WAKLTR_0000< KMNUMnLSTZE;?ZmX literal 0 HcmV?d00001