Merge lp:~alexlauni/groundcontrol/bugfix-lp-518031 into lp:groundcontrol

[Alex Launi]

[Alex Launi (alexlauni)]

Implements sorting on the projects view. Sorts the projects by a string comparison to the search term.

=== modified file 'GroundControl/projects.py'
--- GroundControl/projects.py	2010-02-09 21:28:27 +0000
+++ GroundControl/projects.py	2010-02-15 02:21:14 +0000
@@ -235,6 +235,7 @@
         self.widget("searchLabel").set_text(
             _("Searching Launchpad - please wait..."))
         result = self.widget("term").get_text()
+        self.slist.search_term(term=result)
         #Trad: Thread(target=self.lpp.search, args=(result))
         self.start_thread(self.lpp.search, result)
         #Old: self.lpp.search(result)
@@ -275,11 +276,31 @@
             img2 = img.scale_simple(64, 64, gtk.gdk.INTERP_BILINEAR)
             cell.set_property("pixbuf", img2)
             cell.set_property("visible", True)
+            
+        def sort_projects_func(model, iter1, iter2):
+            """Sorts projects by name to have them ordered by search param, 
+               rather than the order returned by LP"""
+            search_term = self.search_term().lower()
+            
+            proj1 = str(model.get_value(iter1, 0).name).lower()
+            proj2 = str(model.get_value(iter2, 0).name).lower()
+            proj1 = cmp(search_term, proj1)
+            proj2 = cmp(search_term, proj2)
+            
+            if proj1 == 0:
+                return -1
+            elif proj2 == 0:
+                return 1
+            else:
+                return 0
 
         svlist = super(ProjectsView, self).setup()
+        model = svlist.get_model()
+        model.set_sort_func(0, sort_projects_func)
+        model.set_sort_column_id(0, gtk.SORT_ASCENDING)
+        
         column = gtk.TreeViewColumn((_("Online Projects")))
         column.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)
-        #column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         column.set_expand(True)
         # The icon
         renderer_icon = gtk.CellRendererPixbuf()
@@ -295,4 +316,11 @@
         column.set_cell_data_func(renderer, text_cell_func)
         # Add the required coluns to the treeview
         svlist.append_column(column)
+        
+    def search_term(self, term=None):
+        """ Returns the most recently searched term, and sets search term
+            when passed as a named parameter"""
+        if term is not None:
+            self._search_term = term
+        return self._search_term if hasattr(self, '_search_term') else ""