From 4ec27bb165e706955713f4dae81be1c6b67d4eba Mon Sep 17 00:00:00 2001 From: Julien Bonjean Date: Mon, 2 Mar 2009 15:01:24 -0500 Subject: [PATCH] Fixed contact list refresh, added icon --- sflphone-gtk/pixmaps/contacts.svg | 99 +++++++++++++++++++++++++++++ sflphone-gtk/src/actions.c | 2 + sflphone-gtk/src/calllist.c | 42 ++++++------ sflphone-gtk/src/calltree.c | 102 ++++++++++-------------------- sflphone-gtk/src/calltree.h | 2 + 5 files changed, 159 insertions(+), 88 deletions(-) create mode 100644 sflphone-gtk/pixmaps/contacts.svg diff --git a/sflphone-gtk/pixmaps/contacts.svg b/sflphone-gtk/pixmaps/contacts.svg new file mode 100644 index 000000000..5574fc016 --- /dev/null +++ b/sflphone-gtk/pixmaps/contacts.svg @@ -0,0 +1,99 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c index f66b2e922..d3c26360d 100644 --- a/sflphone-gtk/src/actions.c +++ b/sflphone-gtk/src/actions.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -234,6 +235,7 @@ gboolean sflphone_init() contacts = calltab_init(); if(SHOW_SEARCHBAR) histfilter = create_filter(GTK_TREE_MODEL(history->store)); contactfilter = create_filter(GTK_TREE_MODEL(contacts->store)); + init(); account_list_init (); codec_list_init(); sflphone_fill_account_list(FALSE); diff --git a/sflphone-gtk/src/calllist.c b/sflphone-gtk/src/calllist.c index c9629ad46..ce1252140 100644 --- a/sflphone-gtk/src/calllist.c +++ b/sflphone-gtk/src/calllist.c @@ -1,22 +1,22 @@ /* * Copyright (C) 2007 Savoir-Faire Linux inc. * Author: Pierre-Luc Beaudoin - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include #include #include @@ -29,7 +29,7 @@ */ /* GCompareFunc to compare a callID (gchar* and a call_t) */ -gint +gint is_callID_callstruct ( gconstpointer a, gconstpointer b) { call_t * c = (call_t*)a; @@ -44,7 +44,7 @@ is_callID_callstruct ( gconstpointer a, gconstpointer b) } /* GCompareFunc to get current call (gchar* and a call_t) */ -gint +gint get_state_callstruct ( gconstpointer a, gconstpointer b) { call_t * c = (call_t*)a; @@ -58,30 +58,30 @@ get_state_callstruct ( gconstpointer a, gconstpointer b) } } -void +void call_list_init (calltab_t* tab) { tab->callQueue = g_queue_new (); tab->selectedCall = NULL; } -void +void call_list_clean (calltab_t* tab) { g_queue_free (tab->callQueue); } -void +void call_list_reset (calltab_t* tab) { g_queue_free (tab->callQueue); tab->callQueue = g_queue_new(); } -void +void call_list_add (calltab_t* tab, call_t * c) { - if( tab == history ) + if( tab == history ) { // First case: can still add calls to the list if( call_list_get_size(tab) < dbus_get_max_calls() ) @@ -92,7 +92,7 @@ call_list_add (calltab_t* tab, call_t * c) // List full -> Remove the last call from history and preprend the new call to the list else { - update_call_tree_remove( history , (call_t*)g_queue_pop_head( tab -> callQueue ) ); + update_call_tree_remove( history , (call_t*)g_queue_pop_head( tab -> callQueue ) ); g_queue_push_tail (tab->callQueue, (gpointer *) c); update_call_tree_add( history , c ); } @@ -126,7 +126,7 @@ call_list_remove_from_history( call_t* c ) g_print("Size of history = %i\n" , call_list_get_size( history )); } -void +void call_list_remove (calltab_t* tab, const gchar * callID) { call_t * c = call_list_get(tab, callID); @@ -137,7 +137,7 @@ call_list_remove (calltab_t* tab, const gchar * callID) } -call_t * +call_t * call_list_get_by_state (calltab_t* tab, call_state_t state ) { GList * c = g_queue_find_custom (tab->callQueue, &state, get_state_callstruct); @@ -145,11 +145,11 @@ call_list_get_by_state (calltab_t* tab, call_state_t state ) { return (call_t *)c->data; } - else + else { return NULL; } - + } guint @@ -158,13 +158,13 @@ call_list_get_size (calltab_t* tab) return g_queue_get_length (tab->callQueue); } -call_t * +call_t * call_list_get_nth (calltab_t* tab, guint n ) { return g_queue_peek_nth (tab->callQueue, n); } -gchar * +gchar * call_get_name (const call_t * c) { gchar * end = g_strrstr(c->from, "\""); @@ -176,7 +176,7 @@ call_get_name (const call_t * c) } } -gchar * +gchar * call_get_number (const call_t * c) { gchar * number = g_strrstr(c->from, "<") + 1; @@ -192,7 +192,7 @@ call_get_recipient( const call_t * c ) } -call_t * +call_t * call_list_get (calltab_t* tab, const gchar * callID ) { GList * c = g_queue_find_custom (tab->callQueue, callID, is_callID_callstruct); @@ -200,7 +200,7 @@ call_list_get (calltab_t* tab, const gchar * callID ) { return (call_t *)c->data; } - else + else { return NULL; } diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c index 1b4dcc9d7..30ea06913 100644 --- a/sflphone-gtk/src/calltree.c +++ b/sflphone-gtk/src/calltree.c @@ -180,17 +180,11 @@ toggle_history(GtkToggleToolButton *toggle_tool_button UNUSED, { GtkTreeSelection *sel; - if(history_shown){ - active_calltree = current_calls; - gtk_widget_hide(history->tree); - gtk_widget_show(current_calls->tree); - history_shown = FALSE; - }else{ - active_calltree = history; - gtk_widget_hide(current_calls->tree); - gtk_widget_show(history->tree); - history_shown = TRUE; - } + active_calltree = history; + gtk_widget_hide(current_calls->tree); + gtk_widget_hide(contacts->tree); + gtk_widget_show(history->tree); + history_shown = TRUE; sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (active_calltree->view)); g_signal_emit_by_name(sel, "changed"); @@ -207,15 +201,19 @@ toggle_contacts(GtkToggleToolButton *toggle_tool_button UNUSED, GtkTreeSelection *sel; GList *results; GList *i; + char ext[30]; - //gtk_init (&argc, &argv); - init(); - results = search_sync ("s", 50); + // Reset previous results + call_list_reset(contacts); + reset_call_tree(contacts); + + // Do a synchronized search + results = search_sync ("j", 50); if(results == NULL) { - printf("null\n"); - return -1; + printf("No results\n"); + return ; } for (i = results; i != NULL; i = i->next) @@ -228,11 +226,10 @@ toggle_contacts(GtkToggleToolButton *toggle_tool_button UNUSED, call = g_new0 (call_t, 1); call->accountID = g_strdup("Account:1235677223"); - //call->callID = g_strdup("468809080"); call->callID = g_new0(gchar, 30); g_sprintf(call->callID, "%d", rand()); - call->to = g_strdup("\"\" <66e>"); - call->from = g_strconcat("\"\" <", entry->text , ">"); + sprintf(ext, "%d", rand()%100 + 100); + call->from = g_strconcat("\"" , entry->text, "\"<", ext, ">", NULL); call->state = CALL_STATE_RECORD; call->history_state = OUTGOING; @@ -240,44 +237,7 @@ toggle_contacts(GtkToggleToolButton *toggle_tool_button UNUSED, update_call_tree_add(contacts,call); } } - /* - call_t * call; - - call = g_new0 (call_t, 1); - call->accountID = g_strdup("Account:1235677223"); - call->callID = g_strdup("468809080"); - call->callID = g_new0(gchar, 30); - g_sprintf(call->callID, "%d", rand()); - call->from = g_strdup("\"\" <666>"); - call->to = g_strdup(""); - call->state = CALL_STATE_INCOMING; - call->history_state = INCOMING; -*/ - - /* - call_list_add (contacts, call); - update_call_tree_add(contacts,call); -*/ - - - - /* - g_queue_push_tail (calltree->callQueue, (gpointer *) call); - g_queue_push_tail (calltree->callQueue, (gpointer *) call); - */ - /* - if(history_shown){ - active_calltree = current_calls; - gtk_widget_hide(history->tree); - gtk_widget_show(current_calls->tree); - history_shown = FALSE; - }else{ - active_calltree = history; - gtk_widget_hide(current_calls->tree); - gtk_widget_show(history->tree); - history_shown = TRUE; - } - */ + gtk_widget_hide(current_calls->tree); gtk_widget_hide(history->tree); gtk_widget_show(contacts->tree); @@ -585,26 +545,22 @@ create_toolbar () gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(transfertButton), -1); image = gtk_image_new_from_file( ICONS_DIR "/history2.svg"); - historyButton = gtk_toggle_tool_button_new(); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(historyButton), image); + historyButton = gtk_tool_button_new(image, _("History")); #if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_text(GTK_WIDGET(historyButton), _("History")); #endif - gtk_tool_button_set_label(GTK_TOOL_BUTTON(historyButton), _("History")); - g_signal_connect (G_OBJECT (historyButton), "toggled", + g_signal_connect (G_OBJECT (historyButton), "clicked", G_CALLBACK (toggle_history), NULL); gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(historyButton), -1); history_shown = FALSE; active_calltree = current_calls; - image = gtk_image_new_from_file( ICONS_DIR "/history2.svg"); - contactButton = gtk_toggle_tool_button_new(); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(contactButton), image); + image = gtk_image_new_from_file( ICONS_DIR "/contacts.svg"); + contactButton = gtk_tool_button_new(image, _("Contacts")); #if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_text(GTK_WIDGET(contactButton), _("Contacts")); #endif - gtk_tool_button_set_label(GTK_TOOL_BUTTON(contactButton), _("Contacts")); - g_signal_connect (G_OBJECT (contactButton), "toggled", + g_signal_connect (G_OBJECT (contactButton), "clicked", G_CALLBACK (toggle_contacts), NULL); gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(contactButton), -1); @@ -657,6 +613,15 @@ on_key_released (GtkWidget *widget UNUSED, return TRUE; } +/** + * Reset call tree + */ + void +reset_call_tree (calltab_t* tab) +{ + gtk_list_store_clear (tab->store); +} + void create_call_tree (calltab_t* tab) { @@ -933,7 +898,10 @@ update_call_tree_add (calltab_t* tab, call_t * c) g_warning("History - Should not happen!"); } date = timestamp_get_call_date(); - description = g_strconcat( date , description , NULL); + if(tab == contacts) + description = g_strconcat( description , NULL); + else + description = g_strconcat( date , description , NULL); } //Resize it diff --git a/sflphone-gtk/src/calltree.h b/sflphone-gtk/src/calltree.h index 7d8d70eef..216f23f1f 100644 --- a/sflphone-gtk/src/calltree.h +++ b/sflphone-gtk/src/calltree.h @@ -63,6 +63,8 @@ void update_call_tree (calltab_t* ct, call_t * c); */ void update_call_tree_remove (calltab_t* ct, call_t * c); +void reset_call_tree (calltab_t* tab); + /** * Build the toolbar * @return GtkWidget* The toolbar -- GitLab