Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-27 00:45:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-7164-dragonmacher-data-settings-dialog'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-08-26 04:53:01 -04:00
parent 5ef1ee4d7a b1b2c89c5a
commit 70f16d191d
3 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/AbstractSettingsDialog.java
+10 -21
View File
@@ -24,7 +24,6 @@ import java.util.List;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
import docking.DialogComponentProvider;
@@ -146,21 +145,6 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
addButton(newApplyButton);
addCancelButton();
MouseAdapter listener = new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if (settingsTable.isEditing()) {
settingsTable.editingStopped(new ChangeEvent(this));
}
}
};
okButton.addMouseListener(listener);
newApplyButton.addMouseListener(listener);
cancelButton.addMouseListener(listener);
}
private String getHexModePropertyName(SettingsDefinition settingsDef) {
@@ -280,12 +264,17 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
}
@Override
protected void okCallback() {
protected void okCallback(boolean isMouseClick) {
// prevent users from closing the dialog when pressing Enter to confirm an edit
// When the OK button is pressed we want to finish any open edits. However, if this call is
// from the user pressing Enter, then do not close the dialog after finishing the edit. This
// allows users to press Enter to close the combo box edit without closing the dialog.
if (settingsTable.isEditing()) {
settingsTable.editingStopped(null);
return;
if (!isMouseClick) {
return;
}
}
apply();
@@ -313,7 +302,7 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
protected abstract String[] getSuggestedValues(StringSettingsDefinition settingsDefinition);
/**
* Apply changes to settings. This method must be ov
* Apply changes to settings.
* @throws CancelledException thrown if apply operation cancelled
*/
protected abstract void applySettings() throws CancelledException;
@@ -360,7 +349,7 @@ public abstract class AbstractSettingsDialog extends DialogComponentProvider {
StringChoices choices = (StringChoices) value;
int selectedChoice = choices.getSelectedValueIndex();
if (defaultSettings == null) {
if (selectedChoice == 0) { // blank choosen
if (selectedChoice == 0) { // blank chosen
settings.clearSetting(def.getName());
return;
}
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataSettingsDialog.java
+5 -3
View File
@@ -75,7 +75,7 @@ public class DataSettingsDialog extends AbstractSettingsDialog {
}
private static String constructTitle(Data data) {
StringBuffer buffy = new StringBuffer(
StringBuilder buffy = new StringBuilder(
DataTypeSettingsDialog.constructTitle(null, data.getDataType(), false));
buffy.append(" at ");
buffy.append(data.getMinAddress().toString());
@@ -203,7 +203,8 @@ public class DataSettingsDialog extends AbstractSettingsDialog {
private static SettingsDefinition[] getCommonSettings(Program program,
ProgramSelection selection) throws CancelledException {
CommonSettingsAccumulatorTask myTask = new CommonSettingsAccumulatorTask(program, selection);
CommonSettingsAccumulatorTask myTask =
new CommonSettingsAccumulatorTask(program, selection);
new TaskLauncher(myTask, null);
if (myTask.isCancelled()) {
throw new CancelledException();
@@ -237,7 +238,8 @@ public class DataSettingsDialog extends AbstractSettingsDialog {
Program program;
ProgramSelection selection;
ApplyCommonSettingsTask(DataSettingsDialog dlg, Program program, ProgramSelection selection) {
ApplyCommonSettingsTask(DataSettingsDialog dlg, Program program,
ProgramSelection selection) {
super("Applying Settings", true, false, true);
this.dlg = dlg;
this.program = program;
Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java
+17 -1
View File
@@ -488,7 +488,14 @@ public class DialogComponentProvider
okButton.setMnemonic('K');
okButton.setName("OK");
okButton.getAccessibleContext().setAccessibleName("OK");
okButton.addActionListener(e -> okCallback());
okButton.addActionListener(e -> {
int mods = e.getModifiers();
// Note: action event does not use extended modifiers; use the deprecated values
@SuppressWarnings("deprecation")
boolean isMouseClick = (mods & InputEvent.BUTTON1_MASK) == InputEvent.BUTTON1_MASK;
okCallback(isMouseClick);
});
addButton(okButton);
}
@@ -923,6 +930,15 @@ public class DialogComponentProvider
Msg.debug(this, "Ok button pressed");
}
/**
* A version of the OK callback that allows clients to know if the action is a result of a
* mouse click or the Enter key.
* @param mouseClick true if the mouse clicked the OK button
*/
protected void okCallback(boolean mouseClick) {
okCallback();
}
/**
* The callback method for when the "Cancel" button is pressed. The
* default behavior is to call setVisible(false) and dispose() on the