hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #1076] Use Close button instead of Ok/Cancel

Browse Source
This commit is contained in:
Sibo Van Gool 2022-01-31 23:41:43 +01:00
parent d459ba4bd8
commit 1ae589d864
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
View File

@ -67,8 +67,6 @@ public class ComponentPresetChooserDialog extends JDialog {
private List<ComponentPreset> presets; private List<ComponentPreset> presets;
private ComponentPreset.Type presetType; private ComponentPreset.Type presetType;
private boolean okClicked = false;
public ComponentPresetChooserDialog(Window owner, RocketComponent component) { public ComponentPresetChooserDialog(Window owner, RocketComponent component) {
super(owner, trans.get("title"), Dialog.ModalityType.APPLICATION_MODAL); super(owner, trans.get("title"), Dialog.ModalityType.APPLICATION_MODAL);
@ -154,30 +152,20 @@ public class ComponentPresetChooserDialog extends JDialog {
panel.add(new JLabel(Chars.UP_ARROW + " " + trans.get("lbl.favorites")), "spanx, gapleft 5px, wrap para"); panel.add(new JLabel(Chars.UP_ARROW + " " + trans.get("lbl.favorites")), "spanx, gapleft 5px, wrap para");
// OK / Cancel buttons // Close buttons
JButton okButton = new SelectColorButton(trans.get("dlg.but.ok")); JButton closeButton = new SelectColorButton(trans.get("dlg.but.close"));
okButton.addActionListener(new ActionListener() { closeButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
close(true); ComponentPresetChooserDialog.this.setVisible(false);
} }
}); });
panel.add(okButton, "tag ok, spanx, split"); panel.add(closeButton, "spanx, right, tag close");
//// Cancel button
JButton cancelButton = new SelectColorButton(trans.get("dlg.but.cancel"));
cancelButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
close(false);
}
});
panel.add(cancelButton, "tag cancel");
this.add(panel); this.add(panel);
GUIUtil.rememberWindowSize(this); GUIUtil.rememberWindowSize(this);
GUIUtil.setDisposableDialogOptions(this, okButton); GUIUtil.setDisposableDialogOptions(this, closeButton);
updateFilters(); updateFilters();
} }
@ -270,8 +258,6 @@ public class ComponentPresetChooserDialog extends JDialog {
* @return the selected motor, or <code>null</code> if no motor has been selected or the selection was canceled. * @return the selected motor, or <code>null</code> if no motor has been selected or the selection was canceled.
*/ */
public ComponentPreset getSelectedComponentPreset() { public ComponentPreset getSelectedComponentPreset() {
if (!okClicked)
return null;
int row = componentSelectionTable.getSelectedRow(); int row = componentSelectionTable.getSelectedRow();
if (row < 0) { if (row < 0) {
// Nothing selected. // Nothing selected.
@ -281,11 +267,6 @@ public class ComponentPresetChooserDialog extends JDialog {
return presets.get(row); return presets.get(row);
} }
public void close(boolean ok) {
okClicked = ok;
this.setVisible(false);
}
private void updateFilters() { private void updateFilters() {
List<RowFilter<TableModel, Object>> filters = new ArrayList<RowFilter<TableModel, Object>>(2); List<RowFilter<TableModel, Object>> filters = new ArrayList<RowFilter<TableModel, Object>>(2);
String filterTextRegex = filterText.getText(); String filterTextRegex = filterText.getText();