Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/browser.py
diff options
context:
space:
mode:
authorManuel Quiñones <manuq@laptop.org>2012-05-02 11:57:21 (GMT)
committer Manuel Quiñones <manuq@laptop.org>2012-05-02 14:45:26 (GMT)
commitd8a95a5dba23de482764cc1539eff34efb75d7e8 (patch)
tree535dbee222384e380ca1885d1f37ef9a09bd9010 /browser.py
parentfde82cc24bf172db353f02b7e911d5c5e8ecab72 (diff)
Remove link overlay
The loading/link indicator seems to be disturbing for users, and we already have means to display the link information in the palette, and the loading status in the URL entry. Signed-off-by: Manuel Quiñones <manuq@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'browser.py')
-rw-r--r--browser.py59
1 files changed, 2 insertions, 57 deletions
diff --git a/browser.py b/browser.py
index d7a8734..c0bb7bc 100644
--- a/browser.py
+++ b/browser.py
@@ -323,78 +323,23 @@ Gtk.rc_parse_string('''
widget "*browse-tab-close" style "browse-tab-close"''')
-class LinkInfo(Gtk.Label):
- __gtype_name__ = 'BrowseLinkInfo'
-
- def __init__(self):
- GObject.GObject.__init__(self)
- self.set_halign(Gtk.Align.START)
- self.set_valign(Gtk.Align.END)
-
-
-class TabPage(Gtk.Overlay):
+class TabPage(Gtk.ScrolledWindow):
__gtype_name__ = 'BrowseTabPage'
def __init__(self, browser):
GObject.GObject.__init__(self)
self._browser = browser
- self._showing_load_status = False
- self._requested_uri = None
-
- link_info = LinkInfo()
- self.add_overlay(link_info)
- link_info.show()
- scrolled_window = Gtk.ScrolledWindow()
- self.add(scrolled_window)
- scrolled_window.show()
-
- scrolled_window.add(browser)
+ self.add(browser)
browser.show()
- browser.connect('hovering-over-link', self.__hovering_over_link_cb,
- link_info)
- browser.connect('notify::load-status', self.__load_status_cb,
- link_info)
- browser.connect('resource-request-starting',
- self.__resource_request_starting_cb)
-
def _get_browser(self):
return self._browser
browser = GObject.property(type=object,
getter=_get_browser)
- def __hovering_over_link_cb(self, webview, title, uri, link_info):
- if self._showing_load_status:
- return
-
- if uri is None:
- link_info.hide()
- else:
- link_info.set_text(uri)
- link_info.show()
-
- def __load_status_cb(self, webview, param, link_info):
- status = webview.get_load_status()
- if status <= WebKit.LoadStatus.COMMITTED:
- if self._requested_uri is None:
- link_info.set_text(_("Loading..."))
- else:
- link_info.set_text(_("Loading %s...") % self._requested_uri)
- self._showing_load_status = True
- link_info.show()
- else:
- self._showing_load_status = False
- self._requested_uri = None
- link_info.hide()
-
- def __resource_request_starting_cb(self, webview, webframe, webresource,
- request, response):
- """Set the request uri to be shown in the label overlay."""
- self._requested_uri = request.get_uri()
-
class TabLabel(Gtk.HBox):
__gtype_name__ = 'BrowseTabLabel'