diff --git a/glade/dgtkpref.glade b/glade/dgtkpref.glade
index 5a8450b84..8101ff0ff 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>(0 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 0 100 1 10 10
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
- 10
- 1
- 0 0 100 1 10 10
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- True
- 10
- 1
- 0 0 100 1 10 10
-
-
- 1
- 2
- 3
- 4
@@ -481,63 +449,95 @@ their share ratio reaches:
-
+
True
+ True
+ 10
+ 1
+ 0 0 100 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 0 100 1 10 10
- 3
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ True
+ 10
+ 1
+ 0 0 100 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
@@ -641,11 +641,16 @@ their share ratio reaches:
2
2
-
+
True
+ False
+ GTK_WRAP_WORD
- 2
+ 1
+ 2
+ 10
+ 10
@@ -653,8 +658,9 @@ their share ratio reaches:
True
GTK_BUTTONBOX_SPREAD
-
+
True
+ False
gtk-preferences
True
@@ -671,16 +677,11 @@ their share ratio reaches:
-
+
True
- False
- GTK_WRAP_WORD
- 1
- 2
- 10
- 10
+ 2
diff --git a/plugins/ExamplePlugin/plugin.py b/plugins/ExamplePlugin/plugin.py
index 2eb8b7831..5f17807f6 100644
--- a/plugins/ExamplePlugin/plugin.py
+++ b/plugins/ExamplePlugin/plugin.py
@@ -20,7 +20,7 @@ register_plugin("Example Plugin",
plugin_Example,
"0.2",
"An example plugin",
- config=True,
+ config=False,
default=False,
requires="0.5.0",
interface="gtk",
diff --git a/plugins/TorrentSearch/plugin.py b/plugins/TorrentSearch/plugin.py
index 3fdc923b6..bcbf8f9c1 100644
--- a/plugins/TorrentSearch/plugin.py
+++ b/plugins/TorrentSearch/plugin.py
@@ -28,8 +28,6 @@ class plugin_Search:
"text_changed" : self.text_changed }
glade.signal_autoconnect(dic)
self.view.get_selection().set_select_function(self.row_clicked)
-
-
### Note: All other plugins should use self.interface.toolbar
### when adding items to the toolbar
self.se = ''
@@ -91,10 +89,9 @@ class plugin_Search:
def configure(self, widget=None):
import dcommon, gtk, gtk.glade
-
self.dlg.show_all()
model = self.view.get_model()
- model.clear
+ model.clear()
for name in self.engines.keys():
self.view.get_model().append( (name, self.engines.get(name)) )
self.button_add.set_sensitive(0)
@@ -107,8 +104,8 @@ class plugin_Search:
while the_iter is not None:
self.engines.set(model.get_value(the_iter, 0), model.get_value(the_iter, 1))
the_iter = model.iter_next(the_iter)
- else:
- pass
+ self.engines.save_to_file(self.conf_file)
+ self.populate_search_menu()
diff --git a/plugins/TorrentSearch/searchdlg.glade b/plugins/TorrentSearch/searchdlg.glade
index 9d12ff8e4..e30703a9a 100644
--- a/plugins/TorrentSearch/searchdlg.glade
+++ b/plugins/TorrentSearch/searchdlg.glade
@@ -1,6 +1,6 @@
-
+
5
@@ -16,6 +16,103 @@
True
4
4
+
+
+ True
+ gtk-add
+ True
+
+
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+
+
+
+
+ 4
+
+
+
+
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+
+
+
+ 1
+ 4
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ Name:
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ URL:
+
+
+ 2
+ 3
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ gtk-remove
+ True
+
+
+
+ 3
+ 4
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
True
@@ -46,103 +143,6 @@ URL: http://www.google.com/search?q=${query}
4
-
-
- True
- gtk-remove
- True
-
-
-
- 3
- 4
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- URL:
-
-
- 2
- 3
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- Name:
-
-
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
-
-
-
- 1
- 4
- 2
- 3
- GTK_FILL
-
-
-
-
- True
-
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GTK_POLICY_AUTOMATIC
-
-
- True
-
-
-
-
- 4
-
-
-
-
- True
- gtk-add
- True
-
-
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
1
diff --git a/src/delugegtk.py b/src/delugegtk.py
index e6a975b18..9d5e8d359 100755
--- a/src/delugegtk.py
+++ b/src/delugegtk.py
@@ -187,9 +187,24 @@ class DelugeGTK(dbus.service.Object):
self.plugin_view = self.prf_glade.get_widget("plugin_view")
self.plugin_store = gtk.ListStore(str, bool)
self.plugin_view.set_model(self.plugin_store)
- dgtk.add_text_column(self.plugin_view, "Name", 0)
+ self.plugin_view.get_selection().set_select_function(self.plugin_clicked, full=True
+ )
+ name_col = dgtk.add_text_column(self.plugin_view, "Name", 0)
+ name_col.set_expand(True)
dgtk.add_toggle_column(self.plugin_view, "Enabled", 1, toggled_signal=self.plugin_toggled)
self.prf_glade.signal_autoconnect({'plugin_pref': self.plugin_pref})
+
+ def plugin_clicked(self, selection, model, path, is_selected):
+ if is_selected:
+ return True
+ name = model.get_value(model.get_iter(path), 0)
+ plugin = self.plugins.get_plugin(name)
+ version = plugin['version']
+ config = plugin['config']
+ self.prf_glade.get_widget("plugin_conf").set_sensitive(config)
+
+ self.prf_glade.get_widget("plugin_text").get_buffer().set_text("%s\n%s"%(name, version))
+ return True
def plugin_toggled(self, renderer, path):
plugin_iter = self.plugin_store.get_iter_from_string(path)
@@ -202,7 +217,6 @@ class DelugeGTK(dbus.service.Object):
self.plugins.disable_plugin(plugin_name)
def plugin_pref(self, widget=None):
- print "foobar"
(model, plugin_iter) = self.plugin_view.get_selection().get_selected()
plugin_name = self.plugin_store.get_value(plugin_iter, 0)
self.plugins.configure_plugin(plugin_name)