Changeset 3468

Timestamp:

11/21/07 17:55:09 (6 years ago)

Author:

chris

Message:

• src/sms-notes.c: (get_selected_contact), (page_hidden), (sms_notes_data_func), (sms_notes_page_new):
• src/sms.h: Add some code to show avatars/change justification depending on whether a message was sent or received (unfinished)

Location:

trunk/src/target/OM-2007.2/applications/openmoko-messages2

Files:

• ChangeLog (modified) (1 diff)
• src/sms-notes.c (modified) (8 diffs)
• src/sms.h (modified) (1 diff)

trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog

@@ +1 @@
+2007-11-21  Chris Lord  <chris@openedhand.com>
+
+        * src/sms-notes.c: (get_selected_contact), (page_hidden),
+        (sms_notes_data_func), (sms_notes_page_new):
+        * src/sms.h:
+        Add some code to show avatars/change justification depending on whether
+        a message was sent or received (unfinished)
+
 2007-11-21  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c

@@ -24 +24 @@
 #include <libmokoui2/moko-search-bar.h>
 #include <libebook/e-book.h>
+#include <string.h>
 
 static GdkColor alt_color;
@@ -45 +46 @@
         if (!gtk_tree_selection_get_selected (selection, &model, &iter))
                 return NULL;
-        gtk_tree_model_get (model, &iter, COL_UID, &uid, -1);
+        gtk_tree_model_get (model, &iter, COL_UID, &uid,
+                COL_ICON, &data->author_icon, -1);
         
         if (!e_book_get_contact (data->ebook, uid, &contact, &error)) {
@@ -101 +103 @@
         gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
                 data->new_button), FALSE);
+        if (data->recipient_icon) {
+                g_object_unref (data->recipient_icon);
+                data->recipient_icon = NULL;
+        }
 }
 
@@ -209 +215 @@
                                  SmsData *data)
 {
-        gchar *author, *recipient, *body;
+        gchar *author, *recipient, *body, **categories;
         JanaTime *created, *modified;
+        gboolean outgoing = FALSE;
+        gint i;
         
         gtk_tree_model_get (model, iter,
@@ -217 +225 @@
                 JANA_GTK_NOTE_STORE_COL_BODY, &body,
                 JANA_GTK_NOTE_STORE_COL_CREATED, &created,
-                JANA_GTK_NOTE_STORE_COL_MODIFIED, &modified, -1);
-
+                JANA_GTK_NOTE_STORE_COL_MODIFIED, &modified,
+                JANA_GTK_NOTE_STORE_COL_CATEGORIES, &categories, -1);
+
+        if (categories) for (i = 0; categories[i]; i++) {
+                /* Note that this category is not meant for display and 
+                 * shouldn't be translated... (see phone-kit)
+                 */
+                if ((strcmp (categories[i], "Sent") == 0) ||
+                    (strcmp (categories[i], "Sending") == 0) ||
+                    (strcmp (categories[i], "Rejected") == 0)) {
+                        outgoing = TRUE;
+                        break;
+                }
+        }
+        
         g_object_set (cell,
                 "author", author,
@@ -224 +245 @@
                 "body", body,
                 "created", created,
-                "modified", modified, NULL);
+                "modified", modified,
+                "justify", outgoing ?
+                      GTK_JUSTIFY_LEFT : GTK_JUSTIFY_RIGHT,
+                "icon", outgoing ?
+                      data->author_icon : data->recipient_icon,
+                NULL);
         
         g_free (author);
         g_free (recipient);
         g_free (body);
+        g_strfreev (categories);
         if (created) g_object_unref (created);
         if (modified) g_object_unref (modified);
@@ -248 +275 @@
         GHashTable *colours_hash;
         
+        /* FIXME: Set recipient pixbuf */
+        data->recipient_icon = g_object_ref (data->no_photo);
+        
         /* Create note store */
         data->notes = jana_ecal_store_new (JANA_COMPONENT_NOTE);
@@ -260 +290 @@
         colours_hash = g_hash_table_new (g_str_hash, g_str_equal);
         g_hash_table_insert (colours_hash, "Sent", &alt_color);
+        g_hash_table_insert (colours_hash, "Sending", &alt_color);
         
         /* Create treeview and cell renderer */

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h

@@ -48 +48 @@
         GtkWidget *sms_hbox;
         GtkWidget *sms_textview;
+        GdkPixbuf *author_icon;
+        GdkPixbuf *recipient_icon;
 
         GtkWidget *contacts_treeview;