diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/choose.py | 20 | ||||
| -rw-r--r-- | pages/cover.py | 10 | ||||
| -rw-r--r-- | pages/edit.py | 43 | ||||
| -rw-r--r-- | pages/joke.py | 15 | ||||
| -rw-r--r-- | pages/preview.py | 12 | ||||
| -rw-r--r-- | pages/submit.py | 13 |
6 files changed, 43 insertions, 70 deletions
diff --git a/pages/choose.py b/pages/choose.py index e5f9280..33a637f 100644 --- a/pages/choose.py +++ b/pages/choose.py @@ -45,16 +45,14 @@ class Choose(Page): # page title self.append(hippo.CanvasText(text= _('Choose a Jokebook to read:'), xalign=hippo.ALIGNMENT_START, - padding=10, - font_desc=theme.FONT_BODY.get_pango_desc())) + padding=10)) # 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): @@ -93,22 +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, - font_desc=theme.FONT_LARGE.get_pango_desc(), 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, - font_desc=theme.FONT_LARGE.get_pango_desc()))) - # buttons if edit: button = gtk.Button(_('Edit')) @@ -118,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 50d096a..77a205e 100644 --- a/pages/cover.py +++ b/pages/cover.py @@ -38,15 +38,15 @@ class Cover(Page): Page.__init__(self) # title - self.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner, + self.append(hippo.CanvasText(text='"' + (jokebook.title or '') + '" ' + + _('started by') + ' ' + (jokebook.owner or ''), xalign=hippo.ALIGNMENT_CENTER, - padding_top=10, - font_desc=theme.FONT_BODY_BOLD.get_pango_desc())) + padding_top=10)) 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 63aa2d8..e269392 100644 --- a/pages/edit.py +++ b/pages/edit.py @@ -48,52 +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(), - font_desc=theme.FONT_TABS.get_pango_desc()) + 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(), - font_desc=theme.FONT_TABS.get_pango_desc()) + 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(), - font_desc=theme.FONT_TABS.get_pango_desc()) + 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 @@ -101,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 @@ -117,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')) @@ -145,8 +136,7 @@ class EditInfo(Page): # TODO -> gui.Page should follow this pattern rather Page.__init__(self, xalign=hippo.ALIGNMENT_CENTER, orientation=hippo.ORIENTATION_VERTICAL, padding=20, - spacing=20, - box_height=theme.TABS_HEIGHT) + spacing=20) self.__parent = parent @@ -177,17 +167,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, @@ -233,7 +223,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)) @@ -267,8 +257,7 @@ class EditReview(Page): #status_box.append(hippo.CanvasText(text=_('Status:'), #color=theme.COLOR_DARK_GREEN.get_int(), #box_width=100, - #xalign=hippo.ALIGNMENT_START, - #font_desc=theme.FONT_BODY.get_pango_desc())) + #xalign=hippo.ALIGNMENT_START)) ##button = None #button = gtk.RadioButton() #button = gtk.RadioButton(button, _('Approved')) diff --git a/pages/joke.py b/pages/joke.py index 3063df9..9eb804e 100644 --- a/pages/joke.py +++ b/pages/joke.py @@ -57,14 +57,11 @@ class JokeViewer(Page): self.left.append(joke_image) self.left.append(hippo.CanvasText(text=jokebook_title, xalign=hippo.ALIGNMENT_START, - color=theme.COLOR_DARK_GREEN.get_int(), - font_desc=theme.FONT_BODY_BOLD.get_pango_desc())) + color=theme.COLOR_DARK_GREEN.get_int())) self.left.append(hippo.CanvasText(text=_('Joke') + ' ' + str(joke.id), - xalign=hippo.ALIGNMENT_START, - font_desc=theme.FONT_BODY.get_pango_desc())) + xalign=hippo.ALIGNMENT_START)) self.left.append(hippo.CanvasText(text=_('By') + ' ' + str(joke.joker), - xalign=hippo.ALIGNMENT_START, - font_desc=theme.FONT_BODY.get_pango_desc())) + xalign=hippo.ALIGNMENT_START)) # right column self.right = hippo.CanvasBox(border=0, @@ -74,8 +71,7 @@ class JokeViewer(Page): orientation=hippo.ORIENTATION_VERTICAL) self.right.append(hippo.CanvasText(text=_('Question'), 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())) self.right.append(self.make_bodytext(joke.text)) self.right.append(hippo.CanvasBox(box_height=30)) # spacer @@ -83,8 +79,7 @@ class JokeViewer(Page): self.answer_box = hippo.CanvasBox() self.answer_box.append(hippo.CanvasText(text=_('Answer'), 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())) self.answer_box.append(self.make_bodytext(joke.answer)) self.right.append(self.answer_box) diff --git a/pages/preview.py b/pages/preview.py index c88fffe..e0b07a3 100644 --- a/pages/preview.py +++ b/pages/preview.py @@ -41,17 +41,17 @@ 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() cover.props.orientation=hippo.ORIENTATION_VERTICAL - cover.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner, + cover.append(hippo.CanvasText(text='"' + (jokebook.title or '')+ '" ' + + _('started by') + ' ' + (jokebook.owner or ''), xalign=hippo.ALIGNMENT_CENTER, - padding_top=10, - font_desc=theme.FONT_BODY_BOLD.get_pango_desc())) + 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) @@ -60,7 +60,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 99645a6..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,27 +58,24 @@ 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) self.right.append(hippo.CanvasText(text=_('Question'), 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())) self.right.append(self.make_textbox(joke, 'text')) self.right.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL)) self.right.append(hippo.CanvasText(text=_('Answer'), 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())) 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): |