From 38a31f06849ac8543816bb58ca3a00d6e2c79019 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 04 Jan 2009 10:47:30 +0000
Subject: adapt to non-XO screen resolution

---
(limited to 'gui')

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 019f293..b9d0607 100644
--- a/gui/frame.py
+++ b/gui/frame.py
@@ -72,9 +72,8 @@ class Frame(hippo.Canvas):
                                   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
     
@@ -168,7 +167,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 \
@@ -222,10 +221,10 @@ class Frame(hippo.Canvas):
                                          xalign=hippo.ALIGNMENT_START,
                                          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/page.py b/gui/page.py
index 02092be..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
       
       
--
cgit v0.9.1