From 194f1539ec833bfb7956a40d2e59264deea57d2e Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 5 Aug 2024 15:51:47 -0600 Subject: [PATCH] reorder fields in DeploymentSelectionDialog to make it clearer that after the condition is met the delay is added --- .../DeploymentSelectionDialog.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java index 8d715aeb5..4eff329aa 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java @@ -89,18 +89,6 @@ public class DeploymentSelectionDialog extends JDialog { } panel.add( deployEvent, "spanx 3, growx, wrap"); - // ... and delay - //// plus - panel.add(new JLabel(trans.get("ParachuteCfg.lbl.plusdelay")), "right"); - - final DoubleModel delay = new DoubleModel(newConfiguration, "DeployDelay", UnitGroup.UNITS_SHORT_TIME, 0); - final JSpinner delaySpinner = new JSpinner(delay.getSpinnerModel()); - delaySpinner.setEditor(new SpinnerEditor(delaySpinner, 3)); - panel.add(delaySpinner, "spanx, split"); - - //// seconds - panel.add(new JLabel(trans.get("ParachuteCfg.lbl.seconds")), "wrap paragraph"); - // Altitude: altText = new JLabel(trans.get("ParachuteCfg.lbl.Altitude")); panel.add(altText); @@ -115,6 +103,18 @@ public class DeploymentSelectionDialog extends JDialog { altSlider = new BasicSlider(alt.getSliderModel(100, 1000)); panel.add(altSlider, "w 100lp, wrap"); + // ... and delay + //// plus + panel.add(new JLabel(trans.get("ParachuteCfg.lbl.plusdelay")), "right"); + + final DoubleModel delay = new DoubleModel(newConfiguration, "DeployDelay", UnitGroup.UNITS_SHORT_TIME, 0); + final JSpinner delaySpinner = new JSpinner(delay.getSpinnerModel()); + delaySpinner.setEditor(new SpinnerEditor(delaySpinner, 3)); + panel.add(delaySpinner, "spanx, split"); + + //// seconds + panel.add(new JLabel(trans.get("ParachuteCfg.lbl.seconds")), "wrap paragraph"); + deployEvent.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) {