diff options
Diffstat (limited to 'activities/browser/NavigationToolbar.py')
| -rw-r--r-- | activities/browser/NavigationToolbar.py | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/activities/browser/NavigationToolbar.py b/activities/browser/NavigationToolbar.py index 87ed764..1220275 100644 --- a/activities/browser/NavigationToolbar.py +++ b/activities/browser/NavigationToolbar.py @@ -5,13 +5,13 @@ from gettext import gettext as _ from AddressItem import AddressItem class NavigationToolbar(gtk.Toolbar): - def __init__(self, browser): + def __init__(self): gtk.Toolbar.__init__(self) - self._browser = browser - self._embed = self._browser.get_embed() self.set_style(gtk.TOOLBAR_BOTH_HORIZ) - + + self._insert_spring() + self.back = gtk.ToolButton(None, _('Back')) self.back.set_icon_name('back') self.back.connect("clicked", self.__go_back_cb) @@ -25,16 +25,29 @@ class NavigationToolbar(gtk.Toolbar): self.forward.show() separator = gtk.SeparatorToolItem() + separator.set_draw(False) self.insert(separator, -1) separator.show() - - address_item = AddressItem(self.__open_address_cb) + + address_item = AddressItem() + address_item.connect('open-address', self.__open_address_cb) self.insert(address_item, -1) address_item.show() - self._update_sensitivity() + self._insert_spring() + + def _insert_spring(self): + separator = gtk.SeparatorToolItem() + separator.set_draw(False) + separator.set_expand(True) + self.insert(separator, -1) + separator.show() + + def set_embed(self, embed): + self._embed = embed self._embed.connect("location", self.__location_changed) + self._update_sensitivity() def _update_sensitivity(self): self.back.set_sensitive(self._embed.can_go_back()) @@ -49,5 +62,5 @@ class NavigationToolbar(gtk.Toolbar): def __location_changed(self, embed): self._update_sensitivity() - def __open_address_cb(self, address): + def __open_address_cb(self, item, address): self._embed.load_url(address) |