Migrate startcall and stopcall icons

This commit is contained in:
François Grisez 2015-09-24 01:30:22 +02:00
parent 2b2579453e
commit 134c7f09ac
12 changed files with 95 additions and 91 deletions

View file

@ -84,7 +84,7 @@ static GtkWidget * create_conference_panel(void){
GtkWidget *conf_frame=linphone_gtk_create_widget("conf_frame");
GtkWidget *conf_box=linphone_gtk_get_widget(conf_frame,"conf_box");
GtkWidget *button_conf=linphone_gtk_get_widget(conf_frame,"terminate_conf");
GtkWidget *image=create_pixmap("stopcall-small.png");
GtkWidget *image=gtk_image_new_from_icon_name("linphone-stop-call", GTK_ICON_SIZE_BUTTON);
GtkWidget *box;
GtkWidget *viewswitch=linphone_gtk_get_widget(mw,"viewswitch");
GtkWidget *participant;

View file

@ -64,7 +64,7 @@ LinphoneCall *linphone_gtk_get_currently_displayed_call(gboolean *is_conf){
static GtkWidget *make_tab_header(int number){
GtkWidget *w=gtk_hbox_new (FALSE,0);
GtkWidget *i=create_pixmap ("startcall-small.png");
GtkWidget *i=gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_BUTTON);
GtkWidget *l;
gchar *text=g_strdup_printf(_("Call #%i"),number);
l=gtk_label_new (text);
@ -85,9 +85,9 @@ void linphone_gtk_call_update_tab_header(LinphoneCall *call,gboolean pause){
gchar *text;
if(pause){
i=gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE,GTK_ICON_SIZE_SMALL_TOOLBAR);
i=gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE,GTK_ICON_SIZE_BUTTON);
} else {
i=create_pixmap ("startcall-small.png");
i=gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_BUTTON);
}
text=g_strdup_printf(_("Call #%i"),call_index);
@ -109,9 +109,9 @@ static void linphone_gtk_in_call_set_animation_image(GtkWidget *callview, const
if (image_name==NULL){
gtk_widget_hide(container);
}
image=create_pixmap(image_name);
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_DND);
image=gtk_image_new_from_stock(image_name,GTK_ICON_SIZE_DIALOG);
if (elem)
gtk_widget_destroy((GtkWidget*)elem->data);
gtk_widget_show(image);
@ -152,10 +152,11 @@ void transfer_button_clicked(GtkWidget *button, gpointer call_ref){
int call_index=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(call_view),"call_index"));
char *remote_uri=linphone_call_get_remote_address_as_string (other_call);
char *text=g_strdup_printf(_("Transfer to call #%i with %s"),call_index,remote_uri);
GtkWidget *image = gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_MENU);
menu_item=gtk_image_menu_item_new_with_label(text);
ms_free(remote_uri);
g_free(text);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),create_pixmap("startcall-green.png"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
gtk_widget_show(menu_item);
gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_transfer_call,other_call);
@ -440,7 +441,10 @@ void linphone_gtk_create_in_call_view(LinphoneCall *call){
gtk_widget_hide(conf);
button=linphone_gtk_get_widget(call_view,"terminate_call");
image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png"));
image=gtk_image_new_from_icon_name(
linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"),
GTK_ICON_SIZE_BUTTON
);
gtk_button_set_label(GTK_BUTTON(button),_("Hang up"));
gtk_button_set_image(GTK_BUTTON(button),image);
gtk_widget_show(image);
@ -568,12 +572,12 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call){
display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
answer_button=linphone_gtk_get_widget(callview,"accept_call");
image=create_pixmap (linphone_gtk_get_ui_config("start_call_icon","startcall-small.png"));
image=gtk_image_new_from_icon_name("linphone-start-call", GTK_ICON_SIZE_BUTTON);
gtk_button_set_label(GTK_BUTTON(answer_button),_("Answer"));
gtk_button_set_image(GTK_BUTTON(answer_button),image);
gtk_widget_show(image);
image=create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-small.png"));
image=gtk_image_new_from_icon_name("linphone-stop-call", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),image);
gtk_widget_show(image);
@ -841,7 +845,7 @@ void linphone_gtk_in_call_view_terminate(LinphoneCall *call, const char *error_m
g_free(msg);
}
linphone_gtk_in_call_set_animation_image(callview,
linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"),FALSE);
linphone_gtk_get_ui_config("stop_call_icon_name","linphone-stop-call"),FALSE);
gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel"));
gtk_widget_hide(linphone_gtk_get_widget(callview,"record_hbox"));

View file

