diff --git a/TODO b/TODO
index ec6fa203f..dd29a621d 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ For 0.6 release:
* Anonymous stats
* Update checking
* Translations
-* Show proper priority levels in Files tab, plus add menu to alter priorities
* Implement add by hash
* Implement 'Classic' mode
* Add tabs to view menu
diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 31c48e637..2051385d7 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -1430,7 +1430,7 @@
True
6
1
- -1 -1 99999 0.10000000000000001 10 10
+ -1 -1 99999 1 10 10
1
@@ -1448,7 +1448,7 @@
True
6
1
- -1 -1 999999 0.10000000000000001 10 10
+ -1 -1 999999 1 10 10
1
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 6b4c47444..bf2046356 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -1,6 +1,6 @@
-
+
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -1115,40 +1115,71 @@ Disabled
2
15
-
+
True
- True
- The maximum upload slots for all torrents. Set -1 for unlimited.
- 1
- -1 -1 9000 1 10 10
- 1
- True
- True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Upload Speed (KiB/s):
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 0
+ Maximum Connections:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Upload Slots:
- 1
- 2
1
2
GTK_FILL
-
+
True
True
- The maximum upload speed for all torrents. Set -1 for unlimited.
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 4
1
-1 -1 9000 1 10 10
1
- 1
+ True
True
+ GTK_UPDATE_IF_VALID
1
2
- 3
- 4
+ GTK_FILL
+
+
+
+
+ True
+ The maximum download speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Download Speed (KiB/s):
+
+
+ 2
+ 3
GTK_FILL
@@ -1173,74 +1204,43 @@ Disabled
-
+
True
- The maximum download speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Download Speed (KiB/s):
+ True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 1
+ -1 -1 9000 1 10 10
+ 1
+ 1
+ True
- 2
- 3
+ 1
+ 2
+ 3
+ 4
GTK_FILL
-
+
True
True
- The maximum number of connections allowed. Set -1 for unlimited.
- 4
+ The maximum upload slots for all torrents. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
1
True
True
- GTK_UPDATE_IF_VALID
1
2
- GTK_FILL
-
-
-
-
- True
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Slots:
-
-
1
2
GTK_FILL
-
-
- True
- The maximum number of connections allowed. Set -1 for unlimited.
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
- True
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Speed (KiB/s):
-
-
- 3
- 4
- GTK_FILL
-
-
@@ -1284,85 +1284,18 @@ Disabled
2
15
-
- True
- True
- The maximum upload slots per torrent. Set -1 for unlimited.
- 1
- -1 -1 9000 1 10 10
- 1
- True
- True
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
+
True
True
The maximum number of connections per torrent. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
- True
+ 1
True
1
2
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Upload Slots:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Download Speed (KiB/s):
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Upload Speed (KiB/s):
-
-
3
4
GTK_FILL
@@ -1387,20 +1320,87 @@ Disabled
-
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Upload Speed (KiB/s):
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Download Speed (KiB/s):
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Upload Slots:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Connections:
+
+
+ GTK_FILL
+
+
+
+
True
True
The maximum number of connections per torrent. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
- 1
+ True
True
1
2
- 3
- 4
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum upload slots per torrent. Set -1 for unlimited.
+ 1
+ -1 -1 9000 1 10 10
+ 1
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
GTK_FILL
@@ -1635,119 +1635,6 @@ Disabled
2
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- GTK_SHADOW_NONE
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 2
- 12
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 2
- 2
- 10
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Open folder with:
- 0
- True
- True
-
-
-
- GTK_FILL
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Custom:
- 0
- True
- True
- radio_open_folder_stock
-
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Auto-detect (xdg-open)
-Konqueror
-Nautilus
-Thunar
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- False
-
-
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- <b>Desktop File Manager</b>
- True
-
-
- label_item
-
-
-
-
- False
- False
- 5
- 3
-
-
True
@@ -1788,7 +1675,7 @@ Thunar
False
False
- 4
+ 3
@@ -2280,21 +2167,27 @@ Thunar
2
10
-
+
True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
- -1 -1 9999 1 10 10
- True
- True
+ 0
+ Total active seeding:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Total active downloading:
- 1
- 2
1
2
-
+ GTK_FILL
@@ -2314,27 +2207,21 @@ Thunar
-
+
True
+ True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Total active downloading:
+ 1
+ -1 -1 9999 1 10 10
+ True
+ True
+ 1
+ 2
1
2
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Total active seeding:
-
-
- GTK_FILL
+
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index cb1e699c4..6ca4f0446 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -72,9 +72,6 @@ DEFAULT_PREFS = {
"start_in_tray": False,
"lock_tray": False,
"tray_password": "",
- "open_folder_stock": True,
- "stock_file_manager": 0,
- "open_folder_location": "",
"check_new_releases": False,
"send_info": False,
"default_load_path": None,
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index 45f91208c..ecb09ab41 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -281,7 +281,7 @@ class Preferences(component.Component):
widget.set_sensitive(True)
if modifier == "filename":
- widget.set_filename(value)
+ widget.set_current_folder(value)
elif modifier == "active":
widget.set_active(value)
elif modifier == "not_active":
@@ -354,14 +354,6 @@ class Preferences(component.Component):
self.gtkui_config["start_in_tray"])
self.glade.get_widget("chk_lock_tray").set_active(
self.gtkui_config["lock_tray"])
- self.glade.get_widget("combo_file_manager").set_active(
- self.gtkui_config["stock_file_manager"])
- self.glade.get_widget("txt_open_folder_location").set_text(
- self.gtkui_config["open_folder_location"])
- self.glade.get_widget("radio_open_folder_stock").set_active(
- self.gtkui_config["open_folder_stock"])
- self.glade.get_widget("radio_open_folder_custom").set_active(
- not self.gtkui_config["open_folder_stock"])
## Other tab ##
self.glade.get_widget("chk_new_releases").set_active(
@@ -491,12 +483,6 @@ class Preferences(component.Component):
.hexdigest()
if passhex != "c07eb5a8c0dc7bb81c217b67f11c3b7a5e95ffd7":
new_gtkui_config["tray_password"] = passhex
- new_gtkui_config["stock_file_manager"] = \
- self.glade.get_widget("combo_file_manager").get_active()
- new_gtkui_config["open_folder_location"] = \
- self.glade.get_widget("txt_open_folder_location").get_text()
- new_gtkui_config["open_folder_stock"] = \
- self.glade.get_widget("radio_open_folder_stock").get_active()
## Other tab ##
new_gtkui_config["check_new_releases"] = \