Changeset 2094

Timestamp:

05/29/07 17:00:58 (6 years ago)

Author:

thomas

Message:

Patch by: Neil J Patel <njp@…>

• Uses correct icons for the history view.
• Checks that the entry it is loading is a voice entry.
• Properly loads all voice information.
• Fixed list-store types.
• Uses correct icons for incoming/outgoing/missed calls.
• Connects to the 'entry-added' callback in MokoJournal? to update its view when entries are added.
• Fixed filtering so you can now use the menu at the top to filter the list of calls.

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer/src

Files:

• dialer-main.h (modified) (1 diff)
• dialer-window-history.c (modified) (11 diffs)
• dialer-window-history.h (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h

@@ -91 +91 @@
   gboolean history_need_to_update;
 
+  GtkListStore *g_list_store; /* The actual list store */
   GtkTreeModel *g_list_store_filter;    ///<the list store used by the gtktreeview, for displaying the history list dynamically.
-
+  gint g_history_filter_type;
+  
   GdkPixbuf *g_iconReceived, *g_iconMissed, *g_iconDialed;      ///<the global pixbuf for the 3 icons displayed in the history window.}DIALER_APP_DATA;
 } MokoDialerData;

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c

@@ -24 +24 @@
 
 #include <gtk/gtk.h>
+#include <string.h>
 
 #include "common.h"
@@ -33 +34 @@
 /* call types */
 typedef enum {
-  ALL,
+  ALL =0,
   MISSED,
   OUTGOING,
@@ -39 +40 @@
 } CallFilter;
 
+#define HISTORY_CALL_INCOMING_ICON "moko-history-call-in"
+#define HISTORY_CALL_OUTGOING_ICON "moko-history-call-out"
+#define HISTORY_CALL_MISSED_ICON "moko-history-call-missed"
+
 /* function declarations */
 
@@ -46 +51 @@
 static GtkWidget *history_create_menu_history (MokoDialerData * p_dialer_data);
 static gint history_build_history_list_view (MokoDialerData * p_dialer_data);
-
+static void on_entry_added_cb (MokoJournal *journal, 
+                               MokoJournalEntry *entry,
+                               MokoDialerData * p_dialer_data);
 
 /**
@@ -62 +69 @@
                             CallFilter type)
 {
+ p_dialer_data->g_history_filter_type = type;
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER
+                                   (p_dialer_data->g_list_store_filter));
+
  return 0;
 }
@@ -556 +567 @@
                                       GtkTreeIter * iter, gpointer data)
 {
-  /*
   MokoDialerData *p_dialer_data = (MokoDialerData *) data;
   CallFilter type;
   if (p_dialer_data->g_history_filter_type == ALL)
     return TRUE;
-  gtk_tree_model_get (model, iter, COLUMN_TYPE, &type, -1);
+  
+  gtk_tree_model_get (model, iter, HISTORY_CALL_TYPE_COLUMN, &type, -1);
+  
   if (type == p_dialer_data->g_history_filter_type)
     return TRUE;
   else
     return FALSE;
-    */
+    
   return TRUE;
 }
@@ -621 +633 @@
   /* Set up a list store for the history items */
   /* UID, DSTART, MISSED, DIRECTION */
-  list_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_INT);
-
-
-  //we will use a filter to facilitate the filtering in treeview without rebuilding the database.
-  p_dialer_data->g_list_store_filter =
+  list_store = gtk_list_store_new (5, G_TYPE_STRING, 
+                                      G_TYPE_INT, 
+                                      G_TYPE_STRING, 
+                                      G_TYPE_STRING,
+                                      G_TYPE_INT);
+                                      
+  p_dialer_data->g_list_store = list_store;
+
+  /* We setup the default filter */
+  p_dialer_data->g_history_filter_type = ALL;
+  
+  //we will use a filter to facilitate the filtering in treeview without rebuilding the database.  p_dialer_data->g_list_store_filter =
+  p_dialer_data->g_list_store_filter = 
     gtk_tree_model_filter_new (GTK_TREE_MODEL (list_store), NULL);
   gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER
@@ -646 +666 @@
    * here
    */
-  if (!p_dialer_data->journal || !moko_journal_get_nb_entries (p_dialer_data->journal))
+  if (!p_dialer_data->journal)
+  {
+    g_print ("there is no journal\n");
     return 1;
-
-  j_entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
-
-  /* Bail out if we couldn't get the entry. Do we need to display a warning here? */
-  if (!j_entry)
-    return 0;
+  } 
+    /* We register callbacks for when an entry is added, so we can keep the
+     history up-to-date */
+  moko_journal_set_entry_added_callback (p_dialer_data->journal,
+                        (MokoJournalEntryAddedFunc)on_entry_added_cb,
+                        (gpointer)p_dialer_data);
+                        
+  if (!moko_journal_get_nb_entries (p_dialer_data->journal))
+  {
+    g_print ("there are no entries in the journal\n");
+    return 1;
+  }
 
   while (moko_journal_get_entry_at (p_dialer_data->journal, i, &j_entry))
@@ -660 +688 @@
     gchar *icon_name;
     const gchar *display_text;
-    int dstart;
+    time_t dstart;
     enum MessageDirection direction;
     gboolean was_missed;
     const MokoTime *time;
