diff --git a/gtk/calllogs.c b/gtk/calllogs.c index 733d4fc1e..0c2c8dde7 100644 --- a/gtk/calllogs.c +++ b/gtk/calllogs.c @@ -50,9 +50,9 @@ char *linphone_gtk_call_logs_storage_get_db_file(const char *filename){ static void fill_renderers(GtkTreeView *v){ GtkTreeViewColumn *c; GtkCellRenderer *r; - r=gtk_cell_renderer_pixbuf_new(); - c=gtk_tree_view_column_new_with_attributes("icon",r,"pixbuf",0,NULL); + r=gtk_cell_renderer_pixbuf_new(); + c=gtk_tree_view_column_new_with_attributes("icon",r,"icon-name",0,NULL); gtk_tree_view_append_column (v,c); r=gtk_cell_renderer_text_new (); @@ -280,7 +280,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){ store=(GtkTreeStore*)gtk_tree_view_get_model(v); if (store==NULL){ - store=gtk_tree_store_new(3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING); + store=gtk_tree_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING); gtk_tree_view_set_model(v,GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); fill_renderers(GTK_TREE_VIEW(linphone_gtk_get_widget(w,"logs_view"))); @@ -289,8 +289,6 @@ void linphone_gtk_call_log_update(GtkWidget *w){ g_signal_connect_swapped(G_OBJECT(select),"changed",(GCallback)call_log_selection_changed,v); g_signal_connect(G_OBJECT(notebook),"focus-tab",(GCallback)linphone_gtk_call_log_reset_missed_call,NULL); g_signal_connect(G_OBJECT(v),"button-press-event",(GCallback)linphone_gtk_call_log_button_pressed,NULL); -// gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"call_back_button")), -// create_pixmap (linphone_gtk_get_ui_config("callback_button","status-green.png"))); } nb=linphone_core_get_missed_calls_count(linphone_gtk_get_core()); if(nb > 0) @@ -310,7 +308,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){ LinphoneFriend *lf=NULL; int duration=linphone_call_log_get_duration(cl); time_t start_date_time=linphone_call_log_get_start_date(cl); - GdkPixbuf *pbuf; + const gchar *call_status_icon_name; #if GLIB_CHECK_VERSION(2,26,0) if (start_date_time){ @@ -375,13 +373,13 @@ void linphone_gtk_call_log_update(GtkWidget *w){ g_free(seconds); if (start_date) g_free(start_date); gtk_tree_store_append (store,&iter,NULL); - pbuf = linphone_call_log_get_dir(cl)==LinphoneCallOutgoing ? create_pixbuf("call_status_outgoing.png") : create_pixbuf("call_status_incoming.png"); + call_status_icon_name = linphone_call_log_get_dir(cl) == LinphoneCallOutgoing ? + "linphone-call-status-outgoing" : "linphone-call-status-incoming"; gtk_tree_store_set (store,&iter, - 0, pbuf, + 0, call_status_icon_name, 1, headtxt,2,cl,-1); gtk_tree_store_append (store,&iter2,&iter); gtk_tree_store_set (store,&iter2,1,logtxt,-1); - g_object_unref(pbuf); ms_free(addr); g_free(logtxt); g_free(headtxt); @@ -424,19 +422,3 @@ void linphone_gtk_call_log_response(GtkWidget *w, guint response_id){ g_object_set_data(G_OBJECT(mw),"call_logs",NULL); gtk_widget_destroy(w); } - -// GtkWidget * linphone_gtk_show_call_logs(void){ -// GtkWidget *mw=linphone_gtk_get_main_window(); -// -// GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"call_logs"); -// if (w==NULL){ -// w=linphone_gtk_create_window("call_logs"); -// // gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"call_back_button")), -// // create_pixmap (linphone_gtk_get_ui_config("callback_button","status-green.png"))); -// g_object_set_data(G_OBJECT(mw),"call_logs",w); -// g_signal_connect(G_OBJECT(w),"response",(GCallback)linphone_gtk_call_log_response,NULL); -// gtk_widget_show(w); -// linphone_gtk_call_log_update(w); -// }else gtk_window_present(GTK_WINDOW(w)); -// return w; -// } diff --git a/gtk/chat.c b/gtk/chat.c index ac4fac23c..da6b44f99 100644 --- a/gtk/chat.c +++ b/gtk/chat.c @@ -91,7 +91,7 @@ const char* get_display_name(const LinphoneAddress *from){ GtkWidget *create_tab_chat_header(LinphoneChatRoom *cr,const LinphoneAddress *uri){ GtkWidget *w=gtk_hbox_new (FALSE,0); - GtkWidget *i=create_pixmap ("chat.png"); + GtkWidget *i = gtk_image_new_from_icon_name("linphone-chat-nothing", GTK_ICON_SIZE_BUTTON); GtkWidget *l; GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_MENU); GtkWidget *b=gtk_button_new(); 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/friendlist.c b/gtk/friendlist.c index 6cd6c8581..0c1a32da9 100644 --- a/gtk/friendlist.c +++ b/gtk/friendlist.c @@ -25,12 +25,9 @@ static GtkWidget *linphone_gtk_create_contact_menu(GtkWidget *contact_list); enum{ FRIEND_PRESENCE_IMG, FRIEND_NAME, - FRIEND_PRESENCE_STATUS, FRIEND_ID, FRIEND_CHATROOM, FRIEND_SIP_ADDRESS, - FRIEND_ICON, - FRIEND_CALL, FRIEND_CHAT, FRIEND_LIST_NCOL }; @@ -41,88 +38,38 @@ typedef struct _status_picture_tab_t{ } status_picture_tab_t; status_picture_tab_t status_picture_tab[]={ - { LinphoneStatusOnline, "status-green.png" }, - { LinphoneStatusBusy, "status-orange.png" }, - { LinphoneStatusBeRightBack, "status-orange.png" }, - { LinphoneStatusAway, "status-orange.png" }, - { LinphoneStatusOnThePhone, "status-orange.png" }, - { LinphoneStatusOutToLunch, "status-orange.png" }, - { LinphoneStatusDoNotDisturb, "status-red.png" }, - { LinphoneStatusMoved, "status-orange.png" }, - { LinphoneStatusAltService, "status-orange.png" }, - { LinphoneStatusOffline, "status-offline.png" }, - { LinphoneStatusPending, "status-offline.png" }, - { LinphoneStatusEnd, NULL }, + { LinphoneStatusOnline , "linphone-status-online" }, + { LinphoneStatusBusy , "linphone-status-away" }, + { LinphoneStatusBeRightBack , "linphone-status-away" }, + { LinphoneStatusAway , "linphone-status-away" }, + { LinphoneStatusOnThePhone , "linphone-status-away" }, + { LinphoneStatusOutToLunch , "linphone-status-away" }, + { LinphoneStatusDoNotDisturb , "linphone-status-donotdisturb" }, + { LinphoneStatusMoved , "linphone-status-away" }, + { LinphoneStatusAltService , "linphone-status-away" }, + { LinphoneStatusOffline , "linphone-status-offline" }, + { LinphoneStatusPending , "linphone-status-offline" }, + { LinphoneStatusEnd , NULL } }; -static GdkPixbuf *create_status_picture(LinphoneOnlineStatus ss){ +static const char *status_to_icon_name(LinphoneOnlineStatus ss) { status_picture_tab_t *t=status_picture_tab; while(t->img!=NULL){ - if (ss==t->status){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf(t->img); - return pixbuf; + if (ss==t->status) { + return t->img; } ++t; } - g_error("No pixmap defined for status %i",ss); + g_error("No icon name defined for status %i",ss); return NULL; } -static GdkPixbuf *create_call_picture(){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf("call.png"); - return pixbuf; +static GtkWidget *create_status_picture(LinphoneOnlineStatus ss, GtkIconSize icon_size){ + const char *icon_name = status_to_icon_name(ss); + if(icon_name) return gtk_image_new_from_icon_name(icon_name, icon_size); + else return NULL; } -static GdkPixbuf *create_unread_msg(){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf("active_chat.png"); - return pixbuf; -} - -static GdkPixbuf *create_chat_picture(){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf("chat.png"); - return pixbuf; -} - -static GdkPixbuf *create_composing_unread_msg(){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf("composing_active_chat.png"); - return pixbuf; -} - -static GdkPixbuf *create_composing_chat_picture(){ - GdkPixbuf *pixbuf; - pixbuf = create_pixbuf("composing_chat.png"); - return pixbuf; -} - -/* -void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid, const gchar *url, const gchar *status, const gchar *img){ - GtkTreeIter iter; - LinphoneFriend *tmp=0; - - GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)); - if (gtk_tree_model_get_iter_first(model,&iter)) { - do{ - gtk_tree_model_get(model,&iter,FRIEND_ID,&tmp,-1); - //printf("tmp=%i, fid=%i",tmp,fid); - if (fid==tmp) { - GdkPixbuf *pixbuf; - gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_STATUS,status,-1); - pixbuf = create_pixbuf(img); - if (pixbuf) - { - gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_PRESENCE_IMG, pixbuf,-1); - } - } - }while(gtk_tree_model_iter_next(model,&iter)); - } -} -*/ - gboolean linphone_gtk_friend_list_is_contact(const LinphoneAddress *addr){ LinphoneFriend *lf; char *addr_str=linphone_address_as_string(addr); @@ -243,23 +190,18 @@ void linphone_gtk_friend_list_update_chat_picture(){ int nbmsg=0; if (gtk_tree_model_get_iter_first(model,&iter)) { do{ - GdkPixbuf *pbuf = NULL; + const char *icon_name = NULL; gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1); nbmsg=linphone_chat_room_get_unread_messages_count(cr); is_composing=linphone_chat_room_is_remote_composing(cr); if(nbmsg != 0){ - if (is_composing == TRUE) - pbuf = create_composing_unread_msg(); - else - pbuf = create_unread_msg(); + if (is_composing == TRUE) icon_name = "linphone-chat-new-message-and-writing"; + else icon_name = "linphone-chat-new-message"; } else { - if (is_composing == TRUE) - pbuf = create_composing_chat_picture(); - else - pbuf = create_chat_picture(); + if (is_composing == TRUE) icon_name = "linphone-chat-writing"; + else icon_name = "linphone-chat-nothing"; } - gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,pbuf,-1); - if (pbuf) g_object_unref(pbuf); + gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,icon_name,-1); }while(gtk_tree_model_iter_next(model,&iter)); } } @@ -427,17 +369,14 @@ void linphone_gtk_remove_button_clicked(GtkWidget *button){ static GtkWidget * create_presence_menu(){ GtkWidget *menu=gtk_menu_new(); GtkWidget *menu_item; - GdkPixbuf *pbuf; status_picture_tab_t *t; for(t=status_picture_tab;t->img!=NULL;++t){ if (t->status==LinphoneStatusPending){ continue; } menu_item=gtk_image_menu_item_new_with_label(linphone_online_status_to_string(t->status)); - pbuf=create_status_picture(t->status); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), - gtk_image_new_from_pixbuf(pbuf)); - g_object_unref(G_OBJECT(pbuf)); + gtk_image_new_from_icon_name(t->img, GTK_ICON_SIZE_LARGE_TOOLBAR)); 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_set_my_presence,GINT_TO_POINTER(t->status)); @@ -447,10 +386,9 @@ static GtkWidget * create_presence_menu(){ void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss){ GtkWidget *button=linphone_gtk_get_widget(linphone_gtk_get_main_window(),"presence_button"); - GdkPixbuf *pbuf=create_status_picture(ss); - GtkWidget *image=gtk_image_new_from_pixbuf(pbuf); + GtkWidget *image=create_status_picture(ss, GTK_ICON_SIZE_LARGE_TOOLBAR); GtkWidget *menu; - g_object_unref(G_OBJECT(pbuf)); + gtk_widget_set_tooltip_text(button,linphone_online_status_to_string(ss)); gtk_button_set_image(GTK_BUTTON(button),image); /*prepare menu*/ @@ -496,16 +434,12 @@ static void icon_press_handler(GtkEntry *entry){ } static void update_star(GtkEntry *entry, gboolean is_known){ - GdkPixbuf *active,*starred,*unstarred; - active=gtk_entry_get_icon_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY); - starred=g_object_get_data(G_OBJECT(entry),"starred_icon"); - unstarred=g_object_get_data(G_OBJECT(entry),"unstarred_icon"); - if (is_known && (active==unstarred)){ - gtk_entry_set_icon_from_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY,starred); + if (is_known){ + gtk_entry_set_icon_from_icon_name(entry,GTK_ENTRY_ICON_SECONDARY,"linphone-contact-bookmarked"); gtk_entry_set_icon_tooltip_text(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,NULL); - }else if ((!is_known) && (active==starred)){ + }else{ + gtk_entry_set_icon_from_icon_name(entry,GTK_ENTRY_ICON_SECONDARY,"linphone-contact-not-bookmarked"); gtk_entry_set_icon_tooltip_text(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,_("Add to addressbook")); - gtk_entry_set_icon_from_pixbuf(entry,GTK_ENTRY_ICON_SECONDARY,unstarred); } } @@ -532,14 +466,7 @@ static void check_contact(GtkEditable *editable, LinphoneCore *lc){ } static void linphone_gtk_init_bookmark_icon(void){ - GtkWidget *mw=linphone_gtk_get_main_window(); - GtkWidget *entry=linphone_gtk_get_widget(mw,"uribar"); - GdkPixbuf *pbuf=create_pixbuf("contact_unstarred.png"); - gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,pbuf); - g_object_set_data_full(G_OBJECT(entry),"unstarred_icon",pbuf,g_object_unref); - pbuf=create_pixbuf("contact_starred.png"); - g_object_set_data_full(G_OBJECT(entry),"starred_icon",pbuf,g_object_unref); - gtk_entry_set_icon_activatable(GTK_ENTRY(entry),GTK_ENTRY_ICON_SECONDARY,TRUE); + GtkWidget *entry = linphone_gtk_get_widget(linphone_gtk_get_main_window(), "uribar"); g_signal_connect(G_OBJECT(entry),"icon-release",(GCallback)icon_press_handler,NULL); g_signal_connect(G_OBJECT(GTK_EDITABLE(entry)),"changed",(GCallback)check_contact,linphone_gtk_get_core()); } @@ -581,7 +508,7 @@ static gint friend_sort(GtkTreeModel *model, GtkTreeIter *a,GtkTreeIter *b,gpoin return ret; } -static void on_name_column_clicked(GtkTreeModel *model){ +void linphone_gtk_friend_list_on_name_column_clicked(GtkTreeModel *model){ GtkSortType st; gint column; @@ -647,7 +574,8 @@ static MSList *sort_friend_list(const MSList *friends){ return ret; } -static void on_presence_column_clicked(GtkTreeModel *model){ +#if 0 +void linphone_gtk_friend_list_on_presence_column_clicked(GtkTreeModel *model){ GtkSortType st; gint column; @@ -658,6 +586,7 @@ static void on_presence_column_clicked(GtkTreeModel *model){ }else st=GTK_SORT_ASCENDING; gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),FRIEND_ID,st); } +#endif void create_button(){ GtkWidget *main_window = linphone_gtk_get_main_window (); @@ -669,76 +598,15 @@ void create_button(){ } static void linphone_gtk_friend_list_init(GtkWidget *friendlist){ - GtkListStore *store; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkTreeSelection *select; + GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)); + GtkTreeSelection *select = gtk_tree_view_get_selection (GTK_TREE_VIEW (friendlist)); linphone_gtk_init_bookmark_icon(); - - store = gtk_list_store_new(FRIEND_LIST_NCOL,GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, - G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF); - - gtk_tree_view_set_model(GTK_TREE_VIEW(friendlist),GTK_TREE_MODEL(store)); - g_object_unref(G_OBJECT(store)); - - /* Tree specification*/ - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(friendlist),FALSE); gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(friendlist),friend_search_func,NULL,NULL); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(friendlist),FRIEND_NAME); gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store),FRIEND_NAME,friend_sort,NULL,NULL); - - /*Name and presence column*/ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Presence status"), - renderer, - "text", FRIEND_PRESENCE_STATUS, - NULL); - g_object_set (G_OBJECT(column), "resizable", TRUE, NULL); - g_signal_connect_swapped(G_OBJECT(column),"clicked",(GCallback)on_presence_column_clicked,GTK_TREE_MODEL(store)); - gtk_tree_view_column_set_clickable(column,TRUE); - gtk_tree_view_column_set_visible(column,linphone_gtk_get_ui_config_int("friendlist_status",1)); - gtk_tree_view_column_set_min_width(column,50); - - renderer = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(column,renderer,TRUE); - gtk_tree_view_column_add_attribute (column,renderer, - "pixbuf", - FRIEND_PRESENCE_IMG); - gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Name"), - renderer, - "text", FRIEND_NAME,NULL); - g_object_set (G_OBJECT(column), "resizable", TRUE, NULL); - g_signal_connect_swapped(G_OBJECT(column),"clicked",(GCallback)on_name_column_clicked,GTK_TREE_MODEL(store)); - gtk_tree_view_column_set_clickable(column,TRUE); - gtk_tree_view_column_set_expand(column,TRUE); - gtk_tree_view_column_set_max_width(column,60); - gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column); - - /* Call column*/ - renderer = gtk_cell_renderer_pixbuf_new(); - column = gtk_tree_view_column_new_with_attributes (_("Call"),renderer,"pixbuf",FRIEND_CALL,NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column); - - /* Chat column*/ - renderer = gtk_cell_renderer_pixbuf_new(); - column = gtk_tree_view_column_new_with_attributes (_("Chat"),renderer,"pixbuf",FRIEND_CHAT,NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column); - - select = gtk_tree_view_get_selection (GTK_TREE_VIEW (friendlist)); gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE); - - gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(friendlist),GTK_TREE_VIEW_GRID_LINES_NONE); -#if GTK_CHECK_VERSION(2,12,0) - gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(friendlist),FRIEND_SIP_ADDRESS); -#endif - - gtk_widget_set_size_request(friendlist,200,120); - /*gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget( - gtk_widget_get_toplevel(friendlist),"show_category")),0);*/ + + g_object_set_data(G_OBJECT(friendlist), "friendlist_initialized", (gpointer)TRUE); } void linphone_gtk_show_directory_search(void){ @@ -801,26 +669,18 @@ void linphone_gtk_show_friends(void){ GtkListStore *store=NULL; GtkTreeIter iter; const MSList *itf; - //GtkWidget *filter=linphone_gtk_get_widget(mw,"search_bar"); LinphoneCore *core=linphone_gtk_get_core(); - //const gchar *search=NULL; - //gboolean lookup=FALSE; MSList *sorted; LinphoneChatRoom *cr=NULL; linphone_gtk_show_directory_search(); - if (gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))==NULL){ + if (!g_object_get_data(G_OBJECT(friendlist), "friendlist_initialized")) { linphone_gtk_friend_list_init(friendlist); } store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))); gtk_list_store_clear(store); - //search=gtk_entry_get_text(GTK_ENTRY(filter)); - //if (search==NULL || search[0]=='\0') - // lookup=FALSE; - //else lookup=TRUE; - sorted=sort_friend_list(linphone_core_get_friend_list(core)); for(itf=sorted;itf!=NULL;itf=ms_list_next(itf)){ @@ -830,51 +690,26 @@ void linphone_gtk_show_friends(void){ const char *name=linphone_address_get_display_name(f_uri); const char *display=name; char *escaped=NULL; - //char buf[26]={0}; int nbmsg=0; - GdkPixbuf *pbuf, *pbuf2, *pbuf3; - /*if (lookup){ - if (strstr(uri,search)==NULL){ - ms_free(uri); - continue; - } - }*/ //BuddyInfo *bi; gboolean send_subscribe=linphone_friend_get_send_subscribe(lf); if (name==NULL || name[0]=='\0') { display=linphone_address_get_username(f_uri); } gtk_list_store_append(store,&iter); - pbuf = create_chat_picture(); - pbuf2 = create_call_picture(); - pbuf3 = send_subscribe ? create_status_picture(linphone_friend_get_status(lf)) : NULL; gtk_list_store_set(store,&iter,FRIEND_NAME, display,FRIEND_ID,lf, - FRIEND_PRESENCE_IMG, pbuf3, - FRIEND_CHAT,pbuf,FRIEND_CALL,pbuf2,-1); - g_object_unref(pbuf); - g_object_unref(pbuf2); - if (pbuf3) g_object_unref(pbuf3); + FRIEND_PRESENCE_IMG, send_subscribe ? status_to_icon_name(linphone_friend_get_status(lf)) : NULL, + FRIEND_CHAT,"linphone-chat-nothing", -1); cr=linphone_gtk_create_chatroom(f_uri); gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1); nbmsg=linphone_chat_room_get_unread_messages_count(cr); if(nbmsg != 0){ - pbuf = create_unread_msg(); - gtk_list_store_set(store,&iter,FRIEND_CHAT,pbuf,-1); - g_object_unref(pbuf); + gtk_list_store_set(store,&iter,FRIEND_CHAT,"linphone-chat-new-message",-1); } escaped=g_markup_escape_text(uri,-1); gtk_list_store_set(store,&iter,FRIEND_SIP_ADDRESS,escaped,-1); g_free(escaped); - //bi=linphone_friend_get_info(lf); - /*if (bi!=NULL && bi->image_data!=NULL){ - GdkPixbuf *pbuf= - _gdk_pixbuf_new_from_memory_at_scale(bi->image_data,bi->image_length,-1,40,TRUE); - if (pbuf) { - //gtk_list_store_set(store,&iter,FRIEND_ICON,pbuf,-1); - g_object_unref(G_OBJECT(pbuf)); - } - }*/ ms_free(uri); } ms_list_free(sorted); diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 9575dcdf2..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("status-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")); @@ -901,22 +905,13 @@ void linphone_gtk_enable_mute_button(GtkButton *button, gboolean sensitive){ } void linphone_gtk_draw_hold_button(GtkButton *button, gboolean active){ + const gchar *icon_name = active ? "linphone-hold-on" : "linphone-hold-off"; + const gchar *label = active ? _("Resume") : _("Pause"); + GtkWidget *image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); g_object_set_data(G_OBJECT(button),"active",GINT_TO_POINTER(active)); - if (active){ - GtkWidget *image=create_pixmap("hold_off.png"); - gtk_button_set_label(GTK_BUTTON(button),_("Resume")); - if (image!=NULL) { - gtk_button_set_image(GTK_BUTTON(button),image); - gtk_widget_show(image); - } - }else{ - GtkWidget *image=create_pixmap("hold_on.png"); - gtk_button_set_label(GTK_BUTTON(button),_("Pause")); - if (image!=NULL) { - gtk_button_set_image(GTK_BUTTON(button),image); - gtk_widget_show(image); - } - } + gtk_button_set_label(GTK_BUTTON(button),label); + gtk_button_set_image(GTK_BUTTON(button),image); + gtk_widget_show(image); } void linphone_gtk_hold_clicked(GtkButton *button){ diff --git a/gtk/linphone.h b/gtk/linphone.h index 4349abd43..04c587a0d 100644 --- a/gtk/linphone.h +++ b/gtk/linphone.h @@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #define LINPHONE_ICON "linphone.png" +#define LINPHONE_ICON_NAME "linphone" enum { COMPLETION_HISTORY, @@ -157,6 +158,8 @@ LINPHONE_PUBLIC void linphone_gtk_friend_list_set_chat_conversation(const Linpho LINPHONE_PUBLIC gboolean linphone_gtk_friend_list_is_contact(const LinphoneAddress *addr); LINPHONE_PUBLIC void linphone_gtk_friend_list_set_active_address(const LinphoneAddress *addr); LINPHONE_PUBLIC const LinphoneAddress *linphone_gtk_friend_list_get_active_address(void); +// LINPHONE_PUBLIC void linphone_gtk_friend_list_on_presence_column_clicked(GtkTreeModel *model); +LINPHONE_PUBLIC void linphone_gtk_friend_list_on_name_column_clicked(GtkTreeModel *model); LINPHONE_PUBLIC void linphone_gtk_notebook_tab_select(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data); LINPHONE_PUBLIC void linphone_gtk_show_friends(void); LINPHONE_PUBLIC void linphone_gtk_show_contact(LinphoneFriend *lf, GtkWidget *parent); diff --git a/gtk/main.c b/gtk/main.c index 5584933a0..b547a8c1f 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1697,24 +1697,16 @@ static void linphone_gtk_configure_main_window(){ static gboolean config_loaded=FALSE; static const char *title; static const char *home; - static const char *start_call_icon; - static const char *add_call_icon; - static const char *start_chat_icon; static const char *search_icon; static gboolean update_check_menu; - static gboolean buttons_have_borders; static gboolean show_abcd; GtkWidget *w=linphone_gtk_get_main_window(); if (!config_loaded){ title=linphone_gtk_get_ui_config("title","Linphone"); home=linphone_gtk_get_ui_config("home","http://www.linphone.org"); - start_call_icon=linphone_gtk_get_ui_config("start_call_icon","call_start.png"); - add_call_icon=linphone_gtk_get_ui_config("add_call_icon","call_add.png"); - start_chat_icon=linphone_gtk_get_ui_config("start_chat_icon","chat_start.png"); search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL); update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0); - buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1); show_abcd=linphone_gtk_get_ui_config_int("show_abcd",1); config_loaded=TRUE; } @@ -1722,24 +1714,6 @@ static void linphone_gtk_configure_main_window(){ if (title) { gtk_window_set_title(GTK_WINDOW(w),title); } - if (start_call_icon){ - gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")), - create_pixmap (start_call_icon)); - if (!buttons_have_borders) - gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),GTK_RELIEF_NONE); - } - if (add_call_icon){ - gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"add_call")), - create_pixmap (add_call_icon)); - if (!buttons_have_borders) - gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"add_call")),GTK_RELIEF_NONE); - } - if (start_chat_icon){ - gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(w,"start_chat")), - create_pixmap (start_chat_icon)); - if (!buttons_have_borders) - gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_chat")),GTK_RELIEF_NONE); - } if (search_icon){ GdkPixbuf *pbuf=create_pixbuf(search_icon); if(pbuf) { @@ -1753,23 +1727,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 567156394..1adca8248 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -1,8 +1,14 @@ - + + + True + False + 32 + linphone-add-call + True False @@ -18,6 +24,48 @@ False gtk-connect + + + + + + + + + + + + + + + + + + linphone-status-online + Toto + toto@sip.linphone.org + linphone-chat-nothing + + + linphone-status-offline + Toto2 + toto2@sip.linphone.org + linphone-chat-nothing + + + linphone-status-offline + Toto3 + toto3@sip.linphone.org + linphone-chat-nothing + + + + + True + False + 32 + linphone-show-dialer + True False @@ -43,34 +91,6 @@ False gtk-info - - - - - - - - All users - - - Online users - - - - - - - - - - - ADSL - - - Fiber Channel - - - @@ -100,7 +120,21 @@ Delete gtk-remove + + True + False + 32 + linphone-start-call + + + True + False + 32 + linphone-start-chat + + 640 + 480 False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 660 @@ -312,8 +346,9 @@ True ● True + linphone-contact-not-bookmarked False - False + True True True @@ -350,6 +385,7 @@ True True True + dialer_image @@ -363,6 +399,7 @@ True True Initiate a new call + add_call_image @@ -377,6 +414,7 @@ True True True + start_call_image @@ -390,6 +428,7 @@ True True True + start_chat_image @@ -399,12 +438,6 @@ 4 - - - - - - False @@ -417,6 +450,8 @@ True True + 200 + True True @@ -449,13 +484,61 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + contact_list_model + False True - False 1 + 4 + + + + + 2 + + + 0 + + + + + + + 60 + True + + + + 1 + + + + + + + + + linphone-start-call2 + 2 + + + + + + + + + 2 + + + 5 + + + + @@ -523,8 +606,8 @@ - False - False + True + True @@ -711,12 +794,6 @@ 0 - - - - - - False diff --git a/gtk/status_icon.c b/gtk/status_icon.c index 99661222d..588611a40 100644 --- a/gtk/status_icon.c +++ b/gtk/status_icon.c @@ -316,15 +316,13 @@ static void _linphone_status_icon_impl_gtk_popup_menu(GtkStatusIcon *status_icon } static void _linphone_status_icon_impl_gtk_init(LinphoneStatusIcon *si) { - const char *icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON); - const char *call_icon_path=linphone_gtk_get_ui_config("start_call_icon","call_start.png"); - GdkPixbuf *pbuf=create_pixbuf(icon_path); - GtkStatusIcon *icon=gtk_status_icon_new_from_pixbuf(pbuf); + const char *icon_name=linphone_gtk_get_ui_config("icon_name",LINPHONE_ICON_NAME); + const char *blinking_icon_name=linphone_gtk_get_ui_config("binking_status_icon_name","linphone-start-call"); + GtkStatusIcon *icon=gtk_status_icon_new_from_icon_name(icon_name); g_signal_connect_swapped(G_OBJECT(icon),"activate", G_CALLBACK(_linphone_status_icon_impl_gtk_on_click_cb), si); g_signal_connect(G_OBJECT(icon), "popup-menu", G_CALLBACK(_linphone_status_icon_impl_gtk_popup_menu), si); - g_object_set_data_full(G_OBJECT(icon),"icon",pbuf, g_object_unref); - pbuf=create_pixbuf(call_icon_path); - g_object_set_data_full(G_OBJECT(icon),"call_icon",pbuf, g_object_unref); + g_object_set_data_full(G_OBJECT(icon), "icon", g_strdup(icon_name), g_free); + g_object_set_data_full(G_OBJECT(icon), "call_icon", g_strdup(blinking_icon_name), g_free); si->data = icon; } @@ -344,13 +342,13 @@ static void _linphone_status_icon_impl_gtk_start(LinphoneStatusIcon *si) { } static gboolean _linphone_status_icon_impl_gtk_do_icon_blink_cb(GtkStatusIcon *gi){ - GdkPixbuf *call_icon=g_object_get_data(G_OBJECT(gi),"call_icon"); - GdkPixbuf *normal_icon=g_object_get_data(G_OBJECT(gi),"icon"); - GdkPixbuf *cur_icon=gtk_status_icon_get_pixbuf(gi); - if (cur_icon==call_icon){ - gtk_status_icon_set_from_pixbuf(gi,normal_icon); + const gchar *call_icon = (const gchar *)g_object_get_data(G_OBJECT(gi),"call_icon"); + const gchar *normal_icon = (const gchar *)g_object_get_data(G_OBJECT(gi),"icon"); + const gchar *cur_icon = (const gchar *)gtk_status_icon_get_icon_name(gi); + if (cur_icon == call_icon){ + gtk_status_icon_set_from_icon_name(gi,normal_icon); }else{ - gtk_status_icon_set_from_pixbuf(gi,call_icon); + gtk_status_icon_set_from_icon_name(gi,call_icon); } return TRUE; } @@ -363,10 +361,10 @@ static void _linphone_status_icon_impl_enable_blinking(LinphoneStatusIcon *si, g tout=g_timeout_add(500,(GSourceFunc)_linphone_status_icon_impl_gtk_do_icon_blink_cb,icon); g_object_set_data(G_OBJECT(icon),"timeout",GINT_TO_POINTER(tout)); }else if (!val && tout!=0){ - GdkPixbuf *normal_icon=g_object_get_data(G_OBJECT(icon),"icon"); + const gchar *normal_icon = (const gchar *)g_object_get_data(G_OBJECT(icon),"icon"); g_source_remove(tout); g_object_set_data(G_OBJECT(icon),"timeout",NULL); - gtk_status_icon_set_from_pixbuf(icon,normal_icon); + gtk_status_icon_set_from_icon_name(icon,normal_icon); } } diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index c90f789eb..6df0b512b 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -29,22 +29,59 @@ install(FILES ${PIXMAPS} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -install(FILES svg/linphone-micro-muted.svg +install(FILES + svg/linphone-micro-muted.svg svg/linphone-speaker-muted.svg svg/linphone-micro-enabled.svg svg/linphone-speaker-enabled.svg + svg/linphone-status-online.svg + svg/linphone-status-away.svg + svg/linphone-status-donotdisturb.svg + svg/linphone-status-offline.svg DESTINATION ${ICONS_INSTALL_DIR}/scalable/status PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) -install(FILES linphone-micro-muted.png +install(FILES + svg/linphone-start-call.svg + DESTINATION ${ICONS_INSTALL_DIR}/scalable/actions + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ +) + +install(FILES + linphone-micro-muted.png linphone-speaker-muted.png linphone-micro-enabled.png linphone-speaker-enabled.png + linphone-status-online.png + linphone-status-away.png + linphone-status-donotdisturb.png + linphone-status-offline.png + linphone-chat-nothing.png + linphone-chat-new-message.png + linphone-chat-writing.png + linphone-chat-new-message-and-writing.png + linphone-call-status-incoming.png + linphone-call-status-outgoing.png + linphone-contact-bookmarked.png + linphone-contact-not-bookmarked.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/status PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) +install(FILES + linphone-start-call2.png + linphone-show-dialer.png + 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 + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ +) + install(FILES linphone.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index afa9f411f..9f51c8940 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,20 +1,8 @@ pixmapdir=$(datadir)/pixmaps/linphone dist_pixmap_DATA= \ - hold_on.png hold_off.png \ linphone.png linphone-banner.png \ - status-green.png \ - status-orange.png \ - status-red.png \ - status-offline.png \ - call.png \ - chat.png chat_start.png active_chat.png composing_chat.png composing_active_chat.png\ - chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\ - contact-orange.png history-orange.png\ - call_start.png startcall-small.png stopcall-red.png stopcall-small.png call_add.png linphone.icns \ - contact_starred.png contact_unstarred.png \ - call_status_incoming.png call_status_outgoing.png \ + linphone.icns \ ok.png \ - dialer.png \ notok.png iconsdir=$(datadir)/icons/hicolor @@ -30,12 +18,38 @@ dist_status48icons_DATA= \ linphone-micro-muted.png \ linphone-speaker-muted.png \ linphone-micro-enabled.png \ - linphone-speaker-enabled.png + linphone-speaker-enabled.png \ + linphone-status-online.png \ + linphone-status-away.png \ + linphone-status-donotdisturb.png \ + linphone-status-offline.png \ + linphone-chat-nothing.png \ + linphone-chat-new-message.png \ + linphone-chat-writing.png \ + linphone-chat-new-message-and-writing.png \ + linphone-call-status-incoming.png \ + linphone-call_status-outgoing.png \ + linphone-contact-bookmarked.png \ + linphone-contact-not-bookmarked.png statussvgiconsdir=$(iconsdir)/scalable/status dist_statussvgicons_DATA= \ svg/linphone-micro-muted.svg \ svg/linphone-speaker-muted.svg \ svg/linphone-micro-enabled.svg \ - svg/linphone-speaker-enabled.svg + svg/linphone-speaker-enabled.svg \ + svg/linphone-status-online.svg \ + svg/linphone-status-away.svg \ + svg/linphone-status-donotdisturb.svg \ + svg/linphone-status-offline.svg +actions48iconsdir=$(iconsdir)/48x48/actions +dist_actions48icons_DATA= \ + linphone-start-call2.png \ + 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/active_chat.png b/pixmaps/active_chat.png deleted file mode 100644 index ef3cedd1d..000000000 Binary files a/pixmaps/active_chat.png and /dev/null differ diff --git a/pixmaps/call.png b/pixmaps/call.png deleted file mode 100644 index 7edf53556..000000000 Binary files a/pixmaps/call.png and /dev/null differ diff --git a/pixmaps/call_add.png b/pixmaps/call_add.png deleted file mode 100644 index 9e2cbb18e..000000000 Binary files a/pixmaps/call_add.png and /dev/null differ diff --git a/pixmaps/call_start.png b/pixmaps/call_start.png deleted file mode 100644 index 77b264d72..000000000 Binary files a/pixmaps/call_start.png and /dev/null differ diff --git a/pixmaps/call_status_incoming.png b/pixmaps/call_status_incoming.png deleted file mode 100644 index 72ca1330e..000000000 Binary files a/pixmaps/call_status_incoming.png and /dev/null differ diff --git a/pixmaps/call_status_outgoing.png b/pixmaps/call_status_outgoing.png deleted file mode 100644 index aa15b3bea..000000000 Binary files a/pixmaps/call_status_outgoing.png and /dev/null differ diff --git a/pixmaps/chat.png b/pixmaps/chat.png deleted file mode 100644 index 50a23af57..000000000 Binary files a/pixmaps/chat.png and /dev/null differ diff --git a/pixmaps/chat_message_delivered.png b/pixmaps/chat_message_delivered.png deleted file mode 100644 index 5cb746551..000000000 Binary files a/pixmaps/chat_message_delivered.png and /dev/null differ diff --git a/pixmaps/chat_message_inprogress.png b/pixmaps/chat_message_inprogress.png deleted file mode 100644 index 2ffcbca35..000000000 Binary files a/pixmaps/chat_message_inprogress.png and /dev/null differ diff --git a/pixmaps/chat_message_not_delivered.png b/pixmaps/chat_message_not_delivered.png deleted file mode 100644 index cf9c610c0..000000000 Binary files a/pixmaps/chat_message_not_delivered.png and /dev/null differ diff --git a/pixmaps/chat_start.png b/pixmaps/chat_start.png deleted file mode 100644 index 3de673211..000000000 Binary files a/pixmaps/chat_start.png and /dev/null differ diff --git a/pixmaps/composing_active_chat.png b/pixmaps/composing_active_chat.png deleted file mode 100644 index 77da9e37f..000000000 Binary files a/pixmaps/composing_active_chat.png and /dev/null differ diff --git a/pixmaps/composing_chat.png b/pixmaps/composing_chat.png deleted file mode 100644 index 2d329ed21..000000000 Binary files a/pixmaps/composing_chat.png and /dev/null differ diff --git a/pixmaps/contact-orange.png b/pixmaps/contact-orange.png deleted file mode 100644 index 53ba07ed8..000000000 Binary files a/pixmaps/contact-orange.png and /dev/null differ diff --git a/pixmaps/dialer.png b/pixmaps/dialer.png deleted file mode 100644 index bb9747a90..000000000 Binary files a/pixmaps/dialer.png and /dev/null differ diff --git a/pixmaps/history-orange.png b/pixmaps/history-orange.png deleted file mode 100644 index dc9bbf60a..000000000 Binary files a/pixmaps/history-orange.png and /dev/null differ diff --git a/pixmaps/hold_off.png b/pixmaps/hold_off.png deleted file mode 100644 index 3ba6746fb..000000000 Binary files a/pixmaps/hold_off.png and /dev/null differ diff --git a/pixmaps/hold_on.png b/pixmaps/hold_on.png deleted file mode 100644 index 776d5ddd4..000000000 Binary files a/pixmaps/hold_on.png and /dev/null differ diff --git a/pixmaps/linphone-add-call.png b/pixmaps/linphone-add-call.png new file mode 100644 index 000000000..ac53a29e8 Binary files /dev/null and b/pixmaps/linphone-add-call.png differ diff --git a/pixmaps/linphone-call-status-incoming.png b/pixmaps/linphone-call-status-incoming.png new file mode 100644 index 000000000..0091c0f62 Binary files /dev/null and b/pixmaps/linphone-call-status-incoming.png differ diff --git a/pixmaps/linphone-call-status-outgoing.png b/pixmaps/linphone-call-status-outgoing.png new file mode 100644 index 000000000..0c2c19abc Binary files /dev/null and b/pixmaps/linphone-call-status-outgoing.png differ diff --git a/pixmaps/linphone-chat-new-message-and-writing.png b/pixmaps/linphone-chat-new-message-and-writing.png new file mode 100644 index 000000000..c43437c08 Binary files /dev/null and b/pixmaps/linphone-chat-new-message-and-writing.png differ diff --git a/pixmaps/linphone-chat-new-message.png b/pixmaps/linphone-chat-new-message.png new file mode 100644 index 000000000..baa4701f1 Binary files /dev/null and b/pixmaps/linphone-chat-new-message.png differ diff --git a/pixmaps/linphone-chat-nothing.png b/pixmaps/linphone-chat-nothing.png new file mode 100644 index 000000000..49cad5319 Binary files /dev/null and b/pixmaps/linphone-chat-nothing.png differ diff --git a/pixmaps/linphone-chat-writing.png b/pixmaps/linphone-chat-writing.png new file mode 100644 index 000000000..9b94a34c3 Binary files /dev/null and b/pixmaps/linphone-chat-writing.png differ diff --git a/pixmaps/contact_starred.png b/pixmaps/linphone-contact-bookmarked.png similarity index 100% rename from pixmaps/contact_starred.png rename to pixmaps/linphone-contact-bookmarked.png diff --git a/pixmaps/contact_unstarred.png b/pixmaps/linphone-contact-not-bookmarked.png similarity index 100% rename from pixmaps/contact_unstarred.png rename to pixmaps/linphone-contact-not-bookmarked.png diff --git a/pixmaps/linphone-hold-off.png b/pixmaps/linphone-hold-off.png new file mode 100644 index 000000000..016115266 Binary files /dev/null and b/pixmaps/linphone-hold-off.png differ diff --git a/pixmaps/linphone-hold-on.png b/pixmaps/linphone-hold-on.png new file mode 100644 index 000000000..c287c8a32 Binary files /dev/null and b/pixmaps/linphone-hold-on.png differ diff --git a/pixmaps/linphone-show-dialer.png b/pixmaps/linphone-show-dialer.png new file mode 100644 index 000000000..8f8b98f25 Binary files /dev/null and b/pixmaps/linphone-show-dialer.png differ diff --git a/pixmaps/linphone-start-call.png b/pixmaps/linphone-start-call.png new file mode 100644 index 000000000..fab8701f9 Binary files /dev/null and b/pixmaps/linphone-start-call.png differ diff --git a/pixmaps/linphone-start-call2.png b/pixmaps/linphone-start-call2.png new file mode 100644 index 000000000..6569ffff7 Binary files /dev/null and b/pixmaps/linphone-start-call2.png differ diff --git a/pixmaps/linphone-start-chat.png b/pixmaps/linphone-start-chat.png new file mode 100644 index 000000000..224eddb57 Binary files /dev/null and b/pixmaps/linphone-start-chat.png differ diff --git a/pixmaps/linphone-status-away.png b/pixmaps/linphone-status-away.png new file mode 100644 index 000000000..75727dc28 Binary files /dev/null and b/pixmaps/linphone-status-away.png differ diff --git a/pixmaps/linphone-status-donotdisturb.png b/pixmaps/linphone-status-donotdisturb.png new file mode 100644 index 000000000..0556ce197 Binary files /dev/null and b/pixmaps/linphone-status-donotdisturb.png differ diff --git a/pixmaps/linphone-status-offline.png b/pixmaps/linphone-status-offline.png new file mode 100644 index 000000000..0cefa05ac Binary files /dev/null and b/pixmaps/linphone-status-offline.png differ diff --git a/pixmaps/linphone-status-online.png b/pixmaps/linphone-status-online.png new file mode 100644 index 000000000..e56456499 Binary files /dev/null and b/pixmaps/linphone-status-online.png differ 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/pausecall.png b/pixmaps/pausecall.png deleted file mode 100644 index 9ab5bae92..000000000 Binary files a/pixmaps/pausecall.png and /dev/null differ diff --git a/pixmaps/resumecall.png b/pixmaps/resumecall.png deleted file mode 100644 index b8a2d50cd..000000000 Binary files a/pixmaps/resumecall.png and /dev/null 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/status-green.png b/pixmaps/status-green.png deleted file mode 100644 index 1a39a4242..000000000 Binary files a/pixmaps/status-green.png and /dev/null differ diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png deleted file mode 100644 index 243c5c069..000000000 Binary files a/pixmaps/status-offline.png and /dev/null differ diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png deleted file mode 100644 index f2e66d34d..000000000 Binary files a/pixmaps/status-orange.png and /dev/null differ diff --git a/pixmaps/status-red.png b/pixmaps/status-red.png deleted file mode 100644 index e7a0ec98a..000000000 Binary files a/pixmaps/status-red.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-start-call.svg b/pixmaps/svg/linphone-start-call.svg new file mode 100644 index 000000000..e22391a76 --- /dev/null +++ b/pixmaps/svg/linphone-start-call.svg @@ -0,0 +1,77 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pixmaps/svg/linphone-status-away.svg b/pixmaps/svg/linphone-status-away.svg new file mode 100644 index 000000000..fe3d1238c --- /dev/null +++ b/pixmaps/svg/linphone-status-away.svg @@ -0,0 +1,78 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pixmaps/svg/linphone-status-donotdisturb.svg b/pixmaps/svg/linphone-status-donotdisturb.svg new file mode 100644 index 000000000..a1fc9701a --- /dev/null +++ b/pixmaps/svg/linphone-status-donotdisturb.svg @@ -0,0 +1,80 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pixmaps/svg/linphone-status-offline.svg b/pixmaps/svg/linphone-status-offline.svg new file mode 100644 index 000000000..cea91849c --- /dev/null +++ b/pixmaps/svg/linphone-status-offline.svg @@ -0,0 +1,86 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pixmaps/svg/linphone-status-online.svg b/pixmaps/svg/linphone-status-online.svg new file mode 100644 index 000000000..e22391a76 --- /dev/null +++ b/pixmaps/svg/linphone-status-online.svg @@ -0,0 +1,77 @@ + + + +image/svg+xml \ No newline at end of file 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 @@ + + + +image/svg+xml \ 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/status-green.svg b/pixmaps/svg/status-green.svg deleted file mode 100644 index d875488b8..000000000 --- a/pixmaps/svg/status-green.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/pixmaps/svg/status-offline.svg b/pixmaps/svg/status-offline.svg deleted file mode 100644 index 1576f034c..000000000 --- a/pixmaps/svg/status-offline.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pixmaps/svg/status-orange.svg b/pixmaps/svg/status-orange.svg deleted file mode 100644 index 9fbd47226..000000000 --- a/pixmaps/svg/status-orange.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pixmaps/svg/status-red.svg b/pixmaps/svg/status-red.svg deleted file mode 100644 index eb47308a2..000000000 --- a/pixmaps/svg/status-red.svg +++ /dev/null @@ -1,44 +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 @@ - - - - - - - - - - - - - - - - - - - - -