From cd313efa16d8552aafdc959d1c319b1e32dd1a21 Mon Sep 17 00:00:00 2001 From: Emmanuel Milou Date: Thu, 5 Mar 2009 17:41:31 -0500 Subject: [PATCH] Add icons, set the contacts entry state as CALL_STATE_DIALING --- sflphone-gtk/pixmaps/Makefile.am | 2 +- sflphone-gtk/pixmaps/addressbook.svg | 1004 ++++++++++++++++++++++ sflphone-gtk/pixmaps/contact_default.svg | 312 +++++++ sflphone-gtk/pixmaps/face-monkey.svg | 583 +++++++++++++ sflphone-gtk/src/actions.c | 6 +- sflphone-gtk/src/calllist.h | 15 +- sflphone-gtk/src/calltree.c | 57 +- 7 files changed, 1955 insertions(+), 24 deletions(-) create mode 100644 sflphone-gtk/pixmaps/addressbook.svg create mode 100644 sflphone-gtk/pixmaps/contact_default.svg create mode 100644 sflphone-gtk/pixmaps/face-monkey.svg diff --git a/sflphone-gtk/pixmaps/Makefile.am b/sflphone-gtk/pixmaps/Makefile.am index af3933982..798af1622 100644 --- a/sflphone-gtk/pixmaps/Makefile.am +++ b/sflphone-gtk/pixmaps/Makefile.am @@ -2,6 +2,6 @@ icondir = $(datadir)/pixmaps icon_DATA = sflphone.png -buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg sflphone.png stock_person.svg icon_rec.svg rec_call.svg +buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg sflphone.png stock_person.svg icon_rec.svg rec_call.svg addressbook.svg contact_default.svg face-monkey.svg buttonsdir = $(datadir)/sflphone EXTRA_DIST = $(buttons_DATA) $(icon_DATA) diff --git a/sflphone-gtk/pixmaps/addressbook.svg b/sflphone-gtk/pixmaps/addressbook.svg new file mode 100644 index 000000000..7e2c1ede8 --- /dev/null +++ b/sflphone-gtk/pixmaps/addressbook.svg @@ -0,0 +1,1004 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Address Book + 2007-06-23 + + + Lapo Calamandrei + + + + + address + book + contact + + + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sflphone-gtk/pixmaps/contact_default.svg b/sflphone-gtk/pixmaps/contact_default.svg new file mode 100644 index 000000000..5e4938e22 --- /dev/null +++ b/sflphone-gtk/pixmaps/contact_default.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Person + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + user + person + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sflphone-gtk/pixmaps/face-monkey.svg b/sflphone-gtk/pixmaps/face-monkey.svg new file mode 100644 index 000000000..819282da5 --- /dev/null +++ b/sflphone-gtk/pixmaps/face-monkey.svg @@ -0,0 +1,583 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + face-monkey + + + Ulisse Perusin + + + + + based on the work of someone who didn't fill the metadata... + + + + + emotes + monkey + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c index a08180c7a..228fee200 100644 --- a/sflphone-gtk/src/actions.c +++ b/sflphone-gtk/src/actions.c @@ -230,9 +230,9 @@ gboolean sflphone_init() else { dbus_register(getpid(), "Gtk+ Client"); - current_calls = calltab_init(); - history = calltab_init(); - contacts = calltab_init(); + current_calls = calltab_init(); + history = calltab_init(); + contacts = calltab_init(); if(SHOW_SEARCHBAR) histfilter = create_filter(GTK_TREE_MODEL(history->store)); init(); account_list_init (); diff --git a/sflphone-gtk/src/calllist.h b/sflphone-gtk/src/calllist.h index 326979eb7..caa78b880 100644 --- a/sflphone-gtk/src/calllist.h +++ b/sflphone-gtk/src/calllist.h @@ -75,6 +75,17 @@ typedef enum CONTACT } call_type_t; +/** + * @enum contact_type + * This enum have all types of contacts: HOME phone, cell phone, etc... + */ +typedef enum +{ + HOME, + CELLPHONE, + WORK +} contact_type_t; + /** @struct call_t * @brief Call information. * This struct holds information about a call. @@ -93,8 +104,10 @@ typedef struct { gchar * to; /** The current state of the call */ call_state_t state; - /** The history state */ + /** The history state if necessary */ history_state_t history_state; + /** The contact type if necessary */ + contact_type_t contact_type; time_t _start; time_t _stop; diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c index 0f85ded7b..ccaddaa08 100644 --- a/sflphone-gtk/src/calltree.c +++ b/sflphone-gtk/src/calltree.c @@ -247,7 +247,7 @@ show_contacts_tab(GtkToggleToolButton *toggle_tool_button UNUSED, reset_call_tree(contacts); call_list_reset(contacts); - // do a synchronized search + // do a synchronous search results = search_sync (gtk_entry_get_text(GTK_ENTRY(filter_entry)), 50); for (i = results; i != NULL; i = i->next) @@ -260,8 +260,9 @@ show_contacts_tab(GtkToggleToolButton *toggle_tool_button UNUSED, call = g_new0 (call_t, 1); call->from = g_strconcat("\"" , entry->name, "\"<", entry->phone, ">", NULL); - call->state = CALL_STATE_RECORD; - call->history_state = OUTGOING; + call->state = CALL_STATE_DIALING; + //call->history_state = MISSED; + call->contact_type = HOME; call_list_add (contacts, call); update_call_tree_add(contacts,call); @@ -401,7 +402,7 @@ toolbar_update_buttons () gtk_widget_set_sensitive( GTK_WIDGET(recButton), TRUE); break; default: - g_warning("Should not happen!"); + g_warning("Toolbar update - Should not happen!"); break; } } @@ -474,7 +475,7 @@ void row_activated(GtkTreeView *tree_view UNUSED, sflphone_place_call (selectedCall); break; default: - g_warning("Should not happen!"); + g_warning("Row activated - Should not happen!"); break; } } @@ -584,7 +585,7 @@ create_toolbar () gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(historyButton), -1); active_calltree = current_calls; - image = gtk_image_new_from_file( ICONS_DIR "/contacts.svg"); + image = gtk_image_new_from_file( ICONS_DIR "/addressbook.svg"); contactButton = gtk_tool_button_new(image, _("Contacts")); #if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_text(GTK_WIDGET(contactButton), _("Contacts")); @@ -604,9 +605,6 @@ create_toolbar () G_CALLBACK (call_mailbox), NULL); gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(mailboxButton), -1); - - //image = gtk_image_new_from_file( ICONS_DIR "/record.svg"); - //recButton = gtk_tool_button_new (image, _("Record a call")); recButton = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_RECORD); #if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_text(GTK_WIDGET(recButton), _("Record a call")); @@ -823,7 +821,7 @@ update_call_tree (calltab_t* tab, call_t * c) pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/rec_call.svg", NULL); break; default: - g_warning("Should not happen!"); + g_warning("Update calltree - Should not happen!"); } } else @@ -908,14 +906,15 @@ update_call_tree_add (calltab_t* tab, call_t * c) pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/ring.svg", NULL); break; default: - g_warning("Should not happen!"); + g_warning("Update calltree add - Should not happen!"); } } - else{ + + else if (tab == history) { switch(c->history_state) { case INCOMING: - pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL); + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/incoming.svg", NULL); break; case OUTGOING: pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/outgoing.svg", NULL); @@ -924,15 +923,36 @@ update_call_tree_add (calltab_t* tab, call_t * c) pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/missed.svg", NULL); break; default: - g_warning("History - Should not happen!"); + g_warning("History - Should not happen!"); } date = timestamp_get_call_date(); - if(tab == contacts) - description = g_strconcat( description , NULL); - else - description = g_strconcat( date , description , NULL); + description = g_strconcat( date , description , NULL); + } + + else if (tab == contacts) { + switch (c->contact_type) + { + case HOME: + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/face-monkey.svg", NULL); + break; + case WORK: + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/face-monkey.svg", NULL); + break; + case CELLPHONE: + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/contact_default.svg", NULL); + break; + default: + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/contact_default.svg", NULL); + break; + } + description = g_strconcat( description , NULL); + } + + else { + g_warning ("This widget doesn't exist - This is a bug in the application\n."); } + //Resize it if(pixbuf) { @@ -950,7 +970,6 @@ update_call_tree_add (calltab_t* tab, call_t * c) if (pixbuf != NULL) g_object_unref(G_OBJECT(pixbuf)); - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tab->view)); gtk_tree_selection_select_iter(GTK_TREE_SELECTION(sel), &iter); toolbar_update_buttons(); -- GitLab