Move code to use style instead font.py (removed)
This commit is contained in:
@@ -26,7 +26,7 @@ from ConfigParser import ConfigParser
|
||||
from sugar import env
|
||||
|
||||
from sugar.graphics import units
|
||||
from sugar.graphics import font
|
||||
from sugar.graphics import style
|
||||
from sugar.graphics import color
|
||||
from sugar.graphics import iconbutton
|
||||
|
||||
@@ -101,7 +101,7 @@ class VideoBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
xalign=hippo.ALIGNMENT_START,
|
||||
padding_right=units.grid_to_pixels(0.5))
|
||||
self._label.props.color = color.LABEL_TEXT.get_int()
|
||||
self._label.props.font_desc = font.DEFAULT.get_pango_desc()
|
||||
self._label.props.font_desc = style.FONT_NORMAL.get_pango_desc()
|
||||
self.append(self._label)
|
||||
|
||||
# check for camera and if not generate a .jpg
|
||||
@@ -181,7 +181,7 @@ class EntryBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
xalign=hippo.ALIGNMENT_START,
|
||||
padding_right=units.grid_to_pixels(0.5))
|
||||
self._label.props.color = color.LABEL_TEXT.get_int()
|
||||
self._label.props.font_desc = font.DEFAULT.get_pango_desc()
|
||||
self._label.props.font_desc = style.FONT_NORMAL.get_pango_desc()
|
||||
self.append(self._label)
|
||||
|
||||
self._entry = gtk.Entry()
|
||||
@@ -225,7 +225,7 @@ class ColorBox(hippo.CanvasBox, hippo.CanvasItem):
|
||||
xalign=hippo.ALIGNMENT_START,
|
||||
padding_right=units.grid_to_pixels(0.5))
|
||||
self._label.props.color = color.LABEL_TEXT.get_int()
|
||||
self._label.props.font_desc = font.DEFAULT.get_pango_desc()
|
||||
self._label.props.font_desc = style.FONT_NORMAL.get_pango_desc()
|
||||
self.append(self._label)
|
||||
|
||||
self._cp = colorpicker.ColorPicker()
|
||||
|
||||
@@ -26,7 +26,7 @@ import hippo
|
||||
from sugar.graphics.palette import Palette
|
||||
from sugar.graphics.canvasicon import CanvasIcon
|
||||
from sugar.graphics import color
|
||||
from sugar.graphics import font
|
||||
from sugar.graphics import style
|
||||
from sugar.activity import activityfactory
|
||||
from sugar.activity.bundle import Bundle
|
||||
from sugar.clipboard import clipboardservice
|
||||
@@ -60,7 +60,8 @@ class ClipboardMenu(Palette):
|
||||
self._preview_text = hippo.CanvasText(text=preview,
|
||||
size_mode=hippo.CANVAS_SIZE_WRAP_WORD)
|
||||
self._preview_text.props.color = color.LABEL_TEXT.get_int()
|
||||
self._preview_text.props.font_desc = font.DEFAULT.get_pango_desc()
|
||||
self._preview_text.props.font_desc = \
|
||||
style.FONT_NORMAL.get_pango_desc()
|
||||
self.append(self._preview_text)
|
||||
"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user