From e46cdfabc1ff4f8046c1729aafdd00da4534dcf5 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Mon, 11 Nov 2013 21:19:13 -0600 Subject: [PATCH] Move the motor mount configuration back into it's own tab to make the window slightly smaller. --- .../sf/openrocket/gui/configdialog/BodyTubeConfig.java | 10 +++++----- .../openrocket/gui/configdialog/InnerTubeConfig.java | 10 +++++----- .../sf/openrocket/gui/configdialog/MotorConfig.java | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java index 2e5dad565..e490c23a0 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java @@ -15,7 +15,6 @@ import net.sf.openrocket.gui.components.BasicSlider; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; -import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; @@ -98,10 +97,6 @@ public class BodyTubeConfig extends RocketComponentConfig { check.setText(trans.get("BodyTubecfg.checkbox.Filled")); panel.add(check, "skip, span 2, wrap"); - MotorConfig motorConfig = new MotorConfig((MotorMount)c); - - panel.add(motorConfig,"spanx, growx"); - //// Material panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK), "cell 4 0, gapleft paragraph, aligny 0%, spany"); @@ -112,6 +107,11 @@ public class BodyTubeConfig extends RocketComponentConfig { tabbedPane.setSelectedIndex(0); + MotorConfig motorConfig = new MotorConfig((MotorMount)c); + + tabbedPane.insertTab(trans.get("BodyTubecfg.tab.Motor"), null, motorConfig, + trans.get("BodyTubecfg.tab.Motormountconf"), 1); + } diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java index 4d981d7b3..338feb38c 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java @@ -39,7 +39,6 @@ import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; import net.sf.openrocket.rocketcomponent.ClusterConfiguration; import net.sf.openrocket.rocketcomponent.Clusterable; -import net.sf.openrocket.rocketcomponent.EngineBlock; import net.sf.openrocket.rocketcomponent.InnerTube; import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.RingComponent; @@ -168,10 +167,6 @@ public class InnerTubeConfig extends RocketComponentConfig { new DoubleModel(component.getParent(), "Length"))), "w 100lp, wrap"); - MotorConfig motorConfig = new MotorConfig((MotorMount)c); - - panel.add(motorConfig,"spanx, growx"); - //// Material panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK), "cell 4 0, gapleft paragraph, aligny 0%, spany"); @@ -179,6 +174,11 @@ public class InnerTubeConfig extends RocketComponentConfig { tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, panel, trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0); + MotorConfig motorConfig = new MotorConfig((MotorMount)c); + + tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Motor"), null, motorConfig, + trans.get("InnerTubeCfg.tab.ttip.Motor"), 1); + JPanel tab = clusterTab(); //// Cluster and Cluster configuration tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Cluster"), null, tab, diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java index ca4538e38..eaa449245 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java @@ -39,7 +39,6 @@ public class MotorConfig extends JPanel { this.mount = motorMount; - this.setBorder( BorderFactory.createLineBorder(Color.BLACK,1) ); BooleanModel model; model = new BooleanModel(motorMount, "MotorMount");