diff --git a/gtk/conference.c b/gtk/conference.c
index 75a36cbdd..e820b8244 100644
--- a/gtk/conference.c
+++ b/gtk/conference.c
@@ -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;
diff --git a/gtk/incall_view.c b/gtk/incall_view.c
index ff2cda616..e76227488 100644
--- a/gtk/incall_view.c
+++ b/gtk/incall_view.c
@@ -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"));
diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt
index e470168a2..6df0b512b 100644
--- a/pixmaps/CMakeLists.txt
+++ b/pixmaps/CMakeLists.txt
@@ -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
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 7dcbd5d78..9f51c8940 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -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
)
diff --git a/pixmaps/linphone-stop-call.png b/pixmaps/linphone-stop-call.png
new file mode 100644
index 000000000..7f9574f91
Binary files /dev/null and b/pixmaps/linphone-stop-call.png differ
diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png
deleted file mode 100644
index 56cf6e136..000000000
Binary files a/pixmaps/startcall-green.png and /dev/null differ
diff --git a/pixmaps/startcall-small.png b/pixmaps/startcall-small.png
deleted file mode 100644
index d5726e12c..000000000
Binary files a/pixmaps/startcall-small.png and /dev/null differ
diff --git a/pixmaps/stopcall-red.png b/pixmaps/stopcall-red.png
deleted file mode 100644
index 8bd957935..000000000
Binary files a/pixmaps/stopcall-red.png and /dev/null differ
diff --git a/pixmaps/stopcall-small.png b/pixmaps/stopcall-small.png
deleted file mode 100644
index de77592c7..000000000
Binary files a/pixmaps/stopcall-small.png and /dev/null differ
diff --git a/pixmaps/svg/linphone-stop-call.svg b/pixmaps/svg/linphone-stop-call.svg
new file mode 100644
index 000000000..edc8b847c
--- /dev/null
+++ b/pixmaps/svg/linphone-stop-call.svg
@@ -0,0 +1,77 @@
+
+
+
+
\ No newline at end of file
diff --git a/pixmaps/svg/startcall-green.svg b/pixmaps/svg/startcall-green.svg
deleted file mode 100644
index dac2c713b..000000000
--- a/pixmaps/svg/startcall-green.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
diff --git a/pixmaps/svg/stopcall-red.svg b/pixmaps/svg/stopcall-red.svg
deleted file mode 100644
index c3616ae7c..000000000
--- a/pixmaps/svg/stopcall-red.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-