Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui/frame.py5
-rw-r--r--gui/page.py16
-rw-r--r--gui/theme.py15
-rw-r--r--pages/choose.py7
-rw-r--r--pages/cover.py3
-rw-r--r--pages/edit.py12
-rw-r--r--pages/joke.py15
-rw-r--r--pages/preview.py3
-rw-r--r--pages/submit.py6
9 files changed, 21 insertions, 61 deletions
diff --git a/gui/frame.py b/gui/frame.py
index 0d04610..019f293 100644
--- a/gui/frame.py
+++ b/gui/frame.py
@@ -105,7 +105,7 @@ class Frame(hippo.Canvas):
padding_right=100,
yalign=hippo.ALIGNMENT_CENTER,
orientation=hippo.ORIENTATION_VERTICAL)
- button = LanguageComboBox('org.worldwideworkshop.olpc.JokeMachine')
+ button = LanguageComboBox('org.worldwideworkshop.JokeMachineActivity')
button.install()
button.set_name('fubar')
language.props.widget = button
@@ -220,8 +220,7 @@ class Frame(hippo.Canvas):
border_color=theme.COLOR_BLUE.get_int())
widget_box.append(hippo.CanvasText(text= _('Lesson Plans:'),
xalign=hippo.ALIGNMENT_START,
- padding=10,
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ padding=10))
lesson_plans = LessonPlanWidget(Globals.pwd)
lesson_plans.set_size_request(1050, 500)
widget_box.append(hippo.CanvasWidget(widget=lesson_plans,
diff --git a/gui/page.py b/gui/page.py
index 0d83449..02092be 100644
--- a/gui/page.py
+++ b/gui/page.py
@@ -104,8 +104,7 @@ class Page(hippo.CanvasBox):
sound_name = _('Click to choose a sound')
choose_sound = hippo.CanvasText(text=sound_name,
- xalign=hippo.ALIGNMENT_START,
- font_desc=theme.FONT_BODY.get_pango_desc())
+ xalign=hippo.ALIGNMENT_START)
choose_sound.connect('button-press-event', self.__do_clicked_choose_sound, obj, property)
sound_box = RoundBox()
@@ -183,8 +182,7 @@ class Page(hippo.CanvasBox):
size_mode=hippo.CANVAS_SIZE_WRAP_WORD,
box_width=width,
xalign=xalign,
- color=text_color.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc())
+ color=text_color.get_int())
def make_textbox(self, obj, property, width=300, height=100, editable=True):
@@ -202,8 +200,7 @@ class Page(hippo.CanvasBox):
field_box.append(hippo.CanvasText(text=label,
box_width=label_width,
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
#if editable:
textfield = self.__textview(value, field_width, -1, editable, False)
textfield.control.get_buffer().connect('changed', self.__do_changed_control, obj, property)
@@ -213,8 +210,7 @@ class Page(hippo.CanvasBox):
#glitch_box.append(hippo.CanvasText(text=value,
#size_mode=hippo.CANVAS_SIZE_WRAP_WORD,
#box_width=field_width,
- #xalign=hippo.ALIGNMENT_START,
- #font_desc=theme.FONT_BODY.get_pango_desc()))
+ #xalign=hippo.ALIGNMENT_START))
#field_box.append(glitch_box)
return field_box
@@ -228,16 +224,12 @@ class Page(hippo.CanvasBox):
# control props
textview.set_wrap_mode(gtk.WRAP_WORD)
- font = font_desc=theme.FONT_TEXTBOX.get_pango_desc()
- font.set_weight(pango.WEIGHT_LIGHT)
- textview.modify_font(font)
textview.modify_base(gtk.STATE_NORMAL, theme.COLOR_TEXTBOX.get_gdk_color())
textview.set_editable(editable)
textview.set_cursor_visible(editable)
if height == -1:
context = textview.create_pango_context()
layout = pango.Layout(context)
- layout.set_font_description(font) # TODO theme.FONT_BODY should be a pango.FontDescription, not a string
layout.set_text(text[ : text.find('\n')])
(w, h) = layout.get_pixel_size()
height = h #+ theme.BORDER_WIDTH_CONTROL / 2 # fudge factor - on the XO-1 hardware all known solutions evaporate
diff --git a/gui/theme.py b/gui/theme.py
index 22c6f30..02add23 100644
--- a/gui/theme.py
+++ b/gui/theme.py
@@ -111,21 +111,6 @@ BORDER_WIDTH_IMAGE = style.zoom(1)
SPACER_VERTICAL = style.zoom(20)
SPACER_HORIZONTAL = style.zoom(20)
-# fonts ########################################################################
-
-#FONT_SIZE = zoom(7 * _XO_DPI / _get_screen_dpi())
-#FONT_NORMAL = Font('Bitstream Vera Sans %d' % FONT_SIZE)
-#_XO_DPI = 200.0
-FONT_SIZE_LARGE = style.zoom(10 * style._XO_DPI / style._get_screen_dpi())
-FONT_LARGE = style.Font('Bitstream Vera Sans %d' % FONT_SIZE_LARGE)
-
-#FONT_LARGE = style.FONT_NORMAL #'Sans 18'
-FONT_BODY = style.FONT_NORMAL #'Sans 14'
-FONT_BODY_BOLD = style.FONT_BOLD #'Sans Bold 14'
-FONT_TABS = style.FONT_NORMAL #'Sans 12'
-FONT_TEXTBOX = style.FONT_NORMAL #'Sans 10'
-
-
# images #######################################################################
IMAGE_CHOOSE = 'resources/image.png'
diff --git a/pages/choose.py b/pages/choose.py
index e5f9280..997cfdd 100644
--- a/pages/choose.py
+++ b/pages/choose.py
@@ -45,8 +45,7 @@ class Choose(Page):
# page title
self.append(hippo.CanvasText(text= _('Choose a Jokebook to read:'),
xalign=hippo.ALIGNMENT_START,
- padding=10,
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ padding=10))
# list of Jokebooks
allow_edit = Globals.JokeMachineActivity.is_initiator
@@ -96,7 +95,6 @@ class Choose(Page):
title = hippo.CanvasText(text=jokebook.title,
padding_left = 20,
xalign=hippo.ALIGNMENT_START,
- font_desc=theme.FONT_LARGE.get_pango_desc(),
color=theme.COLOR_LINK.get_int())
title.set_clickable(True)
title.connect('button-press-event', self.__do_clicked_title, jokebook)
@@ -106,8 +104,7 @@ class Choose(Page):
# owner
list_row.append(self.__make_column_div(330, hippo.CanvasText(text= jokebook.owner,
- xalign=hippo.ALIGNMENT_START,
- font_desc=theme.FONT_LARGE.get_pango_desc())))
+ xalign=hippo.ALIGNMENT_START)))
# buttons
if edit:
diff --git a/pages/cover.py b/pages/cover.py
index 50d096a..14ba53e 100644
--- a/pages/cover.py
+++ b/pages/cover.py
@@ -40,8 +40,7 @@ class Cover(Page):
# title
self.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner,
xalign=hippo.ALIGNMENT_CENTER,
- padding_top=10,
- font_desc=theme.FONT_BODY_BOLD.get_pango_desc()))
+ padding_top=10))
self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL))
# cover picture
diff --git a/pages/edit.py b/pages/edit.py
index 63aa2d8..eaa2654 100644
--- a/pages/edit.py
+++ b/pages/edit.py
@@ -64,8 +64,7 @@ class PageSelector(hippo.CanvasBox):
padding=theme.PADDING_TAB,
xalign=hippo.ALIGNMENT_START,
background_color=theme.COLOR_TAB_ACTIVE.get_int(),
- color=theme.COLOR_TAB_TEXT.get_int(),
- font_desc=theme.FONT_TABS.get_pango_desc())
+ color=theme.COLOR_TAB_TEXT.get_int())
self.__tab_1.page = EditInfo
self.__tab_1.connect('button-press-event', self.__do_clicked_tab)
tab_box.append(self.__tab_1)
@@ -74,8 +73,7 @@ class PageSelector(hippo.CanvasBox):
padding=theme.PADDING_TAB,
xalign=hippo.ALIGNMENT_START,
background_color=theme.COLOR_TAB_INACTIVE.get_int(),
- color=theme.COLOR_TAB_TEXT.get_int(),
- font_desc=theme.FONT_TABS.get_pango_desc())
+ color=theme.COLOR_TAB_TEXT.get_int())
self.__tab_2.page = EditJokes
self.__tab_2.connect('button-press-event', self.__do_clicked_tab)
tab_box.append(self.__tab_2)
@@ -84,8 +82,7 @@ class PageSelector(hippo.CanvasBox):
padding=theme.PADDING_TAB,
xalign=hippo.ALIGNMENT_START,
background_color=theme.COLOR_TAB_INACTIVE.get_int(),
- color=theme.COLOR_TAB_TEXT.get_int(),
- font_desc=theme.FONT_TABS.get_pango_desc())
+ color=theme.COLOR_TAB_TEXT.get_int())
self.__tab_3.page = EditReview
self.__tab_3.connect('button-press-event', self.__do_clicked_tab)
tab_box.append(self.__tab_3)
@@ -267,8 +264,7 @@ class EditReview(Page):
#status_box.append(hippo.CanvasText(text=_('Status:'),
#color=theme.COLOR_DARK_GREEN.get_int(),
#box_width=100,
- #xalign=hippo.ALIGNMENT_START,
- #font_desc=theme.FONT_BODY.get_pango_desc()))
+ #xalign=hippo.ALIGNMENT_START))
##button = None
#button = gtk.RadioButton()
#button = gtk.RadioButton(button, _('Approved'))
diff --git a/pages/joke.py b/pages/joke.py
index 3063df9..9eb804e 100644
--- a/pages/joke.py
+++ b/pages/joke.py
@@ -57,14 +57,11 @@ class JokeViewer(Page):
self.left.append(joke_image)
self.left.append(hippo.CanvasText(text=jokebook_title,
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY_BOLD.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
self.left.append(hippo.CanvasText(text=_('Joke') + ' ' + str(joke.id),
- xalign=hippo.ALIGNMENT_START,
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ xalign=hippo.ALIGNMENT_START))
self.left.append(hippo.CanvasText(text=_('By') + ' ' + str(joke.joker),
- xalign=hippo.ALIGNMENT_START,
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ xalign=hippo.ALIGNMENT_START))
# right column
self.right = hippo.CanvasBox(border=0,
@@ -74,8 +71,7 @@ class JokeViewer(Page):
orientation=hippo.ORIENTATION_VERTICAL)
self.right.append(hippo.CanvasText(text=_('Question'),
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
self.right.append(self.make_bodytext(joke.text))
self.right.append(hippo.CanvasBox(box_height=30)) # spacer
@@ -83,8 +79,7 @@ class JokeViewer(Page):
self.answer_box = hippo.CanvasBox()
self.answer_box.append(hippo.CanvasText(text=_('Answer'),
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
self.answer_box.append(self.make_bodytext(joke.answer))
self.right.append(self.answer_box)
diff --git a/pages/preview.py b/pages/preview.py
index c88fffe..4e82eb3 100644
--- a/pages/preview.py
+++ b/pages/preview.py
@@ -48,8 +48,7 @@ class Preview(Page):
cover.props.orientation=hippo.ORIENTATION_VERTICAL
cover.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner,
xalign=hippo.ALIGNMENT_CENTER,
- padding_top=10,
- font_desc=theme.FONT_BODY_BOLD.get_pango_desc()))
+ padding_top=10))
cover.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL))
cover_picture = self.make_imagebox(jokebook, 'image', 640, 480, False)
cover.append(cover_picture)
diff --git a/pages/submit.py b/pages/submit.py
index 99645a6..22a510d 100644
--- a/pages/submit.py
+++ b/pages/submit.py
@@ -67,16 +67,14 @@ class JokeEditor(Page):
spacing=theme.BORDER_WIDTH_CONTROL/2)
self.right.append(hippo.CanvasText(text=_('Question'),
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
self.right.append(self.make_textbox(joke, 'text'))
self.right.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL))
self.right.append(hippo.CanvasText(text=_('Answer'),
xalign=hippo.ALIGNMENT_START,
- color=theme.COLOR_DARK_GREEN.get_int(),
- font_desc=theme.FONT_BODY.get_pango_desc()))
+ color=theme.COLOR_DARK_GREEN.get_int()))
self.right.append(self.make_textbox(joke, 'answer'))
self.append(self.left)