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

[fixes #969] Use disabled inside/right tab

Browse Source
This commit is contained in:
Sibo Van Gool 2021-07-26 20:59:40 +02:00
parent 3a5983e0fc
commit 145a27d0f5
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,20 @@ import java.awt.event.ActionListener;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.EventObject; import java.util.EventObject;
import javax.swing.*; import javax.swing.JPanel;
import javax.swing.JColorChooser;
import javax.swing.JDialog;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JComboBox;
import javax.swing.JSeparator;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.JOptionPane;
import javax.swing.JSpinner;
import javax.swing.JSlider;
import javax.swing.JTabbedPane;
import javax.swing.colorchooser.ColorSelectionModel; import javax.swing.colorchooser.ColorSelectionModel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
@ -67,6 +80,8 @@ public class AppearancePanel extends JPanel {
// faster. // faster.
private Appearance defaultAppearance = null; private Appearance defaultAppearance = null;
private JTabbedPane outsideInsidePane = 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
@ -303,7 +318,7 @@ public class AppearancePanel extends JPanel {
if (c instanceof InsideColorComponent) { if (c instanceof InsideColorComponent) {
InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler(); InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler();
JTabbedPane tabbedPane = new JTabbedPane(); outsideInsidePane = new JTabbedPane();
JPanel outsidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]")); JPanel outsidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
JPanel insidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]")); JPanel insidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
@ -325,11 +340,12 @@ public class AppearancePanel extends JPanel {
tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsInside"; tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsInside";
} }
tabbedPane.addTab(trans.get(tr_outside), null, outsidePanel, outsideInsidePane.addTab(trans.get(tr_outside), null, outsidePanel,
"Outside Tool Tip"); "Outside Tool Tip");
tabbedPane.addTab(trans.get(tr_inside), null, insidePanel, outsideInsidePane.addTab(trans.get(tr_inside), null, insidePanel,
"Inside Tool Tip"); "Inside Tool Tip");
add(tabbedPane, "span 4, growx, wrap"); outsideInsidePane.setEnabledAt(1, false);
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());
@ -445,6 +461,8 @@ 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)
outsideInsidePane.setEnabledAt(1, !customInside.isSelected());
} }
}); });
panel.add(customInside, "wrap"); panel.add(customInside, "wrap");