diff options
Diffstat (limited to 'readsidebar.py')
| -rw-r--r-- | readsidebar.py | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/readsidebar.py b/readsidebar.py index 5dee47f..b4db2bc 100644 --- a/readsidebar.py +++ b/readsidebar.py @@ -18,14 +18,12 @@ import logging import time -from gi.repository import Gtk -from gi.repository import Gdk +import gtk -from sugar3.graphics.icon import Icon -from sugar3.graphics.xocolor import XoColor -from sugar3 import profile -from sugar3.util import timestamp_to_elapsed_string -from sugar3.graphics import style +from sugar.graphics.icon import Icon +from sugar.graphics.xocolor import XoColor +from sugar import profile +from sugar.util import timestamp_to_elapsed_string from readbookmark import Bookmark from readdb import BookmarkManager @@ -40,16 +38,17 @@ _logger = logging.getLogger('read-activity') # (required when sharing) -class Sidebar(Gtk.EventBox): +class Sidebar(gtk.EventBox): def __init__(self): - Gtk.EventBox.__init__(self) + gtk.EventBox.__init__(self) self.set_size_request(20, -1) # Take care of the background first - self.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color()) + white = gtk.gdk.color_parse("white") + self.modify_bg(gtk.STATE_NORMAL, white) - self._box = Gtk.VButtonBox() - self._box.set_layout(Gtk.ButtonBoxStyle.CENTER) + self._box = gtk.VButtonBox() + self._box.set_layout(gtk.BUTTONBOX_CENTER) self.add(self._box) self._box.show() @@ -58,7 +57,8 @@ class Sidebar(Gtk.EventBox): self._bookmark_icon = None self._bookmark_manager = None self._is_showing_local_bookmark = False - self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) + + self.add_events(gtk.gdk.BUTTON_PRESS_MASK) def _add_bookmark_icon(self, bookmark): xocolor = XoColor(bookmark.color) @@ -73,7 +73,7 @@ class Sidebar(Gtk.EventBox): self.__event_cb_id = \ self.connect('event', self.__event_cb, bookmark) - self._box.pack_start(self._bookmark_icon, False, False, 0) + self._box.pack_start(self._bookmark_icon, expand=False, fill=False) self._bookmark_icon.show_all() if bookmark.is_local(): @@ -89,30 +89,30 @@ class Sidebar(Gtk.EventBox): % {'user': bookmark.nick, 'time': timestamp_to_elapsed_string(bookmark.timestamp)}) - vbox = Gtk.VBox() + vbox = gtk.VBox() - l = Gtk.Label('<big>%s</big>' % tooltip_header) + l = gtk.Label('<big>%s</big>' % tooltip_header) l.set_use_markup(True) l.set_width_chars(40) l.set_line_wrap(True) - vbox.pack_start(l, False, False, 0) + vbox.pack_start(l, expand=False, fill=False) l.show() - l = Gtk.Label('%s' % tooltip_body) + l = gtk.Label('%s' % tooltip_body) l.set_use_markup(True) l.set_alignment(0, 0) l.set_padding(2, 6) l.set_width_chars(40) l.set_line_wrap(True) - l.set_justify(Gtk.JUSTIFY_FILL) - vbox.pack_start(l, True, True, 0) + l.set_justify(gtk.JUSTIFY_FILL) + vbox.pack_start(l, expand=True, fill=True) l.show() - l = Gtk.Label('<small><i>%s</i></small>' % tooltip_footer) + l = gtk.Label('<small><i>%s</i></small>' % tooltip_footer) l.set_use_markup(True) l.set_width_chars(40) l.set_line_wrap(True) - vbox.pack_start(l, False, False, 0) + vbox.pack_start(l, expand=False, fill=False) l.show() tip.set_custom(vbox) @@ -120,7 +120,7 @@ class Sidebar(Gtk.EventBox): return True def __event_cb(self, widget, event, bookmark): - if event.type == Gdk.EventType.BUTTON_PRESS and \ + if event.type == gtk.gdk.BUTTON_PRESS and \ self._bookmark_icon is not None: bookmark_title = bookmark.get_note_title() |