Merge lp:~rick-rickspencer3/pytask/translatable_titles into lp:pytask

[Rick Spencer]

translatable titles

=== modified file 'bin/pytask'
--- bin/pytask	2010-05-30 16:22:55 +0000
+++ bin/pytask	2010-05-30 16:33:26 +0000
@@ -111,13 +111,26 @@
         self.grid = CouchGrid(database_name, record_type=record_type,keys=keys, 
                               editable=True, type_hints=type_hints)
 
+        for c in self.grid.get_columns():
+            if c.get_title() == "name":
+                c.set_title(_("Name"))
+            elif c.get_title() == "priority":
+                c.set_title(_("Priority"))
+            elif c.get_title() == "due":
+                c.set_title(_("Due"))
+            if c.get_title() == "complete?":
+                c.set_title(_("Completed"))
+
         self.grid.show()
         self.builder.get_object("vbox1").pack_end(self.grid,True,True)
         
         # Here is where the powerful quickly-widgets filtering comes in.
-        filt = GridFilter(self.grid)
-        filt.show()
-        self.builder.get_object("vbox1").pack_start(filt,False,False)
+        self.filt = GridFilter(self.grid)
+        self.filt.show()
+        self.builder.get_object("vbox1").pack_start(self.filt,False,False)
+
+        #hack to allow for naming the titles in the Grid Filter:
+        self.__new_filter_row(self)
         
         toolbar = self.builder.get_object("toolbar1")
         toolbar_check = self.builder.get_object("checkmenuitem1")
@@ -127,9 +140,40 @@
         statusbar_check = self.builder.get_object("checkmenuitem2")
         statusbar_check.set_active(True)
         
+    def __new_filter_row(self, widget, data=None):
+        """
+        new_filter row - hack to allow naming of columns
+        in a grid filter.
+
+        This code works around:
+        https://bugs.edge.launchpad.net/quidgets/+bug/587558
+
+        """
+
+        row = self.filt.rows[len(self.filt.rows)-1]
+        row.connect("add_row_requested",self.__new_filter_row)
+        model = row.column_combo.get_model()
+
+        for i, k in enumerate(model):
+            itr = model.get_iter(i)
+            title = model.get_value(itr,0)
+            if title == "name":
+                model.set_value(itr,0,_("Name"))
+            elif title == "priority":
+                model.set_value(itr,0,_("Priority"))
+            elif title == "due":
+                model.set_value(itr,0,_("Due"))
+            if title == "complete?":
+                model.set_value(itr,0,_("Completed"))
+
+
     def add_row(self, widget, data=None):
         """Adds an editable row to the couchgrid"""
+<<<<<<< TREE
         self.grid.append_row({"Complete?":False})
+=======
+        self.grid.append_row({"complete?":False})
+>>>>>>> MERGE-SOURCE
         
     def remove_row(self, widget, data=None):
         """Removes the currently selected row from the couchgrid"""