codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-03 07:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix torrentview sorting to be persistent

Browse Source
This commit is contained in:
Andrew Resch 2008-08-17 22:26:48 +00:00
parent d2e5f157fa
commit dbdc72913c
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
deluge/ui/gtkui/listview.py
View File

@ -160,12 +160,17 @@ class ListView:
"""create new filter-model """create new filter-model
must be called after listview.create_new_liststore must be called after listview.create_new_liststore
""" """
# Set the liststore filter column sort_column = None
if self.model_filter:
# Save the liststore filter column
sort_column = self.model_filter.get_sort_column_id()
model_filter = self.liststore.filter_new() model_filter = self.liststore.filter_new()
model_filter.set_visible_column( model_filter.set_visible_column(
self.columns["filter"].column_indices[0]) self.columns["filter"].column_indices[0])
self.model_filter = gtk.TreeModelSort(model_filter) self.model_filter = gtk.TreeModelSort(model_filter)
self.treeview.set_model(self.model_filter) 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 save_state(self, filename): def save_state(self, filename):
"""Saves the listview state (column positions and visibility) to """Saves the listview state (column positions and visibility) to
@ -177,10 +182,14 @@ class ListView:
treeview_columns = self.treeview.get_columns() treeview_columns = self.treeview.get_columns()
counter = 0 counter = 0
for column in treeview_columns: for column in treeview_columns:
sort = None
id, order = self.model_filter.get_sort_column_id()
if self.get_column_name(id) == column.get_title():
sort = id
# Append a new column state to the state list # Append a new column state to the state list
state.append(ListViewColumnState(column.get_title(), counter, state.append(ListViewColumnState(column.get_title(), counter,
column.get_width(), column.get_visible(), column.get_width(), column.get_visible(),
column.get_sort_indicator(), int(column.get_sort_order()))) sort, int(column.get_sort_order())))
# Increase the counter because this is how we determine position # Increase the counter because this is how we determine position
counter += 1 counter += 1
@ -228,6 +237,12 @@ class ListView:
else: else:
return self.columns[name].column_indices[0] return self.columns[name].column_indices[0]
def get_column_name(self, index):
"""Get the header name for a liststore column index"""
for key, value in self.columns.items():
if index in value.column_indices:
return key
def get_state_field_column(self, field): def get_state_field_column(self, field):
"""Returns the column number for the state field""" """Returns the column number for the state field"""
for column in self.columns.keys(): for column in self.columns.keys():
@ -402,7 +417,7 @@ class ListView:
self.columns[header].column_indices[text]) self.columns[header].column_indices[text])
elif column_type == None: elif column_type == None:
return return
column.set_sort_column_id(self.columns[header].column_indices[sortid]) column.set_sort_column_id(self.columns[header].column_indices[sortid])
column.set_clickable(True) column.set_clickable(True)
column.set_resizable(True) column.set_resizable(True)
@ -419,8 +434,9 @@ class ListView:
if column_state.width > 0: if column_state.width > 0:
column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
column.set_fixed_width(column_state.width) column.set_fixed_width(column_state.width)
column.set_sort_indicator(column_state.sort)
column.set_sort_order(column_state.sort_order) if column_state.sort is not None and column_state.sort > -1:
self.model_filter.set_sort_column_id(column_state.sort, column_state.sort_order)
column.set_visible(column_state.visible) column.set_visible(column_state.visible)
position = column_state.position position = column_state.position

2
deluge/ui/gtkui/torrentview.py
View File

@ -164,7 +164,7 @@ class TorrentView(listview.ListView, component.Component):
[float], [float],
status_field=["distributed_copies"]) status_field=["distributed_copies"])
self.add_text_column(_("Tracker"), status_field=["tracker_host"]) self.add_text_column(_("Tracker"), status_field=["tracker_host"])
# Set filter to None for now # Set filter to None for now
self.filter = None self.filter = None