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

tab: Rename modeman to mode_manager

Browse Source 
To avoid it being mixed up with the modeman module
This commit is contained in:
Florian Bruhin 2016-07-08 10:20:28 +02:00
parent 7c6dd60f35
commit 334f6cda4f
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/browser/tab.py
View File

@ -220,14 +220,14 @@ class AbstractCaret(QObject):
"""Attribute of AbstractTab for caret browsing.""" """Attribute of AbstractTab for caret browsing."""
def __init__(self, win_id, tab, modeman, parent=None): def __init__(self, win_id, tab, mode_manager, parent=None):
super().__init__(parent) super().__init__(parent)
self._tab = tab self._tab = tab
self._win_id = win_id self._win_id = win_id
self._widget = None self._widget = None
self.selection_enabled = False self.selection_enabled = False
modeman.entered.connect(self._on_mode_entered) mode_manager.entered.connect(self._on_mode_entered)
modeman.left.connect(self._on_mode_left) mode_manager.left.connect(self._on_mode_left)
def _on_mode_entered(self, mode): def _on_mode_entered(self, mode):
raise NotImplementedError raise NotImplementedError
@ -434,7 +434,7 @@ class AbstractTab(QWidget):
super().__init__(parent) super().__init__(parent)
# self.history = AbstractHistory(self) # self.history = AbstractHistory(self)
# self.scroll = AbstractScroller(parent=self) # self.scroll = AbstractScroller(parent=self)
# self.caret = AbstractCaret(win_id=win_id, tab=self, modeman=..., # self.caret = AbstractCaret(win_id=win_id, tab=self, mode_manager=...,
# parent=self) # parent=self)
# self.zoom = AbstractZoom(win_id=win_id) # self.zoom = AbstractZoom(win_id=win_id)
# self.search = AbstractSearch(parent=self) # self.search = AbstractSearch(parent=self)

6
qutebrowser/browser/webengine/webenginetab.py
View File

@ -171,13 +171,13 @@ class WebEngineViewTab(tab.AbstractTab):
"""A QtWebEngine tab in the browser.""" """A QtWebEngine tab in the browser."""
def __init__(self, win_id, modeman, parent=None): def __init__(self, win_id, mode_manager, parent=None):
super().__init__(win_id) super().__init__(win_id)
widget = webview.WebEngineView() widget = webview.WebEngineView()
self.history = WebEngineHistory(self) self.history = WebEngineHistory(self)
self.scroll = WebEngineScroller() self.scroll = WebEngineScroller()
self.caret = WebEngineCaret(win_id=win_id, modeman=modeman, tab=self, self.caret = WebEngineCaret(win_id=win_id, mode_manager=mode_manager,
parent=self) tab=self, parent=self)
self.zoom = WebEngineZoom(win_id=win_id, parent=self) self.zoom = WebEngineZoom(win_id=win_id, parent=self)
self.search = WebEngineSearch(parent=self) self.search = WebEngineSearch(parent=self)
self._set_widget(widget) self._set_widget(widget)

6
qutebrowser/browser/webkit/webkittab.py
View File

@ -450,13 +450,13 @@ class WebViewTab(tabmod.AbstractTab):
"""A QtWebKit tab in the browser.""" """A QtWebKit tab in the browser."""
def __init__(self, win_id, modeman, parent=None): def __init__(self, win_id, mode_manager, parent=None):
super().__init__(win_id) super().__init__(win_id)
widget = webview.WebView(win_id, self.tab_id, tab=self) widget = webview.WebView(win_id, self.tab_id, tab=self)
self.history = WebViewHistory(self) self.history = WebViewHistory(self)
self.scroll = WebViewScroller(parent=self) self.scroll = WebViewScroller(parent=self)
self.caret = WebViewCaret(win_id=win_id, modeman=modeman, tab=self, self.caret = WebViewCaret(win_id=win_id, mode_manager=mode_manager,
parent=self) tab=self, parent=self)
self.zoom = WebViewZoom(win_id=win_id, parent=self) self.zoom = WebViewZoom(win_id=win_id, parent=self)
self.search = WebViewSearch(parent=self) self.search = WebViewSearch(parent=self)
self._set_widget(widget) self._set_widget(widget)

7
tests/unit/browser/test_tab.py
View File

@ -66,12 +66,13 @@ def test_tab(qtbot, view, config_stub):
assert tab_w.win_id == 0 assert tab_w.win_id == 0
assert tab_w._widget is None assert tab_w._widget is None
mode_man = modeman.ModeManager(0) mode_manager = modeman.ModeManager(0)
tab_w.history = tab.AbstractHistory(tab_w) tab_w.history = tab.AbstractHistory(tab_w)
tab_w.scroll = tab.AbstractScroller(parent=tab_w) tab_w.scroll = tab.AbstractScroller(parent=tab_w)
tab_w.caret = tab.AbstractCaret(win_id=tab_w.win_id, modeman=mode_man, tab_w.caret = tab.AbstractCaret(win_id=tab_w.win_id,
tab=tab_w, parent=tab_w) mode_manager=mode_manager, tab=tab_w,
parent=tab_w)
tab_w.zoom = tab.AbstractZoom(win_id=tab_w.win_id) tab_w.zoom = tab.AbstractZoom(win_id=tab_w.win_id)
tab_w.search = tab.AbstractSearch(parent=tab_w) tab_w.search = tab.AbstractSearch(parent=tab_w)