diff options
author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 23:14:32 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 23:14:32 (GMT) |
commit | 8ca1368eec29f1378ac1d81e3494c6d503355d04 (patch) | |
tree | a285efd64b378e8fab261a059e0212c727e18ea2 /src/jarabe/controlpanel/gui.py | |
parent | baed28d9da4c47477abb13833c92bab0623e41e3 (diff) |
Move controlpanel extensions to the extensions path.
Diffstat (limited to 'src/jarabe/controlpanel/gui.py')
-rw-r--r-- | src/jarabe/controlpanel/gui.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py index 3e18cac..2f48151 100644 --- a/src/jarabe/controlpanel/gui.py +++ b/src/jarabe/controlpanel/gui.py @@ -27,6 +27,7 @@ from sugar.graphics.alert import Alert from jarabe.session import get_session_manager from jarabe.controlpanel.toolbar import MainToolbar from jarabe.controlpanel.toolbar import SectionToolbar +from jarabe import config _logger = logging.getLogger('ControlPanel') _MAX_COLUMNS = 5 @@ -194,11 +195,11 @@ class ControlPanel(gtk.Window): self._current_option = option - mod = __import__('.'.join(('jarabe.controlpanel', option, 'view')), + mod = __import__('.'.join(('cpsection', option, 'view')), globals(), locals(), ['view']) view_class = getattr(mod, self._options[option]['view'], None) - mod = __import__('.'.join(('jarabe.controlpanel', option, 'model')), + mod = __import__('.'.join(('cpsection', option, 'model')), globals(), locals(), ['model']) model = ModelWrapper(mod) @@ -224,13 +225,13 @@ class ControlPanel(gtk.Window): ''' options = {} - path = os.path.dirname(__file__) + path = os.path.join(config.ext_path, 'cpsection') folder = os.listdir(path) for item in folder: if os.path.isdir(os.path.join(path, item)) and \ os.path.exists(os.path.join(path, item, '__init__.py')): - mod = __import__('.'.join(('jarabe.controlpanel', item)), + mod = __import__('.'.join(('cpsection', item)), globals(), locals(), [item]) view_class = getattr(mod, 'CLASS', None) if view_class is not None: |