From b13fab13d1cd94b22cc46a3e6acd4cb2847da4ce Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 22 Oct 2015 14:24:06 +0200 Subject: [PATCH] Replace incall view stock icons with our own icons. --- gtk/incall_view.c | 22 ++++---- pixmaps/CMakeLists.txt | 4 ++ pixmaps/Makefile.am | 8 ++- pixmaps/linphone-media-pause.png | Bin 0 -> 1947 bytes pixmaps/linphone-media-play.png | Bin 0 -> 2357 bytes pixmaps/svg/linphone-media-pause.svg | 72 ++++++++++++++++++++++++++ pixmaps/svg/linphone-media-play.svg | 73 +++++++++++++++++++++++++++ 7 files changed, 164 insertions(+), 15 deletions(-) create mode 100644 pixmaps/linphone-media-pause.png create mode 100644 pixmaps/linphone-media-play.png create mode 100644 pixmaps/svg/linphone-media-pause.svg create mode 100644 pixmaps/svg/linphone-media-play.svg diff --git a/gtk/incall_view.c b/gtk/incall_view.c index d7a4b6f55..a2f693ebc 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -94,18 +94,15 @@ void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){ g_free(text); } -static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const char *image_name, gboolean is_stock){ +static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const char *image_name){ GtkWidget *container=linphone_gtk_get_widget(callview,"in_call_animation"); GList *elem=gtk_container_get_children(GTK_CONTAINER(container)); GtkWidget *image; - if (!is_stock){ - if (image_name==NULL){ - gtk_widget_hide(container); - } - image=gtk_image_new_from_icon_name(image_name,GTK_ICON_SIZE_DIALOG); - }else - image=gtk_image_new_from_stock(image_name,GTK_ICON_SIZE_DIALOG); + if (image_name==NULL){ + gtk_widget_hide(container); + } + image=gtk_image_new_from_icon_name(image_name,GTK_ICON_SIZE_DIALOG); if (elem) gtk_widget_destroy((GtkWidget*)elem->data); gtk_widget_show(image); @@ -588,7 +585,7 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call){ gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image); gtk_widget_show(image); - linphone_gtk_in_call_set_animation_image(callview,"linphone-call-status-incoming",FALSE); + linphone_gtk_in_call_set_animation_image(callview,"linphone-call-status-incoming"); } static void rating_to_color(float rating, GdkColor *color){ @@ -781,7 +778,7 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){ gtk_widget_set_sensitive(linphone_gtk_get_widget(callview,"transfer_button"),!in_conf); gtk_label_set_text(GTK_LABEL(duration),_("00:00:00")); - linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_MEDIA_PLAY,TRUE); + linphone_gtk_in_call_set_animation_image(callview,"linphone-media-play"); linphone_gtk_call_update_tab_header(call,FALSE); linphone_gtk_enable_mute_button( GTK_BUTTON(linphone_gtk_get_widget(callview,"incall_mute")),TRUE); @@ -814,7 +811,7 @@ void linphone_gtk_in_call_view_set_paused(LinphoneCall *call){ gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel")); gtk_label_set_markup(GTK_LABEL(status),_("Paused call")); linphone_gtk_in_call_show_video(call); - linphone_gtk_in_call_set_animation_image(callview,GTK_STOCK_MEDIA_PAUSE,TRUE); + linphone_gtk_in_call_set_animation_image(callview,"linphone-media-pause"); gtk_widget_show_all(record_bar); } @@ -855,8 +852,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m gtk_label_set_markup(GTK_LABEL(status),msg); g_free(msg); } - linphone_gtk_in_call_set_animation_image(callview, - linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"),FALSE); + linphone_gtk_in_call_set_animation_image(callview, linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call")); gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel")); gtk_widget_hide(linphone_gtk_get_widget(callview,"record_hbox")); diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 546492c99..5ea2e90ba 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -50,6 +50,8 @@ install(FILES svg/linphone-camera-disabled.svg svg/linphone-security-ok.svg svg/linphone-security-pending.svg + svg/linphone-media-play.svg + svg/linphone-media-pause.svg DESTINATION ${ICONS_INSTALL_DIR}/scalable/status PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) @@ -96,6 +98,8 @@ install(FILES linphone-camera-disabled.png linphone-security-ok.png linphone-security-pending.png + linphone-media-play.png + linphone-media-pause.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/status PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 9cde89e53..7fefd52b7 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -34,7 +34,9 @@ dist_status48icons_DATA= \ linphone-camera-enabled.png \ linphone-camera-disabled.png \ linphone-security-ok.png \ - linphone-security-pending.png + linphone-security-pending.png \ + linphone-media-play.png \ + linphone-media-pause.png statussvgiconsdir=$(iconsdir)/scalable/status dist_statussvgicons_DATA= \ @@ -59,7 +61,9 @@ dist_statussvgicons_DATA= \ svg/linphone-camera-enabled.svg \ svg/linphone-camera-disabled.svg \ svg/linphone-security-ok.svg \ - svg/linphone-security-pending.svg + svg/linphone-security-pending.svg \ + svg/linphone-media-play.svg \ + svg/linphone-media-pause.svg actions48iconsdir=$(iconsdir)/48x48/actions dist_actions48icons_DATA= \ diff --git a/pixmaps/linphone-media-pause.png b/pixmaps/linphone-media-pause.png new file mode 100644 index 0000000000000000000000000000000000000000..f9e062f38071857756e01a7141ae8c28b3943f65 GIT binary patch literal 1947 zcmV;M2W0q(P)|$>A-r3zrI}#HYkSf#?BNC$& zYYK?ji3ClQ&xnBrCD3Y$S&2X`+nqai_oA(<*40D}vZZbtDY2npCGB><=HB!Aqi61% zot@9^a)Ia9yzhC>InOia+;h))&jmi@pv7v)FpQPaX!Lpj>x2+j5Ych~7s=vt%zT=N zMgjaw)3o1bGMTp*qu&b>(B0j=+V}linfWFFSJhFK0sMoAenmukGnver3+1pN0j6nQ zO+-5Z+yWr7(9R_UfLDYNy@P{;f33H2T>=cl_^7VyKLW6=MBQm-{sR#m0dSOvPBQbP zEW3!AKSo3?05$@+4nSiGA-g@#yU%sqcNbkiM@L6e)3oORELYqN;1yA(2R2 z!^{r=*rK?70QY9I*&kP{Ur|6hoz@N=I`jm9uLl)~P6{Eu>Nw89g_14>%d&0&@DzZR zN?(uIw!IVQN4g{`K7f%(Y2j8mJ+3f6W48T%puBZ^Y zqK23N*=+Vd0Pay-y9~ovsm9C^kjv$E0*C?tGyg7|&F-tEqxTZ+?d?AY@E2(|MWfLj zYIz{QvaCyp=qo{irhOk3*59y@PNxMCJ&?DV`Hoa7l^^Yb0A~II3e(_kwrxA%(X0&H zw)X=VmFC5hlarszmjwcd=tiZ^o{+fJ3I?!Ou>-Ce0QB_qGyrJNJ3Y_)b!gOTgzx(S zCn7S^>9ht&0psK2ttd>NH(b{}89v3z7#bQH1(076w&@)3QkkZ{HKt))q{YW z5aKF83eYs|N+sxM$fW8)z>S%&1f&3F4h|_q^nsf`c@%M50Z0Kvv@Gvs=CdL5su@Mx zVt^DNgb23Pnx^?7^Qs5xZdeBjBcSf_V_`C?2h1GI6e2nc6jq@i3m}A8jt?kgvJ3#g z%%4wqYX z5Yd+u^QHWcKtLoC*@MCXW^-3p*X1E`s|w4q)&b~{rVv5|C&fU(!Gi}+0I;PQ@qPb0 zp)stE`%&2TyriDfi?b3xRDR!{NF=Tafm}tHrnv#Y&5BFqI9EV6n{@#UNHYRpcWY~F z^t~il35H=TA)=q5!1IOTeA2wU5Ho)hz>NI8F&>XUSR7M~hK7cmV&=*Q7RoBc1kiQ; z5dc?9a}vPa#WC{)IF56ah`y`1cABPnd!>&0`}@x@^Wy+sXXc-li(}@;0K7p&Kd44N zkx1MDB`eO%cgsA{9F$A1lVw>iqmZ-ri0D?^wnNDiS(ddOz|$yfb)L6v`-`PwOD1;# z@YK}QEs$?J06H`O!m_L#W#ShLWLehz0MvPZcw%B=d)W$=TI=lWTp@(W0$8uO`x+Y? zzjoljf&X1FT?NTxa(OP7dj@lFYDOZFNaw)7z<9ZORj-&fZ{8fAnVH!SpiObV4d9-5 zJie!|ukV5mK&`E<(dOpn?ee*}R4H<%rlvlB`0(M1C&ZfW$dbuqV=k9_2*5XrijEP{ z!?|4U`Fd^^0idg^>r&tMw*uG!V2x7503MRJl~wN}>bhn%O>+woJpteoMMcv9vH%<+ zIwFL4-Eo|E)Brg}T8QXc046hcVE$F>F=oEgaU2^pqV9|CR4TP}a&q$9M06MC4tX(h z0M5!jVvt$yGB_^3CyzlHk-ALjE0Z{LuS$ zZ#KK>zD@k#@6$Wy-h0mZ?YZy1d(U0q{~R<|hGMbU;%GE_1%Q=8h~-4I2*3i_e3qF{ z644O=Z)%$M+iW)b?p*kt6@jji@i^X_;&``}az0ltVI^ zyquXI0I*(B`vC5>Eb9js8b2d}OeUipIB?)G0AJ4!AQ}-u++y4IzG{Om1;a3|2Jkq5 z#fq!m`}n+}wO} zXlUqAsWDn9Wg?Ndf|(ywRJ%JmIyO0uURx-rjRFIW`O$+P3L;--AU$ZQ0cO{N$YHErz*(8K;<{}dv9UV^r_>&atqS5FUwLS0HFpLip z(M|aVP5TaJSbtUczF+ElGAEhHWHN$?9tdP+zO}o%JIHo{05g9Xg=z4*X_|JWPKpQ| z0`Qi6ZW2P+@p$}_s-l-LP4guHN2K_H@$vC51Z{Z&M0AZZW@i`&(P&hiLhpE*`b#0N^;zi064%0eD+BUE+D3Q!R=9 z{{ABXf)%lGU|?WXo&c276f^%JtZ^YkJ_AIQfAJm18PPOt3JKSBXOoG1Y(j`j0ZBm9 zv=vIHqhYP81W>ecWwY7iDhVQ5;(4AKkHZd5SdO#8oLgcsAnx^@c8Vpbg0RZUh>-%Rk8odfYaOPd%`~JNlT&cTZ9Vlc#-Q(AX zFbDvML?Y_$}v-<})CKU>SVP=;-J#09+pgPeeCami2Vl;3d|huygohHk&;Q zOx=zCMtQy-Ay7Pp(&=>V=;&xKfGeTNF=fog*AL# zDwSGRsqvy^w9a+imjMKO_DLe@u`KIXRYeZKFpQM|;!+esi2O-0?|9$7eZv6EASU1U zzg4LNH3PELZb*X8`4-fxm>C&YO0E}sxw!t*bS(V%YAel_w3Lq26 z%zV3T+ta3Fx$-(0hVdc_HG7YUZZJ)=qB_xRVHn0{08gT@*?i74&99W|Te7$dfOEOr zb&y{>06H`O)G&-KW%|z*$S{oi0jTr-;MmyM=CT83vewzzd9e_}0D<46|EY50E_lVXZr!@Z$;ru=0JJOWcLChf*x0zU zx3@R+0Z2t#TU)fDp$=Z{xmg5&R4R3m@B148YyqGay%@j_d0TnG`-o82tcgToJrO+yptw{x0l)%a6VV|d z#6N7?eoyTnr${RieFi{+nd6v#)q0GXZ?kRNM1=@_(cRtMJ%4Ux| z>7yR9>RkpWWhNh~^r|*M)qgc;Z*N~%S66oG14Oh_{@vhgH3sJ7&mQs~ zAi>O6646Qkt(aaMID_*Q<~IPm3c!*V7_-8h{ad9NJv}`&r%#`**L9swoH#Ld`0!!( bf8po9tbA)A9x*oG00000NkvXXu0mjfV76Qy literal 0 HcmV?d00001 diff --git a/pixmaps/svg/linphone-media-pause.svg b/pixmaps/svg/linphone-media-pause.svg new file mode 100644 index 000000000..0e8ed0de7 --- /dev/null +++ b/pixmaps/svg/linphone-media-pause.svg @@ -0,0 +1,72 @@ + + + + + + image/svg+xml + + pause_big_default + + + + + + pause_big_default + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-media-play.svg b/pixmaps/svg/linphone-media-play.svg new file mode 100644 index 000000000..3eb7f0066 --- /dev/null +++ b/pixmaps/svg/linphone-media-play.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + pause_big_default + + + + + + pause_big_default + Created with Sketch. + + + +