diff --git a/deluge/ui/gtkui/glade/notification.glade b/deluge/ui/gtkui/glade/notification.glade deleted file mode 100644 index 252fcbb60..000000000 --- a/deluge/ui/gtkui/glade/notification.glade +++ /dev/null @@ -1,354 +0,0 @@ - - - - - 360 - 200 - True - 5 - GDK_WINDOW_TYPE_HINT_NORMAL - False - - - True - 2 - - - True - - - True - - - - - - True - gtk-info - - - False - 1 - - - - - True - <b>Torrent Notification</b> - True - - - False - 2 - - - - - - - - False - - - - - True - - - True - True - Blinking tray icon - True - 0 - True - - - - - True - True - Popup - True - 0 - True - - - 1 - - - - - True - 6 - 2 - - - True - 20 - - - True - - - True - True - None - 0 - True - True - rad_ssl - - - - - True - True - SSL - 0 - True - rad_tls - - - 1 - - - - - True - True - TLS - 0 - True - rad_ssl - - - 2 - - - - - - - 1 - 2 - 5 - 6 - - - - - True - 20 - - - True - True - False - - - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - True - 20 - - - True - True - - - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - True - 20 - - - True - True - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - Security - - - 5 - 6 - - - - - True - Password - - - 4 - 5 - - - - - True - Username - - - 3 - 4 - - - - - True - Server - - - 2 - 3 - - - - - True - True - Sound - True - 0 - True - - - GTK_FILL - - - - - True - True - Email - 0 - True - - - 1 - 2 - GTK_FILL - - - - - True - 20 - - - True - - - - - 1 - 2 - GTK_FILL - - - - - True - 20 - - - True - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - 2 - - - - - False - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-cancel - True - -6 - - - - - True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index ce82fb76a..20ce0e6c5 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -1815,197 +1815,13 @@ Disabled - - - tab - - - - + True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_RESIZE_QUEUE - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.05000000074505806 - 10 - <i><b><big>Other</big></b></i> - True - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Deluge will check our servers and will tell you if a newer version has been released - Be alerted about new releases - 0 - True - - - - - False - False - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Updates</b> - True - - - label_item - - - - - False - False - 5 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. - True - - - False - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 10 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Yes, please send anonymous statistics - 0 - True - - - - - False - 1 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>System Information</b> - True - - - label_item - - - - - False - False - 5 - 3 - - - - - - + page 10 - 5 - - - - - + 3 + False tab @@ -2220,8 +2036,207 @@ Disabled - + + True + page 11 + + 4 + False + tab + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0.05000000074505806 + 10 + <i><b><big>Other</big></b></i> + True + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Deluge will check our servers and will tell you if a newer version has been released + Be alerted about new releases + 0 + True + + + + + False + False + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Updates</b> + True + + + label_item + + + + + False + False + 5 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. + True + + + False + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Yes, please send anonymous statistics + 0 + True + + + + + False + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>System Information</b> + True + + + label_item + + + + + False + False + 5 + 3 + + + + + + + + + 5 + + + + + True + page 11 + + + 5 + False tab @@ -2674,8 +2689,13 @@ Disabled - + + True + page 12 + + 6 + False tab @@ -2909,6 +2929,302 @@ HTTP W/ Auth tab + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GTK_RESIZE_QUEUE + + + True + + + True + 0.05000000074505806 + <i><b><big>Notification</big></b></i> + True + + + False + False + + + + + True + + + True + True + Blinking tray icon + True + 0 + True + + + + + True + True + Popup + True + 0 + True + + + 1 + + + + + True + 6 + 2 + + + True + 20 + + + True + True + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 20 + + + True + + + + + 1 + 2 + GTK_FILL + + + + + True + True + Email + 0 + True + + + 1 + 2 + GTK_FILL + + + + + True + True + Sound + True + 0 + True + + + GTK_FILL + + + + + True + Server + + + 2 + 3 + + + + + True + Username + + + 3 + 4 + + + + + True + Password + + + 4 + 5 + + + + + True + Security + + + 5 + 6 + + + + + True + 20 + + + True + True + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 20 + + + True + True + + + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + True + 20 + + + True + True + False + + + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + 20 + + + True + + + True + True + None + 0 + True + True + rad_ssl + + + + + True + True + SSL + 0 + True + rad_tls + + + 1 + + + + + True + True + TLS + 0 + True + rad_ssl + + + 2 + + + + + + + 1 + 2 + 5 + 6 + + + + + 2 + + + + + False + 1 + + + + + + + + + 8 + + + + + + tab + + True @@ -2992,9 +3308,12 @@ HTTP W/ Auth - 8 + 9 + + + diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index b3f19ccd2..cd5332374 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -64,7 +64,7 @@ class Preferences(component.Component): # Add the default categories i = 0 for category in ["Downloads", "Network", "Bandwidth", "Interface", - "Other", "Daemon", "Queue", "Proxy", "Plugins"]: + "Other", "Daemon", "Queue", "Proxy", "Notification", "Plugins"]: self.liststore.append([i, category]) i += 1