Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2009-03-15 18:38:08 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2009-03-15 18:38:08 +0000 |
| commit | 17ac7ce7332e2ffebb0844e6c187e4bbffd53e19 (patch) | |
| tree | 5b162411ef9753b0c4b5164f2a79ba028d4fb308 | |
| parent | 97fec6ce1a7c0986d0f54c530ba6ead24f9a23f4 (diff) | |
| download | deluge-17ac7ce7332e2ffebb0844e6c187e4bbffd53e19.tar.gz deluge-17ac7ce7332e2ffebb0844e6c187e4bbffd53e19.tar.bz2 deluge-17ac7ce7332e2ffebb0844e6c187e4bbffd53e19.zip | |
Fix #841 maximum upload slots tooltip
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | deluge/ui/gtkui/glade/preferences_dialog.glade | 1304 |
2 files changed, 654 insertions, 651 deletions
@@ -4,6 +4,7 @@ ==== GtkUI ==== * Add 'Comments' field to the Details tab + * Fix #841 maximum upload slots tooltip === Deluge 1.1.4 - (08 March 2009) === ==== Core ==== diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index 4a3ab9262..70f1bfb1a 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -1,4 +1,6 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<!--Generated with glade3 3.4.5 on Sun Mar 15 11:36:53 2009 --> <glade-interface> <widget class="GtkDialog" id="pref_dialog"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -103,108 +105,25 @@ <property name="n_rows">4</property> <property name="n_columns">2</property> <child> - <widget class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Download to:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox8"> + <widget class="GtkAlignment" id="alignment11"> <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="spacing">5</property> <child> - <widget class="GtkFileChooserButton" id="download_path_button"> + <widget class="GtkHBox" id="hbox5"> <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> - </child> - <child> - <widget class="GtkEntry" id="entry_download_path"> - <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> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="chk_move_completed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Move completed to:</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_toggle"/> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="chk_copy_torrent_file"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Copy of .torrent files to:</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_toggle"/> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="chk_autoadd"> - <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">Auto add .torrents from:</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_toggle"/> - </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="alignment39"> - <property name="visible">True</property> - <child> - <widget class="GtkHBox" id="hbox13"> - <property name="visible">True</property> <property name="spacing">5</property> <child> - <widget class="GtkFileChooserButton" id="move_completed_path_button"> + <widget class="GtkFileChooserButton" id="folder_autoadd"> <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="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> - <property name="title" translatable="yes">Select A Folder</property> </widget> </child> <child> - <widget class="GtkEntry" id="entry_move_completed_path"> + <widget class="GtkEntry" id="entry_autoadd"> <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> </widget> <packing> <property name="position">1</property> @@ -216,8 +135,8 @@ <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="top_attach">3</property> + <property name="bottom_attach">4</property> </packing> </child> <child> @@ -257,25 +176,23 @@ </packing> </child> <child> - <widget class="GtkAlignment" id="alignment11"> + <widget class="GtkAlignment" id="alignment39"> <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="GtkHBox" id="hbox5"> + <widget class="GtkHBox" id="hbox13"> <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="spacing">5</property> <child> - <widget class="GtkFileChooserButton" id="folder_autoadd"> + <widget class="GtkFileChooserButton" id="move_completed_path_button"> <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="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> + <property name="title" translatable="yes">Select A Folder</property> </widget> </child> <child> - <widget class="GtkEntry" id="entry_autoadd"> + <widget class="GtkEntry" id="entry_move_completed_path"> <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> </widget> <packing> <property name="position">1</property> @@ -287,8 +204,93 @@ <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="GtkCheckButton" id="chk_autoadd"> + <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">Auto add .torrents from:</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_toggle"/> + </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="GtkCheckButton" id="chk_copy_torrent_file"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Copy of .torrent files to:</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_toggle"/> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="chk_move_completed"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Move completed to:</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_toggle"/> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox8"> + <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="spacing">5</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> + </child> + <child> + <widget class="GtkEntry" id="entry_download_path"> + <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> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Download to:</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -447,8 +449,8 @@ <property name="label" translatable="yes">page 6</property> </widget> <packing> - <property name="tab_fill">False</property> <property name="type">tab</property> + <property name="tab_fill">False</property> </packing> </child> <child> @@ -887,36 +889,34 @@ <placeholder/> </child> <child> - <widget class="GtkCheckButton" id="chk_dht"> + <widget class="GtkCheckButton" id="chk_upnp"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Distributed hash table may improve the amount of active connections.</property> - <property name="label" translatable="yes">DHT</property> + <property name="tooltip" translatable="yes">Universal Plug and Play</property> + <property name="label" translatable="yes">UPnP</property> <property name="use_underline">True</property> <property name="response_id">0</property> + <property name="active">True</property> <property name="draw_indicator">True</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="GtkCheckButton" id="chk_lsd"> + <widget class="GtkCheckButton" id="chk_natpmp"> <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 Service Discovery finds local peers on your network.</property> - <property name="label" translatable="yes">LSD</property> + <property name="tooltip" translatable="yes">NAT Port Mapping Protocol</property> + <property name="label" translatable="yes">NAT-PMP</property> + <property name="use_underline">True</property> <property name="response_id">0</property> + <property name="active">True</property> <property name="draw_indicator">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -938,34 +938,36 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="chk_natpmp"> + <widget class="GtkCheckButton" id="chk_lsd"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">NAT Port Mapping Protocol</property> - <property name="label" translatable="yes">NAT-PMP</property> - <property name="use_underline">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 Service Discovery finds local peers on your network.</property> + <property name="label" translatable="yes">LSD</property> <property name="response_id">0</property> - <property name="active">True</property> <property name="draw_indicator">True</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="GtkCheckButton" id="chk_upnp"> + <widget class="GtkCheckButton" id="chk_dht"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Universal Plug and Play</property> - <property name="label" translatable="yes">UPnP</property> + <property name="tooltip" translatable="yes">Distributed hash table may improve the amount of active connections.</property> + <property name="label" translatable="yes">DHT</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <property name="active">True</property> <property name="draw_indicator">True</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> @@ -1160,9 +1162,9 @@ Disabled</property> <property name="label" translatable="yes">page 7</property> </widget> <packing> + <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -1228,185 +1230,185 @@ Disabled</property> <property name="n_columns">2</property> <property name="column_spacing">15</property> <child> - <widget class="GtkSpinButton" id="spin_max_upload_slots_global"> + <widget class="GtkSpinButton" id="spin_max_connections_per_second"> <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 0</property> - <property name="climb_rate">1</property> - <property name="snap_to_ticks">True</property> + <property name="adjustment">-1 -1 9999 1 10 0</property> <property name="numeric">True</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="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_max_upload"> + <widget class="GtkSpinButton" id="spin_max_half_open_connections"> <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">-1 -1 9000 1 10 0</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> + <property name="adjustment">-1 -1 9999 1 10 0</property> <property name="numeric">True</property> </widget> <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="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="GtkLabel" id="label58"> <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">-1 -1 9000 1 10 0</property> - <property name="climb_rate">1</property> - <property name="digits">1</property> - <property name="numeric">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum Connection Attempts per Second:</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">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkLabel" id="label57"> <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> + <property name="label" translatable="yes">Maximum Half-Open Connections:</property> </widget> <packing> - <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_connections_global"> + <widget class="GtkLabel" id="label17"> <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="max_length">4</property> - <property name="xalign">1</property> - <property name="adjustment">-1 -1 9000 1 10 0</property> - <property name="climb_rate">1</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_IF_VALID</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 Upload Speed (KiB/s):</property> </widget> <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="GtkLabel" id="label15"> + <widget class="GtkLabel" id="label16"> <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> <packing> - <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="label16"> + <widget class="GtkLabel" id="label15"> <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 slots 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> <packing> + <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="label17"> + <widget class="GtkSpinButton" id="spin_max_connections_global"> <property name="visible">True</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 Upload Speed (KiB/s):</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="max_length">4</property> + <property name="xalign">1</property> + <property name="adjustment">-1 -1 9000 1 10 0</property> + <property name="climb_rate">1</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_IF_VALID</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <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="label57"> + <widget class="GtkLabel" id="label14"> <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 Half-Open Connections:</property> + <property name="label" translatable="yes">Maximum Download Speed (KiB/s):</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</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="GtkLabel" id="label58"> + <widget class="GtkSpinButton" id="spin_max_download"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum Connection Attempts per Second:</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">-1 -1 9000 1 10 0</property> + <property name="climb_rate">1</property> + <property name="digits">1</property> + <property name="numeric">True</property> </widget> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <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_half_open_connections"> + <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">-1 -1 9999 1 10 0</property> + <property name="adjustment">-1 -1 9000 1 10 0</property> + <property name="climb_rate">1</property> + <property name="digits">1</property> <property name="numeric">True</property> </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="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_connections_per_second"> + <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 9999 1 10 0</property> + <property name="adjustment">-1 -1 9000 1 10 0</property> + <property name="climb_rate">1</property> + <property name="snap_to_ticks">True</property> <property name="numeric">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -1494,123 +1496,123 @@ Disabled</property> <property name="n_columns">2</property> <property name="column_spacing">15</property> <child> - <widget class="GtkSpinButton" id="spin_max_upload_per_torrent"> + <widget class="GtkSpinButton" id="spin_max_upload_slots_per_torrent"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</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 9000 1 10 0</property> - <property name="digits">1</property> + <property name="climb_rate">1</property> + <property name="snap_to_ticks">True</property> <property name="numeric">True</property> </widget> <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="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_download_per_torrent"> + <widget class="GtkSpinButton" id="spin_max_connections_per_torrent"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</property> <property name="xalign">1</property> <property name="adjustment">-1 -1 9000 1 10 0</property> - <property name="digits">1</property> + <property name="snap_to_ticks">True</property> <property name="numeric">True</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="GtkLabel" id="label32"> + <widget class="GtkLabel" id="label18"> <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="xalign">0</property> - <property name="label" translatable="yes">Maximum Upload Speed (KiB/s):</property> + <property name="label" translatable="yes">Maximum Connections:</property> </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="GtkLabel" id="label31"> + <widget class="GtkLabel" id="label24"> <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="xalign">0</property> - <property name="label" translatable="yes">Maximum Download Speed (KiB/s):</property> + <property name="label" translatable="yes">Maximum Upload Slots:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</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="label24"> + <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="xalign">0</property> - <property name="label" translatable="yes">Maximum Upload Slots:</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> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <widget class="GtkLabel" id="label32"> <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="xalign">0</property> - <property name="label" translatable="yes">Maximum Connections:</property> + <property name="label" translatable="yes">Maximum Upload Speed (KiB/s):</property> </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="GtkSpinButton" id="spin_max_connections_per_torrent"> + <widget class="GtkSpinButton" id="spin_max_download_per_torrent"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</property> <property name="xalign">1</property> <property name="adjustment">-1 -1 9000 1 10 0</property> - <property name="snap_to_ticks">True</property> + <property name="digits">1</property> <property name="numeric">True</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_per_torrent"> + <widget class="GtkSpinButton" id="spin_max_upload_per_torrent"> <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="tooltip" translatable="yes">The maximum number of connections per torrent. Set -1 for unlimited.</property> <property name="xalign">1</property> <property name="adjustment">-1 -1 9000 1 10 0</property> - <property name="climb_rate">1</property> - <property name="snap_to_ticks">True</property> + <property name="digits">1</property> <property name="numeric">True</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="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -1652,9 +1654,9 @@ Disabled</property> <property name="label" translatable="yes">page 8</property> </widget> <packing> + <property name="type">tab</property> <property name="position">2</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -2022,9 +2024,9 @@ Disabled</property> <property name="label" translatable="yes">page 10</property> </widget> <packing> + <property name="type">tab</property> <property name="position">3</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -2216,9 +2218,9 @@ Disabled</property> <property name="label" translatable="yes">page 11</property> </widget> <packing> + <property name="type">tab</property> <property name="position">4</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -2437,9 +2439,9 @@ Disabled</property> <property name="label" translatable="yes">page 11</property> </widget> <packing> + <property name="type">tab</property> <property name="position">5</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -2558,20 +2560,23 @@ Disabled</property> <property name="n_columns">2</property> <property name="column_spacing">10</property> <child> - <widget class="GtkLabel" id="label42"> + <widget class="GtkSpinButton" id="spin_active"> <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="xalign">0</property> - <property name="label" translatable="yes">Total active downloading:</property> + <property name="xalign">1</property> + <property name="adjustment">0 -1 9999 1 10 0</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_downloading"> + <widget class="GtkSpinButton" id="spin_seeding"> <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> @@ -2583,36 +2588,36 @@ Disabled</property> <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="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label48"> + <widget class="GtkLabel" id="label27"> <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="xalign">0</property> - <property name="label" translatable="yes">Total active:</property> + <property name="label" translatable="yes">Total active seeding:</property> </widget> <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <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="xalign">0</property> - <property name="label" translatable="yes">Total active seeding:</property> + <property name="label" translatable="yes">Total active:</property> </widget> <packing> - <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_seeding"> + <widget class="GtkSpinButton" id="spin_downloading"> <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> @@ -2624,25 +2629,22 @@ Disabled</property> <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">1</property> + <property name="bottom_attach">2</property> <property name="x_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_active"> + <widget class="GtkLabel" id="label42"> <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="xalign">1</property> - <property name="adjustment">0 -1 9999 1 10 0</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Total active downloading:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options"></property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -2705,36 +2707,37 @@ Disabled</property> <property name="n_columns">2</property> <property name="column_spacing">10</property> <child> - <widget class="GtkSpinButton" id="spin_seed_time_limit"> + <widget class="GtkLabel" id="label53"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">6</property> - <property name="xalign">1</property> - <property name="adjustment">6 -1 100 1 10 0</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Share Ratio Limit:</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"></property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_seed_time_ratio_limit"> + <widget class="GtkLabel" id="label54"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">6</property> - <property name="xalign">1</property> - <property name="adjustment">6 -1 100 0.10000000000000001 10 0</property> - <property name="digits">2</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Seed Time Ratio:</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"></property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label55"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Seed Time (m):</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2753,37 +2756,36 @@ Disabled</property> </packing> </child> <child> - <widget class="GtkLabel" id="label55"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Seed Time (m):</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label54"> + <widget class="GtkSpinButton" id="spin_seed_time_ratio_limit"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Seed Time Ratio:</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <property name="xalign">1</property> + <property name="adjustment">6 -1 100 0.10000000000000001 10 0</property> + <property name="digits">2</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> + <property name="x_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label53"> + <widget class="GtkSpinButton" id="spin_seed_time_limit"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Share Ratio Limit:</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <property name="xalign">1</property> + <property name="adjustment">6 -1 100 1 10 0</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <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"></property> </packing> </child> </widget> @@ -2896,9 +2898,9 @@ Disabled</property> <property name="label" translatable="yes">page 12</property> </widget> <packing> + <property name="type">tab</property> <property name="position">6</property> <property name="tab_fill">False</property> - <property name="type">tab</property> </packing> </child> <child> @@ -2962,48 +2964,47 @@ Disabled</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkLabel" id="label62"> + <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="xalign">0</property> - <property name="label" translatable="yes">Username:</property> + <property name="label" translatable="yes">Password:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_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="GtkLabel" id="label63"> + <widget class="GtkEntry" id="txt_proxy_password_peer"> <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="xalign">0</property> - <property name="label" translatable="yes">Type:</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> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_proxy_type_peer"> + <widget class="GtkLabel" id="label60"> <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="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Host:</property> </widget> <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="GtkEntry" id="txt_proxy_username_peer"> + <widget class="GtkEntry" id="txt_proxy_server_peer"> <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> @@ -3011,8 +3012,19 @@ HTTP W/ Auth</property> <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="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label73"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3040,19 +3052,7 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkLabel" id="label73"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="txt_proxy_server_peer"> + <widget class="GtkEntry" id="txt_proxy_username_peer"> <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> @@ -3060,47 +3060,49 @@ HTTP W/ Auth</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="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label60"> + <widget class="GtkComboBox" id="combo_proxy_type_peer"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Host:</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> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_proxy_password_peer"> + <widget class="GtkLabel" id="label63"> <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="visibility">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</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="GtkLabel" id="label61"> + <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="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Username:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3138,48 +3140,47 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkLabel" id="label92"> + <widget class="GtkLabel" id="label88"> <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="xalign">0</property> - <property name="label" translatable="yes">Username:</property> + <property name="label" translatable="yes">Password:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_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="GtkLabel" id="label91"> + <widget class="GtkEntry" id="txt_proxy_password_web_seed"> <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="xalign">0</property> - <property name="label" translatable="yes">Type:</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> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_proxy_type_web_seed"> + <widget class="GtkLabel" id="label89"> <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="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Host:</property> </widget> <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="GtkEntry" id="txt_proxy_username_web_seed"> + <widget class="GtkEntry" id="txt_proxy_server_web_seed"> <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> @@ -3187,8 +3188,19 @@ HTTP W/ Auth</property> <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="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label90"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3216,19 +3228,7 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkLabel" id="label90"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="txt_proxy_server_web_seed"> + <widget class="GtkEntry" id="txt_proxy_username_web_seed"> <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> @@ -3236,47 +3236,49 @@ HTTP W/ Auth</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="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label89"> + <widget class="GtkComboBox" id="combo_proxy_type_web_seed"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Host:</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> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_proxy_password_web_seed"> + <widget class="GtkLabel" id="label91"> <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="visibility">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</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="GtkLabel" id="label88"> + <widget class="GtkLabel" id="label92"> <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="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Username:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3317,48 +3319,47 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkLabel" id="label98"> + <widget class="GtkLabel" id="label94"> <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="xalign">0</property> - <property name="label" translatable="yes">Username:</property> + <property name="label" translatable="yes">Password:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_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="GtkLabel" id="label97"> + <widget class="GtkEntry" id="txt_proxy_password_tracker"> <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="xalign">0</property> - <property name="label" translatable="yes">Type:</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> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_proxy_type_tracker"> + <widget class="GtkLabel" id="label95"> <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="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Host:</property> </widget> <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="GtkEntry" id="txt_proxy_username_tracker"> + <widget class="GtkEntry" id="txt_proxy_server_tracker"> <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> @@ -3366,8 +3367,19 @@ HTTP W/ Auth</property> <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="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label96"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3395,19 +3407,7 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkLabel" id="label96"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="txt_proxy_server_tracker"> + <widget class="GtkEntry" id="txt_proxy_username_tracker"> <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> @@ -3415,47 +3415,49 @@ HTTP W/ Auth</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="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label95"> + <widget class="GtkComboBox" id="combo_proxy_type_tracker"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Host:</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> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_proxy_password_tracker"> + <widget class="GtkLabel" id="label97"> <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="visibility">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</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="GtkLabel" id="label94"> + <widget class="GtkLabel" id="label98"> <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="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Username:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3496,48 +3498,47 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkLabel" id="label104"> + <widget class="GtkLabel" id="label100"> <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="xalign">0</property> - <property name="label" translatable="yes">Username:</property> + <property name="label" translatable="yes">Password:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_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="GtkLabel" id="label103"> + <widget class="GtkEntry" id="txt_proxy_password_dht"> <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="xalign">0</property> - <property name="label" translatable="yes">Type:</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> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_proxy_type_dht"> + <widget class="GtkLabel" id="label101"> <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="items" translatable="yes">None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Host:</property> </widget> <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="GtkEntry" id="txt_proxy_username_dht"> + <widget class="GtkEntry" id="txt_proxy_server_dht"> <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> @@ -3545,8 +3546,19 @@ HTTP W/ Auth</property> <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="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label102"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3574,19 +3586,7 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkLabel" id="label102"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="txt_proxy_server_dht"> + <widget class="GtkEntry" id="txt_proxy_username_dht"> <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> @@ -3594,47 +3594,49 @@ HTTP W/ Auth</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="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label101"> + <widget class="GtkComboBox" id="combo_proxy_type_dht"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Host:</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> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_proxy_password_dht"> + <widget class="GtkLabel" id="label103"> <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="visibility">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Type:</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="GtkLabel" id="label100"> + <widget class="GtkLabel" id="label104"> <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="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Username:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -3739,27 +3741,18 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkFileChooserButton" id="combo_ntf_sound_path"> - <property name="visible">True</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="GtkCheckButton" id="chk_ntf_tray_blink"> + <widget class="GtkCheckButton" id="chk_ntf_sound"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Blinking tray icon</property> + <property name="tooltip" translatable="yes">Only OGG and WAV files are supported</property> + <property name="label" translatable="yes">Sound:</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> - <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> @@ -3781,19 +3774,28 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="chk_ntf_sound"> + <widget class="GtkCheckButton" id="chk_ntf_tray_blink"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Only OGG and WAV files are supported</property> - <property name="label" translatable="yes">Sound:</property> + <property name="label" translatable="yes">Blinking tray icon</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkFileChooserButton" id="combo_ntf_sound_path"> + <property name="visible">True</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> </widget> @@ -3834,67 +3836,109 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkCheckButton" id="chk_ntf_email"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Security:</property> </widget> <packing> - <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_ntf_email"> + <widget class="GtkHBox" id="hbox16"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="spacing">5</property> + <child> + <widget class="GtkRadioButton" id="rad_ntf_none"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">None</property> + <property name="response_id">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkRadioButton" id="rad_ntf_ssl"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">SSL</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <property name="group">rad_ntf_none</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkRadioButton" id="rad_ntf_tls"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">TLS</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <property name="group">rad_ntf_none</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </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="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label76"> + <widget class="GtkLabel" id="label69"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Address:</property> + <property name="label" translatable="yes">Password:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_ntf_server"> + <widget class="GtkEntry" id="txt_ntf_pass"> <property name="visible">True</property> <property name="can_focus">True</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> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="label74"> + <widget class="GtkLabel" id="label68"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Server:</property> + <property name="label" translatable="yes">Username:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -3910,109 +3954,67 @@ HTTP W/ Auth</property> </packing> </child> <child> - <widget class="GtkLabel" id="label68"> + <widget class="GtkLabel" id="label74"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Username:</property> + <property name="label" translatable="yes">Server:</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="txt_ntf_pass"> + <widget class="GtkEntry" id="txt_ntf_server"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="visibility">False</property> </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="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkLabel" id="label69"> + <widget class="GtkLabel" id="label76"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">Address:</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox16"> + <widget class="GtkEntry" id="txt_ntf_email"> <property name="visible">True</property> - <property name="spacing">5</property> - <child> - <widget class="GtkRadioButton" id="rad_ntf_none"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">None</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkRadioButton" id="rad_ntf_ssl"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">SSL</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <property name="group">rad_ntf_none</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkRadioButton" id="rad_ntf_tls"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">TLS</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <property name="group">rad_ntf_none</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkCheckButton" id="chk_ntf_email"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Security:</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enable</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </widget> @@ -4150,129 +4152,129 @@ HTTP W/ Auth</property> <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> - <widget class="GtkLabel" id="label_plugin_email"> + <widget class="GtkLabel" id="label_plugin_details"> <property name="visible">True</property> <property name="xalign">0</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="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label_plugin_homepage"> + <widget class="GtkLabel" id="label_plugin_version"> <property name="visible">True</property> <property name="xalign">0</property> </widget> <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="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label87"> + <widget class="GtkLabel" id="label_plugin_author"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Author Email:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label86"> + <widget class="GtkLabel" id="label85"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Homepage:</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Details:</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label82"> + <widget class="GtkLabel" id="label84"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Author:</property> + <property name="label" translatable="yes">Version:</property> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label84"> + <widget class="GtkLabel" id="label82"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Version:</property> + <property name="label" translatable="yes">Author:</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label85"> + <widget class="GtkLabel" id="label86"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Details:</property> + <property name="label" translatable="yes">Homepage:</property> </widget> <packing> - <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> <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label_plugin_author"> + <widget class="GtkLabel" id="label87"> <property name="visible">True</property> <property name="xalign">0</property> + <property name="label" translatable="yes">Author Email:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label_plugin_version"> + <widget class="GtkLabel" id="label_plugin_homepage"> <property name="visible">True</property> <property name="xalign">0</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="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label_plugin_details"> + <widget class="GtkLabel" id="label_plugin_email"> <property name="visible">True</property> <property name="xalign">0</property> </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="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> |