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

Fix borders in motor selection table

Browse Source
This commit is contained in:
SiboVG 2023-08-20 12:01:53 +02:00
parent e2993a68f9
commit cd742ba171
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package net.sf.openrocket.gui.dialogs.motor.thrustcurve; package net.sf.openrocket.gui.dialogs.motor.thrustcurve;
import java.awt.Color;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
@ -16,6 +17,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSpinner; import javax.swing.JSpinner;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
@ -144,26 +146,25 @@ public abstract class MotorFilterPanel extends JPanel {
// Manufacturer selection // Manufacturer selection
JPanel sub = new JPanel(new MigLayout("fill")); JPanel sub = new JPanel(new MigLayout("fill"));
TitledBorder border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.MANUFACTURER")); Border templateBorder = GUIUtil.getUITheme().getBorder();
TitledBorder border = BorderFactory.createTitledBorder(templateBorder);
border.setTitle(trans.get("TCurveMotorCol.MANUFACTURER"));
GUIUtil.changeFontStyle(border, Font.BOLD); GUIUtil.changeFontStyle(border, Font.BOLD);
sub.setBorder(border); sub.setBorder(border);
this.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1)); this.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
List<Manufacturer> manufacturers = new ArrayList<Manufacturer>(); List<Manufacturer> manufacturers = new ArrayList<>(allManufacturers);
for (Manufacturer m : allManufacturers) {
manufacturers.add(m);
}
Collections.sort(manufacturers, new Comparator<Manufacturer>() { manufacturers.sort(new Comparator<Manufacturer>() {
@Override @Override
public int compare(Manufacturer o1, Manufacturer o2) { public int compare(Manufacturer o1, Manufacturer o2) {
return o1.getSimpleName().compareTo( o2.getSimpleName()); return o1.getSimpleName().compareTo(o2.getSimpleName());
} }
}); });
manufacturerCheckList = new CheckList.Builder().<Manufacturer>build(); manufacturerCheckList = new CheckList.Builder().build();
manufacturerCheckList.setData(manufacturers); manufacturerCheckList.setData(manufacturers);
manufacturerCheckList.setUncheckedItems(unselectedManusFromPreferences); manufacturerCheckList.setUncheckedItems(unselectedManusFromPreferences);
@ -213,7 +214,8 @@ public abstract class MotorFilterPanel extends JPanel {
// Total Impulse selection // Total Impulse selection
{ {
sub = new JPanel(new MigLayout("fill")); sub = new JPanel(new MigLayout("fill"));
border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.TOTAL_IMPULSE")); border = BorderFactory.createTitledBorder(templateBorder);
border.setTitle(trans.get("TCurveMotorCol.TOTAL_IMPULSE"));
GUIUtil.changeFontStyle(border, Font.BOLD); GUIUtil.changeFontStyle(border, Font.BOLD);
sub.setBorder(border); sub.setBorder(border);
@ -240,7 +242,8 @@ public abstract class MotorFilterPanel extends JPanel {
// Motor Dimensions // Motor Dimensions
sub = new JPanel(new MigLayout("fill")); sub = new JPanel(new MigLayout("fill"));
TitledBorder diameterTitleBorder = BorderFactory.createTitledBorder(trans.get("TCMotorSelPan.MotorSize")); TitledBorder diameterTitleBorder = BorderFactory.createTitledBorder(templateBorder);
diameterTitleBorder.setTitle(trans.get("TCMotorSelPan.MotorSize"));
GUIUtil.changeFontStyle(diameterTitleBorder, Font.BOLD); GUIUtil.changeFontStyle(diameterTitleBorder, Font.BOLD);
sub.setBorder(diameterTitleBorder); sub.setBorder(diameterTitleBorder);

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

@ -159,6 +159,7 @@ class MotorInformationPanel extends JPanel {
comment = new JTextArea(5, 5); comment = new JTextArea(5, 5);
comment.setBorder(GUIUtil.getUITheme().getBorder());
GUIUtil.changeFontSize(comment, -2); GUIUtil.changeFontSize(comment, -2);
withCommentFont = comment.getFont(); withCommentFont = comment.getFont();
noCommentFont = withCommentFont.deriveFont(Font.ITALIC); noCommentFont = withCommentFont.deriveFont(Font.ITALIC);

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

@ -332,11 +332,10 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
// Number of motors // Number of motors
{ {
nrOfMotorsLabel = new JLabel(); nrOfMotorsLabel = new StyledLabel(-2f, StyledLabel.Style.ITALIC);
nrOfMotorsLabel.setToolTipText(trans.get("TCMotorSelPan.lbl.ttip.nrOfMotors")); nrOfMotorsLabel.setToolTipText(trans.get("TCMotorSelPan.lbl.ttip.nrOfMotors"));
updateNrOfMotors(); updateNrOfMotors();
nrOfMotorsLabel.setForeground(Color.darkGray); nrOfMotorsLabel.setForeground(Color.darkGray);
nrOfMotorsLabel.setFont(new Font(Font.SANS_SERIF, Font.ITALIC, 11));
panel.add(nrOfMotorsLabel, "gapleft para, spanx, wrap"); panel.add(nrOfMotorsLabel, "gapleft para, spanx, wrap");
sorter.addRowSorterListener(new RowSorterListener() { sorter.addRowSorterListener(new RowSorterListener() {
@Override @Override