Changeset 3431

Timestamp:

11/16/07 14:23:01 (6 years ago)

Author:

thomas

Message:

• src/appmanager-data.h:
• src/appmanager-window.c: (main):
• src/navigation-area.c: (model_filter_func):
• src/search-bar.c: (text_changed_cb), (combo_changed_cb),

(slist_insert), (search_bar_new):

• src/search-bar.h:

Implement Installed/Not? Installed filtering

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• src/appmanager-data.h (modified) (2 diffs)
• src/appmanager-window.c (modified) (1 diff)
• src/navigation-area.c (modified) (1 diff)
• src/search-bar.c (modified) (3 diffs)
• src/search-bar.h (modified) (1 diff)

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

@@ +1 @@
+2007-11-16  Thomas Wood  <thomas@openedhand.com>
+
+        * src/appmanager-data.h:
+        * src/appmanager-window.c: (main):
+        * src/navigation-area.c: (model_filter_func):
+        * src/search-bar.c: (text_changed_cb), (combo_changed_cb),
+        (slist_insert), (search_bar_new):
+        * src/search-bar.h:
+
+        Implement Installed/Not Installed filtering
+
 2007-11-14  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-data.h

@@ -77 +77 @@
   GtkWidget        *searchbar;
   /* these are used to optimise the filter function */
-  gboolean          searchbar_name_search;
+  gint              searchbar_search_type;
   const gchar      *searchbar_needle;
 } ApplicationManagerData;
@@ -88 +88 @@
 } ApplicationManagerDataClass;
 
+enum {
+  SEARCH_ON_SECTION,
+  SEARCH_ON_STATUS,
+  SEARCH_ON_NAME
+};
+
 GType application_manager_data_get_type (void);
 

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/appmanager-window.c

@@ -74 +74 @@
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_size_request (window, 400, 600);
   g_signal_connect (G_OBJECT (window), "delete_event",
                     G_CALLBACK (gtk_main_quit), NULL);

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/navigation-area.c

@@ -85 +85 @@
 
  
-  if (data->searchbar_name_search)
+  if (data->searchbar_search_type == SEARCH_ON_SECTION)
   {
     return (strstr (pkg->name, data->searchbar_needle) != NULL);
   }
-  else
+  else if (data->searchbar_search_type == SEARCH_ON_NAME)
   {
     return (!strcmp (pkg->section, data->searchbar_needle));
   }
-  
+  else if (data->searchbar_search_type == SEARCH_ON_STATUS)
+  {
+    return (pkg->state_status == GPOINTER_TO_INT (data->searchbar_needle));
+  }
+
+  return FALSE;
 
 }

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.c

@@ -42 +42 @@
   needle = gtk_entry_get_text (entry);
  
-  data->searchbar_name_search = TRUE;
+  data->searchbar_search_type = SEARCH_ON_NAME;
   data->searchbar_needle = needle;
 
@@ -60 +60 @@
   GtkTreeIter cb_iter;
   GtkTreeModel *cb_model;
+  gint active;
 
   if (!combo)
     combo = moko_search_bar_get_combo_box (MOKO_SEARCH_BAR (data->searchbar));
 
-  if (!gtk_combo_box_get_active_iter (combo, &cb_iter))
+  active = gtk_combo_box_get_active (combo);
+    
+  if (active < 0)
     return;
-
-  cb_model = gtk_combo_box_get_model (combo);
-  gtk_tree_model_get (cb_model, &cb_iter, 0, &needle, -1);
-  
-  data->searchbar_name_search = FALSE;
-  data->searchbar_needle = needle;
-
-  
+  
+  if (active <= 1)
+  {
+    data->searchbar_search_type = SEARCH_ON_STATUS;
+    if (active == FILTER_INSTALLED)
+      data->searchbar_needle = GINT_TO_POINTER (SS_INSTALLED);
+    else
+      data->searchbar_needle = GINT_TO_POINTER (SS_NOT_INSTALLED);
+  }
+  else
+  {
+    
+    if (!gtk_combo_box_get_active_iter (combo, &cb_iter))
+      return;
+
+    cb_model = gtk_combo_box_get_model (combo);
+    gtk_tree_model_get (cb_model, &cb_iter, 0, &needle, -1);
+    
+    data->searchbar_search_type = SEARCH_ON_SECTION;
+    data->searchbar_needle = needle;
+  }
+
   filter = gtk_tree_view_get_model (GTK_TREE_VIEW (data->tvpkglist));
   gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter));
@@ -145 +162 @@
 
   gtk_list_store_insert_with_values (filter, NULL, FILTER_INSTALLED, 0, "Installed", -1);
-  gtk_list_store_insert_with_values (filter, NULL, FILTER_UPGRADEABLE, 0, "Upgradeable", -1);
+  gtk_list_store_insert_with_values (filter, NULL, FILTER_NOT_INSTALLED, 0, "Not Installed", -1);
   gtk_list_store_insert_with_values (filter, NULL, 3, 0, NULL, -1);
 

trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.h

@@ -26 +26 @@
 {
   FILTER_INSTALLED,
-  FILTER_UPGRADEABLE,
+  FILTER_NOT_INSTALLED,
   FILTER_SELECTED
 } SearchBarFilter;