diff --git a/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py
index 93e155508..dd5dadfe1 100644
--- a/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py
+++ b/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py
@@ -59,16 +59,10 @@ class GtkUI(GtkPluginBase):
if parent:
parent.remove(self.prefs)
-# chk_ap = component.get("Preferences").glade.get_widget('chk_add_paused')
-# downloads_vbox = chk_ap.get_parent().get_parent().get_parent().get_parent()
+ self.downloads_vbox = component.get("Preferences").builder.get_object('downloads_vbox')
+ self.downloads_vbox.pack_start(self.prefs, False, True, 0)
- downloads_vbox = component.get("Preferences").glade.get_widget('vbox1')
- downloads_vbox.pack_start(self.prefs, False, True, 0)
-# self.prefs.set_parent(frame)
-
-# component.get("Preferences").add_page("FreeSpace", self.glade.get_widget("prefs_box"))
- component.get("PluginManager").register_hook("on_apply_prefs",
- self.on_apply_prefs)
+ component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs)
component.get("PluginManager").register_hook("on_show_prefs",
self.on_show_prefs)
@@ -86,18 +80,13 @@ class GtkUI(GtkPluginBase):
except KeyError:
pass
- client.register_event_handler("PluginEnabledEvent",
- self.__on_plugin_enabled)
-
- client.register_event_handler("PluginDisabledEvent",
- self.__on_plugin_disabled)
+ client.register_event_handler("PluginEnabledEvent", self.__on_plugin_enabled)
+ client.register_event_handler("PluginDisabledEvent", self.__on_plugin_disabled)
def disable(self):
- component.get("Preferences").remove_page("FreeSpace")
- component.get("PluginManager").deregister_hook("on_apply_prefs",
- self.on_apply_prefs)
- component.get("PluginManager").deregister_hook("on_show_prefs",
- self.on_show_prefs)
+ self.downloads_vbox.remove(self.prefs)
+ component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs)
+ component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs)
try:
notifications = component.get("GtkPlugin.Notifications")
notifications.deregister_custom_popup_notification(
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.ui
similarity index 83%
rename from deluge/ui/gtkui/glade/preferences_dialog.glade
rename to deluge/ui/gtkui/glade/preferences_dialog.ui
index 99bd0ca96..ca089eb61 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.ui
@@ -1,8 +1,331 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
False
False
2
-
+
False
True
@@ -86,57 +409,57 @@
-
+
+
False
True
-
+
+
1
2
@@ -258,15 +581,15 @@
-
+
+
+
1
2
@@ -274,20 +597,20 @@
-
+
True
True
@@ -295,47 +618,47 @@
-
+
+
True
True
1
-
+
1
2
-
+
+
GTK_FILL
-
+
+
+
3
4
@@ -343,24 +666,24 @@
-
+
True
True
1
-
+
-
+
1
2
@@ -394,15 +717,15 @@
-
+
+
2
4
@@ -413,22 +736,19 @@
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -437,37 +757,37 @@
-
+
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -517,33 +834,33 @@
-
+
True
True
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -609,45 +923,44 @@ used sparingly.
4
-
+
-
+
-
+
-
-
+
+
+ page 6
+
False
- tab
-
+
+
True
True
@@ -769,15 +1082,15 @@ used sparingly.
-
+
False
True
@@ -785,7 +1098,7 @@ used sparingly.
-
+
+
False
True
@@ -808,12 +1121,12 @@ used sparingly.
-
+
+
False
False
@@ -821,7 +1134,7 @@ used sparingly.
-
+
+
False
True
@@ -844,15 +1157,15 @@ used sparingly.
-
+
+
+
False
False
@@ -860,24 +1173,24 @@ used sparingly.
-
+
-
+
False
True
5
-
+
True
True
@@ -885,23 +1198,20 @@ used sparingly.
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
True
@@ -910,32 +1220,32 @@ used sparingly.
-
+
False
False
@@ -995,7 +1305,7 @@ used sparingly.
-
+
+
False
True
@@ -1017,29 +1327,26 @@ used sparingly.
3
-
+
True
True
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -1047,27 +1354,27 @@ used sparingly.
-
+
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -1108,34 +1412,34 @@ used sparingly.
-
+
True
True
0
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
True
@@ -1190,53 +1491,53 @@ used sparingly.
-
+
2
3
@@ -1262,16 +1563,16 @@ used sparingly.
-
+
+
1
2
@@ -1279,16 +1580,16 @@ used sparingly.
-
+
+
1
2
@@ -1300,22 +1601,19 @@ used sparingly.
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
True
@@ -1324,36 +1622,36 @@ used sparingly.
-
+
False
False
@@ -1381,18 +1679,22 @@ used sparingly.
-
+
True
True
@@ -1400,20 +1702,24 @@ Disabled
-
+
+ liststore2
+
+
+
+ 0
+
+
+
True
True
1
-
+
False
False
@@ -1421,22 +1727,22 @@ Either
-
+
False
True
1
-
+
True
True
@@ -1465,7 +1775,7 @@ Disabled
-
+
+
False
True
@@ -1481,29 +1791,26 @@ Disabled
1
-
+
True
True
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -1511,49 +1818,48 @@ Disabled
7
-
+
-
+
-
+
1
-
-
+
+
+ page 7
+
1
False
- tab
-
+
3
4
@@ -1688,25 +1994,25 @@ Disabled
-
+
+
GTK_FILL
-
+
+
1
2
@@ -1714,22 +2020,22 @@ Disabled
-
+
+
1
2
@@ -1737,13 +2043,13 @@ Disabled
-
+
+
2
3
@@ -1751,21 +2057,21 @@ Disabled
-
+
+
1
2
@@ -1775,20 +2081,20 @@ Disabled
-
+
+
1
2
@@ -1798,20 +2104,20 @@ Disabled
-
+
+
1
2
@@ -1820,7 +2126,7 @@ Disabled
GTK_FILL
-
+
True
True
@@ -1828,12 +2134,12 @@ Disabled
-
+
-
+
True
True
@@ -1851,45 +2157,42 @@ Disabled
-
+
-
+
True
True
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -1898,14 +2201,14 @@ Disabled
-
+
GTK_FILL
-
+
+
1
2
@@ -1990,13 +2293,13 @@ Disabled
-
+
+
2
3
@@ -2004,13 +2307,13 @@ Disabled
-
+
+
3
4
@@ -2018,19 +2321,19 @@ Disabled
-
+
+
1
2
@@ -2040,19 +2343,19 @@ Disabled
-
+
+
1
2
@@ -2061,23 +2364,20 @@ Disabled
GTK_FILL
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
True
@@ -2085,49 +2385,48 @@ Disabled
3
-
+
-
+
-
+
2
-
-
+
+
+ page 8
+
2
False
- tab
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -2205,25 +2501,25 @@ Disabled
-
+
True
True
@@ -2268,15 +2564,15 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
1
2
@@ -2324,15 +2620,15 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
1
2
@@ -2342,12 +2638,12 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
2
3
@@ -2355,15 +2651,15 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
1
2
@@ -2373,12 +2669,12 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
3
4
@@ -2386,15 +2682,15 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
1
2
@@ -2404,18 +2700,18 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
2
3
@@ -2423,18 +2719,18 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
2
3
@@ -2444,18 +2740,18 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
2
3
@@ -2465,18 +2761,18 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
+
2
3
@@ -2485,43 +2781,37 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -2530,25 +2820,25 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
True
True
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -2611,24 +2898,24 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
True
True
@@ -2669,12 +2956,12 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
True
True
@@ -2693,12 +2980,12 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
True
True
@@ -2717,13 +3004,13 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
False
True
@@ -2743,24 +3030,24 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
False
True
1
-
+
-
+
True
True
5
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
True
@@ -2819,48 +3103,47 @@ status tab (<b>EXPERIMENTAL!!!</b>)
5
-
+
-
+
-
+
3
-
-
+
+
+ page 10
+
3
False
- tab
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -2956,33 +3236,33 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
False
True
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3039,40 +3316,40 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
False
False
0
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3130,33 +3404,33 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
False
False
0
-
+
-
+
False
False
5
-
+
-
+
-
+
4
-
-
+
+
+ page 11
+
4
False
- tab
-
+
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3350,21 +3620,21 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3397,21 +3664,21 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3444,26 +3708,26 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
False
False
2
-
+
False
True
@@ -3535,12 +3799,12 @@ status tab (<b>EXPERIMENTAL!!!</b>)
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
True
True
5
-
+
-
+
-
+
5
-
-
+
+
+ page 11
+
5
False
- tab
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3695,26 +3952,26 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
GTK_FILL
-
+
+
1
2
@@ -3811,20 +4068,20 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
1
2
GTK_FILL
-
+
True
True
@@ -3832,14 +4089,14 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
True
True
@@ -3847,37 +4104,34 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
True
True
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -3885,50 +4139,50 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
1
2
@@ -3968,7 +4222,7 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
1
2
@@ -3989,7 +4243,7 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+ adjustment21
+
1
2
@@ -4008,7 +4262,7 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
True
True
@@ -4016,13 +4270,13 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
False
False
@@ -4039,7 +4293,7 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
False
False
1
-
+
False
False
@@ -4067,13 +4321,13 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
True
True
2
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
2
-
+
True
True
@@ -4122,48 +4373,47 @@ status tab (<b>EXPERIMENTAL!!!</b>)
2
-
+
-
+
-
+
6
-
-
+
+
+ page 12
+
6
False
- tab
-
+
4
5
@@ -4292,13 +4542,13 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
-
+
1
2
@@ -4320,7 +4570,7 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+
1
2
@@ -4338,18 +4588,19 @@ status tab (<b>EXPERIMENTAL!!!</b>)
-
+
+ liststore4
+
+
+
+
+ 0
+
+
+
1
2
@@ -4358,48 +4609,45 @@ HTTP W/ Auth
-
+
+
GTK_FILL
-
+
+
1
2
GTK_FILL
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -4407,19 +4655,19 @@ HTTP W/ Auth
-
+
3
4
@@ -4473,7 +4721,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4490,12 +4738,12 @@ HTTP W/ Auth
-
+
+
4
5
@@ -4503,13 +4751,13 @@ HTTP W/ Auth
-
+
-
+
1
2
@@ -4531,7 +4779,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4549,18 +4797,19 @@ HTTP W/ Auth
-
+
+ liststore5
+
+
+
+
+ 0
+
+
+
1
2
@@ -4569,48 +4818,45 @@ HTTP W/ Auth
-
+
+
GTK_FILL
-
+
+
1
2
GTK_FILL
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -4618,19 +4864,19 @@ HTTP W/ Auth
-
+
3
4
@@ -4684,7 +4930,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4701,12 +4947,12 @@ HTTP W/ Auth
-
+
+
4
5
@@ -4714,13 +4960,13 @@ HTTP W/ Auth
-
+
-
+
1
2
@@ -4742,7 +4988,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4760,18 +5006,19 @@ HTTP W/ Auth
-
+
+ liststore6
+
+
+
+
+ 0
+
+
+
1
2
@@ -4780,48 +5027,45 @@ HTTP W/ Auth
-
+
+
GTK_FILL
-
+
+
1
2
GTK_FILL
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -4829,19 +5073,19 @@ HTTP W/ Auth
-
+
3
4
@@ -4897,7 +5141,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4914,12 +5158,12 @@ HTTP W/ Auth
-
+
+
4
5
@@ -4928,13 +5172,13 @@ HTTP W/ Auth
-
+
-
+
1
2
@@ -4956,7 +5200,7 @@ HTTP W/ Auth
-
+
+
1
2
@@ -4974,18 +5218,19 @@ HTTP W/ Auth
-
+
+ liststore7
+
+
+
+
+ 0
+
+
+
1
2
@@ -4994,26 +5239,26 @@ HTTP W/ Auth
-
+
+
GTK_FILL
-
+
+
1
2
@@ -5021,29 +5266,26 @@ HTTP W/ Auth
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
3
-
+
True
True
@@ -5051,39 +5293,36 @@ HTTP W/ Auth
2
-
+
-
+
-
+
7
-
+
-
- tab
-
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -5230,59 +5466,59 @@ HTTP W/ Auth
-
+
1
2
@@ -5343,22 +5579,19 @@ HTTP W/ Auth
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
True
True
@@ -5366,43 +5599,43 @@ HTTP W/ Auth
-
+
3
4
@@ -5424,11 +5657,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5436,11 +5669,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5450,11 +5683,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5464,14 +5697,14 @@ HTTP W/ Auth
-
+
+
2
3
@@ -5479,10 +5712,10 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5491,22 +5724,19 @@ HTTP W/ Auth
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
True
True
@@ -5514,42 +5744,42 @@ HTTP W/ Auth
-
+
1
2
@@ -5569,11 +5799,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5582,22 +5812,19 @@ HTTP W/ Auth
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
True
True
@@ -5605,49 +5832,46 @@ HTTP W/ Auth
-
+
False
False
0
-
+
True
True
3
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
@@ -5655,51 +5879,48 @@ HTTP W/ Auth
1
-
+
-
+
True
True
2
-
+
-
+
-
+
8
-
+
-
- tab
-
-
+
False
True
-
+
1
2
@@ -5852,24 +6073,24 @@ HTTP W/ Auth
-
+
+
GTK_FILL
-
+
+
3
4
@@ -5878,12 +6099,12 @@ HTTP W/ Auth
-
+
+
2
3
@@ -5892,11 +6113,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5906,11 +6127,11 @@ HTTP W/ Auth
-
+
+
1
2
@@ -5919,32 +6140,29 @@ HTTP W/ Auth
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
-
+
-
+
False
False
-
+
True
True
@@ -5952,28 +6170,28 @@ HTTP W/ Auth
-
+
+
-
+
False
False
@@ -6004,23 +6222,23 @@ HTTP W/ Auth
-
+
False
False
1
-
+
-
+
False
False
1
-
+
False
False
@@ -6058,27 +6276,27 @@ HTTP W/ Auth
-
+
+
-
+
False
False
0
-
+
False
False
4
-
+
-
+
-
+
- 2
+ 9
-
-
-
- tab
-
-
-
+
-
- tab
-
-
+
+
+
+
True
True
-
+
True
True
1
-
+
-
-
+
+ button_cancel
+ button_apply
+ button_ok
+
+
+
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index 6e637fc66..f95c23892 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -64,18 +64,19 @@ COLOR_STATES = {
class Preferences(component.Component):
def __init__(self):
component.Component.__init__(self, "Preferences")
- self.glade = gtk.glade.XML(deluge.common.resource_filename(
- "deluge.ui.gtkui", os.path.join("glade", "preferences_dialog.glade")
+ self.builder = gtk.Builder()
+ self.builder.add_from_file(deluge.common.resource_filename(
+ "deluge.ui.gtkui", os.path.join("glade", "preferences_dialog.ui")
))
- self.pref_dialog = self.glade.get_widget("pref_dialog")
+ self.pref_dialog = self.builder.get_object("pref_dialog")
self.pref_dialog.set_icon(common.get_deluge_icon())
- self.treeview = self.glade.get_widget("treeview")
- self.notebook = self.glade.get_widget("notebook")
+ self.treeview = self.builder.get_object("treeview")
+ self.notebook = self.builder.get_object("notebook")
self.gtkui_config = ConfigManager("gtkui.conf")
self.load_pref_dialog_state()
- self.glade.get_widget("image_magnet").set_from_file(
+ self.builder.get_object("image_magnet").set_from_file(
deluge.common.get_pixmap("magnet.png"))
# Setup the liststore for the categories (tab pages)
@@ -86,19 +87,17 @@ class Preferences(component.Component):
self.treeview.append_column(column)
# Add the default categories
i = 0
- for category in [_("Downloads"), _("Network"), _("Bandwidth"),
- _("Interface"), _("Other"), _("Daemon"), _("Queue"), _("Proxy"),
- _("Cache"), _("Plugins")]:
+ for category in (_("Downloads"), _("Network"), _("Bandwidth"), _("Interface"), _("Other"),
+ _("Daemon"), _("Queue"), _("Proxy"), _("Cache"), _("Plugins")):
self.liststore.append([i, category])
i += 1
# Setup accounts tab lisview
self.accounts_levels_mapping = None
- self.accounts_authlevel = self.glade.get_widget("accounts_authlevel")
+ self.accounts_authlevel = self.builder.get_object("accounts_authlevel")
self.accounts_liststore = gtk.ListStore(str, str, str, int)
- self.accounts_liststore.set_sort_column_id(ACCOUNTS_USERNAME,
- gtk.SORT_ASCENDING)
- self.accounts_listview = self.glade.get_widget("accounts_listview")
+ self.accounts_liststore.set_sort_column_id(ACCOUNTS_USERNAME, gtk.SORT_ASCENDING)
+ self.accounts_listview = self.builder.get_object("accounts_listview")
self.accounts_listview.append_column(
gtk.TreeViewColumn(
_("Username"), gtk.CellRendererText(), text=ACCOUNTS_USERNAME
@@ -119,12 +118,12 @@ class Preferences(component.Component):
self.accounts_listview.get_selection().connect(
"changed", self._on_accounts_selection_changed
)
- self.accounts_frame = self.glade.get_widget("AccountsFrame")
+ self.accounts_frame = self.builder.get_object("AccountsFrame")
# Setup plugin tab listview
self.plugin_liststore = gtk.ListStore(str, bool)
self.plugin_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING)
- self.plugin_listview = self.glade.get_widget("plugin_listview")
+ self.plugin_listview = self.builder.get_object("plugin_listview")
self.plugin_listview.set_model(self.plugin_liststore)
render = gtk.CellRendererToggle()
render.connect("toggled", self.on_plugin_toggled)
@@ -144,7 +143,7 @@ class Preferences(component.Component):
"changed", self.on_plugin_selection_changed
)
- self.glade.signal_autoconnect({
+ self.builder.connect_signals({
"on_pref_dialog_delete_event": self.on_pref_dialog_delete_event,
"on_button_ok_clicked": self.on_button_ok_clicked,
"on_button_apply_clicked": self.on_button_apply_clicked,
@@ -395,39 +394,39 @@ class Preferences(component.Component):
# Change a few widgets if we're connected to a remote host
if not client.is_localhost():
- self.glade.get_widget("entry_download_path").show()
- self.glade.get_widget("download_path_button").hide()
+ self.builder.get_object("entry_download_path").show()
+ self.builder.get_object("download_path_button").hide()
core_widgets.pop("download_path_button")
core_widgets["entry_download_path"] = (
"text", self.core_config["download_location"]
)
- self.glade.get_widget("entry_move_completed_path").show()
- self.glade.get_widget("move_completed_path_button").hide()
+ self.builder.get_object("entry_move_completed_path").show()
+ self.builder.get_object("move_completed_path_button").hide()
core_widgets.pop("move_completed_path_button")
core_widgets["entry_move_completed_path"] = (
"text", self.core_config["move_completed_path"]
)
- self.glade.get_widget("entry_torrents_path").show()
- self.glade.get_widget("torrent_files_button").hide()
+ self.builder.get_object("entry_torrents_path").show()
+ self.builder.get_object("torrent_files_button").hide()
core_widgets.pop("torrent_files_button")
core_widgets["entry_torrents_path"] = (
"text", self.core_config["torrentfiles_location"]
)
else:
- self.glade.get_widget("entry_download_path").hide()
- self.glade.get_widget("download_path_button").show()
- self.glade.get_widget("entry_move_completed_path").hide()
- self.glade.get_widget("move_completed_path_button").show()
- self.glade.get_widget("entry_torrents_path").hide()
- self.glade.get_widget("torrent_files_button").show()
+ self.builder.get_object("entry_download_path").hide()
+ self.builder.get_object("download_path_button").show()
+ self.builder.get_object("entry_move_completed_path").hide()
+ self.builder.get_object("move_completed_path_button").show()
+ self.builder.get_object("entry_torrents_path").hide()
+ self.builder.get_object("torrent_files_button").show()
# Update the widgets accordingly
for key in core_widgets.keys():
modifier = core_widgets[key][0]
value = core_widgets[key][1]
- widget = self.glade.get_widget(key)
+ widget = self.builder.get_object(key)
if type(widget) == gtk.FileChooserButton:
for child in widget.get_children():
child.set_sensitive(True)
@@ -449,7 +448,7 @@ class Preferences(component.Component):
widget.set_text(value)
for key in core_widgets.keys():
- widget = self.glade.get_widget(key)
+ widget = self.builder.get_object(key)
# Update the toggle status if necessary
self.on_toggle(widget)
else:
@@ -526,34 +525,34 @@ class Preferences(component.Component):
# We don't appear to be connected to a daemon
for key in core_widget_list:
- widget = self.glade.get_widget(key)
+ widget = self.builder.get_object(key)
if type(widget) == gtk.FileChooserButton:
for child in widget.get_children():
child.set_sensitive(False)
widget.set_sensitive(False)
## Downloads tab ##
- self.glade.get_widget("chk_show_dialog").set_active(
+ self.builder.get_object("chk_show_dialog").set_active(
self.gtkui_config["interactive_add"])
- self.glade.get_widget("chk_focus_dialog").set_active(
+ self.builder.get_object("chk_focus_dialog").set_active(
self.gtkui_config["focus_add_dialog"])
## Interface tab ##
- self.glade.get_widget("chk_use_tray").set_active(
+ self.builder.get_object("chk_use_tray").set_active(
self.gtkui_config["enable_system_tray"])
- self.glade.get_widget("chk_min_on_close").set_active(
+ self.builder.get_object("chk_min_on_close").set_active(
self.gtkui_config["close_to_tray"])
- self.glade.get_widget("chk_start_in_tray").set_active(
+ self.builder.get_object("chk_start_in_tray").set_active(
self.gtkui_config["start_in_tray"])
- self.glade.get_widget("chk_enable_appindicator").set_active(
+ self.builder.get_object("chk_enable_appindicator").set_active(
self.gtkui_config["enable_appindicator"])
- self.glade.get_widget("chk_lock_tray").set_active(
+ self.builder.get_object("chk_lock_tray").set_active(
self.gtkui_config["lock_tray"])
- self.glade.get_widget("chk_classic_mode").set_active(
+ self.builder.get_object("chk_classic_mode").set_active(
self.gtkui_config["classic_mode"])
- self.glade.get_widget("chk_show_rate_in_title").set_active(
+ self.builder.get_object("chk_show_rate_in_title").set_active(
self.gtkui_config["show_rate_in_title"])
- self.glade.get_widget("piecesbar_toggle").set_active(
+ self.builder.get_object("piecesbar_toggle").set_active(
self.gtkui_config["show_piecesbar"]
)
self.__set_color("completed", from_config=True)
@@ -562,7 +561,7 @@ class Preferences(component.Component):
self.__set_color("missing", from_config=True)
## Other tab ##
- self.glade.get_widget("chk_show_new_releases").set_active(
+ self.builder.get_object("chk_show_new_releases").set_active(
self.gtkui_config["show_new_releases"])
@@ -608,201 +607,201 @@ class Preferences(component.Component):
## Downloads tab ##
new_gtkui_config["interactive_add"] = \
- self.glade.get_widget("chk_show_dialog").get_active()
+ self.builder.get_object("chk_show_dialog").get_active()
new_gtkui_config["focus_add_dialog"] = \
- self.glade.get_widget("chk_focus_dialog").get_active()
+ self.builder.get_object("chk_focus_dialog").get_active()
for state in ("missing", "waiting", "downloading", "completed"):
- color = self.glade.get_widget("%s_color" % state).get_color()
+ color = self.builder.get_object("%s_color" % state).get_color()
new_gtkui_config["pieces_color_%s" % state] = [
color.red, color.green, color.blue
]
new_core_config["copy_torrent_file"] = \
- self.glade.get_widget("chk_copy_torrent_file").get_active()
+ self.builder.get_object("chk_copy_torrent_file").get_active()
new_core_config["del_copy_torrent_file"] = \
- self.glade.get_widget("chk_del_copy_torrent_file").get_active()
+ self.builder.get_object("chk_del_copy_torrent_file").get_active()
new_core_config["move_completed"] = \
- self.glade.get_widget("chk_move_completed").get_active()
+ self.builder.get_object("chk_move_completed").get_active()
if client.is_localhost():
new_core_config["download_location"] = \
- self.glade.get_widget("download_path_button").get_filename()
+ self.builder.get_object("download_path_button").get_filename()
new_core_config["move_completed_path"] = \
- self.glade.get_widget("move_completed_path_button").get_filename()
+ self.builder.get_object("move_completed_path_button").get_filename()
new_core_config["torrentfiles_location"] = \
- self.glade.get_widget("torrent_files_button").get_filename()
+ self.builder.get_object("torrent_files_button").get_filename()
else:
new_core_config["download_location"] = \
- self.glade.get_widget("entry_download_path").get_text()
+ self.builder.get_object("entry_download_path").get_text()
new_core_config["move_completed_path"] = \
- self.glade.get_widget("entry_move_completed_path").get_text()
+ self.builder.get_object("entry_move_completed_path").get_text()
new_core_config["torrentfiles_location"] = \
- self.glade.get_widget("entry_torrents_path").get_text()
+ self.builder.get_object("entry_torrents_path").get_text()
new_core_config["compact_allocation"] = \
- self.glade.get_widget("radio_compact_allocation").get_active()
+ self.builder.get_object("radio_compact_allocation").get_active()
new_core_config["prioritize_first_last_pieces"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"chk_prioritize_first_last_pieces").get_active()
new_core_config["sequential_download"] = \
- self.glade.get_widget("chk_sequential_download").get_active()
+ self.builder.get_object("chk_sequential_download").get_active()
new_core_config["sequential_download"] = \
- self.glade.get_widget("radio_compact_allocation").get_active() and \
- False or self.glade.get_widget("chk_sequential_download").get_active()
+ self.builder.get_object("radio_compact_allocation").get_active() and \
+ False or self.builder.get_object("chk_sequential_download").get_active()
new_core_config["add_paused"] = \
- self.glade.get_widget("chk_add_paused").get_active()
+ self.builder.get_object("chk_add_paused").get_active()
## Network tab ##
listen_ports = (
- self.glade.get_widget("spin_port_min").get_value_as_int(),
- self.glade.get_widget("spin_port_max").get_value_as_int()
+ self.builder.get_object("spin_port_min").get_value_as_int(),
+ self.builder.get_object("spin_port_max").get_value_as_int()
)
new_core_config["listen_ports"] = listen_ports
new_core_config["random_port"] = \
- self.glade.get_widget("chk_random_port").get_active()
+ self.builder.get_object("chk_random_port").get_active()
outgoing_ports = (
- self.glade.get_widget("spin_outgoing_port_min").get_value_as_int(),
- self.glade.get_widget("spin_outgoing_port_max").get_value_as_int()
+ self.builder.get_object("spin_outgoing_port_min").get_value_as_int(),
+ self.builder.get_object("spin_outgoing_port_max").get_value_as_int()
)
new_core_config["outgoing_ports"] = outgoing_ports
new_core_config["random_outgoing_ports"] = \
- self.glade.get_widget("chk_random_outgoing_ports").get_active()
- new_core_config["listen_interface"] = self.glade.get_widget("entry_interface").get_text()
- new_core_config["peer_tos"] = self.glade.get_widget("entry_peer_tos").get_text()
- new_core_config["dht"] = self.glade.get_widget("chk_dht").get_active()
- new_core_config["upnp"] = self.glade.get_widget("chk_upnp").get_active()
+ self.builder.get_object("chk_random_outgoing_ports").get_active()
+ new_core_config["listen_interface"] = self.builder.get_object("entry_interface").get_text()
+ new_core_config["peer_tos"] = self.builder.get_object("entry_peer_tos").get_text()
+ new_core_config["dht"] = self.builder.get_object("chk_dht").get_active()
+ new_core_config["upnp"] = self.builder.get_object("chk_upnp").get_active()
new_core_config["natpmp"] = \
- self.glade.get_widget("chk_natpmp").get_active()
+ self.builder.get_object("chk_natpmp").get_active()
new_core_config["utpex"] = \
- self.glade.get_widget("chk_utpex").get_active()
+ self.builder.get_object("chk_utpex").get_active()
new_core_config["lsd"] = \
- self.glade.get_widget("chk_lsd").get_active()
+ self.builder.get_object("chk_lsd").get_active()
new_core_config["enc_in_policy"] = \
- self.glade.get_widget("combo_encin").get_active()
+ self.builder.get_object("combo_encin").get_active()
new_core_config["enc_out_policy"] = \
- self.glade.get_widget("combo_encout").get_active()
+ self.builder.get_object("combo_encout").get_active()
new_core_config["enc_level"] = \
- self.glade.get_widget("combo_enclevel").get_active()
+ self.builder.get_object("combo_enclevel").get_active()
new_core_config["enc_prefer_rc4"] = \
- self.glade.get_widget("chk_pref_rc4").get_active()
+ self.builder.get_object("chk_pref_rc4").get_active()
## Bandwidth tab ##
new_core_config["max_connections_global"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_connections_global").get_value_as_int()
new_core_config["max_download_speed"] = \
- self.glade.get_widget("spin_max_download").get_value()
+ self.builder.get_object("spin_max_download").get_value()
new_core_config["max_upload_speed"] = \
- self.glade.get_widget("spin_max_upload").get_value()
+ self.builder.get_object("spin_max_upload").get_value()
new_core_config["max_upload_slots_global"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_upload_slots_global").get_value_as_int()
new_core_config["max_half_open_connections"] = \
- self.glade.get_widget("spin_max_half_open_connections").get_value_as_int()
+ self.builder.get_object("spin_max_half_open_connections").get_value_as_int()
new_core_config["max_connections_per_second"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_connections_per_second").get_value_as_int()
new_core_config["max_connections_per_torrent"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_connections_per_torrent").get_value_as_int()
new_core_config["max_upload_slots_per_torrent"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_upload_slots_per_torrent").get_value_as_int()
new_core_config["max_upload_speed_per_torrent"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_upload_per_torrent").get_value()
new_core_config["max_download_speed_per_torrent"] = \
- self.glade.get_widget(
+ self.builder.get_object(
"spin_max_download_per_torrent").get_value()
new_core_config["ignore_limits_on_local_network"] = \
- self.glade.get_widget("chk_ignore_limits_on_local_network").get_active()
+ self.builder.get_object("chk_ignore_limits_on_local_network").get_active()
new_core_config["rate_limit_ip_overhead"] = \
- self.glade.get_widget("chk_rate_limit_ip_overhead").get_active()
+ self.builder.get_object("chk_rate_limit_ip_overhead").get_active()
## Interface tab ##
new_gtkui_config["enable_system_tray"] = \
- self.glade.get_widget("chk_use_tray").get_active()
+ self.builder.get_object("chk_use_tray").get_active()
new_gtkui_config["close_to_tray"] = \
- self.glade.get_widget("chk_min_on_close").get_active()
+ self.builder.get_object("chk_min_on_close").get_active()
new_gtkui_config["start_in_tray"] = \
- self.glade.get_widget("chk_start_in_tray").get_active()
+ self.builder.get_object("chk_start_in_tray").get_active()
new_gtkui_config["enable_appindicator"] = \
- self.glade.get_widget("chk_enable_appindicator").get_active()
+ self.builder.get_object("chk_enable_appindicator").get_active()
new_gtkui_config["lock_tray"] = \
- self.glade.get_widget("chk_lock_tray").get_active()
+ self.builder.get_object("chk_lock_tray").get_active()
passhex = sha_hash(\
- self.glade.get_widget("txt_tray_password").get_text()).hexdigest()
+ self.builder.get_object("txt_tray_password").get_text()).hexdigest()
if passhex != "c07eb5a8c0dc7bb81c217b67f11c3b7a5e95ffd7":
new_gtkui_config["tray_password"] = passhex
- new_gtkui_in_classic_mode = self.glade.get_widget("chk_classic_mode").get_active()
+ new_gtkui_in_classic_mode = self.builder.get_object("chk_classic_mode").get_active()
new_gtkui_config["classic_mode"] = new_gtkui_in_classic_mode
new_gtkui_config["show_rate_in_title"] = \
- self.glade.get_widget("chk_show_rate_in_title").get_active()
+ self.builder.get_object("chk_show_rate_in_title").get_active()
## Other tab ##
new_gtkui_config["show_new_releases"] = \
- self.glade.get_widget("chk_show_new_releases").get_active()
+ self.builder.get_object("chk_show_new_releases").get_active()
new_core_config["send_info"] = \
- self.glade.get_widget("chk_send_info").get_active()
+ self.builder.get_object("chk_send_info").get_active()
new_core_config["geoip_db_location"] = \
- self.glade.get_widget("entry_geoip").get_text()
+ self.builder.get_object("entry_geoip").get_text()
## Daemon tab ##
new_core_config["daemon_port"] = \
- self.glade.get_widget("spin_daemon_port").get_value_as_int()
+ self.builder.get_object("spin_daemon_port").get_value_as_int()
new_core_config["allow_remote"] = \
- self.glade.get_widget("chk_allow_remote_connections").get_active()
+ self.builder.get_object("chk_allow_remote_connections").get_active()
new_core_config["new_release_check"] = \
- self.glade.get_widget("chk_new_releases").get_active()
+ self.builder.get_object("chk_new_releases").get_active()
## Proxy tab ##
new_core_config["proxies"] = {}
for t in ("peer", "web_seed", "tracker", "dht"):
new_core_config["proxies"][t] = {}
new_core_config["proxies"][t]["type"] = \
- self.glade.get_widget("combo_proxy_type_%s" % t).get_active()
+ self.builder.get_object("combo_proxy_type_%s" % t).get_active()
new_core_config["proxies"][t]["port"] = \
- self.glade.get_widget("spin_proxy_port_%s" % t).get_value_as_int()
+ self.builder.get_object("spin_proxy_port_%s" % t).get_value_as_int()
new_core_config["proxies"][t]["username"] = \
- self.glade.get_widget("txt_proxy_username_%s" % t).get_text()
+ self.builder.get_object("txt_proxy_username_%s" % t).get_text()
new_core_config["proxies"][t]["password"] = \
- self.glade.get_widget("txt_proxy_password_%s" % t).get_text()
+ self.builder.get_object("txt_proxy_password_%s" % t).get_text()
new_core_config["proxies"][t]["hostname"] = \
- self.glade.get_widget("txt_proxy_server_%s" % t).get_text()
+ self.builder.get_object("txt_proxy_server_%s" % t).get_text()
## Queue tab ##
new_core_config["queue_new_to_top"] = \
- self.glade.get_widget("chk_queue_new_top").get_active()
+ self.builder.get_object("chk_queue_new_top").get_active()
new_core_config["max_active_seeding"] = \
- self.glade.get_widget("spin_seeding").get_value_as_int()
+ self.builder.get_object("spin_seeding").get_value_as_int()
new_core_config["max_active_downloading"] = \
- self.glade.get_widget("spin_downloading").get_value_as_int()
+ self.builder.get_object("spin_downloading").get_value_as_int()
new_core_config["max_active_limit"] = \
- self.glade.get_widget("spin_active").get_value_as_int()
+ self.builder.get_object("spin_active").get_value_as_int()
new_core_config["dont_count_slow_torrents"] = \
- self.glade.get_widget("chk_dont_count_slow_torrents").get_active()
+ self.builder.get_object("chk_dont_count_slow_torrents").get_active()
new_core_config["auto_manage_prefer_seeds"] = \
- self.glade.get_widget("chk_auto_manage_prefer_seeds").get_active()
+ self.builder.get_object("chk_auto_manage_prefer_seeds").get_active()
new_core_config["stop_seed_at_ratio"] = \
- self.glade.get_widget("chk_seed_ratio").get_active()
+ self.builder.get_object("chk_seed_ratio").get_active()
new_core_config["remove_seed_at_ratio"] = \
- self.glade.get_widget("chk_remove_ratio").get_active()
+ self.builder.get_object("chk_remove_ratio").get_active()
new_core_config["stop_seed_ratio"] = \
- self.glade.get_widget("spin_share_ratio").get_value()
+ self.builder.get_object("spin_share_ratio").get_value()
new_core_config["share_ratio_limit"] = \
- self.glade.get_widget("spin_share_ratio_limit").get_value()
+ self.builder.get_object("spin_share_ratio_limit").get_value()
new_core_config["seed_time_ratio_limit"] = \
- self.glade.get_widget("spin_seed_time_ratio_limit").get_value()
+ self.builder.get_object("spin_seed_time_ratio_limit").get_value()
new_core_config["seed_time_limit"] = \
- self.glade.get_widget("spin_seed_time_limit").get_value()
+ self.builder.get_object("spin_seed_time_limit").get_value()
## Cache tab ##
new_core_config["cache_size"] = \
- self.glade.get_widget("spin_cache_size").get_value_as_int()
+ self.builder.get_object("spin_cache_size").get_value_as_int()
new_core_config["cache_expiry"] = \
- self.glade.get_widget("spin_cache_expiry").get_value_as_int()
+ self.builder.get_object("spin_cache_expiry").get_value_as_int()
# Run plugin hook to apply preferences
component.get("PluginManager").run_on_apply_prefs()
@@ -840,7 +839,7 @@ class Preferences(component.Component):
if response == gtk.RESPONSE_NO:
# Set each changed config value in the core
self.gtkui_config["classic_mode"] = True
- self.glade.get_widget("chk_classic_mode").set_active(True)
+ self.builder.get_object("chk_classic_mode").set_active(True)
else:
client.disconnect()
component.stop()
@@ -857,13 +856,16 @@ class Preferences(component.Component):
dialog.run()
def hide(self):
- self.glade.get_widget("port_img").hide()
+ self.builder.get_object("port_img").hide()
self.pref_dialog.hide()
def __update_cache_status(self):
# Updates the cache status labels with the info in the dict
- for widget in self.glade.get_widget_prefix("label_cache_"):
- key = widget.get_name()[len("label_cache_"):]
+ for widget_name in ('label_cache_blocks_written', 'label_cache_writes', 'label_cache_write_hit_ratio',
+ 'label_cache_blocks_read', 'label_cache_blocks_read_hit', 'label_cache_read_hit_ratio',
+ 'label_cache_reads', 'label_cache_cache_size', 'label_cache_read_cache_size'):
+ widget = self.builder.get_object(widget_name)
+ key = widget_name[len("label_cache_"):]
value = self.cache_status[key]
if type(value) == float:
value = "%.2f" % value
@@ -924,14 +926,14 @@ class Preferences(component.Component):
def update_dependent_widgets(name, value):
dependency = dependents[name]
for dep in dependency.keys():
- depwidget = self.glade.get_widget(dep)
+ depwidget = self.builder.get_object(dep)
sensitive = [not value, value][dependency[dep]]
depwidget.set_sensitive(sensitive)
if dep in dependents:
update_dependent_widgets(dep, depwidget.get_active() and sensitive)
for key in dependents.keys():
- if widget != self.glade.get_widget(key):
+ if widget != self.builder.get_object(key):
continue
update_dependent_widgets(key, value)
@@ -966,18 +968,18 @@ class Preferences(component.Component):
def on_get_test(status):
if status:
- self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_YES, 4)
- self.glade.get_widget("port_img").show()
+ self.builder.get_object("port_img").set_from_stock(gtk.STOCK_YES, 4)
+ self.builder.get_object("port_img").show()
else:
- self.glade.get_widget("port_img").set_from_stock(gtk.STOCK_DIALOG_WARNING, 4)
- self.glade.get_widget("port_img").show()
+ self.builder.get_object("port_img").set_from_stock(gtk.STOCK_DIALOG_WARNING, 4)
+ self.builder.get_object("port_img").show()
client.core.test_listen_port().addCallback(on_get_test)
# XXX: Consider using gtk.Spinner() instead of the loading gif
# It requires gtk.ver > 2.12
- self.glade.get_widget("port_img").set_from_file(
+ self.builder.get_object("port_img").set_from_file(
deluge.common.get_pixmap('loading.gif')
)
- self.glade.get_widget("port_img").show()
+ self.builder.get_object("port_img").show()
client.force_call()
def on_plugin_toggled(self, renderer, path):
@@ -998,11 +1000,11 @@ class Preferences(component.Component):
return
name = model[itr][0]
plugin_info = component.get("PluginManager").get_plugin_info(name)
- self.glade.get_widget("label_plugin_author").set_text(plugin_info["Author"])
- self.glade.get_widget("label_plugin_version").set_text(plugin_info["Version"])
- self.glade.get_widget("label_plugin_email").set_text(plugin_info["Author-email"])
- self.glade.get_widget("label_plugin_homepage").set_text(plugin_info["Home-page"])
- self.glade.get_widget("label_plugin_details").set_text(plugin_info["Description"])
+ self.builder.get_object("label_plugin_author").set_text(plugin_info["Author"])
+ self.builder.get_object("label_plugin_version").set_text(plugin_info["Version"])
+ self.builder.get_object("label_plugin_email").set_text(plugin_info["Author-email"])
+ self.builder.get_object("label_plugin_homepage").set_text(plugin_info["Home-page"])
+ self.builder.get_object("label_plugin_details").set_text(plugin_info["Description"])
def _on_button_plugin_install_clicked(self, widget):
log.debug("_on_button_plugin_install_clicked")
@@ -1077,12 +1079,12 @@ class Preferences(component.Component):
for h in hides:
for p in prefixes:
- w = self.glade.get_widget(p + h + "_" + name)
+ w = self.builder.get_object(p + h + "_" + name)
if w:
w.hide()
for s in shows:
for p in prefixes:
- w = self.glade.get_widget(p + s + "_" + name)
+ w = self.builder.get_object(p + s + "_" + name)
if w:
w.show()
@@ -1138,11 +1140,11 @@ class Preferences(component.Component):
return
username = model[itr][0]
if username:
- self.glade.get_widget("accounts_edit").set_sensitive(True)
- self.glade.get_widget("accounts_delete").set_sensitive(True)
+ self.builder.get_object("accounts_edit").set_sensitive(True)
+ self.builder.get_object("accounts_delete").set_sensitive(True)
else:
- self.glade.get_widget("accounts_edit").set_sensitive(False)
- self.glade.get_widget("accounts_delete").set_sensitive(False)
+ self.builder.get_object("accounts_edit").set_sensitive(False)
+ self.builder.get_object("accounts_delete").set_sensitive(False)
def _on_accounts_add_clicked(self, widget):
dialog = dialogs.AccountDialog(
@@ -1256,13 +1258,13 @@ class Preferences(component.Component):
dialog.run().addCallback(dialog_finished)
def _on_alocation_toggled(self, widget):
- full_allocation_active = self.glade.get_widget("radio_full_allocation").get_active()
- self.glade.get_widget("chk_prioritize_first_last_pieces").set_sensitive(full_allocation_active)
- self.glade.get_widget("chk_sequential_download").set_sensitive(full_allocation_active)
+ full_allocation_active = self.builder.get_object("radio_full_allocation").get_active()
+ self.builder.get_object("chk_prioritize_first_last_pieces").set_sensitive(full_allocation_active)
+ self.builder.get_object("chk_sequential_download").set_sensitive(full_allocation_active)
def _on_piecesbar_toggle_toggled(self, widget):
self.gtkui_config['show_piecesbar'] = widget.get_active()
- colors_widget = self.glade.get_widget("piecebar_colors_expander")
+ colors_widget = self.builder.get_object("piecebar_colors_expander")
colors_widget.set_visible(widget.get_active())
def _on_completed_color_set(self, widget):
@@ -1294,9 +1296,9 @@ class Preferences(component.Component):
color = gtk.gdk.Color(*self.gtkui_config["pieces_color_%s" % state])
log.debug("Setting %r color state from config to %s", state,
(color.red, color.green, color.blue))
- self.glade.get_widget("%s_color" % state).set_color(color)
+ self.builder.get_object("%s_color" % state).set_color(color)
else:
- color = self.glade.get_widget("%s_color" % state).get_color()
+ color = self.builder.get_object("%s_color" % state).get_color()
log.debug("Setting %r color state to %s", state,
(color.red, color.green, color.blue))
self.gtkui_config["pieces_color_%s" % state] = [
@@ -1305,14 +1307,14 @@ class Preferences(component.Component):
self.gtkui_config.save()
self.gtkui_config.apply_set_functions("pieces_colors")
- self.glade.get_widget("revert_color_%s" % state).set_sensitive(
+ self.builder.get_object("revert_color_%s" % state).set_sensitive(
[color.red, color.green, color.blue] != self.COLOR_DEFAULTS[state]
)
def __revert_color(self, state, from_config=False):
log.debug("Reverting %r color state", state)
- self.glade.get_widget("%s_color" % state).set_color(
+ self.builder.get_object("%s_color" % state).set_color(
gtk.gdk.Color(*self.COLOR_DEFAULTS[state])
)
- self.glade.get_widget("revert_color_%s" % state).set_sensitive(False)
+ self.builder.get_object("revert_color_%s" % state).set_sensitive(False)
self.gtkui_config.apply_set_functions("pieces_colors")