diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 3fb6b08f9..e05c59987 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -810,6 +810,7 @@ custmatdlg.checkbox.Addmaterial = Add material to database ! Ring Component Config +ringcompcfg.lbl.Attributes = Attributes ringcompcfg.OuterRadius = OuterRadius ringcompcfg.Automatic = Automatic ringcompcfg.AutomaticOuter.ttip = Matches outer diameter to the inner diameter of the parent component. @@ -817,6 +818,7 @@ ringcompcfg.InnerRadius = InnerRadius ringcompcfg.AutomaticInner.ttip = Matches inner diameter to the outer diameter of the child inner tube. ringcompcfg.Thickness = Thickness ringcompcfg.Length = Length +ringcompcfg.lbl.Placement = Placement ringcompcfg.Positionrelativeto = Position relative to: ringcompcfg.plus = plus ringcompcfg.PositionValue = PositionValue @@ -971,8 +973,8 @@ RocketCompCfg.checkbox.Endcapped.ttip = Caps (closes) the end of the shoulder. RocketCompCfg.title.Aftshoulder = Aft shoulder RocketCompCfg.border.Foreshoulder = Fore shoulder !RocketCompCfg.lbl.Length = Length: -RocketCompCfg.lbl.InstanceCount = Instance Count -RocketCompCfg.lbl.InstanceSeparation = Instance Separation +RocketCompCfg.lbl.InstanceCount = Instance Count: +RocketCompCfg.lbl.InstanceSeparation = Instance Separation: RocketCompCfg.tab.Outside = Outside RocketCompCfg.tab.Inside = Inside RocketCompCfg.tab.RightSide = Right Side diff --git a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java index 2ae7d2d08..bb6755414 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java @@ -150,7 +150,7 @@ public class EllipticalFinSetConfig extends FinSetConfig { //// Right portion - mainPanel.add(panel, "aligny 20%"); + mainPanel.add(panel, "aligny 0"); mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java index 7fccf0bb1..efb0ffd89 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java @@ -161,7 +161,7 @@ public class FreeformFinSetConfig extends FinSetConfig { order.add(((SpinnerEditor) cantAngleSpinner.getEditor()).getTextField()); panel.add(new UnitSelector(cantAngleModel), "growx"); - panel.add(new BasicSlider(cantAngleModel.getSliderModel(-FinSet.MAX_CANT_RADIANS, FinSet.MAX_CANT_RADIANS)), "w 150lp, wrap 40lp"); + panel.add(new BasicSlider(cantAngleModel.getSliderModel(-FinSet.MAX_CANT_RADIANS, FinSet.MAX_CANT_RADIANS)), "w 150lp, wrap 20lp"); } @@ -195,7 +195,7 @@ public class FreeformFinSetConfig extends FinSetConfig { }); } - mainPanel.add(panel, "aligny 20%"); + mainPanel.add(panel, "aligny 0"); mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy, height 150lp"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java index 9dd2132bb..902b32187 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java @@ -154,8 +154,8 @@ public class InnerTubeConfig extends RocketComponentConfig { //// Right side of panel ---- - JPanel panel2 = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][15lp]", "")); - panel.add(panel2, "cell 4 0, gapleft paragraph, aligny 0%, spany"); + JPanel panel2 = new JPanel(new MigLayout("gap rel unrel, insets 0", "[][65lp::][30lp::][15lp]", "")); + panel.add(panel2, "cell 4 0, gapleft 15lp, aligny 0%, spany"); //// Placement panel2.add(new StyledLabel(trans.get("InnerTubeCfg.lbl.Placement"), StyledLabel.Style.BOLD), "wrap unrel"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java index 22f062436..777cd17ca 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java @@ -51,7 +51,7 @@ public class LaunchLugConfig extends RocketComponentConfig { order.add(((SpinnerEditor) spin.getEditor()).getTextField()); panel.add(new UnitSelector(m), "growx"); - panel.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.1)), "w 100lp, wrap para"); + panel.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.1)), "w 100lp, wrap 20lp"); //// Body tube diameter diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java index b5f8737d2..932e42c8c 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java @@ -36,7 +36,7 @@ public class MotorConfig extends JPanel { private static final Translator trans = Application.getTranslator(); public MotorConfig(MotorMount motorMount, List order) { - super(new MigLayout("fill")); + super(new MigLayout("fillx")); this.mount = motorMount; @@ -76,7 +76,7 @@ public class MotorConfig extends JPanel { final EnumModel igEvModel = new EnumModel(motorInstance, "IgnitionEvent", IgnitionEvent.values()); final JComboBox eventBox = new JComboBox( igEvModel); - panel.add(eventBox , "growx, wrap"); + panel.add(eventBox , "wrap"); order.add(eventBox); // ... and delay diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java index 828cc96a1..558dfd49b 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java @@ -69,7 +69,7 @@ public class NoseConeConfig extends RocketComponentConfig { updateEnabled(); } }); - panel.add(typeBox, "span, wrap rel"); + panel.add(typeBox, "spanx 3, growx, wrap rel"); order.add(typeBox); //// Shape parameter: diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java index 1f9b25eef..9454db0b4 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java @@ -46,7 +46,7 @@ public class RailButtonConfig extends RocketComponentConfig { JPanel primary = new JPanel(new MigLayout("fill")); - JPanel panel = new JPanel( new MigLayout()); + JPanel panel = new JPanel( new MigLayout("gap rel unrel")); { //// Outer Diameter @@ -67,7 +67,7 @@ public class RailButtonConfig extends RocketComponentConfig { panel.add(IDSpinner, "growx"); order.add(((SpinnerEditor) IDSpinner.getEditor()).getTextField()); panel.add(new UnitSelector(IDModel), "growx"); - panel.add(new BasicSlider(IDModel.getSliderModel(0, 0.02)), "w 100lp, wrap para"); + panel.add(new BasicSlider(IDModel.getSliderModel(0, 0.02)), "w 100lp, wrap 20lp"); } { //// Base Height panel.add(new JLabel(trans.get("RailBtnCfg.lbl.BaseHeight"))); @@ -100,7 +100,7 @@ public class RailButtonConfig extends RocketComponentConfig { order.add(((SpinnerEditor) heightSpinner.getEditor()).getTextField()); panel.add(new UnitSelector(heightModel), "growx"); panel.add(new BasicSlider(heightModel.getSliderModel(new DoubleModel(component, "MinTotalHeight", UnitGroup.UNITS_LENGTH), 0.02)), - "w 100lp, wrap para"); + "w 100lp, wrap 20lp"); } { //// Screw height panel.add(new JLabel(trans.get("RailBtnCfg.lbl.ScrewHeight"))); @@ -110,10 +110,10 @@ public class RailButtonConfig extends RocketComponentConfig { panel.add(heightSpinner, "growx"); order.add(((SpinnerEditor) heightSpinner.getEditor()).getTextField()); panel.add(new UnitSelector(heightModel), "growx"); - panel.add(new BasicSlider(heightModel.getSliderModel(0, 0.02)), "w 100lp, wrap para"); + panel.add(new BasicSlider(heightModel.getSliderModel(0, 0.02)), "w 100lp, wrap 20lp"); } - { //// Angular Position: + { //// Rotation: panel.add(new JLabel(trans.get("RailBtnCfg.lbl.Angle"))); DoubleModel angleModel = new DoubleModel(component, "AngleOffset", UnitGroup.UNITS_ANGLE, -180, +180); JSpinner angleSpinner = new JSpinner( angleModel.getSpinnerModel()); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java index 35c313483..e462885c1 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java @@ -14,6 +14,7 @@ import net.sf.openrocket.gui.SpinnerEditor; import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.adaptors.EnumModel; import net.sf.openrocket.gui.components.BasicSlider; +import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; @@ -37,7 +38,9 @@ public class RingComponentConfig extends RocketComponentConfig { DoubleModel m; JSpinner spin; DoubleModel od = null; - + + //// Attributes ---- + panel.add(new StyledLabel(trans.get("ringcompcfg.lbl.Attributes"), StyledLabel.Style.BOLD), "wrap unrel"); //// Outer diameter if (outer != null) { @@ -131,20 +134,25 @@ public class RingComponentConfig extends RocketComponentConfig { panel.add(new UnitSelector(m), "growx"); panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap"); } - - - //// Position - + + //// Material + MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order); + panel.add(materialPanel, "gaptop 20lp, spanx 4, growx, wrap"); + + //// Placement ---- + JPanel positionPanel = new JPanel(new MigLayout("gap rel unrel, insets 0", "[][65lp::][30lp::]", "")); + positionPanel.add(new StyledLabel(trans.get("ringcompcfg.lbl.Placement"), StyledLabel.Style.BOLD), "wrap unrel"); + //// Position relative to: - panel.add(new JLabel(trans.get("ringcompcfg.Positionrelativeto"))); + positionPanel.add(new JLabel(trans.get("ringcompcfg.Positionrelativeto"))); final EnumModel methodModel = new EnumModel(component, "AxialMethod", AxialMethod.axialOffsetMethods ); final JComboBox positionCombo = new JComboBox( methodModel ); - panel.add( positionCombo, "spanx 3, growx, wrap"); + positionPanel.add(positionCombo, "spanx 3, growx, wrap"); order.add(positionCombo); //// plus - panel.add(new JLabel(trans.get("ringcompcfg.plus")), "right"); + positionPanel.add(new JLabel(trans.get("ringcompcfg.plus")), "right"); //// PositionValue m = new DoubleModel(component, "AxialOffset", UnitGroup.UNITS_LENGTH); @@ -153,19 +161,16 @@ public class RingComponentConfig extends RocketComponentConfig { if (!(component instanceof ThicknessRingComponent)) { focusElement = spin; } - panel.add(spin, "growx"); + positionPanel.add(spin, "growx"); order.add(((SpinnerEditor) spin.getEditor()).getTextField()); - - panel.add(new UnitSelector(m), "growx"); - panel.add(new BasicSlider(m.getSliderModel( + + positionPanel.add(new UnitSelector(m), "growx"); + positionPanel.add(new BasicSlider(m.getSliderModel( new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE), new DoubleModel(component.getParent(), "Length"))), "w 100lp, wrap"); - - - //// Material - MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order); - panel.add(materialPanel, "cell 4 0, gapleft paragraph, aligny 0%, spany"); + + panel.add(positionPanel, "cell 4 0, gapleft paragraph, aligny 0%, spany"); return panel; } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index a4d0b44f7..7cfbd15e8 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -137,7 +137,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { //// The drag coefficient is relative to the area of the streamer. panel.add(new StyledLabel(trans.get("StreamerCfg.lbl.longC1"), - -1), "span, wrap"); + -1, StyledLabel.Style.ITALIC), "gapleft para, span, wrap"); // Right side diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java index 0b864a2a7..a7f449659 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java @@ -203,7 +203,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig { "w 150lp, wrap para"); - mainPanel.add(panel, "aligny 20%"); + mainPanel.add(panel, "aligny 0"); mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy"); }