From e0983c05cc4bbd8dfd8a3b090ee0833731089811 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Tue, 3 Mar 2020 09:37:56 -0700 Subject: [PATCH] Add back instance panel dropped in previous commit Adds back the instance options in the previous commit for specifying instance details about rail buttons. This change adds it back but slightly tweaks the layout and location in order to keep the config panel in a 2 column arrangement. Signed-off-by: Billy Olsen --- .../gui/configdialog/RailButtonConfig.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java index 23d6ae2f4..9a7d2759f 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java @@ -77,11 +77,7 @@ public class RailButtonConfig extends RocketComponentConfig { panel.add(new UnitSelector( angleModel), "growx"); panel.add(new BasicSlider( angleModel.getSliderModel(-180, 180)), "w 100lp, wrap"); } - - primary.add(panel, "grow, gapright 201p"); - panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", "")); - - + { //// Position relative to: panel.add(new JLabel(trans.get("RailBtnCfg.lbl.PosRelativeTo"))); @@ -103,10 +99,16 @@ public class RailButtonConfig extends RocketComponentConfig { "w 100lp, wrap para"); } - + + primary.add(panel, "grow, gapright 201p"); + panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", "")); + + //// Instance count + panel.add( instanceablePanel(rbc), "span, wrap"); + //// Material panel.add(materialPanel(Material.Type.BULK),"span, wrap"); - + primary.add(panel, "grow"); return primary;