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

Move tab_id_gen and add tab_id to webview repr.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-26 16:44:41 +02:00
parent 36fd2e5c7f
commit 4e42ff1304
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/utils/usertypes.py
View File

@ -23,7 +23,6 @@ Module attributes:
_UNSET: Used as default argument in the constructor so default can be None. _UNSET: Used as default argument in the constructor so default can be None.
""" """
import itertools
import operator import operator
import collections.abc import collections.abc
import enum as pyenum import enum as pyenum
@ -36,9 +35,6 @@ from qutebrowser.utils import log, qtutils, utils
_UNSET = object() _UNSET = object()
tab_id_gen = itertools.count(0)
def enum(name, *items, start=1, is_int=False): def enum(name, *items, start=1, is_int=False):
"""Factory for simple enumerations. """Factory for simple enumerations.

12
qutebrowser/widgets/webview.py
View File

@ -19,6 +19,8 @@
"""The main browser widgets.""" """The main browser widgets."""
import itertools
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from PyQt5.QtWebKit import QWebSettings from PyQt5.QtWebKit import QWebSettings
@ -35,6 +37,9 @@ LoadStatus = usertypes.enum('LoadStatus', 'none', 'success', 'error', 'warn',
'loading') 'loading')
tab_id_gen = itertools.count(0)
class WebView(QWebView): class WebView(QWebView):
"""One browser tab in TabbedBrowser. """One browser tab in TabbedBrowser.
@ -91,6 +96,7 @@ class WebView(QWebView):
self.cur_url = QUrl() self.cur_url = QUrl()
self.progress = 0 self.progress = 0
self.registry = objreg.ObjectRegistry() self.registry = objreg.ObjectRegistry()
self.tab_id = next(tab_id_gen)
objreg.register('webview', self, registry=self.registry) objreg.register('webview', self, registry=self.registry)
page = webpage.BrowserPage(self) page = webpage.BrowserPage(self)
self.setPage(page) self.setPage(page)
@ -98,8 +104,8 @@ class WebView(QWebView):
hintmanager.mouse_event.connect(self.on_mouse_event) hintmanager.mouse_event.connect(self.on_mouse_event)
hintmanager.set_open_target.connect(self.set_force_open_target) hintmanager.set_open_target.connect(self.set_force_open_target)
objreg.register('hintmanager', hintmanager, registry=self.registry) objreg.register('hintmanager', hintmanager, registry=self.registry)
tab_id = next(usertypes.tab_id_gen) objreg.register('tab-{}'.format(self.tab_id),
objreg.register('tab-{}'.format(tab_id), self.registry, scope='meta') self.registry, scope='meta')
page.linkHovered.connect(self.linkHovered) page.linkHovered.connect(self.linkHovered)
page.mainFrame().loadStarted.connect(self.on_load_started) page.mainFrame().loadStarted.connect(self.on_load_started)
self.urlChanged.connect(self.on_url_changed) self.urlChanged.connect(self.on_url_changed)
@ -113,7 +119,7 @@ class WebView(QWebView):
def __repr__(self): def __repr__(self):
url = utils.elide(self.url().toDisplayString(), 50) url = utils.elide(self.url().toDisplayString(), 50)
return utils.get_repr(self, url=url) return utils.get_repr(self, tab_id=self.tab_id, url=url)
def _set_load_status(self, val): def _set_load_status(self, val):
"""Setter for load_status. """Setter for load_status.