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

Use object registry for webview.tabbedbrowser.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-24 20:27:05 +02:00
parent b119100321
commit 9868721cc7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/webpage.py
View File

@ -301,10 +301,10 @@ class BrowserPage(QWebPage):
log.webview.debug(url.errorString()) log.webview.debug(url.errorString())
return False return False
if self._view.open_target == usertypes.ClickTarget.tab: if self._view.open_target == usertypes.ClickTarget.tab:
self._view.tabbedbrowser.tabopen(url, False) objreg.get('tabbed-browser').tabopen(url, False)
return False return False
elif self._view.open_target == usertypes.ClickTarget.tab_bg: elif self._view.open_target == usertypes.ClickTarget.tab_bg:
self._view.tabbedbrowser.tabopen(url, True) objreg.get('tabbed-browser').tabopen(url, True)
return False return False
else: else:
self.change_title.emit(urlstr) self.change_title.emit(urlstr)

8
qutebrowser/widgets/webview.py
View File

@ -43,9 +43,6 @@ class WebView(QWebView):
Attributes: Attributes:
hintmanager: The HintManager instance for this view. hintmanager: The HintManager instance for this view.
tabbedbrowser: The TabbedBrowser this WebView is part of.
We need this rather than signals to make createWindow
work.
progress: loading progress of this page. progress: loading progress of this page.
scroll_pos: The current scroll position as (x%, y%) tuple. scroll_pos: The current scroll position as (x%, y%) tuple.
statusbar_message: The current javscript statusbar message. statusbar_message: The current javscript statusbar message.
@ -77,11 +74,10 @@ class WebView(QWebView):
load_status_changed = pyqtSignal(str) load_status_changed = pyqtSignal(str)
url_text_changed = pyqtSignal(str) url_text_changed = pyqtSignal(str)
def __init__(self, parent): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
self.load_status = LoadStatus.none self.load_status = LoadStatus.none
self._check_insertmode = False self._check_insertmode = False
self.tabbedbrowser = parent
self.inspector = None self.inspector = None
self.scroll_pos = (-1, -1) self.scroll_pos = (-1, -1)
self.statusbar_message = '' self.statusbar_message = ''
@ -404,7 +400,7 @@ class WebView(QWebView):
if wintype == QWebPage.WebModalDialog: if wintype == QWebPage.WebModalDialog:
log.webview.warning("WebModalDialog requested, but we don't " log.webview.warning("WebModalDialog requested, but we don't "
"support that!") "support that!")
return self.tabbedbrowser.tabopen() return objreg.get('tabbed-browser').tabopen()
def paintEvent(self, e): def paintEvent(self, e):
"""Extend paintEvent to emit a signal if the scroll position changed. """Extend paintEvent to emit a signal if the scroll position changed.