diff options
Diffstat (limited to 'pages/edit.py')
-rw-r--r-- | pages/edit.py | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/pages/edit.py b/pages/edit.py index 24bd781..b960c5d 100644 --- a/pages/edit.py +++ b/pages/edit.py @@ -21,8 +21,8 @@ import gi import os from gi.repository import Gtk -import hippo -import pango +from gi.repository import Hippo +from gi.repository import Pango import logging from gettext import gettext as _ @@ -42,49 +42,49 @@ import persistence.joke -class PageSelector(hippo.CanvasBox): +class PageSelector(Hippo.CanvasBox): def __init__(self, parent, **kwargs): - hippo.CanvasBox.__init__(self, **kwargs) + gobject.GObject.__init__(self, **kwargs) self.__parent = parent 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 + self.props.orientation=Hippo.Orientation.VERTICAL - tab_box = hippo.CanvasBox(background_color=theme.COLOR_TAB_SEPERATOR.get_int(), + 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'), + orientation=Hippo.Orientation.HORIZONTAL) + self.__tab_1 = Hippo.CanvasText(text=_('Edit Jokebook Cover'), padding=theme.PADDING_TAB, - xalign=hippo.ALIGNMENT_START, + 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, hippo.PACK_EXPAND) - self.__tab_2 = hippo.CanvasText(text=_('Edit My Jokes'), + tab_box.append(self.__tab_1, Hippo.PackFlags.EXPAND) + self.__tab_2 = Hippo.CanvasText(text=_('Edit My Jokes'), padding=theme.PADDING_TAB, - xalign=hippo.ALIGNMENT_START, + 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, hippo.PACK_EXPAND) - self.__tab_3 = hippo.CanvasText(text=_('Review Submitted Jokes'), + tab_box.append(self.__tab_2, Hippo.PackFlags.EXPAND) + self.__tab_3 = Hippo.CanvasText(text=_('Review Submitted Jokes'), padding=theme.PADDING_TAB, - xalign=hippo.ALIGNMENT_START, + 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, hippo.PACK_EXPAND) + tab_box.append(self.__tab_3, Hippo.PackFlags.EXPAND) self.append(tab_box) - self.__page = hippo.CanvasBox(background_color=theme.COLOR_PAGE.get_int(), - orientation=hippo.ORIENTATION_VERTICAL) - self.append(self.__page, hippo.PACK_EXPAND) + self.__page = Hippo.CanvasBox(background_color=theme.COLOR_PAGE.get_int(), + orientation=Hippo.Orientation.VERTICAL) + self.append(self.__page, Hippo.PackFlags.EXPAND) @Property @@ -92,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, hippo.PACK_EXPAND) + self.__page.append(value, Hippo.PackFlags.EXPAND) self.__page.the_page = value @@ -113,12 +113,12 @@ class Edit(Page): self.__jokebook = jokebook self.__page_selector = PageSelector(self) - self.append(self.__page_selector, hippo.PACK_EXPAND) + self.append(self.__page_selector, Hippo.PackFlags.EXPAND) self.__page_selector.page = EditInfo(jokebook, self) button = Gtk.Button(_('Preview')) button.connect('clicked', self.__do_clicked_preview, jokebook) - self.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_top=theme.SPACER_VERTICAL)) + self.append(Hippo.CanvasWidget(widget=theme.theme_widget(button), padding_top=theme.SPACER_VERTICAL)) def __do_clicked_preview(self, button, jokebook): @@ -133,8 +133,8 @@ class Edit(Page): class EditInfo(Page): # TODO -> gui.Page should follow this pattern rather def __init__(self, jokebook, parent): - Page.__init__(self, xalign=hippo.ALIGNMENT_CENTER, - orientation=hippo.ORIENTATION_VERTICAL, + Page.__init__(self, xalign=Hippo.ALIGNMENT_CENTER, + orientation=Hippo.Orientation.VERTICAL, padding=20, spacing=20) @@ -144,8 +144,8 @@ class EditInfo(Page): # TODO -> gui.Page should follow this pattern rather self.append(self.make_field(_('Title of Jokebook:'), 250, jokebook, 'title', 300, True)) #field = self.make_field(_('Sound Effect:'), 250, None, '', 300, False) - sound_effect = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL, spacing=10) - sound_effect.append(self.make_bodytext(_('Sound Effect:'), 250, hippo.ALIGNMENT_START, theme.COLOR_DARK_GREEN)) + sound_effect = Hippo.CanvasBox(orientation=Hippo.Orientation.HORIZONTAL, spacing=10) + sound_effect.append(self.make_bodytext(_('Sound Effect:'), 250, Hippo.ALIGNMENT_START, theme.COLOR_DARK_GREEN)) sound_effect.append(self.make_audiobox(jokebook, 'sound', 316)) self.append(sound_effect) @@ -172,33 +172,33 @@ class EditJokes(Page): 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), hippo.PACK_EXPAND) - list_row.append(hippo.CanvasWidget(widget=theme.theme_widget(button), + list_row = self.make_listrow(JokeEditor(joke), Hippo.PackFlags.EXPAND) + list_row.append(Hippo.CanvasWidget(widget=theme.theme_widget(button), padding=5), - hippo.PACK_END) + Hippo.PackFlags.END) jokes_div.append(list_row) - self.append(jokes_div, hippo.PACK_EXPAND) + self.append(jokes_div, Hippo.PackFlags.EXPAND) # new joke button - buttons = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL, - xalign=hippo.ALIGNMENT_START) + buttons = Hippo.CanvasBox(orientation=Hippo.Orientation.HORIZONTAL, + xalign=Hippo.ALIGNMENT_START) button = Gtk.Button(_('Add New Joke')) button.connect('clicked', self.do_clicked_add_joke, jokebook) - buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button))) + buttons.append(Hippo.CanvasWidget(widget=theme.theme_widget(button))) jokes_div.append(buttons) def __do_clicked_delete(self, button, jokebook, joke): confirm = Gtk.MessageDialog(Globals.JokeMachineActivity, - Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT, - Gtk.MESSAGE_QUESTION, - Gtk.BUTTONS_YES_NO, + Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, + Gtk.MessageType.QUESTION, + Gtk.ButtonsType.YES_NO, _('Are you sure you want to delete this joke ?')) response = confirm.run() confirm.hide() confirm.destroy() del confirm - if response == Gtk.RESPONSE_YES: + if response == Gtk.ResponseType.YES: logging.debug('Deleting joke: %s' % joke.id) jokebook.jokes.remove(joke) self.__parent.do_tab_clicked(EditJokes) @@ -227,49 +227,49 @@ class EditReview(Page): jokes_div.props.border=0 for joke in jokebook.submissions: list_row = self.make_listrow(JokeViewer(joke, jokebook.title)) - list_row.props.orientation=hippo.ORIENTATION_VERTICAL + list_row.props.orientation=Hippo.Orientation.VERTICAL - buttons = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL, - xalign=hippo.ALIGNMENT_END, + buttons = Hippo.CanvasBox(orientation=Hippo.Orientation.HORIZONTAL, + xalign=Hippo.ALIGNMENT_END, spacing=10, padding=10) button = Gtk.Button(' ' + _('Reject') + ' ') button.connect('clicked', self.__do_clicked_reject, jokebook, joke) - buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button), + buttons.append(Hippo.CanvasWidget(widget=theme.theme_widget(button), border_color=theme.COLOR_RED.get_int(), border=0, - xalign=hippo.ALIGNMENT_CENTER)) + xalign=Hippo.ALIGNMENT_CENTER)) button = Gtk.Button(' ' + _('Accept') + ' ') button.connect('clicked', self.__do_clicked_accept, jokebook, joke) - buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button), + buttons.append(Hippo.CanvasWidget(widget=theme.theme_widget(button), border_color=theme.COLOR_RED.get_int(), border=0, - xalign=hippo.ALIGNMENT_CENTER)) + xalign=Hippo.ALIGNMENT_CENTER)) list_row.append(buttons) - #list_row.props.orientation=hippo.ORIENTATION_VERTICAL - #status_box = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL, + #list_row.props.orientation=Hippo.Orientation.VERTICAL + #status_box = Hippo.CanvasBox(orientation=Hippo.Orientation.HORIZONTAL, #padding_top=4, #padding_left=4) - #status_box.append(hippo.CanvasText(text=_('Status:'), + #status_box.append(Hippo.CanvasText(text=_('Status:'), #color=theme.COLOR_DARK_GREEN.get_int(), #box_width=100, - #xalign=hippo.ALIGNMENT_START)) + #xalign=Hippo.ALIGNMENT_START)) ##button = None #button = Gtk.RadioButton() #button = Gtk.RadioButton(button, _('Approved')) #button.set_size_request(200, -1) - #status_box.append(hippo.CanvasWidget(widget = button)) + #status_box.append(Hippo.CanvasWidget(widget = button)) #button = Gtk.RadioButton(button, _('Rejected')) #button.set_size_request(200, -1) - #status_box.append(hippo.CanvasWidget(widget = button)) + #status_box.append(Hippo.CanvasWidget(widget = button)) #button = Gtk.RadioButton(button, _('Not Reviewed')) #button.set_size_request(200, -1) #button.set_active(True) - #status_box.append(hippo.CanvasWidget(widget = button)) + #status_box.append(Hippo.CanvasWidget(widget = button)) #list_row.append(status_box) jokes_div.append(list_row) |