From 18b0b341584f44927d4c82dbe7f66798c75a7293 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 14 Feb 2024 13:51:20 +0100 Subject: [PATCH] Disable triangulation method widgets when no triangulation --- .../file/wavefrontobj/OBJOptionChooser.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java b/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java index 912dcd0f0..84e4ed174 100644 --- a/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java +++ b/swing/src/net/sf/openrocket/file/wavefrontobj/OBJOptionChooser.java @@ -56,6 +56,7 @@ public class OBJOptionChooser extends JPanel { private final JCheckBox exportAsSeparateFiles; private final JCheckBox removeOffset; private final JCheckBox triangulate; + private final JLabel tmLabel; private final JComboBox triangulationMethod; private final JCheckBox sRGB; private final JComboBox LOD; @@ -227,11 +228,15 @@ public class OBJOptionChooser extends JPanel { @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { + tmLabel.setEnabled(true); + triangulationMethod.setEnabled(true); // Disable the export appearance, it is not supported in combination with triangulate exportAppearance.setEnabled(false); exportAppearance.setSelected(false); exportAppearance.setToolTipText(trans.get("OBJOptionChooser.checkbox.exportAppearance.ttip.triangulate")); } else { + tmLabel.setEnabled(false); + triangulationMethod.setEnabled(false); // Re-enable exportAppearance.setEnabled(true); exportAppearance.setSelected(opts.isExportAppearance()); @@ -241,9 +246,9 @@ public class OBJOptionChooser extends JPanel { }); //// Triangulation method - JLabel tmLabel = new JLabel(trans.get("OBJOptionChooser.lbl.triangulationMethod")); - tmLabel.setToolTipText(trans.get("OBJOptionChooser.lbl.triangulationMethod.ttip")); - advancedOptionsPanel.add(tmLabel, "spanx, split 2"); + this.tmLabel = new JLabel(trans.get("OBJOptionChooser.lbl.triangulationMethod")); + this.tmLabel.setToolTipText(trans.get("OBJOptionChooser.lbl.triangulationMethod.ttip")); + advancedOptionsPanel.add(this.tmLabel, "spanx, split 2"); this.triangulationMethod = new JComboBox<>(ObjUtils.TriangulationMethod.values()); this.triangulationMethod.setToolTipText(trans.get("OBJOptionChooser.lbl.triangulationMethod.ttip")); this.triangulationMethod.setRenderer(new TriangulationMethodRenderer());