diff --git a/delugegtk.py b/delugegtk.py
index 12bab83a7..2d2d6a0e3 100755
--- a/delugegtk.py
+++ b/delugegtk.py
@@ -57,7 +57,6 @@ class DelugeGTK:
"pref_clicked": self.prf.show_pref,
"plugins_clicked": self.prf.show_plugins,
## Torrent Menu
- "show_info": self.show_info_pane,
## Help Menu
"show_about_dialog": self.abt.show,
}
@@ -97,11 +96,6 @@ class DelugeGTK:
def add_torrent(self, obj):
pass
- def show_info_pane(self, obj):
- if(obj.get_active()):
- self.wtree.get_widget("torrent_info").show()
- else:
- self.wtree.get_widget("torrent_info").hide()
## For testing purposes, create a copy of the interface
if __name__ == "__main__":
diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade
index 16fdbcf05..5cf413ce4 100644
--- a/glade/delugegtk.glade
+++ b/glade/delugegtk.glade
@@ -11,123 +11,636 @@
-
+
True
4
3
-
+
True
- GTK_TOOLBAR_BOTH_HORIZ
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GTK_TOOLBAR_BOTH_HORIZ
- False
+ True
-
+
True
- Add Torrent
- True
- gtk-add
- Add Torrent
-
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+ True
+ True
+ False
+
+
+
+
+ False
+
-
+
True
- Remove Torrent
- True
- gtk-remove
- Remove Torrent
-
+ Torrents
+
+ tab
+ False
+ False
+
-
+
True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+
+
+ True
+ 10
+ 12
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+ True
+ 0
+ <b>Upload Rate:</b>
+ True
+
+
+ 2
+ 3
+ 3
+ 4
+
+
+
+
+ True
+ 0
+
+
+ 3
+ 4
+ 3
+ 4
+
+
+
+
+
+
+
+ 1
+ False
+
-
+
True
- Update Tracker
- True
- gtk-refresh
- Update Tracker
-
+ Details
+
+ tab
+ 1
+ False
+ False
+
-
+
True
- Clear Finished
- True
- gtk-clear
- Clear Finished Torrents
-
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+
+
+
+ 2
+ False
+
-
+
True
+ Files
+
+ tab
+ 2
+ False
+ False
+
-
+
True
- Force Pause/Resume Torrent
- True
- gtk-media-pause
- Force Pause/Resume Torrent
-
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+ True
+
+
+
+ 3
+ False
+
-
+
True
+ Peers
-
-
-
- True
- Move Up
- True
- gtk-go-up
- Queue Torrent Up
-
-
-
-
-
- True
- Move Down
- True
- gtk-go-down
- Queue Torrent Down
-
-
+
+ tab
+ 3
+ False
+ False
+
- 1
- 2
-
- GTK_FILL
+ 3
+ 2
+ 3
-
+
+
+
+
+
+
+
@@ -238,17 +758,31 @@
-
-
-
- 480
- 5
- Preferences Dialog
- False
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK
- 2
-
-
+
True
+ GTK_TOOLBAR_BOTH_HORIZ
+ False
-
+
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
-
-
- True
-
-
- True
- GTK_RESIZE_IMMEDIATE
-
-
- True
-
-
- True
- 3
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- Minimize to tray on close
- True
-
-
- 2
-
-
-
-
-
-
- True
- Options
-
-
- label_item
-
-
-
-
- False
-
-
-
-
- True
-
-
- True
- 2
- 2
-
-
- True
- Ask me where to save each download
- True
-
-
- 2
-
-
-
-
- True
- Save all downloads to:
- True
- radio_ask_save
-
-
- 1
- 2
-
-
-
-
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
- True
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- Save Location
-
-
- label_item
-
-
-
-
- False
- 1
-
-
-
-
- True
- True
-
-
- True
- 1
- 2
-
-
- True
- Stop seeding torrents when
-their share ratio reaches:
- True
-
-
-
-
- True
- True
- 0.10000000000000001 0 10 0.10000000000000001 10 10
- 0.10000000149011612
- 2
- True
-
-
- 1
- 2
-
-
-
-
-
-
- True
- Seeding
-
-
- label_item
-
-
-
-
- False
- 2
-
-
-
-
- True
- True
-
-
- True
- Use compact storage allocation
- True
-
-
-
-
- True
- Storage
-
-
- label_item
-
-
-
-
- False
- 3
-
-
-
-
-
-
-
-
-
-
-
-
+ Add Torrent
+ True
+ gtk-add
+ Add Torrent
+
-
- False
-
-
+
True
- General
+ Remove Torrent
+ True
+ gtk-remove
+ Remove Torrent
+
-
- tab
- False
- False
-
-
+
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
-
-
- True
-
-
- True
-
-
- True
-
-
- True
- 2
- 4
-
-
-
-
-
- True
- Test Port
-
-
- 3
- 4
- 1
- 2
-
-
-
-
- True
- label
-
-
- 2
- 3
- 1
- 2
-
-
-
-
- True
- Active port:
-
-
- 1
- 2
- 1
- 2
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 3
- 4
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 1
- 2
-
-
-
-
- True
- to:
-
-
- 2
- 3
-
-
-
-
- True
- Try from:
-
-
-
-
-
-
- True
- TCP Port
-
-
- label_item
-
-
-
-
- False
-
-
-
-
- True
-
-
- True
- 4
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 1
- 2
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 1
- 2
- 1
- 2
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 1
- 2
- 2
- 3
-
-
-
-
- True
- True
- 0 0 100 1 10 10
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
-
- True
- Bandwidth
-
-
- label_item
-
-
-
-
- False
- 1
-
-
-
-
-
-
-
-
-
-
- 1
- False
-
-
+
True
- Network
+ Update Tracker
+ True
+ gtk-refresh
+ Update Tracker
+
-
- tab
- 1
- False
- False
-
-
+
True
- 2
- 2
-
-
- True
- False
- GTK_WRAP_WORD
-
-
- 1
- 2
- 10
- 10
-
-
-
-
- True
- GTK_BUTTONBOX_SPREAD
-
-
- True
- button
-
-
-
-
- True
- button
-
-
- 1
-
-
-
-
- True
- button
-
-
- 2
-
-
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
-
-
- 2
-
-
+ Clear Finished
+ True
+ gtk-clear
+ Clear Finished Torrents
+
-
- 2
- False
-
-
+
True
- Plugins
-
- tab
- 2
- False
- False
-
+
+
+
+ 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
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK
- GTK_BUTTONBOX_END
-
-
- True
- gtk-cancel
- True
-
-
-
-
- True
- gtk-ok
- True
-
-
- 1
-
-
-
-
- False
- GTK_PACK_END
+ 1
+ 2
+
+ GTK_FILL