@ -75,6 +75,7 @@ install(FILES
linphone-add-call.png
linphone-start-call.png
linphone-start-chat.png
linphone-stop-call.png
linphone-hold-on.png
linphone-hold-off.png
DESTINATION ${ICONS_INSTALL_DIR}/48x48/actions

View file

@ -1,8 +1,7 @@
pixmapdir=$(datadir)/pixmaps/linphone
dist_pixmap_DATA= \
hold_on.png hold_off.png \
linphone.png linphone-banner.png \
startcall-small.png stopcall-red.png stopcall-small.png linphone.icns \
linphone.icns \
ok.png \
notok.png
@ -50,6 +49,7 @@ dist_actions48icons_DATA= \
linphone-show-dialer.png \
linphone-add-call.png \
linphone-start-call.png \
linphone-stop-call.png \
linphone-hold-on \
linphone-hold-off
)

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Calque_1"
x="0px"
y="0px"
width="128"
height="128"
viewBox="0 0 127.99999 128"
enable-background="new 0 0 595.28 841.89"
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="linphone-stop-call.svg"
inkscape:export-filename="/home/francois/projects/linphone/linphone/pixmaps/linphone-stop-call.png"
inkscape:export-xdpi="33.75"
inkscape:export-ydpi="33.75"><metadata
id="metadata26"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs24" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="709"
id="namedview22"
showgrid="false"
inkscape:zoom="3.1714775"
inkscape:cx="30.869103"
inkscape:cy="70.58122"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Calque_1" /><g
id="g3"
transform="matrix(2.0650379,0,0,2.0650379,-714.22704,-804.79365)"><path
d="m 382.281,405.372 c -4.424,-1.164 -9.108,-1.593 -12.965,-0.649 -7.273,1.766 -9.62,4.19 -9.244,10.293 0,0 -0.134,2.94 6.068,2.83 1.377,-0.025 4.886,-0.758 5.386,-2.268 0.496,-1.508 -0.259,-3.038 -0.298,-3.778 -0.04,-0.739 2.005,-1.743 2.865,-1.827 1.115,-0.11 3.937,0.068 6.78,0.769 l 0.122,0.032 c 2.82,0.796 5.355,2.032 6.271,2.681 0.706,0.498 1.995,2.381 1.596,3.001 -0.402,0.625 -1.812,1.584 -2.127,3.141 -0.312,1.561 2.381,3.928 3.562,4.629 5.34,3.162 6.675,0.535 6.675,0.535 3.341,-5.12 2.498,-8.385 -2.95,-13.515 -2.896,-2.723 -7.178,-4.665 -11.6,-5.834 l -0.141,-0.04 z"
id="path5"
inkscape:connector-curvature="0"
style="fill:#c1001f" /><g
id="g7"><g
id="g9"><g
id="g11"><linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="348.47681"
y1="587.90869"
x2="406.73471"
y2="572.29858"
gradientTransform="matrix(-1,0,0,1,753.3428,-156.7246)"><stop
offset="0.15"
style="stop-color:#C1001F"
id="stop14" /><stop
offset="0.35"
style="stop-color:#F4F7EE"
id="stop16" /><stop
offset="0.55"
style="stop-color:#C1001F"
id="stop18" /></linearGradient><path
d="m 392.784,398.354 c -1.882,-0.887 -4.09,-1.869 -7.353,-2.662 -3.447,-0.755 -6.896,-1.283 -10.644,-1.184 -3.949,0.198 -5.917,0.594 -9.073,1.383 -2.858,0.886 -4.242,1.382 -6.507,2.562 -0.99,0.496 -1.774,0.986 -3.745,2.368 -1.289,0.991 -2.766,2.17 -4.177,4.167 -1.193,1.387 -2.382,3.765 -3.171,5.747 -0.893,1.982 -1.387,4.162 -1.387,6.535 0.1,4.167 1.091,7.937 3.166,11.202 1.788,2.773 4.071,5.252 6.741,7.232 l -4.354,11.689 15.052,-6.143 c 0.396,0.1 0.792,0.199 1.095,0.301 3.868,1.188 7.529,1.682 11.098,1.781 4.661,-0.1 8.918,-0.793 12.683,-2.18 3.571,-1.488 6.539,-3.473 8.917,-6.045 2.379,-2.676 4.832,-6.805 5.427,-10.475 0.882,-4.582 0.643,-7.644 -0.052,-10.414 -0.793,-2.774 -1.666,-4.973 -3.604,-7.78 -2.105,-2.421 -3.055,-3.449 -4.832,-4.832 -2.174,-1.572 -3.595,-2.361 -5.28,-3.252 z m -8.01,2.274 c 2.77,0.788 4.953,1.585 6.54,2.481 1.391,0.793 2.972,1.878 4.562,3.171 1.482,1.283 2.873,2.77 4.062,4.653 1.283,1.783 2.075,3.869 2.477,6.242 0.496,3.473 0.298,6.44 -0.693,8.825 -0.989,2.377 -2.367,4.363 -4.161,5.75 -1.883,1.486 -3.863,2.572 -5.943,3.369 -2.082,0.693 -4.068,1.182 -5.946,1.482 -1.782,0.197 -3.171,0.396 -4.066,0.396 -3.271,0 -6.538,-0.494 -9.705,-1.379 -3.274,-0.898 -6.351,-2.279 -9.12,-4.068 -2.677,-1.877 -4.954,-4.16 -6.645,-6.936 -0.991,-1.686 -1.679,-3.176 -2.17,-4.766 -0.496,-1.486 -0.792,-2.968 -0.792,-4.355 0.098,-2.774 0.989,-5.45 2.771,-7.827 1.684,-2.482 4.26,-4.365 7.624,-5.846 3.273,-1.59 7.139,-2.284 11.593,-2.284 3.666,-0.003 6.832,0.394 9.612,1.092 z"
id="path20"
inkscape:connector-curvature="0"
style="fill:url(#SVGID_1_)" /></g></g></g></g></svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

