diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/choose.py | 7 | ||||
| -rw-r--r-- | pages/cover.py | 3 | ||||
| -rw-r--r-- | pages/edit.py | 12 | ||||
| -rw-r--r-- | pages/joke.py | 15 | ||||
| -rw-r--r-- | pages/preview.py | 3 | ||||
| -rw-r--r-- | pages/submit.py | 6 |
6 files changed, 15 insertions, 31 deletions
diff --git a/pages/choose.py b/pages/choose.py index e5f9280..997cfdd 100644 --- a/pages/choose.py +++ b/pages/choose.py @@ -45,8 +45,7 @@ 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 @@ -96,7 +95,6 @@ class Choose(Page): title = hippo.CanvasText(text=jokebook.title, 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) @@ -106,8 +104,7 @@ class Choose(Page): # 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()))) + xalign=hippo.ALIGNMENT_START))) # buttons if edit: diff --git a/pages/cover.py b/pages/cover.py index 50d096a..14ba53e 100644 --- a/pages/cover.py +++ b/pages/cover.py @@ -40,8 +40,7 @@ class Cover(Page): # title self.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner, 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 diff --git a/pages/edit.py b/pages/edit.py index 63aa2d8..eaa2654 100644 --- a/pages/edit.py +++ b/pages/edit.py @@ -64,8 +64,7 @@ class PageSelector(hippo.CanvasBox): 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) @@ -74,8 +73,7 @@ class PageSelector(hippo.CanvasBox): 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) @@ -84,8 +82,7 @@ class PageSelector(hippo.CanvasBox): 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) @@ -267,8 +264,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..4e82eb3 100644 --- a/pages/preview.py +++ b/pages/preview.py @@ -48,8 +48,7 @@ class Preview(Page): cover.props.orientation=hippo.ORIENTATION_VERTICAL cover.append(hippo.CanvasText(text='"' + jokebook.title + '" ' + _('started by') + ' ' + jokebook.owner, 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.append(cover_picture) diff --git a/pages/submit.py b/pages/submit.py index 99645a6..22a510d 100644 --- a/pages/submit.py +++ b/pages/submit.py @@ -67,16 +67,14 @@ class JokeEditor(Page): 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) |