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

Merge pull request #1083 from SiboVG/issue-926

Browse Source 
[fixes #926] Fix motor selection window layout issues
This commit is contained in:
Joe Pfeiffer 2022-01-28 09:22:02 -07:00 committed by GitHub
commit 68032e88ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/resources/l10n/messages.properties
View File

@ -1242,7 +1242,7 @@ TCMotorSelPan.lbl.Launchmass = Launch mass:
TCMotorSelPan.lbl.Emptymass = Empty mass: TCMotorSelPan.lbl.Emptymass = Empty mass:
TCMotorSelPan.lbl.Caseinfo = Case info: TCMotorSelPan.lbl.Caseinfo = Case info:
TCMotorSelPan.lbl.Propinfo = Propellant: TCMotorSelPan.lbl.Propinfo = Propellant:
TCMotorSelPan.lbl.CompatibleCases = Compatible Cases TCMotorSelPan.lbl.CompatibleCases = Compatible Cases:
TCMotorSelPan.lbl.Datapoints = Data points: TCMotorSelPan.lbl.Datapoints = Data points:
TCMotorSelPan.lbl.Digest = Digest: TCMotorSelPan.lbl.Digest = Digest:
TCMotorSelPan.title.Thrustcurve = Thrust curve: TCMotorSelPan.title.Thrustcurve = Thrust curve:

2
core/resources/l10n/messages_nl.properties
View File

@ -1210,7 +1210,7 @@ TCMotorSelPan.lbl.Launchmass = Lanceermassa:
TCMotorSelPan.lbl.Emptymass = Lege massa: TCMotorSelPan.lbl.Emptymass = Lege massa:
TCMotorSelPan.lbl.Caseinfo = Info over de zaak: TCMotorSelPan.lbl.Caseinfo = Info over de zaak:
TCMotorSelPan.lbl.Propinfo = Stuwtof: TCMotorSelPan.lbl.Propinfo = Stuwtof:
TCMotorSelPan.lbl.CompatibleCases = Compatibele gevallen TCMotorSelPan.lbl.CompatibleCases = Compatibele omhulselen:
TCMotorSelPan.lbl.Datapoints = Datapunten: TCMotorSelPan.lbl.Datapoints = Datapunten:
TCMotorSelPan.lbl.Digest = Verteer: TCMotorSelPan.lbl.Digest = Verteer:
TCMotorSelPan.title.Thrustcurve = Stuwkrachtcurve: TCMotorSelPan.title.Thrustcurve = Stuwkrachtcurve:

2
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
View File

@ -172,7 +172,7 @@ public abstract class MotorFilterPanel extends JPanel {
} }
}); });
sub.add(new JScrollPane(manufacturerCheckList.getList()), "grow,wrap"); sub.add(new JScrollPane(manufacturerCheckList.getList()), "grow, pushy, wrap");
JButton clearMotors = new SelectColorButton(trans.get("TCMotorSelPan.btn.checkNone")); JButton clearMotors = new SelectColorButton(trans.get("TCMotorSelPan.btn.checkNone"));
clearMotors.addActionListener( new ActionListener() { clearMotors.addActionListener( new ActionListener() {

2
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
View File

@ -155,7 +155,7 @@ class MotorInformationPanel extends JPanel {
comment.setWrapStyleWord(true); comment.setWrapStyleWord(true);
comment.setEditable(false); comment.setEditable(false);
JScrollPane scrollpane = new JScrollPane(comment); JScrollPane scrollpane = new JScrollPane(comment);
this.add(scrollpane, "spanx, growx, wrap para"); this.add(scrollpane, "spanx, grow, pushy, wrap para");
} }
// Thrust curve plot // Thrust curve plot

4
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
View File

@ -290,7 +290,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
JScrollPane scrollpane = new JScrollPane(); JScrollPane scrollpane = new JScrollPane();
scrollpane.setViewportView(table); scrollpane.setViewportView(table);
panel.add(scrollpane, "grow, width :500:, spanx, wrap"); panel.add(scrollpane, "grow, width :500:, spanx, push, wrap");
} }
@ -354,7 +354,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
rightSide.add(trans.get("TCMotorSelPan.btn.filter"), motorFilterPanel); rightSide.add(trans.get("TCMotorSelPan.btn.filter"), motorFilterPanel);
rightSide.add(trans.get("TCMotorSelPan.btn.details"), motorInformationPanel); rightSide.add(trans.get("TCMotorSelPan.btn.details"), motorInformationPanel);
this.add(rightSide); this.add(rightSide, "growy");
// Update the panel data // Update the panel data
updateData(); updateData();