Skip to content

GitLab

Commit b13fab13 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Replace incall view stock icons with our own icons.

parent a6c73168
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 15 deletions
gtk/incall_view.c
View file @ b13fab13
......@@ -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),_("<b>Paused call</b>"));
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"));
......
pixmaps/CMakeLists.txt
View file @ b13fab13
......@@ -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
)
......
pixmaps/Makefile.am
View file @ b13fab13
......@@ -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= \
......
pixmaps/svg/linphone-media-pause.svg 0 → 100644
View file @ b13fab13
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
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"
width="120"
height="120"
viewBox="0 0 120 120"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="linphone-media-pause.svg"
inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-media-pause.png"
inkscape:export-xdpi="36"
inkscape:export-ydpi="36">
<metadata
id="metadata18">
<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>pause_big_default</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1141"
id="namedview16"
showgrid="false"
inkscape:zoom="1.5838926"
inkscape:cx="-9.1016949"
inkscape:cy="74.184322"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
<title
id="title4">pause_big_default</title>
<desc
id="desc6">Created with Sketch.</desc>
<defs
id="defs8" />
<path
style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
inkscape:connector-curvature="0"
sketch:type="MSShapeGroup"
id="Imported-Layers"
d="m 48.306767,32.08877 0,59.210524 m 23.177529,-59.210524 0,59.210524" />
<path
style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0"
sketch:type="MSShapeGroup"
id="Stroke-2-6"
d="M 112.92098,60.39048 C 112.92098,89.999684 89.20792,114 59.957182,114 30.70644,114 7,89.999684 7,60.39048 7,30.784624 30.70644,6.7809643 59.957182,6.7809643 c 29.250738,0 52.963798,24.0036597 52.963798,53.6095157 l 0,0 z" />
</svg>
pixmaps/svg/linphone-media-play.svg 0 → 100644
View file @ b13fab13
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
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"
width="120"
height="120"
viewBox="0 0 120 120"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="linphone-media-play.svg"
inkscape:export-filename="/home/ghislain/code/linphone-desktop/submodules/linphone/pixmaps/linphone-media-play.png"
inkscape:export-xdpi="36"
inkscape:export-ydpi="36">
<metadata
id="metadata18">
<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>pause_big_default</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1141"
id="namedview16"
showgrid="false"
inkscape:zoom="3.1677852"
inkscape:cx="29.600633"
inkscape:cy="74.184322"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
<title
id="title4">pause_big_default</title>
<desc
id="desc6">Created with Sketch.</desc>
<defs
id="defs8" />
<path
style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7;stroke-linecap:round;stroke-linejoin:round"
inkscape:connector-curvature="0"
sketch:type="MSShapeGroup"
id="Imported-Layers"
d="M 48.306767,32.08877 47.991089,90.983616 78.113534,61.941243 48.439804,32.08877"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:7.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0"
sketch:type="MSShapeGroup"
id="Stroke-2-6"
d="M 112.92098,60.39048 C 112.92098,89.999684 89.20792,114 59.957182,114 30.70644,114 7,89.999684 7,60.39048 7,30.784624 30.70644,6.7809643 59.957182,6.7809643 c 29.250738,0 52.963798,24.0036597 52.963798,53.6095157 l 0,0 z" />
</svg>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment