diff options
author | Daniel Drake <dsd@laptop.org> | 2009-12-24 14:41:52 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2009-12-24 14:43:01 (GMT) |
commit | e383e3f7c32c51af29dd51a9fa457c65a03d41e5 (patch) | |
tree | 61f3e63bbd24799122d8cad913eedf5089df3b84 | |
parent | 7ae842a2551e4c36a85a40571effb205f3d97dd1 (diff) |
Apply activity font settings earlier (#1607)
Fixes some minor changes in toolbar appearance that my previous
work unintentionally introduced.
-rw-r--r-- | src/sugar/activity/activity.py | 3 | ||||
-rw-r--r-- | src/sugar/activity/main.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 32f9a05..9043a3c 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -485,9 +485,6 @@ class Activity(Window, gtk.Container): self._jobject = None self._read_file_called = False - settings = gtk.settings_get_default() - settings.set_property("gtk-font-name", "%s %f" % (style.FONT_FACE, style.FONT_SIZE)) - self._session = _get_session() self._session.register(self) self._session.connect('quit-requested', diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py index 721595c..f143414 100644 --- a/src/sugar/activity/main.py +++ b/src/sugar/activity/main.py @@ -28,6 +28,7 @@ import dbus.glib import sugar from sugar.activity import activityhandle from sugar.bundle.activitybundle import ActivityBundle +from sugar.graphics import style from sugar import logger def create_activity_instance(constructor, handle): @@ -90,6 +91,12 @@ def main(): gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path()) + # This code can be removed when we grow an xsettings daemon (the GTK+ + # init routines will then automatically figure out the font settings) + settings = gtk.settings_get_default() + settings.set_property('gtk-font-name', + '%s %f' % (style.FONT_FACE, style.FONT_SIZE)) + locale_path = None if 'SUGAR_LOCALEDIR' in os.environ: locale_path = os.environ['SUGAR_LOCALEDIR'] |