Migrate dialer.png into linphone-show-dialer icon

This commit is contained in:
François Grisez 2015-09-11 21:53:46 +02:00
parent 3d393990d8
commit 8584d2d72d
6 changed files with 11 additions and 20 deletions

View file

@ -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"));
}

View file

@ -54,6 +54,12 @@
</row>
</data>
</object>
<object class="GtkImage" id="dialer_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">linphone-show-dialer</property>
</object>
<object class="GtkImage" id="edit_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -360,6 +366,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">dialer_image</property>
<signal name="clicked" handler="linphone_gtk_create_keypad" swapped="no"/>
</object>
<packing>

View file

@ -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
)

View file

@ -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
)
linphone-start-call2.png \
linphone-show-dialer.png
)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB