diff options
Diffstat (limited to 'gui/frame.py')
| -rw-r--r-- | gui/frame.py | 33 |
1 files changed, 6 insertions, 27 deletions
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) |