diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 66c94148e..8ddee839a 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -378,23 +378,29 @@ public class RocketComponentConfig extends JPanel { bs = new BasicSlider(m.getSliderModel(new DoubleModel(0), length)); bm.addEnableComponent(bs); - panel.add(bs, "growx 5, w 100lp, wrap 35lp"); + panel.add(bs, "growx 5, w 100lp, wrap"); //END OVERRIDES CG --------------------------------------------------- + // Override subcomponents checkbox + bm = new BooleanModel(component, "OverrideSubcomponents"); + check = new JCheckBox(bm); + //// Override mass and CG of all subcomponents + check.setText(trans.get("RocketCompCfg.checkbox.OverridemassandCG")); + panel.add(check, "spanx, wrap 35lp"); - //BEGIN OVERRIDES CD --------------------------------------------------- + + //BEGIN OVERRIDES CD --------------------------------------------------- bm = new BooleanModel(component, "CDOverridden"); check = new JCheckBox(bm); - //// Override mass: + //// Override coefficient of drag: check.setText(trans.get("RocketCompCfg.checkbox.SetDragCoeff")); panel.add(check, "growx 1, gapright 20lp"); - m = new DoubleModel(component, "OverrideCD", UnitGroup.UNITS_NONE, 0); - + m = new DoubleModel(component, "OverrideCD", UnitGroup.UNITS_COEFFICIENT, 0); spin = new JSpinner(m.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); @@ -402,29 +408,19 @@ public class RocketComponentConfig extends JPanel { panel.add(spin, "growx 1"); - bs = new BasicSlider(m.getSliderModel(0, 0.01, 1.0)); + bs = new BasicSlider(m.getSliderModel(0, 1.0)); bm.addEnableComponent(bs); panel.add(bs, "growx 5, w 100lp, wrap"); //END OVERRIDES CP -------------------------------------------------- - - - - // Override subcomponents checkbox - bm = new BooleanModel(component, "OverrideSubcomponents"); - check = new JCheckBox(bm); - //// Override mass and CG of all subcomponents - check.setText(trans.get("RocketCompCfg.checkbox.OverridemassandCG")); - panel.add(check, "gap para, spanx, wrap para"); - - //// The overridden mass does not include motors.
+ //// The overridden mass does not include motors. panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.longB1") + - //// The center of gravity is measured from the front end of the - trans.get("RocketCompCfg.lbl.longB2") + " " + - component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1), - "spanx, wrap, gap para, height 0::30lp"); + //// The center of gravity is measured from the front end of the + trans.get("RocketCompCfg.lbl.longB2") + " " + + component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1), + "spanx, pushy, aligny bottom"); return panel; }