From 88ee5e95fcb4595d1b81ac2e4ecf8a4d2aee4256 Mon Sep 17 00:00:00 2001 From: pagedown Date: Sat, 22 Jan 2022 03:21:59 +0800 Subject: [PATCH] Add default choices for features that use ask kitten --- kittens/ask/main.py | 1 + kitty/boss.py | 4 ++-- kitty/window.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kittens/ask/main.py b/kittens/ask/main.py index a427a0c30..4ee43b566 100644 --- a/kittens/ask/main.py +++ b/kittens/ask/main.py @@ -262,6 +262,7 @@ class Choose(Handler): self.draw_screen() def on_interrupt(self) -> None: + self.response = '' self.quit_loop(1) on_eot = on_interrupt diff --git a/kitty/boss.py b/kitty/boss.py index c03feba1d..4aa0ef7fa 100644 --- a/kitty/boss.py +++ b/kitty/boss.py @@ -654,7 +654,7 @@ class Boss: if window.has_running_program: msg += ' ' + _('It is running a program.') self._run_kitten( - 'ask', ['--type=yesno', '--message', msg], + 'ask', ['--type=yesno', '--default=y', '--message', msg], window=window, custom_callback=partial(self.handle_close_window_confirmation, window.id) ) @@ -676,7 +676,7 @@ class Boss: window: Optional[Window] = None, confirm_on_cancel: bool = False) -> None: def callback_(res: Dict[str, Any], x: int, boss: Boss) -> None: callback(res.get('response') == 'y', *args) - self._run_kitten('ask', ['--type=yesno', '--message', msg], + self._run_kitten('ask', ['--type=yesno', '--default=y', '--message', msg], window=window, custom_callback=callback_, default_data={'response': 'y' if confirm_on_cancel else 'n'}) def confirm_tab_close(self, tab: Tab) -> None: diff --git a/kitty/window.py b/kitty/window.py index 936be4f9b..ab1a40e98 100644 --- a/kitty/window.py +++ b/kitty/window.py @@ -653,6 +653,7 @@ class Window: 'What would you like to do with this URL:\n') + styled(unquote(url), fg='yellow'), '--choice=o:Open', '--choice=c:Copy to clipboard', '--choice=n;red:Nothing' + '--default=o' ], window=self, custom_callback=partial(self.hyperlink_open_confirmed, url, cwd),