View file

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
<g>
<g>
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="190.6316" y1="411.1187" x2="247.7873" y2="426.4333" gradientTransform="matrix(1 0 0 1 0.5605 -0.2207)">
<stop offset="0.15" style="stop-color:#3BCB09"/>
<stop offset="0.35" style="stop-color:#F4F7EE"/>
<stop offset="0.55" style="stop-color:#3BCB09"/>
</linearGradient>
<path fill="url(#SVGID_1_)" d="M203.045,443.109c1.845,0.869,4.011,1.834,7.209,2.609c3.387,0.74,6.767,1.26,10.441,1.162
c3.874-0.195,5.806-0.584,8.905-1.355c2.808-0.871,4.157-1.355,6.379-2.516c0.974-0.482,1.745-0.967,3.675-2.322
c1.266-0.973,2.714-2.131,4.103-4.088c1.171-1.359,2.338-3.693,3.111-5.639c0.875-1.943,1.359-4.082,1.359-6.41
c-0.102-4.088-1.074-7.787-3.109-10.99c-1.756-2.722-3.995-5.152-6.615-7.096l4.275-11.469l-14.771,6.025
c-0.389-0.097-0.773-0.195-1.069-0.294c-3.8-1.165-7.391-1.65-10.891-1.747c-4.571,0.097-8.747,0.777-12.443,2.138
c-3.501,1.459-6.416,3.406-8.747,5.93c-2.333,2.625-4.738,6.675-5.321,10.277c-0.865,4.496-0.634,7.5,0.048,10.216
c0.776,2.721,1.637,4.873,3.537,7.633c2.064,2.369,2.995,3.383,4.738,4.74C199.997,441.462,201.393,442.228,203.045,443.109z
M210.904,440.878c-2.717-0.773-4.858-1.557-6.416-2.436c-1.363-0.777-2.918-1.846-4.476-3.111
c-1.456-1.258-2.819-2.717-3.986-4.562c-1.261-1.75-2.039-3.797-2.43-6.125c-0.486-3.408-0.292-6.319,0.677-8.657
c0.975-2.333,2.327-4.282,4.083-5.643c1.851-1.458,3.793-2.522,5.835-3.306c2.041-0.68,3.988-1.159,5.83-1.455
c1.75-0.193,3.111-0.389,3.988-0.389c3.208,0,6.416,0.486,9.522,1.353c3.213,0.88,6.229,2.237,8.946,3.991
c2.625,1.842,4.861,4.083,6.52,6.804c0.973,1.653,1.646,3.116,2.13,4.675c0.486,1.459,0.775,2.912,0.775,4.273
c-0.097,2.721-0.973,5.346-2.717,7.68c-1.646,2.438-4.18,4.281-7.479,5.734c-3.213,1.561-7.003,2.242-11.375,2.242
C216.737,441.953,213.629,441.558,210.904,440.878z"/>
</g>
</g>
</g>
<path fill="#3BCB09" d="M214.437,435.634c4.198,1.105,8.646,1.508,12.292,0.615c6.897-1.672,9.124-3.973,8.765-9.754
c0,0,0.129-2.787-5.756-2.689c-1.305,0.023-4.629,0.732-5.101,2.148c-0.472,1.434,0.24,2.885,0.282,3.582
c0.042,0.709-1.902,1.664-2.717,1.736c-1.062,0.102-3.732-0.061-6.431-0.727l-0.121-0.031c-2.673-0.75-5.081-1.922-5.949-2.547
c-0.667-0.467-1.889-2.254-1.506-2.844c0.382-0.596,1.722-1.502,2.018-2.98c0.296-1.479-2.261-3.723-3.376-4.386
c-5.064-2.999-6.333-0.514-6.333-0.514c-3.16,4.855-2.368,7.949,2.798,12.808c2.75,2.588,6.807,4.422,10.998,5.527L214.437,435.634
z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3 KiB

