diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index a3e9484c4..bff61c6e9 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -297,7 +297,8 @@ class Torrent: "max_download_speed": self.max_download_speed, "prioritize_first_last": self.prioritize_first_last, "private": self.private, - "message": self.statusmsg + "message": self.statusmsg, + "hash": self.torrent_id } fns = { diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py index e50344325..baebb57bc 100644 --- a/deluge/ui/gtkui/details_tab.py +++ b/deluge/ui/gtkui/details_tab.py @@ -50,7 +50,8 @@ class DetailsTab: (glade.get_widget("summary_tracker"), None, ("tracker",)), (glade.get_widget("summary_torrent_path"), None, ("save_path",)), (glade.get_widget("summary_private"), str, ("private",)), - (glade.get_widget("summary_message"), str, ("message",)) + (glade.get_widget("summary_message"), str, ("message",)), + (glade.get_widget("summary_hash"), str, ("hash",)) ] def update(self): @@ -66,7 +67,7 @@ class DetailsTab: # Get the torrent status status_keys = ["name", "total_size", "num_files", - "tracker", "save_path", "private", "message"] + "tracker", "save_path", "private", "message", "hash"] client.get_torrent_status( self._on_get_torrent_status, selected, status_keys) diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade index 842761d9e..315d73a3b 100644 --- a/deluge/ui/gtkui/glade/main_window.glade +++ b/deluge/ui/gtkui/glade/main_window.glade @@ -533,188 +533,170 @@ - + True 0 + True + True 1 2 - GTK_FILL - - - - - True - 0 - - - 3 - 4 - GTK_FILL - - - - - True - 0 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 0 - - - 3 - 4 - 1 - 2 - GTK_FILL - - - - - True - 5 - - - True - 0 - <b>Downloaded:</b> - True - - - - - GTK_FILL - - - - - True - 5 - - - True - 0 - <b>Uploaded:</b> - True - - - - - 1 - 2 - GTK_FILL - - - - - True - 5 - - - True - 0 - <b>Share Ratio:</b> - True - - - - - 2 - 3 - GTK_FILL - - - - - True - 5 - - - True - 0 - <b>Next Announce:</b> - True - - - - 3 4 GTK_FILL - + True - 15 - 5 - - - True - 0 - <b>Speed:</b> - True - - + 0 - 2 - 3 + 3 + 4 + 3 + 4 GTK_FILL - + True - 15 - 5 - - - True - 0 - <b>Speed:</b> - True - - + 0 + True + PANGO_WRAP_CHAR + True - 2 - 3 + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + 0 + <b>Tracker Status:</b> + True + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + True + PANGO_WRAP_WORD_CHAR + + + 5 + 6 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 1 + <b>Availability:</b> + True + + + 4 + 5 + 2 + 3 + GTK_FILL + + + + + True + 0 + + + 3 + 4 + 2 + 3 + GTK_FILL + + + + + True + 0 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + + + 5 + 6 1 2 GTK_FILL - + True - 15 - 5 - - - True - 0 - <b>ETA:</b> - True - - + 0 + <b>Peers:</b> + True - 2 - 3 - 2 - 3 + 4 + 5 + 1 + 2 + GTK_FILL + + + + + True + 0 + + + 5 + 6 + GTK_FILL + + + + + True + 0 + <b>Seeders:</b> + True + + + 4 + 5 GTK_FILL @@ -741,170 +723,188 @@ - + True - 0 - <b>Seeders:</b> - True + 15 + 5 + + + True + 0 + <b>ETA:</b> + True + + - 4 - 5 + 2 + 3 + 2 + 3 GTK_FILL - + True - 0 + 15 + 5 + + + True + 0 + <b>Speed:</b> + True + + - 5 - 6 - GTK_FILL - - - - - True - 0 - <b>Peers:</b> - True - - - 4 - 5 + 2 + 3 1 2 GTK_FILL - + True - 0 + 15 + 5 + + + True + 0 + <b>Speed:</b> + True + + + + + 2 + 3 + GTK_FILL + + + + + True + 5 + + + True + 0 + <b>Next Announce:</b> + True + + + + + 3 + 4 + GTK_FILL + + + + + True + 5 + + + True + 0 + <b>Share Ratio:</b> + True + + + + + 2 + 3 + GTK_FILL + + + + + True + 5 + + + True + 0 + <b>Uploaded:</b> + True + + - 5 - 6 1 2 GTK_FILL - + True - 0 + 5 + + + True + 0 + <b>Downloaded:</b> + True + + - 1 - 2 - 2 - 3 GTK_FILL - + True 0 3 4 - 2 - 3 + 1 + 2 GTK_FILL - + True 0 - 1 - <b>Availability:</b> - True - - - 4 - 5 - 2 - 3 - GTK_FILL - - - - - True - 0 - True - PANGO_WRAP_WORD_CHAR - - - 5 - 6 - 2 - 3 - GTK_FILL - - - - - - True - 0 - <b>Tracker Status:</b> - True - - - 4 - 5 - GTK_FILL - - - - - - True - 0 - True - PANGO_WRAP_CHAR - True 1 2 - 4 - 5 + 1 + 2 GTK_FILL - + True 0 3 4 - 3 - 4 GTK_FILL - + True 0 - True - True 1 2 - 3 - 4 GTK_FILL @@ -975,73 +975,11 @@ True - 7 - 2 + 6 + 4 2 - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - 1 - 2 - 6 - 7 - GTK_FILL - - - - - - True - 0 - 1 - <b>Status:</b> - True - - - 6 - 7 - GTK_FILL - - - - - - True - 0 - True - PANGO_WRAP_CHAR - True - - - 1 - 2 - 5 - 6 - GTK_FILL - - - - - - True - 0 - 1 - <b>Private:</b> - True - - - 5 - 6 - GTK_FILL - - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -1051,34 +989,92 @@ 1 - 2 + 4 1 2 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Hash:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + True + + + 1 + 4 + 5 + 6 + + + + + + True + 0 + 1 + <b>Tracker:</b> + True + + + 5 + 6 + GTK_FILL + + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>Path:</b> + 1 + <b>Total Size:</b> True - 1 - 2 + 3 + 4 GTK_FILL + + + True + 0 + True + PANGO_WRAP_CHAR + True + + + 1 + 4 + + + True @@ -1101,16 +1097,16 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - 1 - <b>Total Size:</b> + <b>Path:</b> True @@ -1123,8 +1119,9 @@ - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 True PANGO_WRAP_CHAR @@ -1133,6 +1130,68 @@ 1 2 + 2 + 3 + + + + + + True + 0 + 1 + <b>Status:</b> + True + + + 4 + 5 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + 1 + 4 + 4 + 5 + + + + + + True + 0 + 1 + <b># of files:</b> + True + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + True + 0 + True + + + 3 + 4 + 3 + 4 @@ -1142,20 +1201,6 @@ 0 True - - 1 - 2 - 2 - 3 - - - - - - True - 0 - True - 1 2 @@ -1165,44 +1210,24 @@ - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 1 - <b># of files:</b> - True - - - - - 3 - 4 - GTK_FILL - - - - - + True 0 1 - <b>Tracker:</b> + <b>Private:</b> True - 4 - 5 + 2 + 3 + 2 + 3 GTK_FILL - + True 0 True @@ -1210,11 +1235,10 @@ True - 1 - 2 - 4 - 5 - GTK_FILL + 3 + 4 + 2 + 3