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

[fixes #969] Minor bug fixes

Browse Source
This commit is contained in:
Sibo Van Gool 2021-07-28 01:19:40 +02:00
parent e84f8fd429
commit 1f7e1fd75c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -83,6 +83,8 @@ public class AppearancePanel extends JPanel {
private JTabbedPane outsideInsidePane = null; private JTabbedPane outsideInsidePane = null;
private JCheckBox edgesCheckbox = null; private JCheckBox edgesCheckbox = null;
private JCheckBox customInside = null;
/** /**
* A non-unit that adjusts by a small amount, suitable for values that are * A non-unit that adjusts by a small amount, suitable for values that are
* on the 0-1 scale * on the 0-1 scale
@ -345,15 +347,14 @@ public class AppearancePanel extends JPanel {
"Outside Tool Tip"); "Outside Tool Tip");
outsideInsidePane.addTab(trans.get(tr_inside), null, insidePanel, outsideInsidePane.addTab(trans.get(tr_inside), null, insidePanel,
"Inside Tool Tip"); "Inside Tool Tip");
outsideInsidePane.setEnabledAt(1, false);
add(outsideInsidePane, "span 4, growx, wrap"); add(outsideInsidePane, "span 4, growx, wrap");
// Checkbox to set edges the same as inside/outside // Checkbox to set edges the same as inside/outside
BooleanModel b = new BooleanModel(handler.isEdgesSameAsInside()); BooleanModel b = new BooleanModel(!handler.isEdgesSameAsInside());
edgesCheckbox = new JCheckBox(b); edgesCheckbox = new JCheckBox(b);
edgesCheckbox.setText(trans.get(tr_edges)); edgesCheckbox.setText(trans.get(tr_edges));
edgesCheckbox.setToolTipText(trans.get(tr_edges_ttip)); edgesCheckbox.setToolTipText(trans.get(tr_edges_ttip));
edgesCheckbox.setVisible(false); edgesCheckbox.doClick();
add(edgesCheckbox, "wrap"); add(edgesCheckbox, "wrap");
edgesCheckbox.addActionListener(new ActionListener() { edgesCheckbox.addActionListener(new ActionListener() {
@ -363,6 +364,9 @@ public class AppearancePanel extends JPanel {
c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
} }
}); });
customInside.getActionListeners()[0].actionPerformed(null);
//edgesCheckbox.getActionListeners()[0].actionPerformed(null);
} }
else else
appearanceSection(document, c, false, this); appearanceSection(document, c, false, this);
@ -452,10 +456,10 @@ public class AppearancePanel extends JPanel {
} }
// Custom inside color checkbox on outside tab // Custom inside color checkbox on outside tab
if (!insideBuilder) { if (!insideBuilder && (c instanceof InsideColorComponent)) {
InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler(); InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler();
BooleanModel b = new BooleanModel(handler.isInsideSameAsOutside()); BooleanModel b = new BooleanModel(handler.isInsideSameAsOutside());
JCheckBox customInside = new JCheckBox(b); this.customInside = new JCheckBox(b);
customInside.setText(trans.get(tr_insideOutside)); customInside.setText(trans.get(tr_insideOutside));
customInside.setToolTipText(trans.get(tr_insideOutside_ttip)); customInside.setToolTipText(trans.get(tr_insideOutside_ttip));
customInside.addActionListener(new ActionListener() { customInside.addActionListener(new ActionListener() {
@ -463,10 +467,12 @@ public class AppearancePanel extends JPanel {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
handler.setInsideSameAsOutside(customInside.isSelected()); handler.setInsideSameAsOutside(customInside.isSelected());
c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
if (outsideInsidePane != null) if (outsideInsidePane != null) {
outsideInsidePane.setEnabledAt(1, !customInside.isSelected()); outsideInsidePane.setEnabledAt(1, !customInside.isSelected());
if (edgesCheckbox != null) }
if (edgesCheckbox != null) {
edgesCheckbox.setVisible(!customInside.isSelected()); edgesCheckbox.setVisible(!customInside.isSelected());
}
} }
}); });
panel.add(customInside, "wrap"); panel.add(customInside, "wrap");