diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade index 315d73a3b..1f32542e0 100644 --- a/deluge/ui/gtkui/glade/main_window.glade +++ b/deluge/ui/gtkui/glade/main_window.glade @@ -521,195 +521,137 @@ - - - - - - - - - - - - - + True 0 - True - True 1 2 - 3 - 4 GTK_FILL - + True 0 3 4 - 3 - 4 GTK_FILL - + True 0 - True - PANGO_WRAP_CHAR - True 1 2 - 4 - 5 + 1 + 2 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 - 0 - <b>Peers:</b> - True + 5 + + + True + 0 + <b>Downloaded:</b> + True + + + + + GTK_FILL + + + + + True + 5 + + + True + 0 + <b>Uploaded:</b> + True + + - 4 - 5 1 2 GTK_FILL - + True - 0 + 5 + + + True + 0 + <b>Share Ratio:</b> + True + + - 5 - 6 + 2 + 3 GTK_FILL - + True - 0 - <b>Seeders:</b> - True + 5 + + + True + 0 + <b>Next Announce:</b> + True + + - 4 - 5 + 3 + 4 GTK_FILL - + True 15 5 - + True 0 - <b>Pieces:</b> + <b>Speed:</b> True @@ -717,30 +659,6 @@ 2 3 - 3 - 4 - GTK_FILL - - - - - True - 15 - 5 - - - True - 0 - <b>ETA:</b> - True - - - - - 2 - 3 - 2 - 3 GTK_FILL @@ -767,15 +685,15 @@ - + True 15 5 - + True 0 - <b>Speed:</b> + <b>ETA:</b> True @@ -783,128 +701,198 @@ 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 + 15 5 - + True 0 - <b>Uploaded:</b> + <b>Pieces:</b> True - 1 - 2 + 2 + 3 + 3 + 4 GTK_FILL - + True - 5 - - - True - 0 - <b>Downloaded:</b> - True - - + 0 + <b>Seeders:</b> + True + 4 + 5 GTK_FILL - + True 0 - 3 - 4 + 5 + 6 + GTK_FILL + + + + + True + 0 + <b>Peers:</b> + True + + + 4 + 5 1 2 GTK_FILL - + + True + 0 + + + 5 + 6 + 1 + 2 + GTK_FILL + + + + True 0 1 2 - 1 - 2 + 2 + 3 GTK_FILL - + True 0 3 4 + 2 + 3 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 + 6 + 4 + 5 + GTK_FILL + + + + True 0 + + 3 + 4 + 3 + 4 + GTK_FILL + + + + + True + 0 + True + True + 1 2 + 3 + 4 GTK_FILL @@ -979,82 +967,77 @@ 4 2 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 True PANGO_WRAP_CHAR True - 1 + 3 4 - 1 - 2 + 2 + 3 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - <b>Hash:</b> + 1 + <b>Private:</b> True - 1 - 2 + 2 + 3 + 2 + 3 GTK_FILL - + True 0 True 1 - 4 - 5 - 6 + 2 + 3 + 4 - + + True + 0 + True + + + 3 + 4 + 3 + 4 + + + + + True 0 1 - <b>Tracker:</b> + <b># of files:</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 - 0 - 1 - <b>Total Size:</b> - True - - - - + 2 + 3 3 4 GTK_FILL @@ -1062,8 +1045,38 @@ - + 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>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 True PANGO_WRAP_CHAR @@ -1071,28 +1084,9 @@ 1 - 4 - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - - - True - 0 - 0 - 1 - <b>Name:</b> - True - - - - - GTK_FILL + 2 + 2 + 3 @@ -1119,7 +1113,108 @@ - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 0 + 1 + <b>Name:</b> + True + + + + + GTK_FILL + + + + + + True + 0 + True + PANGO_WRAP_CHAR + True + + + 1 + 4 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + 0 + 1 + <b>Total Size:</b> + True + + + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + 1 + <b>Tracker:</b> + True + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + True + + + 1 + 4 + 5 + 6 + + + + + + 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 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 @@ -1127,118 +1222,11 @@ PANGO_WRAP_CHAR True - - 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 - - - - - - True - 0 - True - - - 1 - 2 - 3 - 4 - - - - - - True - 0 - 1 - <b>Private:</b> - True - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - True - 0 - True - PANGO_WRAP_CHAR - True - - - 3 - 4 - 2 - 3 + 1 + 2 diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 4fa40ecca..45f91208c 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -418,7 +418,7 @@ class Preferences(component.Component): self.glade.get_widget("folder_autoadd").get_filename() else: new_core_config["autoadd_location"] = \ - self.glade.get_widget("entry_autoadd_daemon").get_text() + self.glade.get_widget("entry_autoadd").get_text() new_core_config["compact_allocation"] = \ self.glade.get_widget("radio_compact_allocation").get_active()