yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GT-2925 - Key Bindings - Support Window Menu Provider Key Bindings -

Browse source 
Step 7 - Untangled and removed the key binding management from the
ActionToGuiMapper; fixed bugs and tests
This commit is contained in:
dragonmacher 2019-06-28 15:20:13 -04:00
parent d684ee3ce6
commit 3946a05ded
27 changed files with 515 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
View file

@ -150,16 +150,16 @@ public abstract class PluginTool extends AbstractDockingTool
this.projectManager = projectManager;
this.toolServices = toolServices;
propertyChangeMgr = new PropertyChangeSupport(this);
winMgr = createDockingWindowManager(isDockable, hasStatus, isModal);
taskMgr = new ToolTaskManager(this);
optionsMgr = new OptionsManager(this);
winMgr = createDockingWindowManager(isDockable, hasStatus, isModal);
toolActions = new ToolActions(this, new ActionToGuiHelper(winMgr));
taskMgr = new ToolTaskManager(this);
setToolOptionsHelpLocation();
winMgr.addStatusItem(taskMgr.getMonitorComponent(), false, true);
winMgr.removeStatusItem(taskMgr.getMonitorComponent());
eventMgr = new EventManager(this);
serviceMgr = new ServiceManager();
installServices();
toolActions = new ToolActions(this, winMgr);
pluginMgr = new PluginManager(this, serviceMgr);
dialogMgr = new DialogManager(this);
initActions();
@ -190,8 +190,8 @@ public abstract class PluginTool extends AbstractDockingTool
boolean isModal) {
List<Image> windowIcons = ApplicationInformationDisplayFactory.getWindowIcons();
DockingWindowManager newManager = new DockingWindowManager("EMPTY", windowIcons, this,
isModal, isDockable, hasStatus, null);
DockingWindowManager newManager =
new DockingWindowManager(this, windowIcons, this, isModal, isDockable, hasStatus, null);
return newManager;
}
@ -1322,8 +1322,8 @@ public abstract class PluginTool extends AbstractDockingTool
}
void removeAll(String owner) {
toolActions.removeToolActions(owner);
winMgr.removeAll(owner);
toolActions.removeActions(owner);
winMgr.ownerRemoved(owner);
}
void registerEventProduced(Class<? extends PluginEvent> eventClass) {
@ -1468,6 +1468,7 @@ public abstract class PluginTool extends AbstractDockingTool
return winMgr.getActiveWindow();
}
@Override
public ComponentProvider getActiveComponentProvider() {
return winMgr.getActiveComponentProvider();
}

40
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/KeyBindingsPanel.java
View file

@ -67,7 +67,7 @@ public class KeyBindingsPanel extends JPanel {
private ListSelectionModel selectionModel;
private Options options;
private Map<String, DockingActionIf> actionsByFullName;
private Map<String, List<DockingActionIf>> actionsByFullName;
private Map<String, List<String>> actionNamesByKeyStroke;
private Map<String, KeyStroke> keyStrokesByFullName;
private Map<String, KeyStroke> originalValues; // to know what has been changed
@ -114,11 +114,11 @@ public class KeyBindingsPanel extends JPanel {
changesMade(false);
}
private boolean updateOptions(String fullActionName, KeyStroke currentKeyStroke,
private void updateOptions(String fullActionName, KeyStroke currentKeyStroke,
KeyStroke newKeyStroke) {
if ((currentKeyStroke != null && currentKeyStroke.equals(newKeyStroke)) ||
(currentKeyStroke == null && newKeyStroke == null)) {
return false;
if (Objects.equals(currentKeyStroke, newKeyStroke)) {
return;
}
if (newKeyStroke != null) {
@ -130,19 +130,12 @@ public class KeyBindingsPanel extends JPanel {
originalValues.put(fullActionName, newKeyStroke);
keyStrokesByFullName.put(fullActionName, newKeyStroke);
Set<DockingActionIf> actions = tool.getAllActions();
List<DockingActionIf> actions = actionsByFullName.get(fullActionName);
for (DockingActionIf action : actions) {
if (action.getFullName().equals(fullActionName)) {
action.setUnvalidatedKeyBindingData(new KeyBindingData(newKeyStroke));
}
action.setUnvalidatedKeyBindingData(new KeyBindingData(newKeyStroke));
}
return true;
}
/**
* Cancel the changes to the actions.
*/
public void cancel() {
Iterator<String> iter = originalValues.keySet().iterator();
while (iter.hasNext()) {
@ -173,10 +166,12 @@ public class KeyBindingsPanel extends JPanel {
String longestName = "";
actionsByFullName = KeyBindingUtils.getAllActionsByFullName(tool);
Set<Entry<String, DockingActionIf>> entries = actionsByFullName.entrySet();
for (Entry<String, DockingActionIf> entry : entries) {
Set<Entry<String, List<DockingActionIf>>> entries = actionsByFullName.entrySet();
for (Entry<String, List<DockingActionIf>> entry : entries) {
DockingActionIf action = entry.getValue();
// pick one action, they are all conceptually the same
List<DockingActionIf> actions = entry.getValue();
DockingActionIf action = actions.get(0);
tableActions.add(action);
String actionName = entry.getKey();
@ -413,11 +408,13 @@ public class KeyBindingsPanel extends JPanel {
Iterator<String> iter = keyStrokesByFullName.keySet().iterator();
while (iter.hasNext()) {
String actionName = iter.next();
DockingActionIf action = actionsByFullName.get(actionName);
if (action == null) {
List<DockingActionIf> actions = actionsByFullName.get(actionName);
if (actions.isEmpty()) {
throw new AssertException("No actions defined for " + actionName);
}
// pick one action, they are all conceptually the same
DockingActionIf action = actions.get(0);
KeyStroke currentKeyStroke = keyStrokesByFullName.get(actionName);
KeyBindingData defaultBinding = action.getDefaultKeyBindingData();
KeyStroke newKeyStroke =
@ -669,11 +666,14 @@ public class KeyBindingsPanel extends JPanel {
}
ksField.setText(ksName);
// make sure the label gets enough space
statusLabel.setPreferredSize(
new Dimension(statusLabel.getPreferredSize().width, STATUS_LABEL_HEIGHT));
DockingActionIf action = actionsByFullName.get(fullActionName);
// pick one action, they are all conceptually the same
List<DockingActionIf> actions = actionsByFullName.get(fullActionName);
DockingActionIf action = actions.get(0);
String description = action.getDescription();
if (description == null || description.trim().isEmpty()) {
description = action.getName();

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java
View file

@ -83,7 +83,7 @@ public class GhidraTool extends PluginTool {
@Override
protected DockingWindowManager createDockingWindowManager(boolean isDockable, boolean hasStatus,
boolean isModal) {
return new DockingWindowManager("EMPTY", null, this, isModal, isDockable, hasStatus,
return new DockingWindowManager(this, null, this, isModal, isDockable, hasStatus,
new OpenFileDropHandlerFactory(this));
}