diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/frame.py | 5 | ||||
| -rw-r--r-- | gui/page.py | 16 | ||||
| -rw-r--r-- | gui/theme.py | 15 |
3 files changed, 6 insertions, 30 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' |