From 6b6f0c8cb1a6cdc69a06644c761b14e4472576ce Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Fri, 28 Jan 2022 01:53:12 +0100 Subject: [PATCH 1/2] [fixes #926] Fix layout issues motor selection panel --- .../gui/dialogs/motor/thrustcurve/MotorFilterPanel.java | 2 +- .../gui/dialogs/motor/thrustcurve/MotorInformationPanel.java | 2 +- .../motor/thrustcurve/ThrustCurveMotorSelectionPanel.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java index 55c116eca..8dc619ac8 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java @@ -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")); clearMotors.addActionListener( new ActionListener() { diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java index 00d8e278c..95f7ba0b7 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java @@ -155,7 +155,7 @@ class MotorInformationPanel extends JPanel { comment.setWrapStyleWord(true); comment.setEditable(false); JScrollPane scrollpane = new JScrollPane(comment); - this.add(scrollpane, "spanx, growx, wrap para"); + this.add(scrollpane, "spanx, grow, pushy, wrap para"); } // Thrust curve plot diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index c7f84ae1a..8605ace7b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -290,7 +290,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec JScrollPane scrollpane = new JScrollPane(); 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.details"), motorInformationPanel); - this.add(rightSide); + this.add(rightSide, "growy"); // Update the panel data updateData(); From ee78074f9e3ea802986acbc5b9ebdd6c087a8daf Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Fri, 28 Jan 2022 01:55:26 +0100 Subject: [PATCH 2/2] Add colon for compatible cases (motor selection) --- core/resources/l10n/messages.properties | 2 +- core/resources/l10n/messages_nl.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index c878c8a81..1cfe536e8 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1242,7 +1242,7 @@ TCMotorSelPan.lbl.Launchmass = Launch mass: TCMotorSelPan.lbl.Emptymass = Empty mass: TCMotorSelPan.lbl.Caseinfo = Case info: TCMotorSelPan.lbl.Propinfo = Propellant: -TCMotorSelPan.lbl.CompatibleCases = Compatible Cases +TCMotorSelPan.lbl.CompatibleCases = Compatible Cases: TCMotorSelPan.lbl.Datapoints = Data points: TCMotorSelPan.lbl.Digest = Digest: TCMotorSelPan.title.Thrustcurve = Thrust curve: diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 63724ddfd..2d6b490f7 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1210,7 +1210,7 @@ TCMotorSelPan.lbl.Launchmass = Lanceermassa: TCMotorSelPan.lbl.Emptymass = Lege massa: TCMotorSelPan.lbl.Caseinfo = Info over de zaak: TCMotorSelPan.lbl.Propinfo = Stuwtof: -TCMotorSelPan.lbl.CompatibleCases = Compatibele gevallen +TCMotorSelPan.lbl.CompatibleCases = Compatibele omhulselen: TCMotorSelPan.lbl.Datapoints = Datapunten: TCMotorSelPan.lbl.Digest = Verteer: TCMotorSelPan.title.Thrustcurve = Stuwkrachtcurve: