diff --git a/encryption/glade/preferences_dialog.glade b/encryption/glade/preferences_dialog.glade index dc9fde33a..b2520ed63 100644 --- a/encryption/glade/preferences_dialog.glade +++ b/encryption/glade/preferences_dialog.glade @@ -56,13 +56,15 @@ 2 2 - + True - Ask me where to save each download - True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + 1 2 + 1 + 2 @@ -78,15 +80,13 @@ - + True - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Ask me where to save each download + True - 1 2 - 1 - 2 @@ -126,14 +126,6 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum simultaneous active torrents: - - True @@ -150,6 +142,14 @@ + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum simultaneous active torrents: + + @@ -225,29 +225,6 @@ True 2 2 - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Queue torrents to bottom when they begin seeding - True - - - 2 - - - - - True - Stop seeding torrents when their share ratio reaches: - True - - - 1 - 2 - - True @@ -266,6 +243,29 @@ + + + True + Stop seeding torrents when their share ratio reaches: + True + + + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Queue torrents to bottom when they begin seeding + True + + + 2 + + @@ -361,13 +361,53 @@ - + True - Test Port + Try from: + + + + + True + to: + + + 2 + 3 + + + + + True + True + 0.5 + 0 0 65535 1 10 10 + + + 1 + 2 + + + + + True + True + 0.5 + 0 0 65535 1 10 10 3 4 + + + + + True + Active port: + + + 1 + 2 1 2 @@ -385,57 +425,17 @@ - + True - Active port: - - - 1 - 2 - 1 - 2 - - - - - True - True - 0.5 - 0 0 65535 1 10 10 + Test Port 3 4 + 1 + 2 - - - True - True - 0.5 - 0 0 65535 1 10 10 - - - 1 - 2 - - - - - True - to: - - - 2 - 3 - - - - - True - Try from: - - @@ -474,19 +474,15 @@ 2 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 0 0 100 1 10 10 + Enable Mainline DHT + True - 1 2 - 1 - 2 - GTK_FILL @@ -501,15 +497,19 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable Mainline DHT - True + 1 + 0 0 500 1 10 10 + 1 2 + 1 + 2 + GTK_FILL @@ -628,32 +628,133 @@ 4 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 12 - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Prefer to encrypt the entire stream - True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Disabled + True + True + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enabled + True + chk_encin_disabled + + + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Forced + True + chk_encin_disabled + + + 2 + + - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Preference</b> + <b>Inbound</b> + True + + + label_item + + + + + + + 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 + 12 + + + 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 + Disabled + True + True + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Enabled + True + chk_encout_disabled + + + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Forced + True + chk_encout_disabled + + + 2 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Outbound</b> True @@ -662,8 +763,8 @@ - 3 - 4 + 1 + 2 @@ -739,65 +840,32 @@ - + 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 12 - + True + 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 - Disabled - True - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enabled - True - chk_encout_disabled - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Forced - True - chk_encout_disabled - - - 2 - - + Prefer to encrypt the entire stream + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Outbound</b> + <b>Preference</b> True @@ -806,78 +874,10 @@ - 1 - 2 + 3 + 4 - - - 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 - 12 - - - 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 - Disabled - True - True - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enabled - True - chk_encin_disabled - - - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Forced - True - chk_encin_disabled - - - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Inbound</b> - True - - - label_item - - - - @@ -972,129 +972,25 @@ 5 3 - + True + <i>(-1 is unlimited)</i> + True - 2 3 - 2 - 3 - - True - - - 2 - 3 - 1 - 2 - - - - + True KB/s 2 3 - 4 - 5 - - - - - - True - True - 10 - 1 - -1 -1 1024 1 10 10 - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - Maximum Upload Rate: - - - 4 - 5 - - - - - True - True - 10 - 1 - -1 -1 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Maximum Connections - - - 1 - 2 - - - - - True - 0 - Upload Slots - - - 2 - 3 - - - - - True - 0 - Maximum Download Rate: - - 3 4 - - - - - True - True - 10 - 1 - -1 -1 100 1 10 10 - - - 1 - 2 - 2 - 3 @@ -1115,26 +1011,130 @@ - + + True + True + 10 + 1 + -1 -1 100 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Maximum Download Rate: + + + 3 + 4 + + + + + True + 0 + Upload Slots + + + 2 + 3 + + + + + True + 0 + Maximum Connections + + + 1 + 2 + + + + + True + True + 10 + 1 + -1 -1 1000 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Maximum Upload Rate: + + + 4 + 5 + + + + + True + True + 10 + 1 + -1 -1 1024 1 10 10 + + + 1 + 2 + 4 + 5 + + + + + True KB/s 2 3 - 3 - 4 + 4 + 5 - + True - <i>(-1 is unlimited)</i> - True + 2 3 + 1 + 2 + + + + + True + + + 2 + 3 + 2 + 3 @@ -1220,19 +1220,29 @@ 3 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + Password protect system tray + True - 1 - 2 2 3 + + + True + Enable system tray icon + True + True + + + 2 + + True @@ -1247,25 +1257,15 @@ - - True - Enable system tray icon - True - True - - - 2 - - - - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Password protect system tray - True + False + 1 + 2 2 3 @@ -1308,12 +1308,16 @@ 1 3 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GUI update interval + seconds + + 2 + 3 + + @@ -1332,16 +1336,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - seconds + 0 + GUI update interval - - 2 - 3 - - diff --git a/glade/preferences_dialog.glade b/glade/preferences_dialog.glade index 0d3e8ebc8..af2ad6f40 100644 --- a/glade/preferences_dialog.glade +++ b/glade/preferences_dialog.glade @@ -56,15 +56,13 @@ 2 2 - + True - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Ask me where to save each download + True - 1 2 - 1 - 2 @@ -80,13 +78,15 @@ - + True - Ask me where to save each download - True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + 1 2 + 1 + 2 @@ -126,6 +126,14 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum simultaneous active torrents: + + True @@ -142,14 +150,6 @@ - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum simultaneous active torrents: - - @@ -224,6 +224,29 @@ True 2 2 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Queue torrents to bottom when they begin seeding + True + + + 2 + + + + + True + Stop seeding torrents when their share ratio reaches: + True + + + 1 + 2 + + True @@ -242,29 +265,6 @@ - - - True - Stop seeding torrents when their share ratio reaches: - True - - - 1 - 2 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Queue torrents to bottom when they begin seeding - True - - - 2 - - @@ -361,53 +361,13 @@ - + True - Try from: - - - - - True - to: - - - 2 - 3 - - - - - True - True - 0.5 - 0 0 65535 1 10 10 - - - 1 - 2 - - - - - True - True - 0.5 - 0 0 65535 1 10 10 + Test Port 3 4 - - - - - True - Active port: - - - 1 - 2 1 2 @@ -425,17 +385,57 @@ - + True - Test Port + Active port: + + + 1 + 2 + 1 + 2 + + + + + True + True + 0.5 + 0 0 65535 1 10 10 3 4 - 1 - 2 + + + True + True + 0.5 + 0 0 65535 1 10 10 + + + 1 + 2 + + + + + True + to: + + + 2 + 3 + + + + + True + Try from: + + @@ -475,15 +475,19 @@ 2 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable Mainline DHT - True + 1 + 0 0 500 1 10 10 + 1 2 + 1 + 2 + GTK_FILL @@ -498,19 +502,15 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 0 0 100 1 10 10 + Enable Mainline DHT + True - 1 2 - 1 - 2 - GTK_FILL @@ -682,25 +682,129 @@ 5 3 - + True - <i>(-1 is unlimited)</i> - True + 2 3 + 2 + 3 - + + True + + + 2 + 3 + 1 + 2 + + + + True KB/s 2 3 + 4 + 5 + + + + + + True + True + 10 + 1 + -1 -1 1024 1 10 10 + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + Maximum Upload Rate: + + + 4 + 5 + + + + + True + True + 10 + 1 + -1 -1 1000 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Maximum Connections + + + 1 + 2 + + + + + True + 0 + Upload Slots + + + 2 + 3 + + + + + True + 0 + Maximum Download Rate: + + 3 4 + + + + + True + True + 10 + 1 + -1 -1 100 1 10 10 + + + 1 + 2 + 2 + 3 @@ -721,130 +825,26 @@ - - True - True - 10 - 1 - -1 -1 100 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Maximum Download Rate: - - - 3 - 4 - - - - - True - 0 - Upload Slots - - - 2 - 3 - - - - - True - 0 - Maximum Connections - - - 1 - 2 - - - - - True - True - 10 - 1 - -1 -1 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Maximum Upload Rate: - - - 4 - 5 - - - - - True - True - 10 - 1 - -1 -1 1024 1 10 10 - - - 1 - 2 - 4 - 5 - - - - - + True KB/s 2 3 - 4 - 5 + 3 + 4 - + True + <i>(-1 is unlimited)</i> + True - 2 3 - 1 - 2 - - - - - True - - - 2 - 3 - 2 - 3 @@ -930,29 +930,19 @@ 3 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Password protect system tray - True + False + 1 + 2 2 3 - - - True - Enable system tray icon - True - True - - - 2 - - True @@ -967,15 +957,25 @@ - + + True + Enable system tray icon + True + True + + + 2 + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + Password protect system tray + True - 1 - 2 2 3 @@ -1018,16 +1018,12 @@ 1 3 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - seconds + 0 + GUI update interval - - 2 - 3 - - @@ -1046,12 +1042,16 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GUI update interval + seconds + + 2 + 3 + +