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

[ui] Adjusted spacing of new stage buttons

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-05-08 13:04:21 -04:00
parent deed818fd3
commit 1c540a8252
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
View File

@ -79,7 +79,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
private static final Logger log = LoggerFactory.getLogger(ComponentAddButtons.class); private static final Logger log = LoggerFactory.getLogger(ComponentAddButtons.class);
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
private static final int ROWS = 3; private static final int ROWS = 4;
private static final int MAXCOLS = 6; private static final int MAXCOLS = 6;
private static final String BUTTONPARAM = "grow, sizegroup buttons"; private static final String BUTTONPARAM = "grow, sizegroup buttons";
@ -116,6 +116,18 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
} }
int row = 0; int row = 0;
int col = 0; int col = 0;
////////////////////////////////////////////
add(new JLabel(trans.get("compaddbuttons.assembly")), "span, gaptop unrel, wrap");
//// Component Assembly Components:
addButtonGroup(row,
new ComponentButton(AxialStage.class, trans.get("RocketActions.NewStageAct.Newstage")),
new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.newBooster.lbl")),
new ComponentButton(PodSet.class, trans.get("compaddbuttons.newPods.lbl")));
row++;
//////////////////////////////////////////// ////////////////////////////////////////////
//// Body components and fin sets //// Body components and fin sets
@ -139,7 +151,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
new ComponentButton( RailButton.class, trans.get("compaddbuttons.RailButton")), new ComponentButton( RailButton.class, trans.get("compaddbuttons.RailButton")),
//// Launch lug //// Launch lug
new ComponentButton(LaunchLug.class, trans.get("compaddbuttons.Launchlug"))); new ComponentButton(LaunchLug.class, trans.get("compaddbuttons.Launchlug")));
row++; row++;
///////////////////////////////////////////// /////////////////////////////////////////////
@ -160,20 +172,8 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
row++; row++;
//////////////////////////////////////////// ////////////////////////////////////////////
add(new JLabel(trans.get("compaddbuttons.assembly")), "span 3");
add(new JLabel(trans.get("compaddbuttons.Massobjects")), "span, gaptop unrel, wrap"); add(new JLabel(trans.get("compaddbuttons.Massobjects")), "span, gaptop unrel, wrap");
// RocketActions.NewStageAct.ttip.Newstage = Add a new stage to the rocket design.
// RocketActions.NewStageAct.ttip.newBooster = Add a new set booster stage to the rocket design.
// RocketActions.NewStageAct.ttip.newPods = Add a new set of pods to the rocket design.
//// Component Assembly Components:
ComponentButton[] buttonsToAdd = {
new ComponentButton(AxialStage.class, trans.get("RocketActions.NewStageAct.Newstage")),
new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.newBooster.lbl")),
new ComponentButton(PodSet.class, trans.get("compaddbuttons.newPods.lbl"))};
addButtonGroup(row, buttonsToAdd);
//// Mass objects //// Mass objects
// NOTE: These are on the same line as the assemblies above // NOTE: These are on the same line as the assemblies above
addButtonGroup(row, addButtonGroup(row,