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

Fix Override layout

Browse Source 
Switches the override subcomponent checkbox before the override Cd checkbox + puts the textual info on the bottom
This commit is contained in:
SiboVG 2022-03-07 23:38:53 +01:00
parent 0511bbda4f
commit 336acb037f
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -378,11 +378,18 @@ public class RocketComponentConfig extends JPanel {
bs = new BasicSlider(m.getSliderModel(new DoubleModel(0), length)); bs = new BasicSlider(m.getSliderModel(new DoubleModel(0), length));
bm.addEnableComponent(bs); bm.addEnableComponent(bs);
panel.add(bs, "growx 5, w 100lp, wrap 35lp"); panel.add(bs, "growx 5, w 100lp, wrap");
//END OVERRIDES CG --------------------------------------------------- //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 ---------------------------------------------------
@ -408,22 +415,12 @@ public class RocketComponentConfig extends JPanel {
//END OVERRIDES CP -------------------------------------------------- //END OVERRIDES CP --------------------------------------------------
//// The overridden mass does not include motors.
// 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");
//// <html>The overridden mass does not include motors.<br>
panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.longB1") + panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.longB1") +
//// The center of gravity is measured from the front end of the //// The center of gravity is measured from the front end of the
trans.get("RocketCompCfg.lbl.longB2") + " " + trans.get("RocketCompCfg.lbl.longB2") + " " +
component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1), component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1),
"spanx, wrap, gap para, height 0::30lp"); "spanx, pushy, aligny bottom");
return panel; return panel;
} }