Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6906 - Accessibility - Options fixes for Tab key traversal and for jumping between the options tree to the editor pane using Ctrl-E

dragonmachere685e2c8392b
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisOptionsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisOptionsDialog.java
index 209b4a4ac9..ee391b350d 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisOptionsDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisOptionsDialog.java
@@ -20,6 +20,7 @@ import java.beans.PropertyChangeListener;
import java.util.List;
import docking.DialogComponentProvider;
+import docking.action.DockingAction;
import docking.widgets.OptionDialog;
import ghidra.GhidraOptions;
import ghidra.framework.options.EditorStateFactory;
@@ -62,16 +63,20 @@ public class AnalysisOptionsDialog extends DialogComponentProvider
addOKButton();
addCancelButton();
addApplyButton();
+
setOkButtonText("Analyze");
+ okButton.setMnemonic('N'); // 'N' to avoid conflict with the 'A' in Apply
- // This allows user to press Enter to launch analysis when the dialog is shown. Without
- // this, the table takes focus, which consumes Enter key presses.
- setFocusComponent(okButton);
- okButton.setMnemonic('A');
- setOkEnabled(true);
setPreferredSize(1000, 600);
setRememberSize(true);
setHasChanges(panel.hasChangedValues());
+
+ setFocusComponent(panel.getFocusComponent());
+
+ List<DockingAction> actions = panel.getActions();
+ for (DockingAction action : actions) {
+ addAction(action);
+ }
}
@Override
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisPanel.java
index e4fbff128d..cc9fcdce73 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisPanel.java
@@ -31,6 +31,8 @@ import javax.swing.table.TableColumn;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
+import docking.action.DockingAction;
+import docking.action.builder.ActionBuilder;
import docking.options.editor.GenericOptionsComponent;
import docking.widgets.OptionDialog;
import docking.widgets.combobox.GhidraComboBox;
@@ -44,8 +46,7 @@ import ghidra.framework.GenericRunInfo;
import ghidra.framework.options.*;
import ghidra.framework.preferences.Preferences;
import ghidra.program.model.listing.Program;
-import ghidra.util.HelpLocation;
-import ghidra.util.Msg;
+import ghidra.util.*;
import ghidra.util.exception.AssertException;
import ghidra.util.layout.VerticalLayout;
import help.Help;
@@ -139,6 +140,65 @@ class AnalysisPanel extends JPanel implements PropertyChangeListener {
loadCurrentOptionsIntoEditors();
}
+ public Component getFocusComponent() {
+ return table;
+ }
+
+ List<DockingAction> getActions() {
+
+ DockingAction action = new ActionBuilder("Toggle Editor", "Analysis Panel")
+ .description("Toggles focus from the category view to the editable options")
+ .keyBinding("Control E")
+ .sharedKeyBinding()
+ .enabledWhen(c -> {
+ Component source = c.getSourceComponent();
+ return SwingUtilities.isDescendingFrom(source, AnalysisPanel.this);
+ })
+ .onAction(c -> {
+ if (isTableActive()) {
+ activateOptionsEditor();
+ }
+ else {
+ activateTable();
+ }
+ })
+ .build();
+
+ return List.of(action);
+ }
+
+ private boolean isTableActive() {
+ KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+ Component focusOwner = kfm.getFocusOwner();
+ return table == focusOwner;
+ }
+
+ private void activateTable() {
+ table.requestFocus();
+ Swing.runLater(() -> {
+ int row = table.getSelectedRow();
+ if (row < 0) {
+ table.getSelectionModel().setSelectionInterval(0, 0);
+ }
+ });
+ }
+
+ private void activateOptionsEditor() {
+
+ descriptionComponent.requestFocusInWindow();
+
+ /*
+ // This allows us to focus the first option
+
+ Container focusCycleRoot = getFocusCycleRootAncestor();
+ FocusTraversalPolicy policy = focusCycleRoot.getFocusTraversalPolicy();
+ Component firstComponent = policy.getComponentAfter(focusCycleRoot, component);
+ if (firstComponent != null) {
+ firstComponent.requestFocusInWindow();
+ }
+ */
+ }
+
/**
* Copies the non-default options from the program analysis options into a new options object
* @return the non-default options from the program analysis options into a new options object
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java
index b18f3bc087..9431b183d2 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisPlugin.java
@@ -22,6 +22,9 @@ import docking.DockingWindowManager;
import docking.action.DockingAction;
import docking.action.MenuData;
import docking.action.builder.ActionBuilder;
+import docking.actions.DockingToolActions;
+import docking.actions.SharedDockingActionPlaceholder;
+import docking.options.editor.OptionsDialog;
import docking.widgets.dialogs.MultiLineMessageDialog;
import ghidra.GhidraOptions;
import ghidra.app.CorePluginPackage;
@@ -66,6 +69,8 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis
private static final String SHOW_ANALYSIS_OPTIONS = "Show Analysis Options";
private static final String ANALYZE_GROUP_NAME = "Analyze";
+ static final String OPTIONS_OWNER = "Analysis Options";
+
private DockingAction autoAnalyzeAction;
private HelpLocation helpLocation;
@@ -131,6 +136,11 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis
tool.setMenuGroup(new String[] { "Analysis", "One Shot" }, ANALYZE_GROUP_NAME);
+ // This action is created later in the AnalysisPanel
+ AnalysisOptionsSharedActionPlaceholder placeholder =
+ new AnalysisOptionsSharedActionPlaceholder(OptionsDialog.TOGGLE_EDITOR_ACTION_NAME);
+ DockingToolActions toolActions = tool.getToolActions();
+ toolActions.registerSharedActionPlaceholder(placeholder);
}
private void updateActionName(ActionContext context) {
@@ -324,7 +334,11 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis
}
}
- class OneShotAnalyzerAction extends ListingContextAction {
+//=================================================================================================
+// Inner Classes
+//=================================================================================================
+
+ private class OneShotAnalyzerAction extends ListingContextAction {
private Analyzer analyzer;
private Program canAnalyzeProgram;
private boolean canAnalyze;
@@ -390,4 +404,26 @@ public class AutoAnalysisPlugin extends Plugin implements AutoAnalysisManagerLis
}
}
}
+
+ // Small class to register actions by name before the various editors have been shown. We need
+ // this for the Analysis OptionsDialog actions to appear in the key binding options.
+ private class AnalysisOptionsSharedActionPlaceholder implements SharedDockingActionPlaceholder {
+
+ private String actionName;
+
+ AnalysisOptionsSharedActionPlaceholder(String actionName) {
+ this.actionName = actionName;
+ }
+
+ @Override
+ public String getOwner() {
+ return OPTIONS_OWNER;
+ }
+
+ @Override
+ public String getName() {
+ return actionName;
+ }
+ }
+
}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/OptionsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/OptionsDialog.java
index bcc06229ea..c494e7f173 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/OptionsDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/OptionsDialog.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import docking.DialogComponentProvider;
*/
public class OptionsDialog extends DialogComponentProvider implements OptionListener {
- private OptionsEditorPanel optionRenderer;
+ private OptionsEditorPanel optionEditor;
private List<Option> options = new ArrayList<>();
private boolean cancelled = false;
private OptionValidator validator;
@@ -56,11 +56,11 @@ public class OptionsDialog extends DialogComponentProvider implements OptionList
options.add(option);
}
- optionRenderer = new OptionsEditorPanel(options, addressFactoryService);
- optionRenderer.getAccessibleContext().setAccessibleName("Options");
+ optionEditor = new OptionsEditorPanel(options, addressFactoryService);
+ optionEditor.getAccessibleContext().setAccessibleName("Options");
addOKButton();
addCancelButton();
- addWorkPanel(optionRenderer);
+ addWorkPanel(optionEditor);
setRememberSize(false);
}
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java
index d549d44eea..61134bad20 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java
@@ -1327,6 +1327,10 @@ public class DialogComponentProvider
* @param action the action
*/
public void addAction(DockingActionIf action) {
+ if (dialogActions.contains(action)) {
+ return; // protect from repeated adding
+ }
+
dialogActions.add(action);
addToolbarAction(action);
popupManager.addAction(action);
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/ColorEditor.java b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/ColorEditor.java
index 73a6b23e93..6d12db830a 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/ColorEditor.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/ColorEditor.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,21 +16,20 @@
package docking.options.editor;
import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import java.awt.event.*;
import java.beans.PropertyEditorSupport;
-import javax.swing.*;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
import docking.DialogComponentProvider;
import docking.DockingWindowManager;
import docking.widgets.label.GDHtmlLabel;
-import generic.theme.GThemeDefaults.Colors.Palette;
import ghidra.util.ColorUtils;
import ghidra.util.WebColors;
/**
- * Color editor that is a bit unusual in that its custom component is a button that when pushed,
+ * Color editor that is a bit unusual in that its custom component is a label that when clicked,
* pops up a dialog for editing the color. Use {@link ColorPropertyEditor} for a more traditional
* property editor that returns a direct color editing component.
*/
@@ -38,27 +37,21 @@ public class ColorEditor extends PropertyEditorSupport {
private static GhidraColorChooser colorChooser;
- private JLabel previewLabel = new GDHtmlLabel();
+ private FocusableLabel previewLabel = new FocusableLabel();
private Color color;
private Color lastUserSelectedColor;
public ColorEditor() {
- previewLabel.setOpaque(true);
- previewLabel.setPreferredSize(new Dimension(100, 20));
- previewLabel.setHorizontalAlignment(SwingConstants.CENTER);
- previewLabel.getAccessibleContext().setAccessibleName("Preview");
- previewLabel.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- // show the editor to get the user value
- showDialog(evt.getComponent());
-
- ColorEditor.this.firePropertyChange();
-
- // now set the new value
- updateColor(color);
- }
- });
+ }
+
+ private void triggerEdit() {
+ // show the editor to get the user value
+ showDialog(previewLabel);
+
+ ColorEditor.this.firePropertyChange();
+
+ // now set the new value
+ updateColor(color);
}
private void showDialog(Component parentComponent) {
@@ -108,17 +101,6 @@ public class ColorEditor extends PropertyEditorSupport {
return false;
}
- @Override
- public void paintValue(Graphics gfx, Rectangle box) {
- if (color != null) {
- gfx.setColor(color);
- }
- else {
- gfx.setColor(Palette.BLACK);
- }
- gfx.fillRect(box.x, box.y, box.width, box.height);
- }
-
private class EditorProvider extends DialogComponentProvider {
EditorProvider(JPanel contentPanel) {
super("Color Editor", true);
@@ -156,4 +138,63 @@ public class ColorEditor extends PropertyEditorSupport {
colorChooser.setColor(color);
}
}
+
+ private class FocusableLabel extends GDHtmlLabel {
+
+ FocusableLabel() {
+ setOpaque(true);
+ setFocusable(true);
+ setPreferredSize(new Dimension(100, 20));
+ setHorizontalAlignment(SwingConstants.CENTER);
+ getAccessibleContext().setAccessibleName("Preview");
+ addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ triggerEdit();
+ }
+ });
+ addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_SPACE) {
+ triggerEdit();
+ e.consume();
+ }
+ }
+ });
+ addFocusListener(new FocusListener() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ repaint();
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ repaint();
+ }
+ });
+ }
+
+ @Override
+ public void paint(Graphics g) {
+
+ super.paint(g);
+
+ if (!hasFocus()) {
+ return;
+ }
+
+ Color otherColor = ColorUtils.contrastForegroundColor(color);
+ g.setColor(otherColor);
+
+ Dimension size = getSize();
+ int offset = 4;
+ int x = offset;
+ int y = offset;
+ int w = size.width - (2 * offset);
+ int h = size.height - (2 * offset);
+ g.drawRect(x, y, w, h);
+ }
+
+ }
}
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsDialog.java
index b7760ababd..506852c39d 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsDialog.java
@@ -17,10 +17,12 @@ package docking.options.editor;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.List;
import javax.swing.tree.TreePath;
import docking.ReusableDialogComponentProvider;
+import docking.action.DockingAction;
import docking.widgets.OptionDialog;
import ghidra.framework.options.Options;
@@ -28,6 +30,10 @@ import ghidra.framework.options.Options;
* Dialog for editing options within a tool.
*/
public class OptionsDialog extends ReusableDialogComponentProvider {
+
+ public static final String OPTIONS_OWNER = "Tool Options";
+ public static final String TOGGLE_EDITOR_ACTION_NAME = "Toggle Editor";
+
private OptionsPanel panel;
private boolean hasChanges;
@@ -63,6 +69,11 @@ public class OptionsDialog extends ReusableDialogComponentProvider {
setMinimumSize(1000, 600);
setFocusComponent(panel.getFocusComponent());
+
+ List<DockingAction> actions = panel.getActions();
+ for (DockingAction action : actions) {
+ addAction(action);
+ }
}
@Override
@@ -90,12 +101,15 @@ public class OptionsDialog extends ReusableDialogComponentProvider {
panel.cancel();
if (hasChanges) {
- int result = OptionDialog.showYesNoCancelDialog(panel, "Save Changes?",
- "These options have changed. Do you want to save them?");
+
+ int result = OptionDialog.showOptionDialog(panel, "Save Options Changes?",
+ "These options have changed. Do you want to save them?",
+ "Save", "Don't Save", OptionDialog.QUESTION_MESSAGE);
if (result == OptionDialog.CANCEL_OPTION) {
return;
}
- if (result == OptionDialog.YES_OPTION) {
+
+ if (result == OptionDialog.OPTION_ONE) { // Save
if (!applyChanges()) {
return;
}
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsPanel.java
index c60ea829ff..559443f340 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsPanel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsPanel.java
@@ -27,6 +27,8 @@ import javax.swing.*;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
+import docking.action.DockingAction;
+import docking.action.builder.ActionBuilder;
import docking.widgets.MultiLineLabel;
import docking.widgets.OptionDialog;
import docking.widgets.label.GIconLabel;
@@ -59,8 +61,8 @@ public class OptionsPanel extends JPanel {
private JSplitPane splitPane;
- public OptionsPanel(String rootName, Options[] options, boolean showRestoreDefaultsButton,
- PropertyChangeListener changeListener) {
+ public OptionsPanel(String rootName, Options[] options,
+ boolean showRestoreDefaultsButton, PropertyChangeListener changeListener) {
this.changeListener = changeListener;
updateManager = new SwingUpdateManager(100, () -> {
@@ -125,6 +127,57 @@ public class OptionsPanel extends JPanel {
if (showRestoreDefaultsButton) {
restoreDefaultPanel.add(createRestoreDefaultsButton(), BorderLayout.EAST);
}
+
+ }
+
+ List<DockingAction> getActions() {
+
+ DockingAction action =
+ new ActionBuilder(OptionsDialog.TOGGLE_EDITOR_ACTION_NAME, OptionsDialog.OPTIONS_OWNER)
+ .description("Toggles focus from the category view to the editable options")
+ .keyBinding("Control E")
+ .sharedKeyBinding()
+ .enabledWhen(c -> {
+ Component source = c.getSourceComponent();
+ return SwingUtilities.isDescendingFrom(source, OptionsPanel.this);
+ })
+ .onAction(c -> {
+ if (isTreeActive()) {
+ activateOptionsEditor();
+ }
+ else {
+ activateTree();
+ }
+ })
+ .build();
+
+ return List.of(action);
+ }
+
+ private void activateOptionsEditor() {
+ int n = optionsEditorContainer.getComponentCount();
+ if (n == 0) {
+ activateTree();
+ return; // no tree node selected
+ }
+
+ Component component = optionsEditorContainer.getComponent(0);
+ Container focusCycleRoot = getFocusCycleRootAncestor();
+ FocusTraversalPolicy policy = focusCycleRoot.getFocusTraversalPolicy();
+ Component firstComponent = policy.getComponentAfter(focusCycleRoot, component);
+ if (firstComponent != null) {
+ firstComponent.requestFocusInWindow();
+ }
+ }
+
+ private void activateTree() {
+ gTree.requestFocus();
+ }
+
+ private boolean isTreeActive() {
+ KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+ Component focusOwner = kfm.getFocusOwner();
+ return SwingUtilities.isDescendingFrom(focusOwner, gTree);
}
public void dispose() {
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
index 2735479d3e..0b744f0e25 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
@@ -252,6 +252,11 @@ public class GTree extends JPanel implements BusyListener {
add(filterProvider.getFilterComponent(), BorderLayout.SOUTH);
}
+ @Override
+ public void requestFocus() {
+ tree.requestFocus();
+ }
+
/**
* Sets an accessible name on the GTree. This prefix will be used to assign
* meaningful accessible names to the tree, filter text field and the filter options button such
diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionsEditor.java b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionsEditor.java
index 325e8cb44d..c0488356e8 100644
--- a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionsEditor.java
+++ b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionsEditor.java
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,7 @@ public interface OptionsEditor {
/**
* Apply the changes.
+ * @throws InvalidInputException if the input is invalid
*/
public void apply() throws InvalidInputException;
@@ -47,7 +48,7 @@ public interface OptionsEditor {
/**
* Sets the options change listener
- * @param listener
+ * @param listener the listener
*/
public void setOptionsPropertyChangeListener(PropertyChangeListener listener);
@@ -56,6 +57,7 @@ public interface OptionsEditor {
*
* @param options The editable options that for which a GUI component will be created
* @param editorStateFactory The factory that will provide state objects this options editor
+ * @return the component
*/
public JComponent getEditorComponent(Options options, EditorStateFactory editorStateFactory);
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/KeyBindingsPanel.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/KeyBindingsPanel.java
index 1ade1749a0..4cf7f1cf9c 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/KeyBindingsPanel.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/KeyBindingsPanel.java
@@ -554,9 +554,14 @@ public class KeyBindingsPanel extends JPanel {
return; // nothing to do
}
+ Container parent = getParent();
+ if (parent == null) {
+ // this can happen due to Swing.runLater() calls after we have been disposed
+ return;
+ }
+
remove(component);
add(newView, BorderLayout.SOUTH);
- Container parent = getParent();
parent.validate();
parent.repaint();
}
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java
index 7e47310f0d..9b88da7108 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java
@@ -23,6 +23,8 @@ import javax.swing.tree.TreePath;
import org.jdom2.Element;
+import docking.actions.DockingToolActions;
+import docking.actions.SharedDockingActionPlaceholder;
import docking.options.OptionsService;
import docking.options.editor.OptionsDialog;
import docking.tool.ToolConstants;
@@ -38,10 +40,13 @@ import ghidra.util.exception.AssertException;
* Created by PluginTool to manage the set of Options for each category.
*/
public class OptionsManager implements OptionsService, OptionsChangeListener {
+
private OptionsDialog optionsDialog;
private PluginTool tool;
private Map<String, ToolOptions> optionsMap;
+ private OptionsSharedActionPlaceholder toggleActionPlaceholder;
+
/**
* Constructor
* @param tool associated with this OptionsManager
@@ -51,6 +56,19 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
optionsMap = new HashMap<>();
}
+ private void createActions() {
+
+ if (toggleActionPlaceholder != null) {
+ return;
+ }
+
+ // This action is created later in the OptionsPanel
+ toggleActionPlaceholder =
+ new OptionsSharedActionPlaceholder(OptionsDialog.TOGGLE_EDITOR_ACTION_NAME);
+ DockingToolActions toolActions = tool.getToolActions();
+ toolActions.registerSharedActionPlaceholder(toggleActionPlaceholder);
+ }
+
public void dispose() {
if (optionsDialog != null) {
optionsDialog.dispose();
@@ -203,6 +221,8 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
return null;
}
+ createActions();
+
Options keyBindingOptions = getOptions(DockingToolConstants.KEY_BINDINGS);
TreePath path = null;
if (optionsDialog != null) {
@@ -234,6 +254,15 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
}
}
+ @Override
+ public void optionsChanged(ToolOptions options, String name, Object oldValue, Object newValue) {
+ tool.setConfigChanged(true);
+ }
+
+//=================================================================================================
+// Inner Classes
+//=================================================================================================
+
private class OptionsComparator implements Comparator<ToolOptions> {
@Override
public int compare(ToolOptions o1, ToolOptions o2) {
@@ -245,10 +274,6 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
private KeyBindingsPanel panel;
- KeyBindingOptionsEditor() {
- panel = new KeyBindingsPanel(tool);
- }
-
@Override
public void apply() {
panel.apply();
@@ -266,7 +291,9 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
@Override
public void dispose() {
- panel.dispose();
+ if (panel != null) {
+ panel.dispose();
+ }
}
@Override
@@ -277,12 +304,31 @@ public class OptionsManager implements OptionsService, OptionsChangeListener {
@Override
public void setOptionsPropertyChangeListener(PropertyChangeListener listener) {
+ if (panel == null) {
+ panel = new KeyBindingsPanel(tool);
+ }
panel.setOptionsPropertyChangeListener(listener);
}
}
- @Override
- public void optionsChanged(ToolOptions options, String name, Object oldValue, Object newValue) {
- tool.setConfigChanged(true);
+ // Small class to register actions by name before the various editors have been shown. We need
+ // this for the OptionsDialog actions to appear in the key binding options.
+ private class OptionsSharedActionPlaceholder implements SharedDockingActionPlaceholder {
+
+ private String name;
+
+ OptionsSharedActionPlaceholder(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getOwner() {
+ return OptionsDialog.OPTIONS_OWNER;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
}
}