Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/canvaslistbox.py8
-rw-r--r--gui/frame.py33
-rw-r--r--gui/lessonplanwidget.py1
-rw-r--r--gui/page.py24
-rw-r--r--gui/theme.py19
5 files changed, 18 insertions, 67 deletions
diff --git a/gui/canvaslistbox.py b/gui/canvaslistbox.py
index 126e4f0..e53f7a6 100644
--- a/gui/canvaslistbox.py
+++ b/gui/canvaslistbox.py
@@ -29,7 +29,7 @@ from gui import page
# TODO- height seems bust
class CanvasListBox(hippo.CanvasWidget):
- def __init__(self, width = 0, height = 0):
+ def __init__(self):
self._entries_div = hippo.CanvasBox()
# props not set properly in constructor
@@ -50,8 +50,6 @@ class CanvasListBox(hippo.CanvasWidget):
scroller = gtk.ScrolledWindow()
scroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
- if width > 0 or height > 0:
- scroller.set_size_request(width, height) # TODO -> Size according to _entries_div w/ a max_entries or somesuch ?
viewport = gtk.Viewport()
viewport.set_shadow_type(gtk.SHADOW_NONE)
viewport.add(hbox)
@@ -67,6 +65,6 @@ class CanvasListBox(hippo.CanvasWidget):
border_color=theme.COLOR_DARK_GREEN.get_int())
- def append(self, entry):
- self._entries_div.append(entry)
+ def append(self, entry, *args):
+ self._entries_div.append(entry, *args)
diff --git a/gui/frame.py b/gui/frame.py
index 0d04610..49a5a8e 100644
--- a/gui/frame.py
+++ b/gui/frame.py
@@ -23,7 +23,6 @@ import gtk
import hippo
import logging
-from i18n import LanguageComboBox
from gettext import gettext as _
from globals import Globals
@@ -66,15 +65,13 @@ class Frame(hippo.Canvas):
orientation=hippo.ORIENTATION_VERTICAL)
self.__root.append(self.__container, hippo.PACK_EXPAND)
- self.__page = hippo.CanvasBox(box_height=theme.PAGE_HEIGHT,
- background_color=theme.COLOR_PAGE.get_int(),
+ self.__page = hippo.CanvasBox(background_color=theme.COLOR_PAGE.get_int(),
border=4,
border_color=theme.COLOR_PAGE_BORDER.get_int(),
spacing=8,
padding=20,
- xalign=hippo.ALIGNMENT_CENTER,
orientation=hippo.ORIENTATION_VERTICAL)
- self.__container.append(self.__page)
+ self.__container.append(self.__page, hippo.PACK_EXPAND)
self.__page_class = None
@@ -94,23 +91,6 @@ class Frame(hippo.Canvas):
logo.set_from_file(Globals.logo)
ret.append(hippo.CanvasWidget(widget=logo))
- # language selection box
- language = hippo.CanvasWidget(background_color=theme.COLOR_BACKGROUND.get_int(),
- border_top=theme.BORDER_WIDTH,
- border_left=theme.BORDER_WIDTH,
- border_color=theme.COLOR_FRAME.get_int(),
- padding_top=12,
- padding_bottom=12,
- padding_left=100,
- padding_right=100,
- yalign=hippo.ALIGNMENT_CENTER,
- orientation=hippo.ORIENTATION_VERTICAL)
- button = LanguageComboBox('org.worldwideworkshop.olpc.JokeMachine')
- button.install()
- button.set_name('fubar')
- language.props.widget = button
- ret.append(language, hippo.PACK_EXPAND)
-
# lesson plans
lesson_plans = hippo.CanvasWidget(background_color=theme.COLOR_BACKGROUND.get_int(),
border_top=theme.BORDER_WIDTH,
@@ -168,7 +148,7 @@ class Frame(hippo.Canvas):
def set(self, value):
self.__page_class = type(value)
self.__page.clear()
- self.__page.append(value)
+ self.__page.append(value, hippo.PACK_EXPAND)
# some rules for the buttons in the footer
if not Globals.JokeMachineActivity.is_initiator \
@@ -220,13 +200,12 @@ 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,
border=0,
- border_color=theme.COLOR_DARK_GREEN.get_int()))
+ border_color=theme.COLOR_DARK_GREEN.get_int()),
+ hippo.PACK_EXPAND)
self.page = widget_box
self.__button_read.set_visible(False)
self.__button_make.set_visible(False)
diff --git a/gui/lessonplanwidget.py b/gui/lessonplanwidget.py
index 3d4a100..98c90ce 100644
--- a/gui/lessonplanwidget.py
+++ b/gui/lessonplanwidget.py
@@ -22,6 +22,7 @@ import os
import locale
import gtk
import logging
+from gettext import gettext as _
from abiword import Canvas as AbiCanvas
diff --git a/gui/page.py b/gui/page.py
index 0d83449..b0aafb5 100644
--- a/gui/page.py
+++ b/gui/page.py
@@ -59,8 +59,8 @@ class Page(hippo.CanvasBox):
self.__color_listrow = theme.COLOR_LIST_ROW_ALT.get_int()
- def append(self, item, **kwargs):
- hippo.CanvasBox.append(self, item, **kwargs)
+ def append(self, item, *args, **kwargs):
+ hippo.CanvasBox.append(self, item, *args, **kwargs)
@property
@@ -74,14 +74,14 @@ class Page(hippo.CanvasBox):
return self.__color_listrow
- def make_listrow(self, contents = None):
+ def make_listrow(self, contents = None, *args):
list_row = RoundBox()
list_row.props.border = 0 # properties not being set properly by constructor
list_row.props.padding = theme.DEFAULT_PADDING
#list_row.props.padding_right=0
list_row.props.background_color = self.color_listrow
if contents is not None:
- list_row.append(contents)
+ list_row.append(contents, *args)
return list_row
@@ -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..20537aa 100644
--- a/gui/theme.py
+++ b/gui/theme.py
@@ -98,10 +98,6 @@ COLOR_TAB_TEXT = COLOR_WHITE
zoom = style.zoom
-PAGE_HEIGHT = style.zoom(635) # don't ask
-TABS_HEIGHT = style.zoom(480) # 465 450
-PREVIEW_HEIGHT = style.zoom(519) # 564
-
PADDING_TAB = style.zoom(6)
DEFAULT_PADDING = style.zoom(6)
DEFAULT_SPACING = style.zoom(8)
@@ -111,21 +107,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'
generated by cgit v0.9.1 at 2024-05-02 15:23:03 (GMT)