Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / gui / dialogs / preferences / PreferencesDialog.java

diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
index 986c4a40e42e7253d971ca05e73658e6bee636a8..a3d963ee9a864a5f57075216ad0a627fb7ca6688 100644 (file)
--- a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
@@ -388,7 +388,6 @@ public class PreferencesDialog extends JDialog {
                combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE));
                panel.add(combo, "sizegroup boxes, wrap");
                
-
                //// Moment of inertia:
                panel.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia")));
                combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA));
@@ -403,10 +402,16 @@ public class PreferencesDialog extends JDialog {
                //// Stability:
                panel.add(new JLabel(trans.get("pref.dlg.lbl.Stability")));
                combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_STABILITY));
+               panel.add(combo, "sizegroup boxes");
+               
+               //// Windspeed:
+               panel.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed")));
+               combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED));
                panel.add(combo, "sizegroup boxes, wrap para");
                
 
 
+
                //// Default metric button
                JButton button = new JButton(trans.get("pref.dlg.but.defaultmetric"));
                button.addActionListener(new ActionListener() {