Updates for 0.9.5

[debian/openrocket] / src / net / sf / openrocket / gui / configdialog / RingComponentConfig.java
diff --git a/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java

index 1b2f12ad3dbd6cc4516f4ba31c58926effa949ae..3a11c74b86da09054bd0ccbd9fd3ba51949cb736 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
@@ -16,8 +16,10 @@ 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.DescriptionArea;
  import net.sf.openrocket.gui.components.UnitSelector;
  import net.sf.openrocket.material.Material;
+import net.sf.openrocket.rocketcomponent.EngineBlock;
  import net.sf.openrocket.rocketcomponent.RingComponent;
  import net.sf.openrocket.rocketcomponent.RocketComponent;
  import net.sf.openrocket.unit.UnitGroup;
@@ -142,8 +144,17 @@ public class RingComponentConfig extends RocketComponentConfig {
  
                 
                 //// Material
-               panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
-                               "cell 4 0, gapleft paragraph, aligny 0%, spany");
+               JPanel sub = materialPanel(new JPanel(new MigLayout()), Material.Type.BULK);
+               
+               if (component instanceof EngineBlock) {
+                       final DescriptionArea desc = new DescriptionArea(6);
+                       desc.setText("<html>An <b>engine block</b> stops the motor from moving forwards " +
+                                       "in the motor mount tube.<br><br>In order to add a motor, create a " +
+                                       "<b>body tube</b> or <b>inner tube</b> and mark it as a motor mount in " +
+                                       "the <em>Motor</em> tab.");
+                       sub.add(desc, "width 1px, growx, wrap");
+               }
+               panel.add(sub,"cell 4 0, gapleft paragraph, aligny 0%, spany");
                 
                 return panel;
         }
@@ -199,7 +210,13 @@ public class RingComponentConfig extends RocketComponentConfig {
                                 ((RingComponent) component).setRadialPosition(0.0);
                         }
                 });
-               panel.add(button,"spanx, right");
+               panel.add(button,"spanx, right, wrap para");
+               
+               
+               DescriptionArea note = new DescriptionArea(2);
+               note.setText("Note: An inner tube will not affect the aerodynamics" +
+                               " of the rocket even if it is located outside of the body tube.");
+               panel.add(note, "spanx, growx");
                 
                 
                 return panel;