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

[fixes #969] Hide tabbed view

Browse Source
This commit is contained in:
Sibo Van Gool 2021-08-04 00:18:28 +02:00
parent 1f7e1fd75c
commit e18bc1ad95
2 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,10 +809,10 @@ AppearanceCfg.lbl.texture.offset = Offset:
AppearanceCfg.lbl.texture.center = Center: AppearanceCfg.lbl.texture.center = Center:
AppearanceCfg.lbl.texture.rotation = Rotation: AppearanceCfg.lbl.texture.rotation = Rotation:
AppearanceCfg.lbl.texture.repeat = Repeat: AppearanceCfg.lbl.texture.repeat = Repeat:
AppearanceCfg.lbl.InsideSameAsOutside = Use for inside AppearanceCfg.lbl.InsideSameAsOutside = Use separate appearance for outside and inside
AppearanceCfg.lbl.LeftSideSameAsRightSide = Use for right side AppearanceCfg.lbl.LeftSideSameAsRightSide = Use separate appearance for left and right side(s)
AppearanceCfg.lbl.ttip.InsideSameAsOutside = Use the same appearance for the inside as for the outside AppearanceCfg.lbl.ttip.InsideSameAsOutside = Use a separate appearance for outside and inside
AppearanceCfg.lbl.ttip.LeftSideSameAsRightSide = Use the same appearance for the right side as for the left side AppearanceCfg.lbl.ttip.LeftSideSameAsRightSide = Use a separate appearance for left and right side(s)
AppearanceCfg.lbl.EdgesSameAsInside = Use inside appearance for edges AppearanceCfg.lbl.EdgesSameAsInside = Use inside appearance for edges
AppearanceCfg.lbl.EdgesSameAsRightSide = Use right side appearance for edges AppearanceCfg.lbl.EdgesSameAsRightSide = Use right side appearance for edges
AppearanceCfg.lbl.ttip.EdgesSameAsInside = Use the inside appearance (checked) or outside appearance (unchecked) for the edges AppearanceCfg.lbl.ttip.EdgesSameAsInside = Use the inside appearance (checked) or outside appearance (unchecked) for the edges

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

@ -321,33 +321,31 @@ public class AppearancePanel extends JPanel {
if (c instanceof InsideColorComponent) { if (c instanceof InsideColorComponent) {
InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler(); InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler();
outsideInsidePane = new JTabbedPane();
JPanel outsidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
JPanel insidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
appearanceSection(document, c, false, outsidePanel);
appearanceSection(document, c, true, insidePanel);
// Get translator keys // Get translator keys
String tr_outside, tr_inside, tr_edges, tr_edges_ttip; String tr_outside, tr_inside, tr_edges, tr_edges_ttip, tr_insideOutside, tr_insideOutside_ttip;
if (c instanceof FinSet) { if (c instanceof FinSet) {
tr_outside = "RocketCompCfg.tab.LeftSide"; tr_outside = "RocketCompCfg.tab.LeftSide";
tr_inside = "RocketCompCfg.tab.RightSide"; tr_inside = "RocketCompCfg.tab.RightSide";
tr_edges = "AppearanceCfg.lbl.EdgesSameAsRightSide"; tr_edges = "AppearanceCfg.lbl.EdgesSameAsRightSide";
tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsRightSide"; tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsRightSide";
tr_insideOutside = "AppearanceCfg.lbl.LeftSideSameAsRightSide";
tr_insideOutside_ttip = "AppearanceCfg.lbl.ttip.LeftSideSameAsRightSide";
} }
else { else {
tr_outside = "RocketCompCfg.tab.Outside"; tr_outside = "RocketCompCfg.tab.Outside";
tr_inside = "RocketCompCfg.tab.Inside"; tr_inside = "RocketCompCfg.tab.Inside";
tr_edges = "AppearanceCfg.lbl.EdgesSameAsInside"; tr_edges = "AppearanceCfg.lbl.EdgesSameAsInside";
tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsInside"; tr_edges_ttip = "AppearanceCfg.lbl.ttip.EdgesSameAsInside";
tr_insideOutside = "AppearanceCfg.lbl.InsideSameAsOutside";
tr_insideOutside_ttip = "AppearanceCfg.lbl.ttip.InsideSameAsOutside";
} }
outsideInsidePane.addTab(trans.get(tr_outside), null, outsidePanel, // Checkbox for using separate outside/inside appearance
"Outside Tool Tip"); BooleanModel b_customInside = new BooleanModel(handler.isInsideSameAsOutside());
outsideInsidePane.addTab(trans.get(tr_inside), null, insidePanel, this.customInside = new JCheckBox(b_customInside);
"Inside Tool Tip"); customInside.setText(trans.get(tr_insideOutside));
add(outsideInsidePane, "span 4, growx, wrap"); customInside.setToolTipText(trans.get(tr_insideOutside_ttip));
add(customInside, "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());
@ -357,6 +355,19 @@ public class AppearancePanel extends JPanel {
edgesCheckbox.doClick(); edgesCheckbox.doClick();
add(edgesCheckbox, "wrap"); add(edgesCheckbox, "wrap");
outsideInsidePane = new JTabbedPane();
JPanel outsidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
JPanel insidePanel = new JPanel(new MigLayout("fill", "[150][grow][150][grow]"));
appearanceSection(document, c, false, outsidePanel);
appearanceSection(document, c, true, insidePanel);
outsideInsidePane.addTab(trans.get(tr_outside), null, outsidePanel,
"Outside Tool Tip");
outsideInsidePane.addTab(trans.get(tr_inside), null, insidePanel,
"Inside Tool Tip");
add(outsideInsidePane, "span 4, growx, wrap");
edgesCheckbox.addActionListener(new ActionListener() { edgesCheckbox.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -365,8 +376,28 @@ public class AppearancePanel extends JPanel {
} }
}); });
// Show the outside/inside tabbed display when customInside is selected
customInside.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
handler.setInsideSameAsOutside(!customInside.isSelected());
c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
if (customInside.isSelected()) {
remove(outsidePanel);
outsideInsidePane.insertTab(trans.get(tr_outside), null, outsidePanel,
"Outside Tool Tip", 0);
outsideInsidePane.setSelectedIndex(0);
add(outsideInsidePane, "span 4, growx, wrap");
}
else {
remove(outsideInsidePane);
add(outsidePanel, "span 4, growx, wrap");
}
updateUI();
}
});
customInside.getActionListeners()[0].actionPerformed(null); customInside.getActionListeners()[0].actionPerformed(null);
//edgesCheckbox.getActionListeners()[0].actionPerformed(null);
} }
else else
appearanceSection(document, c, false, this); appearanceSection(document, c, false, this);
@ -439,44 +470,7 @@ public class AppearancePanel extends JPanel {
} }
}); });
materialDefault.setText(trans.get("AppearanceCfg.lbl.Usedefault")); materialDefault.setText(trans.get("AppearanceCfg.lbl.Usedefault"));
if (insideBuilder) panel.add(materialDefault, "wrap");
panel.add(materialDefault, "wrap");
else
panel.add(materialDefault);
// Get translation keys
String tr_insideOutside, tr_insideOutside_ttip;
if (c instanceof FinSet) {
tr_insideOutside = "AppearanceCfg.lbl.LeftSideSameAsRightSide";
tr_insideOutside_ttip = "AppearanceCfg.lbl.ttip.LeftSideSameAsRightSide";
}
else {
tr_insideOutside = "AppearanceCfg.lbl.InsideSameAsOutside";
tr_insideOutside_ttip = "AppearanceCfg.lbl.ttip.InsideSameAsOutside";
}
// Custom inside color checkbox on outside tab
if (!insideBuilder && (c instanceof InsideColorComponent)) {
InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler();
BooleanModel b = new BooleanModel(handler.isInsideSameAsOutside());
this.customInside = new JCheckBox(b);
customInside.setText(trans.get(tr_insideOutside));
customInside.setToolTipText(trans.get(tr_insideOutside_ttip));
customInside.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
handler.setInsideSameAsOutside(customInside.isSelected());
c.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
if (outsideInsidePane != null) {
outsideInsidePane.setEnabledAt(1, !customInside.isSelected());
}
if (edgesCheckbox != null) {
edgesCheckbox.setVisible(!customInside.isSelected());
}
}
});
panel.add(customInside, "wrap");
}
// Texture File // Texture File
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.Texture"))); panel.add(new JLabel(trans.get("AppearanceCfg.lbl.Texture")));