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

Tunnel :hint and :navigate

Browse Source
This commit is contained in:
Florian Bruhin 2016-06-15 14:07:05 +02:00
parent 5fe2230e1f
commit ac4186a0f0
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/browser/commands.py
View File

@ -479,15 +479,22 @@ class CommandDispatcher:
cmdutils.check_exclusive((tab, bg, window), 'tbw')
widget = self._current_widget()
frame = widget.page().currentFrame()
url = self._current_url().adjusted(QUrl.RemoveFragment)
if frame is None:
raise cmdexc.CommandError("No frame focused!")
if where in ['prev', 'next']:
frame = widget._widget.page().currentFrame() # FIXME
if frame is None:
raise cmdexc.CommandError("No frame focused!")
else:
frame = None
hintmanager = objreg.get('hintmanager', scope='tab', tab='current')
if where == 'prev':
assert frame is not None
hintmanager.follow_prevnext(frame, url, prev=True, tab=tab,
background=bg, window=window)
elif where == 'next':
assert frame is not None
hintmanager.follow_prevnext(frame, url, prev=False, tab=tab,
background=bg, window=window)
elif where == 'up':

6
qutebrowser/browser/hints.py
View File

@ -811,10 +811,10 @@ class HintManager(QObject):
"""
tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=self._win_id)
widget = tabbed_browser.currentWidget()
if widget is None:
tab = tabbed_browser.currentWidget()
if tab is None:
raise cmdexc.CommandError("No WebView available yet!")
mainframe = widget.page().mainFrame()
mainframe = tab._widget.page().mainFrame() # FIXME
if mainframe is None:
raise cmdexc.CommandError("No frame focused!")
mode_manager = objreg.get('mode-manager', scope='window',