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

Add --related flag to edit-url.

Browse Source
This commit is contained in:
Ryan Roden-Corrent 2017-10-26 22:13:35 -04:00
parent 6519f500a9
commit 24f466b2c3
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/browser/commands.py
View File

@ -2113,7 +2113,7 @@ class CommandDispatcher:
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
def edit_url(self, url=None, bg=False, tab=False, window=False, def edit_url(self, url=None, bg=False, tab=False, window=False,
private=False): private=False, related=False):
"""Navigate to a url formed in an external editor. """Navigate to a url formed in an external editor.
The editor which should be launched can be configured via the The editor which should be launched can be configured via the
@ -2125,6 +2125,8 @@ class CommandDispatcher:
tab: Open in a new tab. tab: Open in a new tab.
window: Open in a new window. window: Open in a new window.
private: Open a new window in private browsing mode. private: Open a new window in private browsing mode.
related: If opening a new tab, position the tab as related to the
current one (like clicking on a link).
""" """
cmdutils.check_exclusive((tab, bg, window), 'tbw') cmdutils.check_exclusive((tab, bg, window), 'tbw')
@ -2135,7 +2137,7 @@ class CommandDispatcher:
# Passthrough for openurl args (e.g. -t, -b, -w) # Passthrough for openurl args (e.g. -t, -b, -w)
ed.editing_finished.connect(functools.partial( ed.editing_finished.connect(functools.partial(
self._open_if_changed, old_url=old_url, bg=bg, tab=tab, self._open_if_changed, old_url=old_url, bg=bg, tab=tab,
window=window, private=private)) window=window, private=private, related=related))
ed.edit(url or old_url) ed.edit(url or old_url)
@ -2160,7 +2162,7 @@ class CommandDispatcher:
self._tabbed_browser.jump_mark(key) self._tabbed_browser.jump_mark(key)
def _open_if_changed(self, url=None, old_url=None, bg=False, tab=False, def _open_if_changed(self, url=None, old_url=None, bg=False, tab=False,
window=False, private=False): window=False, private=False, related=False):
"""Open a URL unless it's already open in the tab. """Open a URL unless it's already open in the tab.
Args: Args:
@ -2170,10 +2172,12 @@ class CommandDispatcher:
tab: Open in a new tab. tab: Open in a new tab.
window: Open in a new window. window: Open in a new window.
private: Open a new window in private browsing mode. private: Open a new window in private browsing mode.
related: If opening a new tab, position the tab as related to the
current one (like clicking on a link).
""" """
if bg or tab or window or private or url != old_url: if bg or tab or window or private or related or url != old_url:
self.openurl(url=url, bg=bg, tab=tab, window=window, self.openurl(url=url, bg=bg, tab=tab, window=window,
private=private) private=private, related=related)
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
def fullscreen(self, leave=False): def fullscreen(self, leave=False):

10
tests/end2end/features/editor.feature
View File

@ -23,6 +23,16 @@ Feature: Opening external editors
- data/numbers/1.txt - data/numbers/1.txt
- data/numbers/2.txt (active) - data/numbers/2.txt (active)
Scenario: Editing a URL with -rt
When I set tabs.new_position.related to prev
And I open data/numbers/1.txt
And I set up a fake editor replacing "1.txt" by "2.txt"
And I run :edit-url -rt
Then data/numbers/2.txt should be loaded
And the following tabs should be open:
- data/numbers/2.txt (active)
- data/numbers/1.txt
Scenario: Editing a URL with -b Scenario: Editing a URL with -b
When I run :tab-only When I run :tab-only
And I open data/numbers/1.txt And I open data/numbers/1.txt