From 2094a5d0e84fa577bb45573658b86247504bdac1 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Tue, 17 Nov 2020 16:56:58 -0500 Subject: [PATCH] GP-399 - fixed broken keybindings --- .../app/plugin/core/navigation/NextSelectedRangeAction.java | 4 +++- .../plugin/core/navigation/PreviousSelectedRangeAction.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextSelectedRangeAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextSelectedRangeAction.java index 073470aeba..2bc0c9e7fb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextSelectedRangeAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextSelectedRangeAction.java @@ -15,6 +15,7 @@ */ package ghidra.app.plugin.core.navigation; +import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import docking.DockingUtils; @@ -44,7 +45,8 @@ public class NextSelectedRangeAction extends NextRangeAction { ResourceManager.loadImage("images/NextSelectionBlock16.gif"), ToolConstants.TOOLBAR_GROUP_THREE, NextPrevSelectedRangePlugin.ACTION_SUB_GROUP)); setKeyBindingData( - new KeyBindingData(KeyEvent.VK_BRACERIGHT, DockingUtils.CONTROL_KEY_MODIFIER_MASK)); + new KeyBindingData(KeyEvent.VK_OPEN_BRACKET, DockingUtils.CONTROL_KEY_MODIFIER_MASK | + InputEvent.SHIFT_DOWN_MASK)); setDescription("Go to next selected range"); setHelpLocation(new HelpLocation(HelpTopics.SELECTION, getName())); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousSelectedRangeAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousSelectedRangeAction.java index 0b85432a47..7ef4a1ad07 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousSelectedRangeAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousSelectedRangeAction.java @@ -15,6 +15,7 @@ */ package ghidra.app.plugin.core.navigation; +import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import javax.swing.ImageIcon; @@ -45,7 +46,8 @@ public class PreviousSelectedRangeAction extends PreviousRangeAction { setToolBarData(new ToolBarData(icon, ToolConstants.TOOLBAR_GROUP_THREE, NextPrevSelectedRangePlugin.ACTION_SUB_GROUP)); setKeyBindingData( - new KeyBindingData(KeyEvent.VK_BRACELEFT, DockingUtils.CONTROL_KEY_MODIFIER_MASK)); + new KeyBindingData(KeyEvent.VK_CLOSE_BRACKET, DockingUtils.CONTROL_KEY_MODIFIER_MASK | + InputEvent.SHIFT_DOWN_MASK)); setDescription("Go to previous selected range"); setHelpLocation(new HelpLocation(HelpTopics.SELECTION, getName()));