Module: deluge Branch: multiuser Commit: c057feb931f9139ddb2c605f41abd1d5ad01eb9d
Author: Pedro Algarvio <[email protected]> Date: Tue Dec 14 17:52:32 2010 +0000 Make branch runnable. --- deluge/ui/gtkui/preferences.py | 67 +++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 32 deletions(-) diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index c2d6fc8..9a3be8b 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -33,6 +33,7 @@ # # +import os import gtk import pkg_resources from twisted.internet.defer import maybeDeferred @@ -54,13 +55,13 @@ class PreferencePage(object): self.name = "" self.widget = None self.builder = None - + # Set the core widgets and their config keys # {widget: (accessor, core_key, non_localhost_widget), ...} self.core_widgets = {} # Likewise for local widgets self.local_widgets = {} - + def show(self): """ Called when the page needs to have it's values updated. @@ -119,6 +120,8 @@ class PreferencePage(object): :type obj: string """ + if not os.path.isfile(xmlfile): + xmlfile = os.path.join(os.path.dirname(__file__), xmlfile) self.builder = gtk.Builder() self.builder.add_from_file(xmlfile) self.set_widget(self.builder.get_object(obj)) @@ -128,7 +131,7 @@ class GtkUIPreferencePage(PreferencePage): super(GtkUIPreferencePage, self).__init__() self.name = name self.set_widget_from_file(xml, widget) - + def show(self): """ Called when the page needs to have it's values updated. @@ -149,8 +152,8 @@ class GtkUIPreferencePage(PreferencePage): # if core is a localhost, but show its non_localhost widget self.builder.get_object(non_localhost).show() widget.hide() - - + + class DownloadsPreferencePage(GtkUIPreferencePage): def __init__(self, name, xml, widget): super(DownloadsPreferencePage, self).__init__(name, xml, widget) @@ -175,7 +178,7 @@ class DownloadsPreferencePage(GtkUIPreferencePage): class NetworkPreferencePage(PreferencePage): pass - + class BandwidthPreferencePage(PreferencePage): def __init__(self): self.name = _("Bandwidth") @@ -295,14 +298,14 @@ class Preferences(component.Component): column = gtk.TreeViewColumn(_("Categories"), render, text=0) self.listview.append_column(column) self.listview.set_model(self.liststore) - + self.listview.get_selection().connect("changed", self._on_selection_changed) # Store the PreferencePages currently in the Preferences dialog self.pages = {} - + self.add_page(DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page")) - + def add_page(self, page): """ @@ -394,26 +397,26 @@ class Preferences(component.Component): self.dialog, traceback=True).run() -p = Preferences() -#d = DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page") -#p.add_page(d) -d2 = NetworkPreferencePage(_("Network"), "glade/preferences/network.glade", "network_prefs_page") -p.add_page(d2) -#d3 = BandwidthPreferencePage() -#p.add_page(d3) -#d4 = InterfacePreferencePage() -#p.add_page(d4) -#d5 = OtherPreferencePage() -#p.add_page(d5) -#d6 = DaemonPreferencePage() -#p.add_page(d6) -#d7 = QueuePreferencePage() -#p.add_page(d7) -#d8 = ProxyPreferencePage() -#p.add_page(d8) -#d9 = CachePreferencePage() -#p.add_page(d9) -#d10 = PluginsPreferencePage() -#p.add_page(d10) -p.show() -gtk.main() +#p = Preferences() +##d = DownloadsPreferencePage(_("Downloads"), "glade/preferences/downloads.glade", "downloads_prefs_page") +##p.add_page(d) +##d2 = NetworkPreferencePage(_("Network"), "glade/preferences/network.glade", "network_prefs_page") +##p.add_page(d2) +##d3 = BandwidthPreferencePage() +##p.add_page(d3) +##d4 = InterfacePreferencePage() +##p.add_page(d4) +##d5 = OtherPreferencePage() +##p.add_page(d5) +##d6 = DaemonPreferencePage() +##p.add_page(d6) +##d7 = QueuePreferencePage() +##p.add_page(d7) +##d8 = ProxyPreferencePage() +##p.add_page(d8) +##d9 = CachePreferencePage() +##p.add_page(d9) +##d10 = PluginsPreferencePage() +##p.add_page(d10) +#p.show() +#gtk.main() -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
