summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Tibbitts <zach@collegegeek.org>2006-12-04 23:59:45 +0000
committerZach Tibbitts <zach@collegegeek.org>2006-12-04 23:59:45 +0000
commit9522863ac3d079c3c92d1d90386d3f73b0b4ac3e (patch)
tree4d72b5d9417f936da02beef566ba30dee8a26f7c
parenta292ef1282191f00499a84b70bdb3dda39dad968 (diff)
downloaddeluge-9522863ac3d079c3c92d1d90386d3f73b0b4ac3e.tar.gz
deluge-9522863ac3d079c3c92d1d90386d3f73b0b4ac3e.tar.bz2
deluge-9522863ac3d079c3c92d1d90386d3f73b0b4ac3e.zip
more work
-rw-r--r--dcommon.py2
-rwxr-xr-xdelugegtk.py30
-rw-r--r--glade/delugegtk.glade1451
3 files changed, 788 insertions, 695 deletions
diff --git a/dcommon.py b/dcommon.py
index 6c479fec1..30ff9a7a0 100644
--- a/dcommon.py
+++ b/dcommon.py
@@ -6,7 +6,7 @@
import sys, os, webbrowser
-PROGRAM_NAME = "Deluge Torrent"
+PROGRAM_NAME = "Deluge"
PROGRAM_VERSION = "0.5"
DELUGE_DIR = os.path.abspath(os.path.dirname(sys.argv[0]))
GLADE_DIR = DELUGE_DIR + "/glade"
diff --git a/delugegtk.py b/delugegtk.py
index 54eb5beca..712acc4bb 100755
--- a/delugegtk.py
+++ b/delugegtk.py
@@ -27,6 +27,9 @@ class DelugeGTK:
"new_torrent": self.new_torrent,
"add_torrent": self.add_torrent,
"pref_clicked": self.show_preferences_dialog,
+ "plugins_clicked": self.show_plugins_dialog,
+ ## Torrent Menu
+ "show_info": self.show_info_pane,
## Help Menu
"show_about_dialog": self.show_about_dialog,
}
@@ -43,6 +46,7 @@ class DelugeGTK:
dcommon.get_pixmap("deluge256.png")))
## Create the preferences dialog
self.prf = self.wtree.get_widget("pref_dialog")
+ self.prf.set_icon_from_file(dcommon.get_pixmap("deluge32.png"))
@@ -52,15 +56,31 @@ class DelugeGTK:
def add_torrent(self, obj):
pass
- def show_about_dialog(self, obj):
- self.abt.show_all()
- self.abt.run()
- self.abt.hide_all()
-
def show_preferences_dialog(self, obj):
self.prf.show_all()
+ self.wtree.get_widget("pref_notebook").set_current_page(0)
+ self.prf.run()
+ self.prf.hide_all()
+
+ def show_plugins_dialog(self, obj):
+ self.prf.show_all()
+ self.wtree.get_widget("pref_notebook").set_current_page(2)
self.prf.run()
self.prf.hide_all()
+
+ def show_info_pane(self, obj):
+ if(obj.get_active()):
+ self.wtree.get_widget("torrent_info").show()
+ else:
+ self.wtree.get_widget("torrent_info").hide()
+
+
+
+ def show_about_dialog(self, obj):
+ self.abt.show_all()
+ self.abt.run()
+ self.abt.hide_all()
+
if __name__ == "__main__":
diff --git a/glade/delugegtk.glade b/glade/delugegtk.glade
index 44890240f..ad555ab58 100644
--- a/glade/delugegtk.glade
+++ b/glade/delugegtk.glade
@@ -5,6 +5,8 @@
<widget class="GtkWindow" id="main_window">
<property name="visible">True</property>
<property name="title">Deluge</property>
+ <property name="default_width">640</property>
+ <property name="default_height">480</property>
<signal name="destroy" handler="quit"/>
<signal name="destroy_event" handler="quit"/>
<signal name="delete_event" handler="delete"/>
@@ -14,374 +16,17 @@
<property name="n_rows">4</property>
<property name="n_columns">3</property>
<child>
- <widget class="GtkToolbar" id="tb_middle">
- <property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</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="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolbar" id="tb_left">
+ <widget class="GtkStatusbar" id="statusbar1">
<property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
- <property name="show_arrow">False</property>
- <child>
- <widget class="GtkToolButton" id="toolbutton1">
- <property name="visible">True</property>
- <property name="label">Add Torrent</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-add</property>
- <property name="tooltip" translatable="yes">Add Torrent</property>
- <signal name="clicked" handler="add_torrent"/>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_remove">
- <property name="visible">True</property>
- <property name="label">Remove Torrent</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-remove</property>
- <property name="tooltip" translatable="yes">Remove Torrent</property>
- <signal name="clicked" handler="remove_torrent"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorToolItem" id="toolbutton6">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_update">
- <property name="visible">True</property>
- <property name="label">Update Tracker</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-refresh</property>
- <property name="tooltip" translatable="yes">Update Tracker</property>
- <signal name="clicked" handler="update_tracker"/>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton3">
- <property name="visible">True</property>
- <property name="label">Clear Finished</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-clear</property>
- <property name="tooltip" translatable="yes">Clear Finished Torrents</property>
- <signal name="clicked" handler="clear_finished"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_pause">
- <property name="visible">True</property>
- <property name="label">Force Pause/Resume Torrent</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-media-pause</property>
- <property name="tooltip" translatable="yes">Force Pause/Resume Torrent</property>
- <signal name="clicked" handler="pause_torrent"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_up">
- <property name="visible">True</property>
- <property name="label">Move Up</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-go-up</property>
- <property name="tooltip" translatable="yes">Queue Torrent Up</property>
- <signal name="clicked" handler="torrent_up"/>
- </widget>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_down">
- <property name="visible">True</property>
- <property name="label">Move Down</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-go-down</property>
- <property name="tooltip" translatable="yes">Queue Torrent Down</property>
- <signal name="clicked" handler="torrent_down"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem" id="menu_file">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menuitem1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="menuitem1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Create a Torrent</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="new_torrent"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image10">
- <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 | GDK_ENTER_NOTIFY_MASK</property>
- <property name="stock">gtk-new</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menu_addtorrent1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add a Torrent...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="add_torrent"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menu_removetorrent">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Remove selected Torrent</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="remove_torrent"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image28">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem9">
- <property name="visible">True</property>
- <property name="label">gtk-preferences</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="pref_clicked"/>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="plugins1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Manage Plugins</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="manageplugins_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image8">
- <property name="visible">True</property>
- <property name="stock">gtk-disconnect</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="imagemenuitem1">
- <property name="visible">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="menu_quit"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menu_torrent">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Torrent</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkCheckMenuItem" id="menushowinfo">
- <property name="visible">True</property>
- <property name="active">True</property>
- <property name="label" translatable="yes">Show Info Pane</property>
- <property name="use_underline">True</property>
- <signal name="toggled" handler="show_info_pane_clicked"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menu_q_to_bottom">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Queue to Bottom</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="torrent_bottom"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image9">
- <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 | GDK_ENTER_NOTIFY_MASK</property>
- <property name="stock">gtk-goto-bottom</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem5">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menu_update_tracker">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Update Tracker</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="update_tracker"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image29">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Clear Finished</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="clear_finished"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image30">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menu_help">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menuitem2_menu">
- <child>
- <widget class="GtkImageMenuItem" id="menu_forums">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Open the online support forums in your web browser</property>
- <property name="label" translatable="yes">Deluge Support _Forums</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="open_forums"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="stock">gtk-network</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Translate This Application...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="translate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image32">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem4">
- <property name="visible">True</property>
- <property name="label">gtk-about</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="show_about_dialog"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
</widget>
<packing>
<property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkToolbar" id="tb_right">
- <property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
- <property name="show_arrow">False</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>
- <property name="x_options"></property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<widget class="GtkVPaned" id="vpaned1">
<property name="visible">True</property>
<child>
@@ -405,7 +50,7 @@
</packing>
</child>
<child>
- <widget class="GtkNotebook" id="torrentInfo">
+ <widget class="GtkNotebook" id="torrent_info">
<property name="visible">True</property>
<property name="enable_popup">True</property>
<child>
@@ -430,173 +75,156 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="summary_compact_allocation">
+ <widget class="GtkLabel" id="summary_title">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="right_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label177">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Use compact storage allocation:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Total Size:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Name:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Total Downloaded:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="summary_tracker_response">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_tracker">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Percentage Done:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_uploaded_this_session">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Downloaded this session:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_share_ratio">
+ <widget class="GtkLabel" id="summary_total_size">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="summary_total_downloaded">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Uploaded This Session:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <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">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="summary_percentage_done">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Share Ratio:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_total_uploaded">
+ <widget class="GtkLabel" id="summary_downloaded_this_session">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_pieces">
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Tracker:&lt;/b&gt;</property>
+ <property name="use_markup">True</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>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Total Uploaded:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Tracker Response:&lt;/b&gt;</property>
<property name="use_markup">True</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>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Pieces:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Tracker Status:&lt;/b&gt;</property>
<property name="use_markup">True</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>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_next_announce">
+ <widget class="GtkLabel" id="summary_tracker_status">
<property name="visible">True</property>
<property name="xalign">0</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
@@ -616,158 +244,175 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_tracker_status">
+ <widget class="GtkLabel" id="summary_next_announce">
<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="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Tracker Status:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Pieces:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <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="label10">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Tracker Response:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Total Uploaded:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <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="GtkLabel" id="label9">
+ <widget class="GtkLabel" id="summary_pieces">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Tracker:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <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="summary_downloaded_this_session">
+ <widget class="GtkLabel" id="summary_total_uploaded">
<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="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_percentage_done">
+ <widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Share Ratio:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_total_downloaded">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Uploaded This Session:&lt;/b&gt;</property>
+ <property name="use_markup">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="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_total_size">
+ <widget class="GtkLabel" id="summary_share_ratio">
<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="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="summary_uploaded_this_session">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Downloaded this session:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
</widget>
<packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="summary_tracker">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Percentage Done:&lt;/b&gt;</property>
- <property name="use_markup">True</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">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="summary_tracker_response">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Total Downloaded:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label177">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Total Size:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Name:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;b&gt;Use compact storage allocation:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="summary_title">
+ <widget class="GtkLabel" id="summary_compact_allocation">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
</packing>
</child>
</widget>
@@ -863,21 +508,380 @@
</packing>
</child>
<child>
- <widget class="GtkStatusbar" id="statusbar1">
+ <widget class="GtkToolbar" id="tb_right">
<property name="visible">True</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+ <property name="show_arrow">False</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>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkMenuItem" id="menu_file">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="menuitem1_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Create a Torrent</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="new_torrent"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image10">
+ <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 | GDK_ENTER_NOTIFY_MASK</property>
+ <property name="stock">gtk-new</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_addtorrent1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Add a Torrent...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="add_torrent"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image27">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_removetorrent">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Remove selected Torrent</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="remove_torrent"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image28">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem9">
+ <property name="visible">True</property>
+ <property name="label">gtk-preferences</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="pref_clicked"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="plugins1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Manage Plugins</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="plugins_clicked"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image8">
+ <property name="visible">True</property>
+ <property name="stock">gtk-disconnect</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="imagemenuitem1">
+ <property name="visible">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="menu_quit"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="menu_torrent">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Torrent</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_show_info">
+ <property name="visible">True</property>
+ <property name="active">True</property>
+ <property name="label" translatable="yes">Show Info Pane</property>
+ <property name="use_underline">True</property>
+ <signal name="toggled" handler="show_info"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_q_to_bottom">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Queue to Bottom</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="torrent_bottom"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image9">
+ <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 | GDK_ENTER_NOTIFY_MASK</property>
+ <property name="stock">gtk-goto-bottom</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem5">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_update_tracker">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Update Tracker</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="update_tracker"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image29">
+ <property name="visible">True</property>
+ <property name="stock">gtk-refresh</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Clear Finished</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="clear_finished"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image30">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="menu_help">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="menuitem2_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_forums">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Open the online support forums in your web browser</property>
+ <property name="label" translatable="yes">Deluge Support _Forums</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="open_forums"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image31">
+ <property name="visible">True</property>
+ <property name="stock">gtk-network</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Translate This Application...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="translate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image32">
+ <property name="visible">True</property>
+ <property name="stock">gtk-edit</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem4">
+ <property name="visible">True</property>
+ <property name="label">gtk-about</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="show_about_dialog"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkToolbar" id="tb_left">
+ <property name="visible">True</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton1">
+ <property name="visible">True</property>
+ <property name="label">Add Torrent</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-add</property>
+ <property name="tooltip" translatable="yes">Add Torrent</property>
+ <signal name="clicked" handler="add_torrent"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_remove">
+ <property name="visible">True</property>
+ <property name="label">Remove Torrent</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-remove</property>
+ <property name="tooltip" translatable="yes">Remove Torrent</property>
+ <signal name="clicked" handler="remove_torrent"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorToolItem" id="toolbutton6">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_update">
+ <property name="visible">True</property>
+ <property name="label">Update Tracker</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-refresh</property>
+ <property name="tooltip" translatable="yes">Update Tracker</property>
+ <signal name="clicked" handler="update_tracker"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton3">
+ <property name="visible">True</property>
+ <property name="label">Clear Finished</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-clear</property>
+ <property name="tooltip" translatable="yes">Clear Finished Torrents</property>
+ <signal name="clicked" handler="clear_finished"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_pause">
+ <property name="visible">True</property>
+ <property name="label">Force Pause/Resume Torrent</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-media-pause</property>
+ <property name="tooltip" translatable="yes">Force Pause/Resume Torrent</property>
+ <signal name="clicked" handler="pause_torrent"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_up">
+ <property name="visible">True</property>
+ <property name="label">Move Up</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-go-up</property>
+ <property name="tooltip" translatable="yes">Queue Torrent Up</property>
+ <signal name="clicked" handler="torrent_up"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkToolButton" id="toolbutton_down">
+ <property name="visible">True</property>
+ <property name="label">Move Down</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-go-down</property>
+ <property name="tooltip" translatable="yes">Queue Torrent Down</property>
+ <signal name="clicked" handler="torrent_down"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkToolbar" id="tb_middle">
+ <property name="visible">True</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</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="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
<widget class="GtkDialog" id="pref_dialog">
+ <property name="width_request">480</property>
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Preferences Dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
@@ -885,10 +889,10 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkNotebook" id="notebook1">
+ <widget class="GtkNotebook" id="pref_notebook">
<property name="visible">True</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
+ <widget class="GtkScrolledWindow" id="gen_options">
<property name="visible">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -898,6 +902,53 @@
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="resize_mode">GTK_RESIZE_IMMEDIATE</property>
+ <child>
+ <widget class="GtkExpander" id="expander6">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkTable" id="table5">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="chk_min_on_close">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Minimize to tray on close</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Options</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
<child>
<widget class="GtkExpander" id="expander1">
<property name="visible">True</property>
@@ -907,20 +958,23 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton1">
+ <widget class="GtkFileChooserButton" id="filechooserbutton1">
+ <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Ask me where to save each download</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>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton2">
+ <widget class="GtkRadioButton" id="radio_save_all_too">
<property name="visible">True</property>
<property name="label" translatable="yes">Save all downloads to:</property>
<property name="draw_indicator">True</property>
+ <property name="group">radio_ask_save</property>
</widget>
<packing>
<property name="top_attach">1</property>
@@ -928,15 +982,13 @@
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="filechooserbutton1">
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <widget class="GtkRadioButton" id="radio_ask_save">
<property name="visible">True</property>
+ <property name="label" translatable="yes">Ask me where to save each download</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>
</packing>
</child>
</widget>
@@ -953,24 +1005,19 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkExpander" id="expander2">
<property name="visible">True</property>
+ <property name="expanded">True</property>
<child>
<widget class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="n_rows">1</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop seeding torrents when their share ratio reaches:</property>
- <property name="draw_indicator">True</property>
- </widget>
- </child>
- <child>
<widget class="GtkSpinButton" id="spinbutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -984,6 +1031,14 @@
<property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Stop seeding torrents when
+their share ratio reaches:</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
@@ -998,16 +1053,17 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkExpander" id="expander3">
<property name="visible">True</property>
+ <property name="expanded">True</property>
<child>
<widget class="GtkCheckButton" id="checkbutton2">
<property name="visible">True</property>
- <property name="label" translatable="yes">Use compact storage allocation (Saves space)</property>
+ <property name="label" translatable="yes">Use compact storage allocation</property>
<property name="draw_indicator">True</property>
</widget>
</child>
@@ -1023,9 +1079,15 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -1047,198 +1109,210 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkScrolledWindow" id="net_options">
<property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
- <widget class="GtkExpander" id="expander5">
+ <widget class="GtkViewport" id="viewport3">
<property name="visible">True</property>
<child>
- <widget class="GtkTable" id="table6">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">4</property>
- <child>
- <widget class="GtkButton" id="button6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Test Port</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="label28">
- <property name="visible">True</property>
- <property name="label" translatable="yes">label</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="label27">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Active port:</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>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinbutton3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- </packing>
- </child>
<child>
- <widget class="GtkSpinButton" id="spinbutton2">
+ <widget class="GtkExpander" id="expander5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <child>
+ <widget class="GtkTable" id="table6">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Try from:</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">to:</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Active port:</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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label</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="GtkButton" id="button6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Test Port</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>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">TCP Port</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkExpander" id="expander4">
<property name="visible">True</property>
- <property name="label" translatable="yes">to:</property>
+ <child>
+ <widget class="GtkTable" id="table7">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</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="GtkSpinButton" id="spinbutton6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bandwidth</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Try from:</property>
- </widget>
- </child>
- <child>
<placeholder/>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="label" translatable="yes">TCP Port</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
</widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="expander4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkTable" id="table7">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinbutton7">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinbutton6">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</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>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinbutton5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</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="GtkSpinButton" id="spinbutton4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 10 10</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>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bandwidth</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</widget>
<packing>
@@ -1259,22 +1333,16 @@
</packing>
</child>
<child>
- <widget class="GtkTable" id="table5">
+ <widget class="GtkTable" id="plugins_options">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkViewport" id="viewport3">
+ <widget class="GtkTreeView" id="treeview1">
<property name="visible">True</property>
- <child>
- <widget class="GtkTextView" id="textview1">
- <property name="visible">True</property>
- </widget>
- </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -1316,11 +1384,16 @@
</packing>
</child>
<child>
- <widget class="GtkTreeView" id="treeview1">
+ <widget class="GtkTextView" id="textview1">
<property name="visible">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
</widget>
<packing>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_padding">10</property>
+ <property name="y_padding">10</property>
</packing>
</child>
</widget>