diff options
Diffstat (limited to 'pages/choose.py')
| -rw-r--r-- | pages/choose.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/pages/choose.py b/pages/choose.py index 96120c5..e78953e 100644 --- a/pages/choose.py +++ b/pages/choose.py @@ -20,8 +20,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 _ @@ -43,8 +43,8 @@ class Choose(Page): Page.__init__(self) # page title - self.append(hippo.CanvasText(text= _('Choose a Jokebook to read:'), - xalign=hippo.ALIGNMENT_START, + self.append(Hippo.CanvasText(text= _('Choose a Jokebook to read:'), + xalign=Hippo.ALIGNMENT_START, padding=10)) # list of Jokebooks @@ -52,7 +52,7 @@ class Choose(Page): jokebooks_div = CanvasListBox() for jokebook in Globals.JokeMachineState.jokebooks: jokebooks_div.append(self.__make_jokebook_div(jokebook, allow_edit)) - self.append(jokebooks_div, hippo.PACK_EXPAND) + self.append(jokebooks_div, Hippo.PackFlags.EXPAND) def __do_clicked_title(self, control, event, jokebook): @@ -69,15 +69,15 @@ class Choose(Page): message += '\'' + jokebook.title + '\' ' message += _('jokebook ?') 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, message) response = confirm.run() confirm.hide() confirm.destroy() del confirm - if response == Gtk.RESPONSE_YES: + if response == Gtk.ResponseType.YES: logging.debug('Deleting jokebook: %s' % jokebook.title) Globals.JokeMachineState.jokebooks.remove(jokebook) Globals.JokeMachineActivity.set_page(pages.choose.Choose) @@ -91,35 +91,35 @@ class Choose(Page): list_row.append(self.__make_column_div(100, thumbnail)) # title - title = hippo.CanvasText( + title = Hippo.CanvasText( text = (jokebook.title or '')+ "\n" + (jokebook.owner or ''), padding_left = 20, - xalign=hippo.ALIGNMENT_START, + 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(-1, title), hippo.PACK_EXPAND) + list_row.append(self.__make_column_div(-1, title), Hippo.PackFlags.EXPAND) - list_row.append(hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer + list_row.append(Hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer # buttons if edit: button = Gtk.Button(_('Edit')) button.connect('clicked', self.__do_clicked_edit, 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 + 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 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 + 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 def __make_column_div(self, width, content): - ret = hippo.CanvasBox( + ret = Hippo.CanvasBox( box_width=width, - yalign=hippo.ALIGNMENT_CENTER) + yalign=Hippo.ALIGNMENT_CENTER) ret.append(content) return ret |