View file

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
<g>
<path fill="#C1001F" d="M382.281,405.372c-4.424-1.164-9.108-1.593-12.965-0.649c-7.273,1.766-9.62,4.19-9.244,10.293
c0,0-0.134,2.94,6.068,2.83c1.377-0.025,4.886-0.758,5.386-2.268c0.496-1.508-0.259-3.038-0.298-3.778
c-0.04-0.739,2.005-1.743,2.865-1.827c1.115-0.11,3.937,0.068,6.78,0.769l0.122,0.032c2.82,0.796,5.355,2.032,6.271,2.681
c0.706,0.498,1.995,2.381,1.596,3.001c-0.402,0.625-1.812,1.584-2.127,3.141c-0.312,1.561,2.381,3.928,3.562,4.629
c5.34,3.162,6.675,0.535,6.675,0.535c3.341-5.12,2.498-8.385-2.95-13.515c-2.896-2.723-7.178-4.665-11.6-5.834L382.281,405.372z"/>
<g>
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="348.4768" y1="587.9087" x2="406.7347" y2="572.2986" gradientTransform="matrix(-1 0 0 1 753.3428 -156.7246)">
<stop offset="0.15" style="stop-color:#C1001F"/>
<stop offset="0.35" style="stop-color:#F4F7EE"/>
<stop offset="0.55" style="stop-color:#C1001F"/>
</linearGradient>
<path fill="url(#SVGID_1_)" d="M392.784,398.354c-1.882-0.887-4.09-1.869-7.353-2.662c-3.447-0.755-6.896-1.283-10.644-1.184
c-3.949,0.198-5.917,0.594-9.073,1.383c-2.858,0.886-4.242,1.382-6.507,2.562c-0.99,0.496-1.774,0.986-3.745,2.368
c-1.289,0.991-2.766,2.17-4.177,4.167c-1.193,1.387-2.382,3.765-3.171,5.747c-0.893,1.982-1.387,4.162-1.387,6.535
c0.1,4.167,1.091,7.937,3.166,11.202c1.788,2.773,4.071,5.252,6.741,7.232l-4.354,11.689l15.052-6.143
c0.396,0.1,0.792,0.199,1.095,0.301c3.868,1.188,7.529,1.682,11.098,1.781c4.661-0.1,8.918-0.793,12.683-2.18
c3.571-1.488,6.539-3.473,8.917-6.045c2.379-2.676,4.832-6.805,5.427-10.475c0.882-4.582,0.643-7.644-0.052-10.414
c-0.793-2.774-1.666-4.973-3.604-7.78c-2.105-2.421-3.055-3.449-4.832-4.832C395.89,400.034,394.469,399.245,392.784,398.354z
M384.774,400.628c2.77,0.788,4.953,1.585,6.54,2.481c1.391,0.793,2.972,1.878,4.562,3.171c1.482,1.283,2.873,2.77,4.062,4.653
c1.283,1.783,2.075,3.869,2.477,6.242c0.496,3.473,0.298,6.44-0.693,8.825c-0.989,2.377-2.367,4.363-4.161,5.75
c-1.883,1.486-3.863,2.572-5.943,3.369c-2.082,0.693-4.068,1.182-5.946,1.482c-1.782,0.197-3.171,0.396-4.066,0.396
c-3.271,0-6.538-0.494-9.705-1.379c-3.274-0.898-6.351-2.279-9.12-4.068c-2.677-1.877-4.954-4.16-6.645-6.936
c-0.991-1.686-1.679-3.176-2.17-4.766c-0.496-1.486-0.792-2.968-0.792-4.355c0.098-2.774,0.989-5.45,2.771-7.827
c1.684-2.482,4.26-4.365,7.624-5.846c3.273-1.59,7.139-2.284,11.593-2.284C378.828,399.533,381.994,399.93,384.774,400.628z"/>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3 KiB