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

Hide edit decal button if edit not possible

Browse Source
This commit is contained in:
SiboVG 2023-01-25 00:07:46 +01:00
parent cc0d04aa42
commit fb99a11989
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package net.sf.openrocket.gui.configdialog;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Desktop;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -494,13 +495,11 @@ public class AppearancePanel extends JPanel {
if (!insideBuilder) { if (!insideBuilder) {
builder = ab; builder = ab;
mDefault = new BooleanModel(c.getAppearance() == null || defaultAppearance.equals(c.getAppearance())); mDefault = new BooleanModel(c.getAppearance() == null || defaultAppearance.equals(c.getAppearance()));
} } else if (c instanceof InsideColorComponent) {
else if (c instanceof InsideColorComponent) {
builder = insideAb; builder = insideAb;
Appearance appearance = ((InsideColorComponent)c).getInsideColorComponentHandler().getInsideAppearance(); Appearance appearance = ((InsideColorComponent) c).getInsideColorComponentHandler().getInsideAppearance();
mDefault = new BooleanModel(appearance == null || defaultAppearance.equals(appearance)); mDefault = new BooleanModel(appearance == null || defaultAppearance.equals(appearance));
} } else return;
else return;
DecalModel decalModel = new DecalModel(panel, document, builder); DecalModel decalModel = new DecalModel(panel, document, builder);
JComboBox<DecalImage> textureDropDown = new JComboBox<DecalImage>(decalModel); JComboBox<DecalImage> textureDropDown = new JComboBox<DecalImage>(decalModel);
@ -509,6 +508,7 @@ public class AppearancePanel extends JPanel {
// for multi-comp edits, the listeners' decals may not be updated otherwise // for multi-comp edits, the listeners' decals may not be updated otherwise
textureDropDown.addActionListener(new ActionListener() { textureDropDown.addActionListener(new ActionListener() {
private DecalImage previousSelection = (DecalImage) decalModel.getSelectedItem(); private DecalImage previousSelection = (DecalImage) decalModel.getSelectedItem();
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
DecalImage decal = (DecalImage) textureDropDown.getSelectedItem(); DecalImage decal = (DecalImage) textureDropDown.getSelectedItem();
@ -534,8 +534,7 @@ public class AppearancePanel extends JPanel {
if (!insideBuilder) { if (!insideBuilder) {
previousUserSelectedAppearance = (builder == null) ? null previousUserSelectedAppearance = (builder == null) ? null
: builder.getAppearance(); : builder.getAppearance();
} } else {
else {
previousUserSelectedInsideAppearance = (builder == null) ? null previousUserSelectedInsideAppearance = (builder == null) ? null
: builder.getAppearance(); : builder.getAppearance();
} }
@ -556,8 +555,7 @@ public class AppearancePanel extends JPanel {
listener.setAppearance(previousUserSelectedAppearance); listener.setAppearance(previousUserSelectedAppearance);
} }
builder.setAppearance(previousUserSelectedAppearance); builder.setAppearance(previousUserSelectedAppearance);
} } else {
else {
// Set the listeners' inside appearance to the previous user selected appearance // Set the listeners' inside appearance to the previous user selected appearance
for (AppearanceBuilder listener : builder.getConfigListeners().values()) { for (AppearanceBuilder listener : builder.getConfigListeners().values()) {
listener.setAppearance(previousUserSelectedInsideAppearance); listener.setAppearance(previousUserSelectedInsideAppearance);
@ -576,8 +574,11 @@ public class AppearancePanel extends JPanel {
JPanel p = new JPanel(new MigLayout("fill, ins 0", "[grow][]")); JPanel p = new JPanel(new MigLayout("fill, ins 0", "[grow][]"));
mDefault.addEnableComponent(textureDropDown, false); mDefault.addEnableComponent(textureDropDown, false);
p.add(textureDropDown, "grow"); p.add(textureDropDown, "grow");
panel.add(p, "span 3, growx, wrap"); panel.add(p, "spanx 3, growx, wrap");
order.add(textureDropDown); order.add(textureDropDown);
//// Edit button
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
JButton editBtn = new SelectColorButton( JButton editBtn = new SelectColorButton(
trans.get("AppearanceCfg.but.edit")); trans.get("AppearanceCfg.but.edit"));
editBtn.setEnabled(builder.getImage() != null); editBtn.setEnabled(builder.getImage() != null);
@ -607,6 +608,7 @@ public class AppearancePanel extends JPanel {
}); });
p.add(editBtn); p.add(editBtn);
}
// TODO: move the separate columns in two separate panels instead of adding them in a zig-zag way // TODO: move the separate columns in two separate panels instead of adding them in a zig-zag way
// Color // Color