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

Set scale to component scale when an item is selected + extra cleanup

Browse Source
This commit is contained in:
SiboVG 2022-05-31 14:21:00 +02:00
parent 7bc6bd2c81
commit 76bc575ff4
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
View File

@ -345,17 +345,22 @@ public class ScaleDialog extends JDialog {
selectionOption.setToolTipText(tip); selectionOption.setToolTipText(tip);
panel.add(selectionOption, "growx, wrap para*2"); panel.add(selectionOption, "growx, wrap para*2");
// Select the 'scale component / scale selection and all subcomponents' if a component is selected
if (selection != null && selection.size() > 0) {
selectionOption.setSelectedIndex(1);
}
// Change the offset checkbox to false when 'Scale selection' is selection and only one component is selected, // Change the offset checkbox to false when 'Scale selection' is selection and only one component is selected,
// since this is a common action. // since this is a common action.
selectionOption.addItemListener(new ItemListener() { ItemListener listener = new ItemListener() {
@Override @Override
public void itemStateChanged(ItemEvent e) { public void itemStateChanged(ItemEvent e) {
if (SCALE_SELECTION.equals(selectionOption.getSelectedItem()) && (selection != null) && if (scaleOffsets == null) return;
(selection.size() == 1) && (scaleOffsets != null)) {
scaleOffsets.setSelected(false); scaleOffsets.setSelected(!SCALE_SELECTION.equals(selectionOption.getSelectedItem()));
}
} }
}); };
selectionOption.addItemListener(listener);
// Scale multiplier // Scale multiplier
@ -424,7 +429,7 @@ public class ScaleDialog extends JDialog {
// Scale offsets // Scale offsets
scaleOffsets = new JCheckBox(trans.get("checkbox.scaleOffsets")); scaleOffsets = new JCheckBox(trans.get("checkbox.scaleOffsets"));
scaleOffsets.setToolTipText(trans.get("checkbox.scaleOffsets.ttip")); scaleOffsets.setToolTipText(trans.get("checkbox.scaleOffsets.ttip"));
scaleOffsets.setSelected(true); listener.itemStateChanged(null); // Triggers the selection state of scaleOffsets
panel.add(scaleOffsets, "span, wrap para*3"); panel.add(scaleOffsets, "span, wrap para*3");
@ -457,7 +462,7 @@ public class ScaleDialog extends JDialog {
}); });
panel.add(cancel, "right, gap para"); panel.add(cancel, "right, gap para");
GUIUtil.setDisposableDialogOptions(this, scale); GUIUtil.setDisposableDialogOptions(this, scale);
} }