From 254304263258fff5960d4cbc7627933ae2630fdd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 15 Apr 2010 22:45:22 +0200 Subject: [PATCH] improve gui and add presence icons --- gtk-glade/friendlist.c | 24 ++++++++++++------------ gtk-glade/incall_view.c | 1 - gtk-glade/main.c | 4 ++++ pixmaps/status-green.png | Bin 0 -> 1261 bytes pixmaps/status-offline.png | Bin 0 -> 1179 bytes pixmaps/status-orange.png | Bin 0 -> 1252 bytes pixmaps/status-red.png | Bin 0 -> 1202 bytes 7 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 pixmaps/status-green.png create mode 100644 pixmaps/status-offline.png create mode 100644 pixmaps/status-orange.png create mode 100644 pixmaps/status-red.png diff --git a/gtk-glade/friendlist.c b/gtk-glade/friendlist.c index 25173488d..d4fddf871 100644 --- a/gtk-glade/friendlist.c +++ b/gtk-glade/friendlist.c @@ -39,17 +39,17 @@ typedef struct _status_picture_tab_t{ } status_picture_tab_t; status_picture_tab_t status_picture_tab[]={ - { LINPHONE_STATUS_ONLINE, "sip-online.png" }, - { LINPHONE_STATUS_BUSY, "sip-busy.png" }, - { LINPHONE_STATUS_BERIGHTBACK, "sip-bifm.png" }, - { LINPHONE_STATUS_AWAY, "sip-away.png" }, - { LINPHONE_STATUS_ONTHEPHONE, "sip-otp.png" }, - { LINPHONE_STATUS_OUTTOLUNCH, "sip-otl.png" }, - { LINPHONE_STATUS_NOT_DISTURB, "sip-closed.png" }, - { LINPHONE_STATUS_MOVED, "sip-closed.png" }, - { LINPHONE_STATUS_ALT_SERVICE, "sip-closed.png" }, - { LINPHONE_STATUS_OFFLINE, "sip-away.png" }, - { LINPHONE_STATUS_PENDING, "sip-wfa.png" }, + { LINPHONE_STATUS_ONLINE, "status-green.png" }, + { LINPHONE_STATUS_BUSY, "status-orange.png" }, + { LINPHONE_STATUS_BERIGHTBACK, "status-orange.png" }, + { LINPHONE_STATUS_AWAY, "status-orange.png" }, + { LINPHONE_STATUS_ONTHEPHONE, "status-orange.png" }, + { LINPHONE_STATUS_OUTTOLUNCH, "status-orange.png" }, + { LINPHONE_STATUS_NOT_DISTURB, "status-red.png" }, + { LINPHONE_STATUS_MOVED, "status-orange.png" }, + { LINPHONE_STATUS_ALT_SERVICE, "status-orange.png" }, + { LINPHONE_STATUS_OFFLINE, "status-offline.png" }, + { LINPHONE_STATUS_PENDING, "status-offline.png" }, { LINPHONE_STATUS_END, NULL }, }; @@ -153,7 +153,7 @@ void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss){ GtkWidget *image=gtk_image_new_from_pixbuf(pbuf); GtkWidget *menu; g_object_unref(G_OBJECT(pbuf)); - gtk_button_set_label(GTK_BUTTON(button),linphone_online_status_to_string(ss)); + gtk_widget_set_tooltip_text(button,linphone_online_status_to_string(ss)); gtk_button_set_image(GTK_BUTTON(button),image); /*prepare menu*/ menu=(GtkWidget*)g_object_get_data(G_OBJECT(button),"presence_menu"); diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c index 1cf772b05..c3c95eabe 100644 --- a/gtk-glade/incall_view.c +++ b/gtk-glade/incall_view.c @@ -208,6 +208,5 @@ void linphone_gtk_mute_toggled(GtkToggleButton *button){ void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive){ gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive); - gtk_object_set(GTK_OBJECT(button),"gtk-button-images",TRUE,NULL); linphone_gtk_draw_mute_button(button,FALSE); } diff --git a/gtk-glade/main.c b/gtk-glade/main.c index c87352f4a..770e12414 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -1226,6 +1226,7 @@ int main(int argc, char *argv[]){ const char *config_file; const char *factory_config_file; const char *lang; + GtkSettings *settings; g_thread_init(NULL); gdk_threads_init(); @@ -1272,6 +1273,9 @@ int main(int argc, char *argv[]){ gdk_threads_leave(); return -1; } + settings=gtk_settings_get_default(); + g_object_set(settings, "gtk-menu-images", TRUE, NULL); + g_object_set(settings, "gtk-button-images", TRUE, NULL); #ifdef WIN32 if (workingdir!=NULL) _chdir(workingdir); diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png new file mode 100644 index 0000000000000000000000000000000000000000..67eb9a972d5a1471f993628f983c0f2ac1f9da7f GIT binary patch literal 1261 zcmVP000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>Gy9s~#TqyPW}e@R3^R7l6Q zm49qgRTRg+=k~Q-JG#O)pqqaPbU-u_k-7EZk7R04h?O@=gxB! z%$_;Jl^qOq+zN)eg270~ZxM6c`RnDWHs4gHQSL;N0CUz5Z9uJCu6vM>*k10kvlcUBLK)?A|}~wkXB( zO-Dr&1D*`Y2CHO;#qfkWY~-0PF=|PJ`@}QC#mmbw~J`Ju(AjAiDCe0ApL_hBfCthEA&hjHYHE z8sXS}01yDJ2LNXM{WQSW?2&7mnbA&GKR2S5G>o1zLOlAQ2r;b99|H3V`we^fqod9~pBmZ%HW#BCMmh-ZFjfX}b)A z5&<9=K$bz}0pkLldDguQ)_-3j)hSQUHqPzz{&W(I?$ppNz~}>zS)&v>Q-1VMEG({^ z3gGk0`=bM~VU5)RpI;uX@yp)vgcEczU5kPU?EoZ(v;qL4D(?bt>2C^E)hi`4rr@jr zkdf-oV8-)?&CN`8djyDDQn|iWQOZq?8_q{eWL^Qn<&=^)%CSFve)%Jx-}6jeYjF+$ z)HN3`0>BeaP3QxFcaE*H67X2c?zh4=Vr>P`MPypqJJY@m0Csp!587?&asayl!~x_0 zs08Swriz9*uK3x-A#;ZOQQT}O%vUTVKr8do>V%LL&)23Duy z&>_s)%AI9D2QcxW8IvVphY zh(u$9_w2QQ-T?QJV;y^~y?tGe_J;#YBGLZ&02~aMiFts9=pkMEB_JMbKk7ZIO=aUR X+!)WS!rg8B00000NkvXXu0mjfBTzp+ literal 0 HcmV?d00001 diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png new file mode 100644 index 0000000000000000000000000000000000000000..243c5c069f0d359cb1d984bd6b2a03b53904beaf GIT binary patch literal 1179 zcmV;M1Z4Y(P)Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>G!9N0hb3IG5EElET{R7l6Q zm0fHURTRhn=YDKkTDIM;R%(e&#h^qX0#&2D6%DZ(9!%UA*syGO>6TZG_@FTxZ z69dyOrEOXhs)(jZQ66ecYJ5-=8YK|*!6uYag_+r{rR>h^Jw9|xKWtHXpPTzT z_ssbK{wM40?F}{ zs2Z&`l$Ia@{DKe9_uzXzdKUn`>T z$^$%^gNM8+*5*BLbFo-_qUiap0GgLm81&6@?dD~>GTj3J_5qlN5N|YWsIyvITl4?) z^DXPdLqhQpFk%2iNxs3v(e^~*)DlqV@#7IsDT?Ehs7LOk~bnu7UO>N7v?h-#|z9he+--Mx1SLKX`sl>)i(7w@9LawzjrE0HCw8dk+yBtE;PeB9TY|0D{5F z{%mgMZGh_mY^bkq+$@L?1^{71#gcR+^&tcA3Smw!h~^70y;n4Nr{qi%2@Hc^xzp2a z^V=ekNP)ov^J^)Kn*hJFl&fX|Y0nlXu_2_{E2Yyd0Z3h5-ZwNfwC>JF zMWzwJOLKwZW9f9-2mlBu`4$MjYbm!^R8@R>@#5(E+l34c4oW6r0Vo4#QcC&&^Svn+ zi(Qji?bTZ60$T6!idE+(CdPN&MrWvZb2FcVu?IjAjAT3>cb7C(02m$~-X029pALm; z8bh_!Mk#&Dw(U&Tp82Y|x!GF{aP(+jol;&3L`MKr0mu`mEt!me^tbLkZ)0O)m6gGY zH)}(|mkXY+9NUHCWOI(~o^$N%h1q=GVTLPU>I`r0fe)}=2#+;7$zcKbspWyMn*;+yym*wvbMX0 t2|)nsVJHh>E(>4`!1swnV)|BR`~|8|uDc}G)KLHc002ovPDHLkV1ioW3y1&! literal 0 HcmV?d00001 diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e66d34d04c7152d884a82fa5ad5e8cc1be6f57 GIT binary patch literal 1252 zcmVP000*V1^@s6{^R5m00001b5ch_0Itp) z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>Gz4@H`Ql>h()c1c7*R7l6Q zm2GTORT#&A=d``uTDtKzR%jP9#@lwsJBk`VAjYU6ktmWFqXZHY_<%-YA|h^H=G34@ zB1`Zk!4cnx2$*PsMiN7SL=r(!*0pnEW~19$wh654rMK-leppAk0ZxpbFZZ6e=Xam~ z|GDSD|J0hS8B<5zo&ROv3tNKui3xhG7GhIcu^*@#7ZTa~u+KZa@*ZbVd0C#nyvR8* zFnK7}*qe$s#geh6UwV5_{=97CnN-*c%u$++eVX+kCIhySO0T|YCK^PjI{2uw(7(kn z3YH6}*XeM35r!9K_k%rvw)??O;2SXd8>@rom0~_1a)KP0{YI?&hLFh1x0N=^%zgpO zrOS&nCLrBjq~S#x9x{WMQT6~T*^jdOQOSOBLm*tBX`>;BIXXJOcQ~ATlcLJT;055Z)G;qFkaO zyWyPhOxj%W;<@AF8Liji2%EtNv=Xm^UXn8t78&(W#cN${*C3(l;6Y#wa0prWglUCr zfUp&qlTq9S!Y^PzNEOC*g(_Ze>l*80V^v@yLhJ@yBOs)GhiP?R6^&NlPOZd`KnPj5 z#I!B$*SBY3}{j~7aIMF)pfDcJz}qmd+~mbXhZOM#4A<{cfT z>vdxQ#|LA@Gt8Q3S%r-HlyX!6JAf|0iDq-3j}zy&&MX8lYcA9a&G#doE2-8?(9?m= z*;Y$mc4G3_f?W3DnG}GqQ1ffs!e&j>Do9X<=DX~gr9*D}tB_?H0NSB<<`}j@f|v>v z0GO`2Ou?RXj9f_jgapNfQIVe8b_Y*pix||-TsQ_gR5$H z{o6YwWCdrTI0Z}rJ~3;e>m)#BP4tj7CTtUiS73PFx%k`R!-=luqFV)=vw|y79LoY) zkUYnzI{;|=V$-uOfB9QR@jS!um;b2-E`2c69sb zVdLrCd}O!Vaq0BJR99p{I?+{%);@%Afxaj-?Mmy@W~8G*d`aeJG5!MDxX9kPx#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV1P>G$2wY|f`2YX}L`g(JR7l6Q zm2GU3RTRg6_de~qJ#Dus?~b%(5+DIFyaZvvb^D-+5C|fuiI}KB&@aZoV$_gGG$iVL zOEg47(BQ%cW5gE(C5W_hiU??@PCK2lZe=hA0k)?d^yN8zSYf4XL!zEf_uPBW`Q86L zC-=htWCy^pkIJ%3zT>|KR7})3*MO{caB%@}{vUyUSiaitnK8A>oIP#4IdjScCED5l z({HD&A6wfmv_uch{P3N>1ayeNoeEi}UxsrQ=Pqg_aAg+tUcPq~s1g4?0&l4j*J$l^qrGm7 zQa6UjjW&zP_9e*nCa|ppww1*0OH3Hzti4XM9}No%;d@fx1wa{IGi7)@`y5^~?C`pq zRJkjbx^ULYSc$SsvTtJcd~#m4FIgk0^j(0f0CaQ#@e5bz8&nclCP?lSvfVYga^w8A zQ2g4(50qD0oVh;ITy~C@)K#~qDD0+^r1!qj}|DHmL+>wqjoFQSOvBMsitE+uxGF|x?Vu* z5ET``1mNI&+IsVoEu^ExK-Yl81=$k9w{`$Bak57C16~EogS5Y&S9DQ09|HPwQ&YYs zaJyFMTzg9EP3MmeJ$hh}eHp+gH8&ou zT{&k^iT`;))&k$8Fc!_FD+w^2mXwWJF7TPaZ3=m}P??Q-Iyd|!NM}>t_4s!j3{*+; z-H)95qJCf58w!M zoFV+rDCCXY)Rr1Lc3lCQOIOl8s{9V+HFxP!w@Z14<{OfT5tFo7m%5z25m2-|@l9l37z