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

Initial work on message.confirm_async

Browse Source 
Creation of _tab_close and usage of partial.
This commit is contained in:
thuck 2016-11-07 22:28:05 +01:00
parent 49b2a19925
commit f10284b04a
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qutebrowser/browser/commands.py
View File

@ -212,6 +212,19 @@ class CommandDispatcher:
"{!r}!".format(conf_selection)) "{!r}!".format(conf_selection))
return None return None
def _tab_close(self, tab, left=False, right=False, opposite=False, count=None):
tabbar = self._tabbed_browser.tabBar()
selection_override = self._get_selection_override(left, right,
opposite)
if selection_override is None:
self._tabbed_browser.close_tab(tab)
else:
old_selection_behavior = tabbar.selectionBehaviorOnRemove()
tabbar.setSelectionBehaviorOnRemove(selection_override)
self._tabbed_browser.close_tab(tab)
tabbar.setSelectionBehaviorOnRemove(old_selection_behavior)
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
@cmdutils.argument('count', count=True) @cmdutils.argument('count', count=True)
def tab_close(self, left=False, right=False, opposite=False, count=None): def tab_close(self, left=False, right=False, opposite=False, count=None):
@ -229,23 +242,17 @@ class CommandDispatcher:
if tab is None: if tab is None:
return return
close = functools.partial(self._tab_close, tab, left,
right, opposite, count)
if tab.data.pinned: if tab.data.pinned:
result = message.ask("Are you sure you want to close a pinned tab?", message.confirm_async(title='Pinned Tab',
mode=usertypes.PromptMode.yesno, default=False) text="Are you sure you want to close a pinned tab?",
yes_action=close, default=False)
if result is False or result is None:
return
tabbar = self._tabbed_browser.tabBar()
selection_override = self._get_selection_override(left, right,
opposite)
if selection_override is None:
self._tabbed_browser.close_tab(tab)
else: else:
old_selection_behavior = tabbar.selectionBehaviorOnRemove() close()
tabbar.setSelectionBehaviorOnRemove(selection_override)
self._tabbed_browser.close_tab(tab)
tabbar.setSelectionBehaviorOnRemove(old_selection_behavior)
@cmdutils.register(instance='command-dispatcher', scope='window', @cmdutils.register(instance='command-dispatcher', scope='window',
name='tab-pin') name='tab-pin')