Ticket #2256: listview.py.2.diff

deluge/ui/gtkui/listview.py

@@ -147 +147 @@
             self.sort_func = None
             self.sort_id = None
 
+            # Values needed to update TreeViewColumns
+            self.type = None
+            self.renderer = None
+            self.text_index = 0
+            self.value_index = 0
+            self.pixbuf_index = 0
+            self.data_func = None
+
     class TreeviewColumn(gtk.TreeViewColumn):
         """
             TreeViewColumn does not signal right-click events, and we need them
@@ -424 +432 @@
         for column in self.columns.values():
             if column.column_indices[0] > column_indices[0]:
                 # We need to shift this column_indices
-                for index in column.column_indices:
-                    index = index - len(column_indices)
+                for i, index in enumerate(column.column_indices):
+                    column.column_indices[i] = index - len(column_indices)
+
+                # Update the associated TreeViewColumn
+                self.update_column(column.name)
 
         # Remove from the liststore columns list
         for index in column_indices:
@@ -466 +477 @@
         self.columns[header].sort_func = sort_func
         self.columns[header].sort_id = column_indices[sortid]
 
+        # Store creation details
+        self.columns[header].type = column_type
+        self.columns[header].renderer = render
+        self.columns[header].text_index = text
+        self.columns[header].value_index = value
+        self.columns[header].pixbuf_index = pixbuf
+        self.columns[header].data_func = function
+
         # Create a new list with the added column
         self.create_new_liststore()
 
@@ -553 +572 @@
 
         return True
 
+    def update_column(self, header):
+        """Update TreeViewColumn based on ListView column mappings"""
+        column = self.columns[header]
+        tree_column = self.columns[header].column
+
+        if column.type == "text":
+            tree_column.set_attributes(column.renderer,
+                text=column.column_indices[column.text_index])
+        elif column.type == "bool":
+            tree_column.set_attributes(column.renderer,
+                active=column.column_indices[0])
+        elif column.type == "func":
+            if len(column.column_indices) > 1:
+                tree_column.set_cell_data_func(column.renderer,
+                    column.data_func, tuple(column.column_indices))
+            else:
+                tree_column.set_cell_data_func(column.renderer,
+                    column.data_func, column.column_indices[0])
+        elif column.type == "progress":
+            if column.data_func is None:
+                tree_column.set_attributes(column.renderer,
+                    text=column.column_indices[column.text_index],
+                    value=column.column_indices[column.value_index])
+            else:
+                tree_column.set_cell_data_func(column.renderer,
+                    column.data_func, tuple(column.column_indices))
+        elif column.type == "texticon":
+            if column.data_func is not None:
+                tree_column.set_cell_data_func(
+                    column.renderer[column.pixbuf_index],
+                    column.data_func,
+                    column.column_indices[column.pixbuf_index])
+
+            tree_column.set_attributes(
+                column.renderer[column.text_index],
+                text=column.column_indices[column.text_index])
+
+        return
+
     def add_text_column(self, header, col_type=str, hidden=False, position=None,
                         status_field=None, sortid=0, column_type="text",
                         sort_func=None, default=True):