From f25e3c829741141156c4ca10c86884bda99830e9 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sun, 15 Jan 2023 19:55:15 +0100 Subject: [PATCH] Remove separators + final adjustments --- .../openrocket/gui/configdialog/AppearancePanel.java | 6 +++--- .../gui/configdialog/EllipticalFinSetConfig.java | 5 +---- .../gui/configdialog/FreeformFinSetConfig.java | 6 +----- .../openrocket/gui/configdialog/InnerTubeConfig.java | 3 --- .../openrocket/gui/configdialog/LaunchLugConfig.java | 3 --- .../openrocket/gui/configdialog/ParachuteConfig.java | 3 --- .../openrocket/gui/configdialog/RailButtonConfig.java | 5 +---- .../gui/configdialog/RingComponentConfig.java | 3 --- .../openrocket/gui/configdialog/ShockCordConfig.java | 3 --- .../openrocket/gui/configdialog/StreamerConfig.java | 3 --- .../gui/configdialog/TrapezoidFinSetConfig.java | 5 +---- .../openrocket/gui/configdialog/TubeFinSetConfig.java | 11 ++--------- 12 files changed, 9 insertions(+), 47 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index 08582c6b8..b8c8c0eb3 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -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"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java index 78eea8f62..fe0117da4 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java @@ -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::]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java index 567a176e7..96632632a 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java @@ -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::]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java index 833e1ee74..9947f6867 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java @@ -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::][]")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java index ae593e646..807c17b84 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java @@ -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::][]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java index df27a48e8..4e15807ee 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java @@ -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::][]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java index 9d61245ca..00cee7bf0 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java @@ -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::][]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java index 544973dad..92938ce12 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java @@ -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"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java index d7f3f2c95..c892cff34 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java @@ -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"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index 3bc02a02b..be23ecd81 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -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")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java index 72d6e6e9f..d00921583 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java @@ -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::]", "")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java index 27e416aad..210d97c84 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java @@ -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::][]", ""));