From 8584d2d72df623d3eaf00e2785e1a325eb84a9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 11 Sep 2015 21:53:46 +0200 Subject: [PATCH] Migrate dialer.png into linphone-show-dialer icon --- gtk/main.c | 17 ----------------- gtk/main.ui | 7 +++++++ pixmaps/CMakeLists.txt | 1 + pixmaps/Makefile.am | 6 +++--- pixmaps/dialer.png | Bin 5152 -> 0 bytes pixmaps/linphone-show-dialer.png | Bin 0 -> 7527 bytes 6 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 pixmaps/dialer.png create mode 100644 pixmaps/linphone-show-dialer.png diff --git a/gtk/main.c b/gtk/main.c index 6eaa6e928..0635c92bf 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1752,23 +1752,6 @@ static void linphone_gtk_configure_main_window(){ tmp=g_strdup(home); g_object_set_data_full(G_OBJECT(menu_item),"home",tmp, (GDestroyNotify)g_free); } - { - /* - GdkPixbuf *pbuf=create_pixbuf("contact-orange.png"); - if (pbuf) { - gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf); - g_object_unref(G_OBJECT(pbuf)); - } - */ - } - { - GdkPixbuf *pbuf=create_pixbuf("dialer.png"); - if (pbuf) { - GtkButton *button=GTK_BUTTON(linphone_gtk_get_widget(w,"keypad")); - gtk_button_set_image(button,gtk_image_new_from_pixbuf (pbuf)); - g_object_unref(pbuf); - } - } if (linphone_gtk_can_manage_accounts()) { gtk_widget_show(linphone_gtk_get_widget(w,"assistant_item")); } diff --git a/gtk/main.ui b/gtk/main.ui index 2b0b45dff..aeed50cb4 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -54,6 +54,12 @@ + + True + False + 32 + linphone-show-dialer + True False @@ -360,6 +366,7 @@ True True True + dialer_image diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 033c567d5..0af9613dc 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -61,6 +61,7 @@ install(FILES install(FILES linphone-start-call2.png + linphone-show-dialer.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/actions PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index e767aa088..af4d42980 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -9,7 +9,6 @@ dist_pixmap_DATA= \ contact_starred.png contact_unstarred.png \ call_status_incoming.png call_status_outgoing.png \ ok.png \ - dialer.png \ notok.png iconsdir=$(datadir)/icons/hicolor @@ -48,5 +47,6 @@ dist_statussvgicons_DATA= \ actions48iconsdir=$(iconsdir)/48x48/actions dist_actions48icons_DATA= \ - linphone-start-call2.png -) \ No newline at end of file + linphone-start-call2.png \ + linphone-show-dialer.png +) diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png deleted file mode 100644 index bb9747a90644cf96aa2fdf7ca7aafd49e87c9a10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5152 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 xe+q}jCG002ovPDHLkV1kdh%%K1P literal 0 HcmV?d00001