r3677 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src

chris at sita.openmoko.org chris at sita.openmoko.org
Tue Dec 18 12:57:39 CET 2007


Author: chris
Date: 2007-12-18 12:57:37 +0100 (Tue, 18 Dec 2007)
New Revision: 3677

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
        * src/sms-notes.c: (notes_visible_func), (sms_notes_page_new):
        Add all/sent/received filter to notes page


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-18 11:30:42 UTC (rev 3676)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-18 11:57:37 UTC (rev 3677)
@@ -1,5 +1,10 @@
 2007-12-18  Chris Lord  <chris at openedhand.com>
 
+	* src/sms-notes.c: (notes_visible_func), (sms_notes_page_new):
+	Add all/sent/received filter to notes page
+
+2007-12-18  Chris Lord  <chris at openedhand.com>
+
 	* src/sms.h:
 	* src/sms-contacts.c: (update_categories), (ref_category),
 	(categories_to_list), (contacts_added_cb), (contacts_changed_cb),

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-12-18 11:30:42 UTC (rev 3676)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-12-18 11:57:37 UTC (rev 3677)
@@ -34,6 +34,12 @@
 static gboolean hidden = TRUE;
 static gboolean open = FALSE;
 
+enum {
+	ALL_NOTES,
+	SENT_NOTES,
+	RECV_NOTES,
+};
+
 static void
 note_changed_cb (JanaStoreView *store_view, GList *components, SmsData *data)
 {
@@ -591,8 +597,28 @@
 		
 		return result;
 	} else {
+		gchar *author_uid;
+		gboolean result;
+		
 		/* Filter on selected category */
-		return TRUE;
+		gint type = gtk_combo_box_get_active (
+			moko_search_bar_get_combo_box (MOKO_SEARCH_BAR (
+				data->notes_search))); 
+		
+		if (type <= ALL_NOTES) return TRUE;
+		
+		gtk_tree_model_get (model, iter,
+			JANA_GTK_NOTE_STORE_COL_UID, &author_uid, -1);
+		if (!author_uid) return FALSE;
+		
+		if (strcmp (author_uid, data->author_uid) == 0)
+			result = (type == SENT_NOTES) ? TRUE : FALSE;
+		else
+			result = (type == SENT_NOTES) ? FALSE : TRUE;
+		
+		g_free (author_uid);
+		
+		return result;
 	}
 }
 
@@ -642,6 +668,11 @@
 	
 	/* Create search bar */
 	notes_combo = gtk_combo_box_new_text ();
+	gtk_combo_box_append_text (GTK_COMBO_BOX (notes_combo), "All");
+	gtk_combo_box_append_text (GTK_COMBO_BOX (notes_combo), "Sent");
+	gtk_combo_box_append_text (GTK_COMBO_BOX (notes_combo), "Received");
+	gtk_combo_box_set_active (GTK_COMBO_BOX (notes_combo), 0);
+	
 	data->notes_search = moko_search_bar_new_with_combo (
 		GTK_COMBO_BOX (notes_combo));
 	g_signal_connect (data->notes_search, "toggled",





More information about the commitlog mailing list