diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-12 12:02:29 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-12 12:02:29 (GMT) |
| commit | be806eb1918f7db90e661b5fcb4e260a0b1ba669 (patch) | |
| tree | 09ca8d2341d5875c1623801516a5f32bf1626063 /sugar | |
| parent | ca2b08f8b6fb1bc54a4e4f9cfc457f57cf958c7f (diff) | |
More cleanups and some fixes
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/Makefile.am | 1 | ||||
| -rw-r--r-- | sugar/__init__.py | 11 | ||||
| -rw-r--r-- | sugar/activity/Activity.py | 13 | ||||
| -rw-r--r-- | sugar/theme.py | 10 |
4 files changed, 14 insertions, 21 deletions
diff --git a/sugar/Makefile.am b/sugar/Makefile.am index c69d4b2..228c624 100644 --- a/sugar/Makefile.am +++ b/sugar/Makefile.am @@ -7,6 +7,7 @@ sugar_PYTHON = \ bots.py \ env.py \ keybindings.py \ + theme.py \ util.py \ LogWriter.py diff --git a/sugar/__init__.py b/sugar/__init__.py index 5ecc9df..e69de29 100644 --- a/sugar/__init__.py +++ b/sugar/__init__.py @@ -1,11 +0,0 @@ -import pygtk -pygtk.require('2.0') -import gtk - -settings = gtk.settings_get_default() - -if settings.get_property('gtk-theme-name') != 'olpc': - settings.set_string_property('gtk-theme-name', 'olpc', '') - -if settings.get_property('gtk-icon-theme-name') != 'olpc': - settings.set_string_property('gtk-icon-theme-name', 'olpc', '') diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py index bbccb9c..220d5e9 100644 --- a/sugar/activity/Activity.py +++ b/sugar/activity/Activity.py @@ -11,6 +11,7 @@ import gtk, gobject from sugar.LogWriter import LogWriter from sugar import keybindings import sugar.util +import sugar.theme SHELL_SERVICE_NAME = "caom.redhat.Sugar.Shell" SHELL_SERVICE_PATH = "/com/redhat/Sugar/Shell" @@ -82,18 +83,10 @@ def create(activity_name, service = None, args = None): else: factory.create() -def _get_registry(): - bus = dbus.SessionBus() - proxy_obj = bus.get_object("com.redhat.Sugar.ActivityRegistry", - "/com/redhat/Sugar/ActivityRegistry") - return dbus.Interface(proxy_obj, "com.redhat.Sugar.ActivityRegistry") - -def list_activities(): - registry = _get_registry() - return registry.list_activities() - def main(activity_name, activity_class): """Starts the activity main loop.""" + sugar.theme.setup() + log_writer = LogWriter(activity_name) log_writer.start() diff --git a/sugar/theme.py b/sugar/theme.py new file mode 100644 index 0000000..628d188 --- /dev/null +++ b/sugar/theme.py @@ -0,0 +1,10 @@ +import gtk + +def setup(): + settings = gtk.settings_get_default() + + if settings.get_property('gtk-theme-name') != 'olpc': + settings.set_string_property('gtk-theme-name', 'olpc', '') + + if settings.get_property('gtk-icon-theme-name') != 'olpc': + settings.set_string_property('gtk-icon-theme-name', 'olpc', '') |