From 709d44d6026702dcfc0e25e073190f46aa1d096c Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 24 Dec 2009 14:41:52 +0000 Subject: [PATCH] Apply activity font settings earlier (#1607) Fixes some minor changes in toolbar appearance that my previous work unintentionally introduced. --- src/sugar/activity/activity.py | 3 --- 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 a3db42e4..d4892d04 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -280,9 +280,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 93f34e6f..ef4d0016 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 @@ -96,6 +97,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']