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

Remove separators + final adjustments

Browse Source
This commit is contained in:
SiboVG 2023-01-15 19:55:15 +01:00
parent 1361c1a46d
commit f25e3c8297
12 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -648,7 +648,7 @@ public class AppearancePanel extends JPanel {
panel.add(spinShine, "split 3, w 60");
panel.add(unitShine);
panel.add(slideShine, "w 50, growx");
panel.add(slideShine, "w 100lp");
order.add(order.indexOf(colorButton) + 1, ((SpinnerEditor) spinShine.getEditor()).getTextField());
// Offset
@ -685,7 +685,7 @@ public class AppearancePanel extends JPanel {
panel.add(spinOpacity, "split 3, w 60");
panel.add(unitOpacity);
panel.add(slideOpacity, "w 50, growx");
panel.add(slideOpacity, "w 100lp");
order.add(order.indexOf(((SpinnerEditor) spinShine.getEditor()).getTextField()) + 1,
((SpinnerEditor) spinOpacity.getEditor()).getTextField());
@ -702,7 +702,7 @@ public class AppearancePanel extends JPanel {
BasicSlider bs = new BasicSlider(rotationModel.getSliderModel(
-Math.PI, Math.PI));
mDefault.addEnableComponent(bs, false);
panel.add(bs, "w 100, wrap");
panel.add(bs, "w 100lp, wrap");
// Repeat
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.repeat")), "skip 2, gapleft para");

5
swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
View File

@ -120,11 +120,8 @@ public class EllipticalFinSetConfig extends FinSetConfig {
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 30lp");
}
mainPanel.add(panel, "aligny 0, gapright 50lp");
mainPanel.add(panel, "aligny 0, gapright 40lp");
// Separator
//mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 20lp 20lp");
// Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));

6
swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
View File

@ -169,11 +169,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 30lp");
}
mainPanel.add(panel, "aligny 0, gapright 50lp");
// Separator
//mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 20lp 20lp");
mainPanel.add(panel, "aligny 0, gapright 40lp");
// Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));

3
swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
View File

@ -148,9 +148,6 @@ public class InnerTubeConfig extends RocketComponentConfig {
mainPanel.add(panel, "aligny 0, gapright 40lp");
// Separator
//mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
//// Right side of panel ----
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]"));

3
swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
View File

@ -98,9 +98,6 @@ public class LaunchLugConfig extends RocketComponentConfig {
primary.add(panel, "grow, gapright 40lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 20lp 20lp");
// Right panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));

3
swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
View File

@ -158,9 +158,6 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
panel.add(shroudPanel, "spanx, wrap");
primary.add(panel, "grow, gapright 20lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
// Right side
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));

5
swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
View File

@ -138,10 +138,7 @@ public class RailButtonConfig extends RocketComponentConfig {
}
primary.add(panel, "grow, gapright 50lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 20lp 20lp");
primary.add(panel, "grow, gapright 40lp");
// Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));

3
swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
View File

@ -135,9 +135,6 @@ public class RingComponentConfig extends RocketComponentConfig {
primary.add(panel, "grow, gapright 40lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
// Right side panel
JPanel rightSide = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
primary.add(rightSide, "cell 4 0, aligny 0, spany");

3
swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
View File

@ -59,9 +59,6 @@ public class ShockCordConfig extends RocketComponentConfig {
trans.get("ShockCordCfg.lbl.Shockcordmaterial"), null, "Material", order);
panel.add(materialPanel, "spanx 4, wrap, gapright 40lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
///// Right side
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));
primary.add(panel, "aligny 0%, grow, spany");

3
swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
View File

@ -140,9 +140,6 @@ public class StreamerConfig extends RecoveryDeviceConfig {
primary.add(panel, "grow, gapright 20lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
// Right side
panel = new JPanel(new MigLayout("ins 0"));

5
swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
View File

@ -171,10 +171,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
panel.add(new BasicSlider(thicknessModel.getSliderModel(0, 0.01)), "w 100lp, wrap para");
}
mainPanel.add(panel, "aligny 0, gapright 50lp");
// Separator
//mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 20lp 20lp");
mainPanel.add(panel, "aligny 0, gapright 40lp");
// Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::]", ""));

11
swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
View File

@ -81,11 +81,8 @@ public class TubeFinSetConfig extends RocketComponentConfig {
//// Inner diameter:
panel.add(new JLabel(trans.get("TubeFinSetCfg.lbl.Innerdiam")));
// Diameter = 2*Radius
m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
panel.add(spin, "growx");
@ -95,7 +92,6 @@ public class TubeFinSetConfig extends RocketComponentConfig {
panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap rel");
//// Wall thickness
//// Thickness:
panel.add(new JLabel(trans.get("TubeFinSetCfg.lbl.Thickness")));
@ -109,10 +105,7 @@ public class TubeFinSetConfig extends RocketComponentConfig {
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 20lp");
primary.add(panel, "grow, gapright 50lp");
// Separator
//primary.add(new JSeparator(SwingConstants.VERTICAL), "growy, gapx 10lp 10lp");
primary.add(panel, "grow, gapright 40lp");
// Right side panel
panel = new JPanel(new MigLayout("gap rel unrel, ins 0", "[][65lp::][30lp::][]", ""));