diff --git a/delugegtk.py b/delugegtk.py
index 2d2d6a0e3..1ac036483 100755
--- a/delugegtk.py
+++ b/delugegtk.py
@@ -54,6 +54,7 @@ class DelugeGTK:
## File Menu
"new_torrent": self.new_torrent,
"add_torrent": self.add_torrent,
+ ## Edit Menu
"pref_clicked": self.prf.show_pref,
"plugins_clicked": self.prf.show_plugins,
## Torrent Menu
@@ -66,8 +67,8 @@ class DelugeGTK:
## Create the torrent listview
self.torrent_view = self.wtree.get_widget("torrent_view")
- self.torrent_list = gtk.ListStore(str)
- self.torrent_view.set_model(self.torrent_list)
+ self.store = gtk.ListStore(str)
+ self.torrent_view.set_model(self.store)
## Still a lot of work to be done here,
@@ -81,11 +82,11 @@ class DelugeGTK:
## Deluge's code (up to 0.4) got way out of
## hand.
- self.name_column = dgtk.TextColumn("Name")
+ self.name_column = dgtk.TextColumn("Name", 0)
self.torrent_view.append_column(self.name_column)
- self.progress_column = dgtk.ProgressColumn("Progress")
+ self.progress_column = dgtk.ProgressColumn("Progress", 1)
self.torrent_view.append_column(self.progress_column)
- self.check_column = dgtk.ToggleColumn("Enabled")
+ self.check_column = dgtk.ToggleColumn("Enabled", 2)
self.torrent_view.append_column(self.check_column)
diff --git a/dgtk.py b/dgtk.py
index fc8ecd942..61739f374 100644
--- a/dgtk.py
+++ b/dgtk.py
@@ -80,14 +80,18 @@ class PreferencesDialog:
self.notebook.set_current_page(2)
self.prf.run()
self.prf.hide_all()
+
+## Columns still need work, but should be easy now that I've worked out
+## liststores and treeviews.
+## Most likely will get rid of Objects for columns, and instead revert to
+## a more organized form of the old add_column method, which will properly
+## create and add the column and in addition, return that column to the
+## calling function.
class TextColumn(gtk.TreeViewColumn):
- def __init__(self, title):
+ def __init__(self, title, cid):
gtk.TreeViewColumn.__init__(self, title, gtk.CellRendererText())
- def set_value(self, string):
- pass
-
def show(self):
self.set_visible(True)
@@ -95,12 +99,14 @@ class TextColumn(gtk.TreeViewColumn):
self.set_visible(False)
class ToggleColumn(gtk.TreeViewColumn):
- def __init__(self, title):
- gtk.TreeViewColumn.__init__(self, title, gtk.CellRendererToggle())
-
- def set_value(self, value):
- pass
-
+ def __init__(self, title, cid):
+ self.renderer = gtk.CellRendererToggle()
+ gtk.TreeViewColumn.__init__(self, title, self.renderer, value=cid)
+ self.set_resizable(True)
+ self.set_sort_column_id(cid)
+ self.set_expand(False)
+ #renderer.connect("toggled", toggledSignal, cid)
+
def show(self):
self.set_visible(True)
@@ -108,11 +114,12 @@ class ToggleColumn(gtk.TreeViewColumn):
self.set_visible(False)
class ProgressColumn(gtk.TreeViewColumn):
- def __init__(self, title):
- gtk.TreeViewColumn.__init__(self, title, gtk.CellRendererProgress())
-
- def set_value(self, progress):
- pass
+ def __init__(self, title, cid):
+ self.renderer = gtk.CellRendererProgress()
+ gtk.TreeViewColumn.__init__(self, title, self.renderer, value=cid)
+ self.set_resizable(True)
+ self.set_sort_column_id(cid)
+ self.set_expand(True)
def show(self):
self.set_visible(True)
diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade
index 5cf413ce4..ffb2c2643 100644
--- a/glade/delugegtk.glade
+++ b/glade/delugegtk.glade
@@ -15,6 +15,360 @@
True
4
3
+
+
+ True
+ GTK_TOOLBAR_BOTH_HORIZ
+ False
+
+
+ True
+ Add Torrent
+ Add Torrent
+ True
+ gtk-add
+
+
+
+ False
+
+
+
+
+ True
+ Remove Torrent
+ Remove Torrent
+ True
+ gtk-remove
+
+
+
+ False
+
+
+
+
+ True
+
+
+ False
+ False
+
+
+
+
+ True
+ Update Tracker
+ Update Tracker
+ True
+ gtk-refresh
+
+
+
+ False
+
+
+
+
+ True
+ Clear Finished Torrents
+ Clear Finished
+ True
+ gtk-clear
+
+
+
+ False
+
+
+
+
+ True
+
+
+ False
+ False
+
+
+
+
+ True
+ Force Pause/Resume Torrent
+ Force Pause/Resume Torrent
+ True
+ gtk-media-pause
+
+
+
+ False
+
+
+
+
+ True
+
+
+ False
+ False
+
+
+
+
+ True
+ Queue Torrent Up
+ Move Up
+ True
+ gtk-go-up
+
+
+
+ False
+
+
+
+
+ True
+ Queue Torrent Down
+ Move Down
+ True
+ gtk-go-down
+
+
+
+ False
+
+
+
+
+ 1
+ 2
+
+ GTK_FILL
+
+
+
+
+ True
+ GTK_TOOLBAR_BOTH_HORIZ
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ GTK_TOOLBAR_BOTH_HORIZ
+ False
+
+
+ 2
+ 3
+ 1
+ 2
+
+ GTK_FILL
+
+
+
+
+
+ 3
+
+
+
+
+
+ True
+
+
+ 3
+ 3
+ 4
+
+
+
True
@@ -77,439 +431,13 @@
-
- True
-
-
- 3
- 4
- 10
- 11
-
-
-
-
- True
- 0
- <b>Estimated Time Remaining:</b>
- True
-
-
- 2
- 3
- 10
- 11
-
-
-
-
- True
-
-
- 3
- 4
- 4
- 5
-
-
-
-
- True
-
-
- 1
- 2
- 4
- 5
-
-
-
-
- True
- 0
- <b>Peers:</b>
- True
-
-
- 2
- 3
- 4
- 5
-
-
-
-
- True
- 0
- <b>Seeders:</b>
- True
-
-
- 4
- 5
-
-
-
-
- True
- 0
- True
-
-
- 1
- 4
-
-
-
-
- True
- 0
- <b>Total Size:</b>
- True
-
-
- 1
- 2
-
-
-
-
- True
- 0
- <b>Total Downloaded:</b>
- True
-
-
- 2
- 3
-
-
-
-
- True
- 0
- <b>Percentage Done:</b>
- True
-
-
- 5
- 6
-
-
-
-
- True
- 0
- <b>Downloaded this session:</b>
- True
-
-
- 6
- 7
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 1
- 2
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 2
- 3
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 5
- 6
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 6
- 7
-
-
-
-
- True
- 0
- <b>Tracker:</b>
- True
-
-
- 7
- 8
-
-
-
-
- True
- 0
- <b>Tracker Response:</b>
- True
-
-
- 8
- 9
-
-
-
-
- True
- 0
- <b>Tracker Status:</b>
- True
-
-
- 9
- 10
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 9
- 10
-
-
-
-
- True
- 0
- <b>Next Announce:</b>
- True
-
-
- 2
- 3
- 9
- 10
-
-
-
-
+
True
0
3
4
- 9
- 10
-
-
-
-
- True
- 0
- <b>Pieces:</b>
- True
-
-
- 2
- 3
- 1
- 2
-
-
-
-
- True
- 0
- <b>Total Uploaded:</b>
- True
-
-
- 2
- 3
- 2
- 3
-
-
-
-
- True
- 0
-
-
- 3
- 4
- 1
- 2
-
-
-
-
- True
- 0
-
-
- 3
- 4
- 2
- 3
-
-
-
-
- True
- 0
- <b>Share Ratio:</b>
- True
-
-
- 2
- 3
- 5
- 6
-
-
-
-
- True
- 0
- <b>Uploaded This Session:</b>
- True
-
-
- 2
- 3
- 6
- 7
-
-
-
-
- True
- 0
-
-
- 3
- 4
- 5
- 6
-
-
-
-
- True
- 0
-
-
- 3
- 4
- 6
- 7
-
-
-
-
- True
- 0
-
-
- 1
- 4
- 7
- 8
-
-
-
-
- True
- 0
-
-
- 1
- 4
- 8
- 9
-
-
-
-
- True
- 0
- <b>Name:</b>
- True
-
-
-
-
- True
- 0
- <b>Use compact storage allocation:</b>
- True
-
-
- 10
- 11
-
-
-
-
- True
- 0
-
-
- 1
- 2
- 10
- 11
-
-
-
-
- True
- 0
- <b>Download Rate:</b>
- True
-
-
- 3
- 4
-
-
-
-
- True
- 0
-
-
- 1
- 2
3
4
@@ -529,15 +457,441 @@
-
+
+ True
+ 0
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+ True
+ 0
+ <b>Download Rate:</b>
+ True
+
+
+ 3
+ 4
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 10
+ 11
+
+
+
+
+ True
+ 0
+ <b>Use compact storage allocation:</b>
+ True
+
+
+ 10
+ 11
+
+
+
+
+ True
+ 0
+ <b>Name:</b>
+ True
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 4
+ 8
+ 9
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 4
+ 7
+ 8
+
+
+
+
True
0
3
4
- 3
- 4
+ 6
+ 7
+
+
+
+
+ True
+ 0
+
+
+ 3
+ 4
+ 5
+ 6
+
+
+
+
+ True
+ 0
+ <b>Uploaded This Session:</b>
+ True
+
+
+ 2
+ 3
+ 6
+ 7
+
+
+
+
+ True
+ 0
+ <b>Share Ratio:</b>
+ True
+
+
+ 2
+ 3
+ 5
+ 6
+
+
+
+
+ True
+ 0
+
+
+ 3
+ 4
+ 2
+ 3
+
+
+
+
+ True
+ 0
+
+
+ 3
+ 4
+ 1
+ 2
+
+
+
+
+ True
+ 0
+ <b>Total Uploaded:</b>
+ True
+
+
+ 2
+ 3
+ 2
+ 3
+
+
+
+
+ True
+ 0
+ <b>Pieces:</b>
+ True
+
+
+ 2
+ 3
+ 1
+ 2
+
+
+
+
+ True
+ 0
+
+
+ 3
+ 4
+ 9
+ 10
+
+
+
+
+ True
+ 0
+ <b>Next Announce:</b>
+ True
+
+
+ 2
+ 3
+ 9
+ 10
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 9
+ 10
+
+
+
+
+ True
+ 0
+ <b>Tracker Status:</b>
+ True
+
+
+ 9
+ 10
+
+
+
+
+ True
+ 0
+ <b>Tracker Response:</b>
+ True
+
+
+ 8
+ 9
+
+
+
+
+ True
+ 0
+ <b>Tracker:</b>
+ True
+
+
+ 7
+ 8
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 6
+ 7
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 5
+ 6
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+ True
+ 0
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+ True
+ 0
+ <b>Downloaded this session:</b>
+ True
+
+
+ 6
+ 7
+
+
+
+
+ True
+ 0
+ <b>Percentage Done:</b>
+ True
+
+
+ 5
+ 6
+
+
+
+
+ True
+ 0
+ <b>Total Downloaded:</b>
+ True
+
+
+ 2
+ 3
+
+
+
+
+ True
+ 0
+ <b>Total Size:</b>
+ True
+
+
+ 1
+ 2
+
+
+
+
+ True
+ 0
+ True
+
+
+ 1
+ 4
+
+
+
+
+ True
+ 0
+ <b>Seeders:</b>
+ True
+
+
+ 4
+ 5
+
+
+
+
+ True
+ 0
+ <b>Peers:</b>
+ True
+
+
+ 2
+ 3
+ 4
+ 5
+
+
+
+
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+ True
+
+
+ 3
+ 4
+ 4
+ 5
+
+
+
+
+ True
+ 0
+ <b>Estimated Time Remaining:</b>
+ True
+
+
+ 2
+ 3
+ 10
+ 11
+
+
+
+
+ True
+
+
+ 3
+ 4
+ 10
+ 11
@@ -628,406 +982,6 @@
3
-
-
- True
-
-
- 3
- 3
- 4
-
-
-
-
-
-
- 3
-
-
-
-
-
- True
- GTK_TOOLBAR_BOTH_HORIZ
- False
-
-
- 2
- 3
- 1
- 2
-
- GTK_FILL
-
-
-
-
- True
- GTK_TOOLBAR_BOTH_HORIZ
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GTK_TOOLBAR_BOTH_HORIZ
- False
-
-
- True
- Add Torrent
- True
- gtk-add
- Add Torrent
-
-
-
-
-
- True
- Remove Torrent
- True
- gtk-remove
- Remove Torrent
-
-
-
-
-
- True
-
-
-
-
- True
- Update Tracker
- True
- gtk-refresh
- Update Tracker
-
-
-
-
-
- True
- Clear Finished
- True
- gtk-clear
- Clear Finished Torrents
-
-
-
-
-
- True
-
-
-
-
- True
- Force Pause/Resume Torrent
- True
- gtk-media-pause
- Force Pause/Resume Torrent
-
-
-
-
-
- True
-
-
-
-
- True
- Move Up
- True
- gtk-go-up
- Queue Torrent Up
-
-
-
-
-
- True
- Move Down
- True
- gtk-go-down
- Queue Torrent Down
-
-
-
-
-
- 1
- 2
-
- GTK_FILL
-
-