Changeset 3661

Timestamp:

12/17/07 15:56:09 (5 years ago)

Author:

chris

Message:

• configure.ac: Add AC_GNU_SOURCE for strcasestr

• src/sms-contacts.c: Include config.h first

• src/sms-notes.c: (search_toggled_cb), (search_text_changed_cb), (search_combo_changed_cb), (notes_visible_func), (sms_notes_page_new):
• src/sms.h: Add notes filtering via search string

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/sms-contacts.c (modified) (2 diffs)
• src/sms-notes.c (modified) (5 diffs)
• src/sms.h (modified) (1 diff)

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

@@ +1 @@
+2007-12-17  Chris Lord  <chris@openedhand.com>
+
+        * configure.ac:
+        Add AC_GNU_SOURCE for strcasestr
+
+        * src/sms-contacts.c:
+        Include config.h first
+
+        * src/sms-notes.c: (search_toggled_cb), (search_text_changed_cb),
+        (search_combo_changed_cb), (notes_visible_func),
+        (sms_notes_page_new):
+        * src/sms.h:
+        Add notes filtering via search string
+
 2007-12-17  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac

@@ -10 +10 @@
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+AC_GNU_SOURCE
 
 PKG_CHECK_MODULES(EBOOK, libebook-1.2)

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

@@ -18 +18 @@
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include "sms-contacts.h"
 #include "sms-utils.h"
@@ -23 +27 @@
 #include <libmokoui2/moko-search-bar.h>
 #include <string.h>
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 
 static const gchar *clear_numbers_uid;

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

@@ -17 +17 @@
  *  Current Version: $Rev$ ($Date$) [$Author$]
  */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include "sms-notes.h"
@@ -539 +543 @@
 }
 
+static void
+search_toggled_cb (MokoSearchBar *bar, gboolean search_visible, SmsData *data)
+{
+        gtk_tree_model_filter_refilter (
+                GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static void
+search_text_changed_cb (MokoSearchBar *bar, GtkEditable *editable,
+                        SmsData *data)
+{
+        gtk_tree_model_filter_refilter (
+                GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static void
+search_combo_changed_cb (MokoSearchBar *bar, GtkComboBox *combo_box,
+                         SmsData *data)
+{
+        gtk_tree_model_filter_refilter (
+                GTK_TREE_MODEL_FILTER (data->note_filter));
+}
+
+static
+gboolean notes_visible_func (GtkTreeModel *model, GtkTreeIter *iter,
+                                SmsData *data)
+{
+        if (moko_search_bar_search_visible (
+            MOKO_SEARCH_BAR (data->notes_search))) {
+                const gchar *search;
+                gboolean result;
+                gchar *body;
+
+                search = gtk_entry_get_text (moko_search_bar_get_entry (
+                        MOKO_SEARCH_BAR (data->notes_search)));
+                
+                if ((!search) || (search[0] == '\0')) return TRUE;
+                
+                /* Filter on search query */
+                gtk_tree_model_get (model, iter, JANA_GTK_NOTE_STORE_COL_BODY,
+                        &body, -1);
+                if (!body) return FALSE;
+                
+                /* FIXME: Use a proper UTF-8 casefold comparison here */
+                result = strcasestr (body, search) ? TRUE : FALSE;
+                g_free (body);
+                
+                return result;
+        } else {
+                /* Filter on selected category */
+                return TRUE;
+        }
+}
+
 GtkWidget *
 sms_notes_page_new (SmsData *data)
 {
-        GtkWidget *scroll, *vbox, *searchbar;
+        GtkWidget *scroll, *vbox, *notes_combo;
         GtkCellRenderer *renderer;
         GHashTable *colours_hash;
@@ -564 +622 @@
         data->note_store = jana_gtk_note_store_new ();
         data->note_filter = gtk_tree_model_filter_new (data->note_store, NULL);
+        gtk_tree_model_filter_set_visible_func ((GtkTreeModelFilter *)
+                data->note_filter, (GtkTreeModelFilterVisibleFunc)
+                notes_visible_func, data, NULL);
         
         /* Create a category-colour hash for the cell renderer */
@@ -581 +642 @@
         
         /* Create search bar */
-        data->notes_combo = gtk_combo_box_new_text ();
-        searchbar = moko_search_bar_new_with_combo (
-                GTK_COMBO_BOX (data->notes_combo));
+        notes_combo = gtk_combo_box_new_text ();
+        data->notes_search = moko_search_bar_new_with_combo (
+                GTK_COMBO_BOX (notes_combo));
+        g_signal_connect (data->notes_search, "toggled",
+                G_CALLBACK (search_toggled_cb), data);
+        g_signal_connect (data->notes_search, "text_changed",
+                G_CALLBACK (search_text_changed_cb), data);
+        g_signal_connect (data->notes_search, "combo_changed",
+                G_CALLBACK (search_combo_changed_cb), data);
         
         /* Pack widgets */
@@ -590 +657 @@
         
         vbox = gtk_vbox_new (FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), data->notes_search, FALSE, TRUE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
         gtk_widget_show_all (vbox);

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

@@ -54 +54 @@
         GtkToolItem *delete_button;
 
-        GtkWidget *notes_combo;
+        GtkWidget *notes_search;
         GdkPixbuf *author_icon;
         GdkPixbuf *recipient_icon;