Deluge
diff options
| author | Marcos Pinto <markybob@dipconsultants.com> | 2007-11-18 09:17:55 +0000 |
|---|---|---|
| committer | Marcos Pinto <markybob@dipconsultants.com> | 2007-11-18 09:17:55 +0000 |
| commit | 553bdcc3a66a477ffa961ecdf3d77649e25aa324 (patch) | |
| tree | fa00ddbd9537d87ed0252f19ffa9fd837eec2332 | |
| parent | 3eab9473bfce78770ddb6f7b37179a85061fe369 (diff) | |
| download | deluge-553bdcc3a66a477ffa961ecdf3d77649e25aa324.tar.gz deluge-553bdcc3a66a477ffa961ecdf3d77649e25aa324.tar.bz2 deluge-553bdcc3a66a477ffa961ecdf3d77649e25aa324.zip | |
remove lsd...damnit
| -rw-r--r-- | glade/preferences_dialog.glade | 683 | ||||
| -rw-r--r-- | src/core.py | 2 | ||||
| -rw-r--r-- | src/dialogs.py | 4 | ||||
| -rw-r--r-- | src/pref.py | 4 |
4 files changed, 339 insertions, 354 deletions
diff --git a/glade/preferences_dialog.glade b/glade/preferences_dialog.glade index 474846bf4..c87b5dad2 100644 --- a/glade/preferences_dialog.glade +++ b/glade/preferences_dialog.glade @@ -68,19 +68,6 @@ <property name="n_rows">1</property> <property name="n_columns">2</property> <child> - <widget class="GtkFileChooserButton" id="download_path_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> - <property name="title" translatable="yes">Select A Folder</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> <widget class="GtkRadioButton" id="radio_save_all_to"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -94,6 +81,19 @@ <signal name="toggled" handler="toggle_ui"/> </widget> </child> + <child> + <widget class="GtkFileChooserButton" id="download_path_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> + <property name="title" translatable="yes">Select A Folder</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> </widget> <packing> <property name="position">1</property> @@ -106,13 +106,6 @@ <property name="n_rows">1</property> <property name="n_columns">2</property> <child> - <widget class="GtkLabel" id="label38"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Store all torrent files in:</property> - </widget> - </child> - <child> <widget class="GtkAlignment" id="alignment32"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -131,6 +124,13 @@ <property name="right_attach">2</property> </packing> </child> + <child> + <widget class="GtkLabel" id="label38"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Store all torrent files in:</property> + </widget> + </child> </widget> <packing> <property name="position">2</property> @@ -175,16 +175,6 @@ <property name="n_rows">1</property> <property name="n_columns">2</property> <child> - <widget class="GtkCheckButton" id="chk_autoload"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Autoload all torrent files in:</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - </widget> - </child> - <child> <widget class="GtkAlignment" id="alignment36"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -202,6 +192,16 @@ <property name="right_attach">2</property> </packing> </child> + <child> + <widget class="GtkCheckButton" id="chk_autoload"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Autoload all torrent files in:</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + </widget> + </child> </widget> </child> </widget> @@ -773,21 +773,6 @@ <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkCheckButton" id="chk_lsd"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">Local Peer Discovery</property> - <property name="label" translatable="yes">Local Peer Discovery</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="position">3</property> - </packing> - </child> </widget> </child> </widget> @@ -1158,10 +1143,10 @@ Either</property> <property name="n_rows">5</property> <property name="n_columns">2</property> <child> - <widget class="GtkSpinButton" id="spin_max_upload_slots_global"> + <widget class="GtkSpinButton" id="spin_max_half_open"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum upload slots for all torrents. Set -1 for unlimited.</property> + <property name="tooltip" translatable="yes">The maximum half-open connections. A high value may crash some cheap routers. Set -1 for unlimited.</property> <property name="xalign">1</property> <property name="adjustment">-1 -1 9000 1 10 10</property> <property name="climb_rate">1</property> @@ -1169,90 +1154,48 @@ Either</property> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="spin_max_upload"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum upload speed for all torrents. Set -1 for unlimited.</property> - <property name="xalign">1</property> - <property name="adjustment">0 -1 9000 1 10 10</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_max_download"> + <widget class="GtkAlignment" id="alignment33"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">The maximum download speed for all torrents. Set -1 for unlimited.</property> - <property name="xalign">1</property> - <property name="adjustment">0 -1 9000 1 10 10</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label52"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The maximum download speed for all torrents. Set -1 for unlimited.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Download Speed (KiB/s):</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="spin_max_connections_global"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum number of connections allowed. Set -1 for unlimited.</property> - <property name="xalign">1</property> - <property name="adjustment">-1 -1 1000 1 10 10</property> - <property name="climb_rate">1</property> + <property name="right_padding">10</property> + <child> + <widget class="GtkLabel" id="label39"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The maximum half-open connections. A high value may crash some cheap routers. Set -1 for unlimited.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum Half-Open Connections:</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment4"> + <widget class="GtkAlignment" id="alignment18"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="right_padding">10</property> <child> - <widget class="GtkLabel" id="label54"> + <widget class="GtkLabel" id="label20"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The maximum number of connections allowed. Set -1 for unlimited.</property> + <property name="tooltip" translatable="yes">The maximum upload speed for all torrents. Set -1 for unlimited.</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Connections:</property> + <property name="label" translatable="yes">Maximum Upload Slots:</property> </widget> </child> </widget> <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -1277,50 +1220,92 @@ Either</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment18"> + <widget class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="right_padding">10</property> <child> - <widget class="GtkLabel" id="label20"> + <widget class="GtkLabel" id="label54"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The maximum upload speed for all torrents. Set -1 for unlimited.</property> + <property name="tooltip" translatable="yes">The maximum number of connections allowed. Set -1 for unlimited.</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Upload Slots:</property> + <property name="label" translatable="yes">Maximum Connections:</property> </widget> </child> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment33"> + <widget class="GtkSpinButton" id="spin_max_connections_global"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The maximum number of connections allowed. Set -1 for unlimited.</property> + <property name="xalign">1</property> + <property name="adjustment">-1 -1 1000 1 10 10</property> + <property name="climb_rate">1</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label52"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The maximum download speed for all torrents. Set -1 for unlimited.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum Download Speed (KiB/s):</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="spin_max_download"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="right_padding">10</property> - <child> - <widget class="GtkLabel" id="label39"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The maximum half-open connections. A high value may crash some cheap routers. Set -1 for unlimited.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Half-Open Connections:</property> - </widget> - </child> + <property name="tooltip" translatable="yes">The maximum download speed for all torrents. Set -1 for unlimited.</property> + <property name="xalign">1</property> + <property name="adjustment">0 -1 9000 1 10 10</property> + <property name="climb_rate">1</property> + <property name="digits">1</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_max_half_open"> + <widget class="GtkSpinButton" id="spin_max_upload"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum half-open connections. A high value may crash some cheap routers. Set -1 for unlimited.</property> + <property name="tooltip" translatable="yes">The maximum upload speed for all torrents. Set -1 for unlimited.</property> + <property name="xalign">1</property> + <property name="adjustment">0 -1 9000 1 10 10</property> + <property name="climb_rate">1</property> + <property name="digits">1</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="spin_max_upload_slots_global"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The maximum upload slots for all torrents. Set -1 for unlimited.</property> <property name="xalign">1</property> <property name="adjustment">-1 -1 9000 1 10 10</property> <property name="climb_rate">1</property> @@ -1328,8 +1313,8 @@ Either</property> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -1374,20 +1359,37 @@ Either</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <child> - <widget class="GtkSpinButton" id="spin_max_upload_slots_per_torrent"> + <widget class="GtkAlignment" id="alignment21"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum upload slots per torrent. Set -1 for unlimited.</property> - <property name="xalign">1</property> - <property name="adjustment">-1 -1 1000 1 10 10</property> - <property name="climb_rate">1</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkLabel" id="label31"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum Connections:</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkAlignment" id="alignment22"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkLabel" id="label33"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip" translatable="yes">The maximum upload slots per torrent. Set -1 for unlimited.</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum Upload Slots:</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -1405,39 +1407,22 @@ Either</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment22"> + <widget class="GtkSpinButton" id="spin_max_upload_slots_per_torrent"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <widget class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">The maximum upload slots per torrent. Set -1 for unlimited.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Upload Slots:</property> - </widget> - </child> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The maximum upload slots per torrent. Set -1 for unlimited.</property> + <property name="xalign">1</property> + <property name="adjustment">-1 -1 1000 1 10 10</property> + <property name="climb_rate">1</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> - <child> - <widget class="GtkAlignment" id="alignment21"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <widget class="GtkLabel" id="label31"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Connections:</property> - </widget> - </child> - </widget> - </child> </widget> </child> </widget> @@ -1546,57 +1531,61 @@ Either</property> <placeholder/> </child> <child> - <widget class="GtkSpinButton" id="spin_peer_proxy_port"> + <widget class="GtkEntry" id="txt_peer_proxy_hostname"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label8"> + <widget class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Port</property> + <property name="label" translatable="yes">Proxy type</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Username</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label7"> + <widget class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Server</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_peer_proxy_password"> + <widget class="GtkComboBox" id="combo_peer_proxy_type"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="visibility">False</property> + <property name="items" translatable="yes">None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> </packing> </child> <child> @@ -1614,61 +1603,57 @@ Either</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_peer_proxy_type"> + <widget class="GtkEntry" id="txt_peer_proxy_password"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="visibility">False</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label6"> + <widget class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="yes">Server</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label5"> + <widget class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Username</property> + <property name="label" translatable="yes">Port</property> </widget> <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Proxy type</property> - </widget> - </child> - <child> - <widget class="GtkEntry" id="txt_peer_proxy_hostname"> + <widget class="GtkSpinButton" id="spin_peer_proxy_port"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -1741,57 +1726,61 @@ HTTP W/ Auth</property> <placeholder/> </child> <child> - <widget class="GtkSpinButton" id="spin_tracker_proxy_port"> + <widget class="GtkEntry" id="txt_tracker_proxy_hostname"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <widget class="GtkLabel" id="label49"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Port</property> + <property name="label" translatable="yes">Proxy type</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label48"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Username</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label45"> + <widget class="GtkLabel" id="label47"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Server</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_tracker_proxy_password"> + <widget class="GtkComboBox" id="combo_tracker_proxy_type"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="visibility">False</property> + <property name="items" translatable="yes">None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> </packing> </child> <child> @@ -1809,61 +1798,57 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_tracker_proxy_type"> + <widget class="GtkEntry" id="txt_tracker_proxy_password"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="visibility">False</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label47"> + <widget class="GtkLabel" id="label45"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="yes">Server</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label48"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Username</property> + <property name="label" translatable="yes">Port</property> </widget> <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label49"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Proxy type</property> - </widget> - </child> - <child> - <widget class="GtkEntry" id="txt_tracker_proxy_hostname"> + <widget class="GtkSpinButton" id="spin_tracker_proxy_port"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -1936,57 +1921,61 @@ HTTP W/ Auth</property> <placeholder/> </child> <child> - <widget class="GtkSpinButton" id="spin_dht_proxy_port"> + <widget class="GtkEntry" id="txt_dht_proxy_hostname"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label61"> + <widget class="GtkLabel" id="label65"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Port</property> + <property name="label" translatable="yes">Proxy type</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label64"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Username</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label62"> + <widget class="GtkLabel" id="label63"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Server</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_dht_proxy_password"> + <widget class="GtkComboBox" id="combo_dht_proxy_type"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="visibility">False</property> + <property name="items" translatable="yes">None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> </packing> </child> <child> @@ -2004,61 +1993,57 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_dht_proxy_type"> + <widget class="GtkEntry" id="txt_dht_proxy_password"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="visibility">False</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label63"> + <widget class="GtkLabel" id="label62"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="yes">Server</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label64"> + <widget class="GtkLabel" id="label61"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Username</property> + <property name="label" translatable="yes">Port</property> </widget> <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label65"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Proxy type</property> - </widget> - </child> - <child> - <widget class="GtkEntry" id="txt_dht_proxy_hostname"> + <widget class="GtkSpinButton" id="spin_dht_proxy_port"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -2131,57 +2116,61 @@ HTTP W/ Auth</property> <placeholder/> </child> <child> - <widget class="GtkSpinButton" id="spin_web_proxy_port"> + <widget class="GtkEntry" id="txt_web_proxy_hostname"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label67"> + <widget class="GtkLabel" id="label71"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Port</property> + <property name="label" translatable="yes">Proxy type</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label70"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Username</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label68"> + <widget class="GtkLabel" id="label69"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Server</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_web_proxy_password"> + <widget class="GtkComboBox" id="combo_web_proxy_type"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="visibility">False</property> + <property name="items" translatable="yes">None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> </packing> </child> <child> @@ -2199,61 +2188,57 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_web_proxy_type"> + <widget class="GtkEntry" id="txt_web_proxy_password"> <property name="visible">True</property> <property name="sensitive">False</property> + <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="visibility">False</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label69"> + <widget class="GtkLabel" id="label68"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="yes">Server</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkLabel" id="label67"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Username</property> + <property name="label" translatable="yes">Port</property> </widget> <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label71"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Proxy type</property> - </widget> - </child> - <child> - <widget class="GtkEntry" id="txt_web_proxy_hostname"> + <widget class="GtkSpinButton" id="spin_web_proxy_port"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="adjustment">8080 0 10000 1 10 10</property> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -2476,41 +2461,22 @@ HTTP W/ Auth</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <child> - <widget class="GtkAlignment" id="alignment24"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <widget class="GtkRadioButton" id="radio_open_folder_stock"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Open folder with:</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkAlignment" id="alignment25"> + <widget class="GtkAlignment" id="alignment27"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="left_padding">40</property> <child> - <widget class="GtkRadioButton" id="radio_open_folder_custom"> + <widget class="GtkEntry" id="txt_open_folder_location"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Custom:</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">radio_open_folder_stock</property> - <signal name="focus_in_event" handler="on_radio_open_folder_custom_focus_in_event"/> + <signal name="focus_in_event" handler="on_txt_open_folder_location_focus_in_event"/> </widget> </child> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> @@ -2537,26 +2503,45 @@ Thunar</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment27"> + <widget class="GtkAlignment" id="alignment25"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="left_padding">40</property> <child> - <widget class="GtkEntry" id="txt_open_folder_location"> + <widget class="GtkRadioButton" id="radio_open_folder_custom"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <signal name="focus_in_event" handler="on_txt_open_folder_location_focus_in_event"/> + <property name="label" translatable="yes">Custom:</property> + <property name="response_id">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">radio_open_folder_stock</property> + <signal name="focus_in_event" handler="on_radio_open_folder_custom_focus_in_event"/> </widget> </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> + <child> + <widget class="GtkAlignment" id="alignment24"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkRadioButton" id="radio_open_folder_stock"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Open folder with:</property> + <property name="response_id">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + </child> + </widget> + </child> </widget> <packing> <property name="expand">False</property> diff --git a/src/core.py b/src/core.py index 3f250c106..1b478eb82 100644 --- a/src/core.py +++ b/src/core.py @@ -78,7 +78,7 @@ PREF_FUNCTIONS = { "max_upload_speed_bps" : deluge_core.set_upload_rate_limit, "enable_dht" : None, # not a normal pref in that is is applied only on start "use_upnp" : deluge_core.use_upnp, - "use_lsd" : deluge_core.use_lsd, +# "use_lsd" : deluge_core.use_lsd, "use_natpmp" : deluge_core.use_natpmp, "use_utpex" : deluge_core.use_utpex, } diff --git a/src/dialogs.py b/src/dialogs.py index 1463e6d26..5e7b1776e 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -100,7 +100,7 @@ class PreferencesDlg: self.glade.get_widget("chk_tracker_proxy").set_active(self.preferences.get("tracker_proxy")) self.glade.get_widget("chk_dht_proxy").set_active(self.preferences.get("dht_proxy")) self.glade.get_widget("chk_upnp").set_active(self.preferences.get("use_upnp")) - self.glade.get_widget("chk_lsd").set_active(self.preferences.get("use_lsd")) +# self.glade.get_widget("chk_lsd").set_active(self.preferences.get("use_lsd")) self.glade.get_widget("chk_random_port").set_active(self.preferences.get("random_port")) self.glade.get_widget("chk_natpmp").set_active(self.preferences.get("use_natpmp")) self.glade.get_widget("chk_utpex").set_active(self.preferences.get("use_utpex")) @@ -215,7 +215,7 @@ class PreferencesDlg: self.preferences.set("dht_proxy", self.glade.get_widget("chk_dht_proxy").get_active()) self.preferences.set("web_proxy", self.glade.get_widget("chk_web_proxy").get_active()) self.preferences.set("use_upnp", self.glade.get_widget("chk_upnp").get_active()) - self.preferences.set("use_lsd", self.glade.get_widget("chk_lsd").get_active()) +# self.preferences.set("use_lsd", self.glade.get_widget("chk_lsd").get_active()) self.preferences.set("tracker_proxy_type", self.glade.get_widget("combo_tracker_proxy_type").get_active()) self.preferences.set("dht_proxy_type", self.glade.get_widget("combo_dht_proxy_type").get_active()) self.preferences.set("web_proxy_type", self.glade.get_widget("combo_web_proxy_type").get_active()) diff --git a/src/pref.py b/src/pref.py index 11187ea61..0fee8b498 100644 --- a/src/pref.py +++ b/src/pref.py @@ -124,7 +124,7 @@ if common.windows_check(): "use_default_dir" : False, "use_natpmp" : False, "use_upnp" : True, - "use_lsd" : True, + # "use_lsd" : False, "use_utpex" : True, "new_releases" : True, "window_height" : 480, @@ -235,7 +235,7 @@ else: "use_default_dir" : False, "use_natpmp" : False, "use_upnp" : True, - "use_lsd" : True, +# "use_lsd" : False, "use_utpex" : True, "new_releases" : True, "window_height" : 480, |