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

Move the motor mount configuration back into it's own tab to make the

Browse Source 
window slightly smaller.
This commit is contained in:
kruland2607 2013-11-11 21:19:13 -06:00
parent ed3e9b04b3
commit e46cdfabc1
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
View File

@ -15,7 +15,6 @@ import net.sf.openrocket.gui.components.BasicSlider;
import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
@ -98,10 +97,6 @@ public class BodyTubeConfig extends RocketComponentConfig {
check.setText(trans.get("BodyTubecfg.checkbox.Filled")); check.setText(trans.get("BodyTubecfg.checkbox.Filled"));
panel.add(check, "skip, span 2, wrap"); panel.add(check, "skip, span 2, wrap");
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
panel.add(motorConfig,"spanx, growx");
//// Material //// Material
panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK), panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
"cell 4 0, gapleft paragraph, aligny 0%, spany"); "cell 4 0, gapleft paragraph, aligny 0%, spany");
@ -112,6 +107,11 @@ public class BodyTubeConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0); tabbedPane.setSelectedIndex(0);
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
tabbedPane.insertTab(trans.get("BodyTubecfg.tab.Motor"), null, motorConfig,
trans.get("BodyTubecfg.tab.Motormountconf"), 1);
} }

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

@ -39,7 +39,6 @@ import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.ClusterConfiguration; import net.sf.openrocket.rocketcomponent.ClusterConfiguration;
import net.sf.openrocket.rocketcomponent.Clusterable; import net.sf.openrocket.rocketcomponent.Clusterable;
import net.sf.openrocket.rocketcomponent.EngineBlock;
import net.sf.openrocket.rocketcomponent.InnerTube; import net.sf.openrocket.rocketcomponent.InnerTube;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RingComponent;
@ -168,10 +167,6 @@ public class InnerTubeConfig extends RocketComponentConfig {
new DoubleModel(component.getParent(), "Length"))), new DoubleModel(component.getParent(), "Length"))),
"w 100lp, wrap"); "w 100lp, wrap");
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
panel.add(motorConfig,"spanx, growx");
//// Material //// Material
panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK), panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
"cell 4 0, gapleft paragraph, aligny 0%, spany"); "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, tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, panel,
trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0); 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(); JPanel tab = clusterTab();
//// Cluster and Cluster configuration //// Cluster and Cluster configuration
tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Cluster"), null, tab, tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Cluster"), null, tab,

1
swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
View File

@ -39,7 +39,6 @@ public class MotorConfig extends JPanel {
this.mount = motorMount; this.mount = motorMount;
this.setBorder( BorderFactory.createLineBorder(Color.BLACK,1) );
BooleanModel model; BooleanModel model;
model = new BooleanModel(motorMount, "MotorMount"); model = new BooleanModel(motorMount, "MotorMount");