diff --git a/glade/dgtkpref.glade b/glade/dgtkpref.glade
index fd6a75ea1..6185f0540 100644
--- a/glade/dgtkpref.glade
+++ b/glade/dgtkpref.glade
@@ -44,6 +44,18 @@
+
+
+ True
+ Enable system tray icon
+ True
+ True
+
+
+
+ 2
+
+
True
@@ -57,18 +69,6 @@
12
-
-
- True
- Enable system tray icon
- True
- True
-
-
-
- 2
-
-
@@ -95,13 +95,15 @@
2
2
-
+
True
- Ask me where to save each download
- True
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ 1
2
+ 1
+ 2
@@ -117,15 +119,13 @@
-
+
True
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ Ask me where to save each download
+ True
- 1
2
- 1
- 2
@@ -154,14 +154,6 @@
True
1
2
-
-
- True
- Stop seeding torrents when
-their share ratio reaches:
- True
-
-
True
@@ -179,6 +171,14 @@ their share ratio reaches:
+
+
+ True
+ Stop seeding torrents when
+their share ratio reaches:
+ True
+
+
@@ -272,13 +272,53 @@ their share ratio reaches:
-
+
True
- Test Port
+ Try from:
+
+
+
+
+ True
+ to:
+
+
+ 2
+ 3
+
+
+
+
+ True
+ True
+ 0.5
+ 0 0 65535 1 10 10
+
+
+ 1
+ 2
+
+
+
+
+ True
+ True
+ 0.5
+ 0 0 65535 1 10 10
3
4
+
+
+
+
+ True
+ Active port:
+
+
+ 1
+ 2
1
2
@@ -296,57 +336,17 @@ their share ratio reaches:
-
+
True
- Active port:
-
-
- 1
- 2
- 1
- 2
-
-
-
-
- True
- True
- 0.5
- 0 0 65535 1 10 10
+ Test Port
3
4
+ 1
+ 2
-
-
- True
- True
- 0.5
- 0 0 65535 1 10 10
-
-
- 1
- 2
-
-
-
-
- True
- to:
-
-
- 2
- 3
-
-
-
-
- True
- Try from:
-
-
@@ -373,94 +373,62 @@ their share ratio reaches:
5
3
-
+
True
- 0
- Maximum Upload Rate:
+ <i>(-1 is unlimited)</i>
+ True
- 1
- 2
+ 3
-
+
True
- 0
- Maximum number of Uploads:
-
-
- 2
- 3
-
-
-
-
- True
- 0
- Maximum Download Rate:
+ KB/s
+ 2
+ 3
3
4
+
-
+
True
- 0
- Maximum number of Downloads:
+ 2
+ 3
+ 2
+ 3
+
+
+
+
+
+ True
+ KB/s
+
+
+ 2
+ 3
+ 1
+ 2
+
+
+
+
+
+ True
+
+
+ 2
+ 3
4
5
-
-
-
-
- True
- True
- 10
- 1
- 0 -1 1024 1 10 10
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
- 10
- 1
- 0 -1 100 1 10 10
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- True
- 10
- 1
- 0 -1 2048 1 10 10
-
-
- 1
- 2
- 3
- 4
@@ -481,63 +449,95 @@ their share ratio reaches:
-
+
True
+ True
+ 10
+ 1
+ 0 -1 2048 1 10 10
- 2
- 3
- 4
- 5
-
-
-
-
-
- True
- KB/s
-
-
- 2
- 3
- 1
- 2
-
-
-
-
-
- True
-
-
- 2
- 3
- 2
- 3
-
-
-
-
-
- True
- KB/s
-
-
- 2
- 3
+ 1
+ 2
3
4
-
+
True
- <i>(0 is unlimited)</i>
- True
+ True
+ 10
+ 1
+ 0 -1 100 1 10 10
- 3
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ True
+ 10
+ 1
+ 0 -1 1024 1 10 10
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ 0
+ Maximum number of Downloads:
+
+
+ 4
+ 5
+
+
+
+
+ True
+ 0
+ Maximum Download Rate:
+
+
+ 3
+ 4
+
+
+
+
+ True
+ 0
+ Maximum number of Uploads:
+
+
+ 2
+ 3
+
+
+
+
+ True
+ 0
+ Maximum Upload Rate:
+
+
+ 1
+ 2
diff --git a/scripts/deluge b/scripts/deluge
index 24557c63f..6132c5edf 100755
--- a/scripts/deluge
+++ b/scripts/deluge
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python
#
# deluge
# Copyright (C) Zach Tibbitts 2006
diff --git a/src/delugegtk.py b/src/delugegtk.py
index eb0ccdbbe..4a78ce990 100755
--- a/src/delugegtk.py
+++ b/src/delugegtk.py
@@ -367,9 +367,9 @@ class DelugeGTK(dbus.service.Object):
self.prf_glade.get_widget("spin_num_download").set_value(self.pref.get("max_number_downloads", int))
except KeyError:
pass
- self.prf.show_all()
+ self.prf.show()
result = self.prf.run()
- self.prf.hide_all()
+ self.prf.hide()
print result
if result == 1:
self.pref.set("enable_system_tray", self.prf_glade.get_widget("chk_use_tray").get_active())