rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of _page attribute of WebView

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-24 20:29:38 +02:00
parent 9868721cc7
commit 7e8e9ee21f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/widgets/webview.py
View File

@ -51,7 +51,6 @@ class WebView(QWebView):
open_target: Where to open the next tab ("normal", "tab", "tab_bg") open_target: Where to open the next tab ("normal", "tab", "tab_bg")
viewing_source: Whether the webview is currently displaying source viewing_source: Whether the webview is currently displaying source
code. code.
_page: The QWebPage behind the view
_cur_url: The current URL (accessed via cur_url property). _cur_url: The current URL (accessed via cur_url property).
_has_ssl_errors: Whether SSL errors occured during loading. _has_ssl_errors: Whether SSL errors occured during loading.
_zoom: A NeighborList with the zoom levels. _zoom: A NeighborList with the zoom levels.
@ -90,16 +89,16 @@ class WebView(QWebView):
self._cur_url = None self._cur_url = None
self.cur_url = QUrl() self.cur_url = QUrl()
self.progress = 0 self.progress = 0
self._page = webpage.BrowserPage(self) page = webpage.BrowserPage(self)
self.setPage(self._page) self.setPage(page)
self.hintmanager = hints.HintManager(self) self.hintmanager = hints.HintManager(self)
self.hintmanager.mouse_event.connect(self.on_mouse_event) self.hintmanager.mouse_event.connect(self.on_mouse_event)
self.hintmanager.set_open_target.connect(self.set_force_open_target) self.hintmanager.set_open_target.connect(self.set_force_open_target)
self._page.linkHovered.connect(self.linkHovered) page.linkHovered.connect(self.linkHovered)
self._page.mainFrame().loadStarted.connect(self.on_load_started) page.mainFrame().loadStarted.connect(self.on_load_started)
self._page.change_title.connect(self.titleChanged) page.change_title.connect(self.titleChanged)
self.urlChanged.connect(self.on_url_changed) self.urlChanged.connect(self.on_url_changed)
self._page.mainFrame().loadFinished.connect(self.on_load_finished) page.mainFrame().loadFinished.connect(self.on_load_finished)
self.loadProgress.connect(lambda p: setattr(self, 'progress', p)) self.loadProgress.connect(lambda p: setattr(self, 'progress', p))
self.page().statusBarMessage.connect( self.page().statusBarMessage.connect(
lambda msg: setattr(self, 'statusbar_message', msg)) lambda msg: setattr(self, 'statusbar_message', msg))