-
+    MokoJournalVoiceInfo *info = NULL;
+    CallFilter type;
+    
+    /* We're not interested in anything other than voice entrys */
+    if (moko_journal_entry_get_type (j_entry) != VOICE_JOURNAL_ENTRY)
+    {
+      i++;
+      continue;
+    }
+    
     uid = moko_journal_entry_get_contact_uid (j_entry);
     moko_journal_entry_get_direction (j_entry, &direction);
     time = moko_journal_entry_get_dtstart (j_entry);
-    was_missed = moko_journal_voice_info_get_was_missed ((MokoJournalVoiceInfo*) j_entry);
-    number = moko_journal_voice_info_get_distant_number ((MokoJournalVoiceInfo*)j_entry);
-
+    dstart = moko_time_as_timet (time);
+    moko_journal_entry_get_voice_info (j_entry, &info);
+    was_missed = moko_journal_voice_info_get_was_missed (info);
+    number = moko_journal_voice_info_get_distant_number (info);
+    
+    /* If the number is null, the number may have been stored in the summary*/
+    if (strcmp (number, "NULL") == 0) 
+      number = moko_journal_entry_get_summary (j_entry);
+
+    /* Load the correct icon */
     if (direction == DIRECTION_OUT)
-      icon_name = "call-in";
+    {
+      icon_name = HISTORY_CALL_OUTGOING_ICON;
+      type = OUTGOING;
+    }
     else
+    {
       if (was_missed)
-        icon_name = "call-missed";
+      {
+        icon_name = HISTORY_CALL_MISSED_ICON;
+        type = MISSED;
+      }
       else
-        icon_name = "call-out";
-
+      { 
+        icon_name = HISTORY_CALL_INCOMING_ICON;
+        type = INCOMING;      
+      }
+    }
     /* display text should be either the contact name, or the number if the
      * contact name is not know */
     /* FIXME: look up uid */
     display_text = number;
-
+    
     gtk_list_store_insert_with_values (list_store, NULL, 0,
         HISTORY_NUMBER_COLUMN, number,
@@ -689 +743 @@
         HISTORY_ICON_NAME_COLUMN, icon_name,
         HISTORY_DISPLAY_TEXT_COLUMN, display_text,
+        HISTORY_CALL_TYPE_COLUMN, type,
         -1);
-
     i++;
   }
@@ -854 +908 @@
 }
 
-
+static void
+on_entry_added_cb (MokoJournal *journal, 
+                   MokoJournalEntry *j_entry,
+                   MokoDialerData * p_dialer_data)
+{
+  GtkListStore *list_store;
+  const gchar *uid, *number;
+  gchar *icon_name;
+  const gchar *display_text;
+  time_t dstart;
+  enum MessageDirection direction;
+  gboolean was_missed;
+  const MokoTime *time;
+  MokoJournalVoiceInfo *info = NULL;
+  CallFilter type;
+    
+  g_return_if_fail (p_dialer_data);
+  /* We're not interested in anything other than voice entrys */
+  if (moko_journal_entry_get_type (j_entry) != VOICE_JOURNAL_ENTRY)
+  {
+    return;
+  }
+  /* Get the list store*/
+  list_store = p_dialer_data->g_list_store;
+  
+  uid = moko_journal_entry_get_contact_uid (j_entry);
+  moko_journal_entry_get_direction (j_entry, &direction);
+  time = moko_journal_entry_get_dtstart (j_entry);
+  dstart = moko_time_as_timet (time);
+  moko_journal_entry_get_voice_info (j_entry, &info);
+  was_missed = moko_journal_voice_info_get_was_missed (info);
+  number = moko_journal_voice_info_get_distant_number (info);
+    
+  /* If the number is null, the number may have been stored in the summary*/
+  if (strcmp (number, "NULL") == 0)
+    number = moko_journal_entry_get_summary (j_entry);
+
+  /* Load the correct icon */
+  if (direction == DIRECTION_OUT)
+  {
+    icon_name = HISTORY_CALL_OUTGOING_ICON;
+    type = OUTGOING;
+  }
+  else
+  {
+    if (was_missed)
+    {
+      icon_name = HISTORY_CALL_MISSED_ICON;
+      type = MISSED;
+    }
+    else
+    { 
+      icon_name = HISTORY_CALL_INCOMING_ICON;
+      type = INCOMING;      
+    }
+  }
+ 
+  /* display text should be either the contact name, or the number if the
+   * contact name is not know */
+  /* FIXME: look up uid */
+  display_text = number;
+    
+  gtk_list_store_insert_with_values (list_store, NULL, 0,
+      HISTORY_NUMBER_COLUMN, number,
+      HISTORY_DSTART_COLUMN, dstart,
+      HISTORY_ICON_NAME_COLUMN, icon_name,
+      HISTORY_DISPLAY_TEXT_COLUMN, display_text,
+      HISTORY_CALL_TYPE_COLUMN, type,
+      -1);
+}
+
+

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.h

@@ -26 +26 @@
   HISTORY_ICON_NAME_COLUMN, /* icon name for display */
   HISTORY_DISPLAY_TEXT_COLUMN, /* name or number for display */
+  HISTORY_CALL_TYPE_COLUMN /* Used for identifying the type of call */
 };