Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorEduardo Silva <edsiper@monotop.(none)>2007-07-09 14:09:24 (GMT)
committer Eduardo Silva <edsiper@monotop.(none)>2007-07-09 14:09:24 (GMT)
commitaa6a02436859df3d2d803d945a94d1cdd4b77772 (patch)
treeadb3b80b6eac8e02390ecf786c1960dcae6c5ed1 /shell
parent40ed24f0fe1d34198c105a4c1396282e244fbba9 (diff)
Move code to use style instead font.py (removed)
Diffstat (limited to 'shell')
-rw-r--r--shell/intro/intro.py8
-rw-r--r--shell/view/clipboardmenu.py5
2 files changed, 7 insertions, 6 deletions
diff --git a/shell/intro/intro.py b/shell/intro/intro.py
index 0a927c4..0c23240 100644
--- a/shell/intro/intro.py
+++ b/shell/intro/intro.py
@@ -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()
diff --git a/shell/view/clipboardmenu.py b/shell/view/clipboardmenu.py
index 17df779..cd154d9 100644
--- a/shell/view/clipboardmenu.py
+++ b/shell/view/clipboardmenu.py
@@ -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)
"""