diff options
-rw-r--r-- | gui/canvaslistbox.py | 8 | ||||
-rw-r--r-- | gui/frame.py | 9 | ||||
-rw-r--r-- | gui/page.py | 8 | ||||
-rw-r--r-- | pages/choose.py | 15 | ||||
-rw-r--r-- | pages/cover.py | 4 | ||||
-rw-r--r-- | pages/edit.py | 28 | ||||
-rw-r--r-- | pages/preview.py | 6 | ||||
-rw-r--r-- | pages/submit.py | 7 |
8 files changed, 35 insertions, 50 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 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 diff --git a/pages/choose.py b/pages/choose.py index 997cfdd..33a637f 100644 --- a/pages/choose.py +++ b/pages/choose.py @@ -49,11 +49,10 @@ class Choose(Page): # list of Jokebooks allow_edit = Globals.JokeMachineActivity.is_initiator - #jokebooks_div = CanvasListBox(1050, 500) - jokebooks_div = CanvasListBox(1050, theme.zoom(500)) # TODO -> This should be sizing relative to parent + jokebooks_div = CanvasListBox() for jokebook in Globals.JokeMachineState.jokebooks: jokebooks_div.append(self.__make_jokebook_div(jokebook, allow_edit)) - self.append(jokebooks_div) + self.append(jokebooks_div, hippo.PACK_EXPAND) def __do_clicked_title(self, control, event, jokebook): @@ -92,20 +91,17 @@ class Choose(Page): list_row.append(self.__make_column_div(100, thumbnail)) # title - title = hippo.CanvasText(text=jokebook.title, + title = hippo.CanvasText( + text = (jokebook.title or '')+ "\n" + (jokebook.owner or ''), padding_left = 20, xalign=hippo.ALIGNMENT_START, color=theme.COLOR_LINK.get_int()) title.set_clickable(True) title.connect('button-press-event', self.__do_clicked_title, jokebook) - list_row.append(self.__make_column_div(330, title)) + list_row.append(self.__make_column_div(-1, title), hippo.PACK_EXPAND) list_row.append(hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer - # owner - list_row.append(self.__make_column_div(330, hippo.CanvasText(text= jokebook.owner, - xalign=hippo.ALIGNMENT_START))) - # buttons if edit: button = gtk.Button(_('Edit')) @@ -115,6 +111,7 @@ class Choose(Page): button = gtk.Button(_('Delete')) button.connect('clicked', self.__do_clicked_delete, jokebook) list_row.append(self.__make_column_div(100, hippo.CanvasWidget(widget=theme.theme_widget(button)))) + list_row.append(hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer return list_row diff --git a/pages/cover.py b/pages/cover.py index 14ba53e..46821fc 100644 --- a/pages/cover.py +++ b/pages/cover.py @@ -44,8 +44,8 @@ class Cover(Page): self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) # cover picture - cover_picture = self.make_imagebox(jokebook, 'image', 640, 480, False) - self.append(cover_picture) + cover_picture = self.make_imagebox(jokebook, 'image', 480, 360, False) + self.append(cover_picture, hippo.PACK_EXPAND) self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) # open button diff --git a/pages/edit.py b/pages/edit.py index eaa2654..8e7419c 100644 --- a/pages/edit.py +++ b/pages/edit.py @@ -48,49 +48,43 @@ class PageSelector(hippo.CanvasBox): hippo.CanvasBox.__init__(self, **kwargs) self.__parent = parent - control_width = 1024 # TODO -> Figure this out from parent size self.props.border = 1 self.props.border_color=theme.COLOR_TAB_ACTIVE.get_int() self.props.background_color=theme.COLOR_PAGE.get_int() self.props.orientation=hippo.ORIENTATION_VERTICAL - # button box -> # TODO -> Make into generic control - tab_width = control_width / 3.0 tab_box = hippo.CanvasBox(background_color=theme.COLOR_TAB_SEPERATOR.get_int(), spacing=2, orientation=hippo.ORIENTATION_HORIZONTAL) self.__tab_1 = hippo.CanvasText(text=_('Edit Jokebook Cover'), - box_width=tab_width, padding=theme.PADDING_TAB, xalign=hippo.ALIGNMENT_START, background_color=theme.COLOR_TAB_ACTIVE.get_int(), 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) + tab_box.append(self.__tab_1, hippo.PACK_EXPAND) self.__tab_2 = hippo.CanvasText(text=_('Edit My Jokes'), - box_width=tab_width, padding=theme.PADDING_TAB, xalign=hippo.ALIGNMENT_START, background_color=theme.COLOR_TAB_INACTIVE.get_int(), 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) + tab_box.append(self.__tab_2, hippo.PACK_EXPAND) self.__tab_3 = hippo.CanvasText(text=_('Review Submitted Jokes'), - box_width=tab_width, padding=theme.PADDING_TAB, xalign=hippo.ALIGNMENT_START, background_color=theme.COLOR_TAB_INACTIVE.get_int(), 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) + tab_box.append(self.__tab_3, hippo.PACK_EXPAND) self.append(tab_box) self.__page = hippo.CanvasBox(background_color=theme.COLOR_PAGE.get_int(), orientation=hippo.ORIENTATION_VERTICAL) - self.append(self.__page) + self.append(self.__page, hippo.PACK_EXPAND) @Property @@ -98,7 +92,7 @@ class PageSelector(hippo.CanvasBox): def get(self): return self.__page.the_page def set(self, value): self.__page.clear() - self.__page.append(value) + self.__page.append(value, hippo.PACK_EXPAND) self.__page.the_page = value @@ -114,12 +108,12 @@ class PageSelector(hippo.CanvasBox): class Edit(Page): def __init__(self, jokebook): - Page.__init__(self, xalign=hippo.ALIGNMENT_CENTER) + Page.__init__(self) self.__jokebook = jokebook self.__page_selector = PageSelector(self) - self.append(self.__page_selector) + self.append(self.__page_selector, hippo.PACK_EXPAND) self.__page_selector.page = EditInfo(jokebook, self) button = gtk.Button(_('Preview')) @@ -174,17 +168,17 @@ class EditJokes(Page): self.__parent = parent # list of jokes - jokes_div = CanvasListBox(800, theme.TABS_HEIGHT) + jokes_div = CanvasListBox() jokes_div.props.border=0 for joke in jokebook.jokes: button = gtk.Button(' ' + _('Delete') + ' ') button.connect('clicked', self.__do_clicked_delete, jokebook, joke) - list_row = self.make_listrow(JokeEditor(joke)) + list_row = self.make_listrow(JokeEditor(joke), hippo.PACK_EXPAND) list_row.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding=5), hippo.PACK_END) jokes_div.append(list_row) - self.append(jokes_div) + self.append(jokes_div, hippo.PACK_EXPAND) # new joke button buttons = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL, @@ -230,7 +224,7 @@ class EditReview(Page): self.__parent = parent - jokes_div = CanvasListBox(800, theme.TABS_HEIGHT) + jokes_div = CanvasListBox() jokes_div.props.border=0 for joke in jokebook.submissions: list_row = self.make_listrow(JokeViewer(joke, jokebook.title)) diff --git a/pages/preview.py b/pages/preview.py index 4e82eb3..a9763a5 100644 --- a/pages/preview.py +++ b/pages/preview.py @@ -41,7 +41,7 @@ class Preview(Page): def __init__(self, jokebook): Page.__init__(self, xalign=hippo.ALIGNMENT_CENTER) - preview_box = CanvasListBox(1028, theme.PREVIEW_HEIGHT) # TODO - really shouldn't be hardcoded + preview_box = CanvasListBox() # cover cover = self.make_listrow() @@ -50,7 +50,7 @@ class Preview(Page): xalign=hippo.ALIGNMENT_CENTER, padding_top=10)) cover.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) - cover_picture = self.make_imagebox(jokebook, 'image', 640, 480, False) + cover_picture = self.make_imagebox(jokebook, 'image', 480, 360, False) cover.append(cover_picture) cover.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) preview_box.append(cover) @@ -59,7 +59,7 @@ class Preview(Page): for joke in jokebook.jokes: list_row = self.make_listrow(JokeViewer(joke, jokebook.title)) preview_box.append(list_row) - self.append(preview_box) + self.append(preview_box, hippo.PACK_EXPAND) self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) diff --git a/pages/submit.py b/pages/submit.py index 22a510d..aed4dbe 100644 --- a/pages/submit.py +++ b/pages/submit.py @@ -44,13 +44,11 @@ class JokeEditor(Page): padding=4, border_color=theme.COLOR_RED.get_int(), border=0, - xalign=hippo.ALIGNMENT_START, orientation=hippo.ORIENTATION_HORIZONTAL) # left column self.left = hippo.CanvasBox(border=0, border_color=theme.COLOR_RED.get_int(), - box_width=450, xalign=hippo.ALIGNMENT_START, orientation=hippo.ORIENTATION_VERTICAL, padding=theme.BORDER_WIDTH_CONTROL/2) @@ -60,8 +58,7 @@ class JokeEditor(Page): # right column self.right = hippo.CanvasBox(border=0, border_color=theme.COLOR_RED.get_int(), - box_width=350, - xalign=hippo.ALIGNMENT_START, + padding=theme.SPACER_HORIZONTAL, orientation=hippo.ORIENTATION_VERTICAL, padding_bottom=theme.BORDER_WIDTH_CONTROL/2, spacing=theme.BORDER_WIDTH_CONTROL/2) @@ -78,7 +75,7 @@ class JokeEditor(Page): self.right.append(self.make_textbox(joke, 'answer')) self.append(self.left) - self.append(self.right) + self.append(self.right, hippo.PACK_EXPAND) class Submit(Page): |