From 8c7947eab18e21bc6643ed277e0581729f9a2601 Mon Sep 17 00:00:00 2001 From: iobyte Date: Wed, 7 Jun 2023 20:05:55 +0000 Subject: [PATCH] trackeditor: replace showConfirmDialog with showOptionDialog git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8984 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 2f5bc7f487f6277d721d84d3767a95f28839de61 Former-commit-id: e61308826926ffab74602a72956606d7b9b24bea --- .../gui/segment/SegmentSideProperties.java | 27 ++++++++++++++----- src/tools/trackeditor/utils/Properties.java | 2 +- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/tools/trackeditor/gui/segment/SegmentSideProperties.java b/src/tools/trackeditor/gui/segment/SegmentSideProperties.java index 27da883e..cb1399ee 100644 --- a/src/tools/trackeditor/gui/segment/SegmentSideProperties.java +++ b/src/tools/trackeditor/gui/segment/SegmentSideProperties.java @@ -812,24 +812,36 @@ public class SegmentSideProperties extends JPanel implements SliderListener case "no barrier": if (parent.editorFrame.getInteractiveFixes()) { - // fix up bad values (height should be 0) + // fix up bad values (height should be 0) if (getBarrierHeight(segment, side) != 0) { - if (JOptionPane.showConfirmDialog(null, "Found " + side.getName() + " barrier style \"no barrier\" with" + - getBarrierHeightText(segment, side) + getBarrierWidthText(segment, side) + getBarrierSurfaceText(segment, side) + - " ?\n\nShould be 0.0.", "Fix Barrier Height", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) + String[] options = { "Set height to 0.0", "Ignore" }; + switch (JOptionPane.showOptionDialog(null, "Found " + side.getName() + " barrier style \"no barrier\" with" + + getBarrierHeightText(segment, side) + getBarrierWidthText(segment, side) + getBarrierSurfaceText(segment, side), + "Invalid Barrier Height", JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1])) { + case 0: // set height to 0 side.setBarrierHeight(0); + break; + case 1: // ignore + // nothing + break; } } // fix up bad values (width should be 0) if (getBarrierWidth(segment, side) != 0) { - if (JOptionPane.showConfirmDialog(null, "Found " + side.getName() + " barrier style \"no barrier\" with " + - getBarrierWidthText(segment, side) + getBarrierHeightText(segment, side) + getBarrierSurfaceText(segment, side) + - " ?\n\nShould be 0.0.", "Fix Barrier Width", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) + String[] options = { "Set width to 0.0", "Ignore" }; + switch (JOptionPane.showOptionDialog(null, "Found " + side.getName() + " barrier style \"no barrier\" with" + + getBarrierWidthText(segment, side) + getBarrierHeightText(segment, side) + getBarrierSurfaceText(segment, side), + "Invalid Barrier Width", JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1])) { + case 0: // set width to 0 side.setBarrierWidth(0); + break; + case 1: // ignore + // nothing + break; } } } @@ -888,6 +900,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener side.setBarrierSurface(null); side.setBarrierHeight(Double.NaN); side.setBarrierWidth(Double.NaN); + side.setHasBarrier(false); getBarrierSurfaceComboBox().setSelectedIndex(-1); getBarrierHeightSlider().setValue(side.getBarrierHeight()); getBarrierHeightSlider().setEnabled(false); diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 1b0dad1a..7184ddda 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.2.38"; + public final String version = "1.2.39"; private String path; private double imageScale = 1;