sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/icarito/sugar-toolkit-gtk3

Browse Source
This commit is contained in:
Sam Parkinson
2016-04-27 21:39:12 +10:00
parent 66c01ba2c6 2f2b2d20d8
commit ea3b673f51
7 changed files with 91 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sugar3/graphics/style.py
+7 -3
View File
@@ -169,9 +169,13 @@ MEDIUM_ICON_SIZE = zoom(55 * 1.5)
LARGE_ICON_SIZE = zoom(55 * 2.0)
XLARGE_ICON_SIZE = zoom(55 * 2.75)
settings = Gio.Settings('org.sugarlabs.font')
FONT_SIZE = settings.get_double('default-size')
FONT_FACE = settings.get_string('default-face')
if 'org.sugarlabs.font' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.font')
FONT_SIZE = settings.get_double('default-size')
FONT_FACE = settings.get_string('default-face')
else:
FONT_SIZE = 10
FONT_FACE = 'Sans Serif'
FONT_NORMAL = Font('%s %f' % (FONT_FACE, FONT_SIZE))
FONT_BOLD = Font('%s bold %f' % (FONT_FACE, FONT_SIZE))
src/sugar3/graphics/xocolor.py
+3 -2
View File
@@ -244,8 +244,9 @@ class XoColor:
parsed_color = None
if color_string is None:
settings = Gio.Settings('org.sugarlabs.user')
color_string = settings.get_string('color')
if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.user')
color_string = settings.get_string('color')
if color_string is not None:
parsed_color = _parse_string(color_string)