Changeset 3737

Timestamp:

08/22/08 08:11:15 (5 months ago)

Author:

andar

Message:

Sorting # column will place downloaders above seeds

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• deluge/ui/gtkui/listview.py (modified) (7 diffs)
• deluge/ui/gtkui/torrentview.py (modified) (8 diffs)

trunk/ChangeLog

@@ -8 +8 @@
   * Add peer progress to the peers tab
   * Add 'edit' to edit trackers dialog
+  * Sorting # column will place downloaders above seeds

trunk/deluge/ui/gtkui/listview.py

@@ -120 +120 @@
             # show up in any menu listing;  it cannot be shown ever.
             self.hidden = False
+            # If this is set, it is used to sort the model
+            self.sort_func = None
+            self.sort_id = None
                 
     def __init__(self, treeview_widget=None, state_file=None):
@@ -169 +172 @@
             self.columns["filter"].column_indices[0])
         self.model_filter = gtk.TreeModelSort(model_filter)
+        self.set_sort_functions()                
         self.treeview.set_model(self.model_filter)
         if sort_column and sort_column != (None, None):
             self.model_filter.set_sort_column_id(*sort_column)
-    
+
+    def set_sort_functions(self):
+        for column in self.columns.values():
+            if column.sort_func:
+                log.debug("sort_func: %s sort_id: %s", column.sort_func, column.sort_id)
+                self.model_filter.set_sort_func(
+                    column.sort_id,
+                    column.sort_func,
+                    column.sort_id)
+            
     def save_state(self, filename):
         """Saves the listview state (column positions and visibility) to
@@ -355 +368 @@
     def add_column(self, header, render, col_types, hidden, position, 
             status_field, sortid, text=0, value=0, pixbuf=0, function=None,
-            column_type=None):
+            column_type=None, sort_func=None):
         """Adds a column to the ListView"""
         # Add the column types to liststore_columns
@@ -377 +390 @@
            
         self.columns[header].status_field = status_field
+        self.columns[header].sort_func = sort_func
+        self.columns[header].sort_id = column_indices[sortid]
         
         # Create a new list with the added column
@@ -458 +473 @@
                                             status_field=None,
                                             sortid=0,
-                                            column_type="text"):
+                                            column_type="text",
+                                            sort_func=None):
         """Add a text column to the listview.  Only the header name is required.
         """
         render = gtk.CellRendererText()
         self.add_column(header, render, col_type, hidden, position,
-                    status_field, sortid, column_type=column_type)
+                    status_field, sortid, column_type=column_type, sort_func=sort_func)
        
         return True
@@ -480 +496 @@
     def add_func_column(self, header, function, col_types, sortid=0, 
                                 hidden=False, position=None, status_field=None,
-                                column_type="func"):
+                                column_type="func", sort_func=None):
         """Add a function column to the listview.  Need a header name, the
         function and the column types."""
@@ -487 +503 @@
         self.add_column(header, render, col_types, hidden, position,
                             status_field, sortid, column_type=column_type, 
-                            function=function)
+                            function=function, sort_func=sort_func)
 
         return True

trunk/deluge/ui/gtkui/torrentview.py

@@ -101 +101 @@
         cell.set_property("text", value + 1)
 
+def queue_column_sort(model, iter1, iter2, data):
+    v1 = model[iter1][data]
+    v2 = model[iter2][data]
+    if v1 == v2:
+        return 0
+    if v2 < 0:
+        return -1
+    if v1 < 0:
+        return 1
+    if v1 > v2:
+        return 1
+    if v2 > v1:
+        return -1
+        
 class TorrentView(listview.ListView, component.Component):
     """TorrentView handles the listing of torrents."""
@@ -123 +137 @@
         self.add_text_column("torrent_id", hidden=True)
         self.add_bool_column("dirty", hidden=True)
-        self.add_func_column("#", cell_data_queue, [int], status_field=["queue"])
+        self.add_func_column("#", cell_data_queue, [int], status_field=["queue"], sort_func=queue_column_sort)
         self.add_texticon_column(_("Name"), status_field=["state", "name"],
                                             function=cell_data_statusicon)
@@ -180 +194 @@
 
         self.treeview.connect("drag-drop", self.on_drag_drop)
-
+        
     def start(self):
         """Start the torrentview"""
@@ -188 +202 @@
 
     def _on_session_state(self, state):
+        self.treeview.freeze_child_notify()
+        model = self.treeview.get_model()
         for torrent_id in state:
             self.add_row(torrent_id, update=False)
             self.mark_dirty(torrent_id)
+        self.treeview.set_model(model)
+        self.treeview.thaw_child_notify()
         self.update()
 
@@ -254 +272 @@
         """
         filter_column = self.columns["filter"].column_indices[0]
-
         # Update the torrent view model with data we've received
         status = self.status
+        (sort_id, sort_type) = self.treeview.get_model().get_sort_column_id()
+        self.treeview.get_model().set_sort_column_id(-1, gtk.SORT_ASCENDING)
         for row in self.liststore:
             torrent_id = row[self.columns["torrent_id"].column_indices[0]]
@@ -272 +291 @@
                         try:
                             # Only update if different
-                            if row[column_index] != \
-                                status[torrent_id][self.columns[column].status_field[0]]:
-                                row[column_index] = status[torrent_id][
-                                        self.columns[column].status_field[0]]
+                            row_value = status[torrent_id][self.columns[column].status_field[0]]
+                            if row[column_index] != row_value:
+                                row[column_index] = row_value
                         except (TypeError, KeyError), e:
                             log.warning("Unable to update column %s: %s",
@@ -285 +303 @@
                             try:
                                 # Only update if different
-                                if row[index] != \
-                                    status[torrent_id][
-                                        self.columns[column].status_field[
-                                            column_index.index(index)]]:
-
-                                    row[index] = \
-                                        status[torrent_id][
-                                            self.columns[column].status_field[
-                                                column_index.index(index)]]
+                                row_value = status[torrent_id][self.columns[column].status_field[column_index.index(index)]]
+                                if row[index] != row_value:
+                                    row[index] = row_value
                             except:
                                 pass
+        self.treeview.get_model().set_sort_column_id(sort_id, sort_type)
         # Update the toolbar buttons just in case some state has changed
         component.get("ToolBar").update_buttons()
@@ -416 +429 @@
     def on_drag_drop(self, widget, drag_context, x, y, timestamp):
         widget.stop_emission("drag-drop")
-