Ticket #1607: 0001-Apply-activity-font-settings-earlier.patch

File 0001-Apply-activity-font-settings-earlier.patch, 2.0 KB (added by dsd, 14 years ago)

  • src/sugar/activity/activity.py 

    From 69c52e6e8e55f311632b9e03825070eec042077c Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Mon, 7 Dec 2009 17:41:50 +0000
Subject: [PATCH] Apply activity font settings earlier

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 32f9a05..9043a3c 100644
    a b class Activity(Window, gtk.Container): 
    485485        self._jobject = None
    486486        self._read_file_called = False
    487487
    488         settings = gtk.settings_get_default()
    489         settings.set_property("gtk-font-name", "%s %f" % (style.FONT_FACE, style.FONT_SIZE))
    490 
    491488        self._session = _get_session()
    492489        self._session.register(self)
    493490        self._session.connect('quit-requested',

  • src/sugar/activity/main.py 

    diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index 721595c..17d3d7d 100644
    a b import dbus.glib 
    2828import sugar
    2929from sugar.activity import activityhandle
    3030from sugar.bundle.activitybundle import ActivityBundle
     31from sugar.graphics import style
    3132from sugar import logger
    3233
    3334def create_activity_instance(constructor, handle):
    … … def main(): 
    9091
    9192    gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
    9293
     94    # This code can be removed when we grow an xsettings daemon (the GTK+
     95    # init routines will then automatically figure out the font settings)
     96    settings = gtk.settings_get_default()
     97    settings.set_property("gtk-font-name",
     98                          "%s %f" % (style.FONT_FACE, style.FONT_SIZE))
     99
    93100    locale_path = None
    94101    if 'SUGAR_LOCALEDIR' in os.environ:
    95102        locale_path = os.environ['SUGAR_LOCALEDIR']