summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbendikro <bendikro@gmail.com>2013-01-17 15:39:42 +0100
committerbendikro <bendikro@gmail.com>2013-01-18 23:25:43 +0100
commit5e19fd0122c84a14c6b6fe773ff89cc9cef901ea (patch)
treea031ea05d8b52023992e65c8dcc300b4b118018c
parent7492d480291a47698a2d7b80584e40ecd5dfda42 (diff)
downloaddeluge-5e19fd0122c84a14c6b6fe773ff89cc9cef901ea.tar.gz
deluge-5e19fd0122c84a14c6b6fe773ff89cc9cef901ea.tar.bz2
deluge-5e19fd0122c84a14c6b6fe773ff89cc9cef901ea.zip
Fixed bug with handling adding/removing columns in GTKUI.
Also reinserted two lines that were lost when porting patch to master
-rw-r--r--deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py3
-rw-r--r--deluge/ui/gtkui/listview.py9
2 files changed, 8 insertions, 4 deletions
diff --git a/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py b/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py
index 8ee0d3c59..bf69e289b 100644
--- a/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py
+++ b/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py
@@ -74,11 +74,8 @@ class GtkUI(GtkPluginBase):
self.sidebar_menu.unload()
del self.sidebar_menu
-
-
component.get("TorrentView").remove_column(_("Label"))
log.debug(1.1)
- component.get("TorrentView").create_model_filter() #todo:improve.
except Exception, e:
log.debug(e)
diff --git a/deluge/ui/gtkui/listview.py b/deluge/ui/gtkui/listview.py
index 417051845..120dda3e7 100644
--- a/deluge/ui/gtkui/listview.py
+++ b/deluge/ui/gtkui/listview.py
@@ -238,6 +238,8 @@ class ListView:
model_filter.set_visible_column(
self.columns["filter"].column_indices[0])
self.model_filter = gtk.TreeModelSort(model_filter)
+ self.model_filter.connect("sort-column-changed", self.on_model_sort_changed)
+ self.model_filter.connect("row-inserted", self.on_model_row_inserted)
self.treeview.set_model(self.model_filter)
self.set_sort_functions()
self.set_model_sort()
@@ -488,10 +490,11 @@ class ListView:
# Create a new liststore
self.create_new_liststore()
+ # Create new model for the treeview
+ self.create_model_filter()
# Re-create the menu
self.create_checklist_menu()
-
return
def add_column(self, header, render, col_types, hidden, position,
@@ -530,6 +533,10 @@ class ListView:
# Create a new list with the added column
self.create_new_liststore()
+ # Happens only on columns added after the torrent list has been loaded
+ if self.model_filter:
+ self.create_model_filter()
+
column = self.TreeviewColumn(header)
if column_type == "text":