diff options
Diffstat (limited to 'src/jarabe/journal/detailview.py')
| -rw-r--r-- | src/jarabe/journal/detailview.py | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/src/jarabe/journal/detailview.py b/src/jarabe/journal/detailview.py index aa8c039..b5a7a2b 100644 --- a/src/jarabe/journal/detailview.py +++ b/src/jarabe/journal/detailview.py @@ -19,7 +19,6 @@ from gettext import gettext as _ import gobject import gtk -import hippo from sugar.graphics import style from sugar.graphics.icon import CanvasIcon @@ -39,21 +38,23 @@ class DetailView(gtk.VBox): self._metadata = None self._expanded_entry = None - canvas = hippo.Canvas() - - self._root = hippo.CanvasBox() - self._root.props.background_color = style.COLOR_PANEL_GREY.get_int() - canvas.set_root(self._root) + root_box = gtk.EventBox() + root_box.modify_bg(gtk.STATE_NORMAL, + style.COLOR_WHITE.get_gdk_color()) + self._root = gtk.VBox() + root_box.add(self._root) back_bar = BackBar() back_bar.connect('button-release-event', self.__back_bar_release_event_cb) - self._root.append(back_bar) + self._root.pack_start(back_bar, False, False, style.DEFAULT_SPACING) gobject.GObject.__init__(self, **kwargs) + gtk.VBox.__init__(self) - self.pack_start(canvas) - canvas.show() + self.pack_start(root_box, True, True, 0) + self._root.show() + self.show_all() def _fav_icon_activated_cb(self, fav_icon): keep = not self._expanded_entry.get_keep() @@ -67,8 +68,9 @@ class DetailView(gtk.VBox): def _update_view(self): if self._expanded_entry is None: self._expanded_entry = ExpandedEntry() - self._root.append(self._expanded_entry, hippo.PACK_EXPAND) + self._root.pack_start(self._expanded_entry) self._expanded_entry.set_metadata(self._metadata) + self._root.show_all() def refresh(self): logging.debug('DetailView.refresh') @@ -86,34 +88,35 @@ class DetailView(gtk.VBox): type=object, getter=get_metadata, setter=set_metadata) -class BackBar(hippo.CanvasBox): +class BackBar(gtk.EventBox): def __init__(self): - hippo.CanvasBox.__init__(self, - orientation=hippo.ORIENTATION_HORIZONTAL, - border=style.LINE_WIDTH, - background_color=style.COLOR_PANEL_GREY.get_int(), - border_color=style.COLOR_SELECTION_GREY.get_int(), - padding=style.DEFAULT_PADDING, - padding_left=style.DEFAULT_SPACING, - spacing=style.DEFAULT_SPACING) - + gtk.EventBox.__init__(self) + self.set_border_width(style.DEFAULT_SPACING) + self.modify_bg(gtk.STATE_NORMAL, + style.COLOR_PANEL_GREY.get_gdk_color()) + hbox = gtk.HBox() icon = CanvasIcon(icon_name='go-previous', size=style.SMALL_ICON_SIZE, fill_color=style.COLOR_TOOLBAR_GREY.get_svg()) - self.append(icon) + hbox.pack_start(icon, False, False, style.DEFAULT_SPACING) - label = hippo.CanvasText(text=_('Back'), - font_desc=style.FONT_NORMAL.get_pango_desc()) - self.append(label) + label = gtk.Label() + label.set_text(_('Back')) + halign = gtk.Alignment(0, 0, 0, 0) + halign.add(label) + hbox.pack_start(halign, True, True, style.DEFAULT_SPACING) + hbox.show() + self.add(hbox) if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL: - self.reverse() + hbox.reverse() self.connect('motion-notify-event', self.__motion_notify_event_cb) def __motion_notify_event_cb(self, box, event): - if event.detail == hippo.MOTION_DETAIL_ENTER: - box.props.background_color = style.COLOR_SELECTION_GREY.get_int() - elif event.detail == hippo.MOTION_DETAIL_LEAVE: - box.props.background_color = style.COLOR_PANEL_GREY.get_int() + if event.detail == 1: # TODO: enter + box.props.background_color = style.COLOR_SELECTION_GREY.get_gdk_color() + elif event.detail == 0: # TODO: leave + box.props.background_color = style.COLOR_PANEL_GREY.get_gdk_color() return False + |