From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1739) id D07533858CD1; Mon, 31 Jul 2023 10:08:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D07533858CD1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690798126; bh=iQbOw102Ez97sJp1WTi2fobVRFKRcR0getdx+TyXYxs=; h=To:Subject:Date:From:From; b=u6JV9ZW2pgPxVH6cNVLlCnsh6BmySd2zoyPmen8HVbO0/UgAFZzsvloVgGEZ2frIp kXu7vEU1iGFeihYsJ54NsY6JLyQR3SOsm73RCCrxGGGya9TyTplS/NBPIClehIAMRJ Vz7KFludNW9pqiDF5Dro98kCb8bwymsYWPzUqzQk= To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.926-29-g8eb2882d X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7eec2e7920e8cc011feb12bbcbba0bbd88f17a24 X-Git-Newrev: 8eb2882d04178927e55a423e0f4a7cb5798fc2a6 Message-Id: <20230731100846.D07533858CD1@sourceware.org> Date: Mon, 31 Jul 2023 10:08:46 +0000 (GMT) From: Christian Franke List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=8eb2882d04178927e55a423e0f4a7cb5798fc2a6 commit 8eb2882d04178927e55a423e0f4a7cb5798fc2a6 Author: Christian Franke Date: Mon Jul 31 12:05:11 2023 +0200 Keyboard accelerator for keep or skip Ctrl+K selects keep or skip and then moves selection to next row. Diff: --- PickPackageLine.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PickPackageLine.cc b/PickPackageLine.cc index c1e2a150..d380965d 100644 --- a/PickPackageLine.cc +++ b/PickPackageLine.cc @@ -155,6 +155,7 @@ PickPackageLine::map_key_to_action(WORD vkey, int modkeys, int & col_num, col_num = new_col; return Action::PopUp; case 'I': // Ctrl+I: select install default version and move to next row + case 'K': // Ctrl+K: select keep or skip package and move to next row case 'R': // Ctrl+R: select reinstall and move to next row case 'U': // Ctrl+U: select uninstall and move to next row if (modkeys != ModifierKeys::Control) @@ -163,8 +164,9 @@ PickPackageLine::map_key_to_action(WORD vkey, int modkeys, int & col_num, switch (vkey) { case 'I': action_id = packagemeta::Install_action; break; + default: action_id = packagemeta::NoChange_action; break; case 'R': action_id = packagemeta::Reinstall_action; break; - default: action_id = packagemeta::Uninstall_action; break; + case 'U': action_id = packagemeta::Uninstall_action; break; } return Action::Direct | Action::NextRow; }