trackeditor: make ckecking default objects optional

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9332 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2024-02-21 17:19:02 +00:00
parent 18bd02daf4
commit 2ac59800de
4 changed files with 42 additions and 3 deletions

View File

@ -1194,9 +1194,13 @@ public class CheckDialog extends JDialog
{ {
checkTrackObject(trackData.getObjects().get(i), "Track"); checkTrackObject(trackData.getObjects().get(i), "Track");
} }
for (int i = 0; i < defaultObjects.size(); i++)
if (editorFrame.getCheckDefaultObjects())
{ {
checkTrackObject(defaultObjects.get(i), "Default"); for (int i = 0; i < defaultObjects.size(); i++)
{
checkTrackObject(defaultObjects.get(i), "Default");
}
} }
} }
private File findTextureFile(String texture) private File findTextureFile(String texture)

View File

@ -246,6 +246,8 @@ public class EditorFrame extends JFrame
private final static String CURSOR_COORDINATES = "CursorCoordinates"; private final static String CURSOR_COORDINATES = "CursorCoordinates";
private boolean cursorNames = false; private boolean cursorNames = false;
private final static String CURSOR_NAMES = "CursorNames"; private final static String CURSOR_NAMES = "CursorNames";
private boolean checkDefaultObjects = false;
private final static String CHECK_DEFAULT_OBJECTS = "CheckDefaultObjects";
private TrackData trackData = null; private TrackData trackData = null;
private Vector<Surface> defaultSurfaces = new Vector<Surface>(); private Vector<Surface> defaultSurfaces = new Vector<Surface>();
@ -388,6 +390,7 @@ public class EditorFrame extends JFrame
interactiveFixes = preferences.getBoolean(INTERACTIVE_FIXES, false); interactiveFixes = preferences.getBoolean(INTERACTIVE_FIXES, false);
cursorCoordinates = preferences.getBoolean(CURSOR_COORDINATES, false); cursorCoordinates = preferences.getBoolean(CURSOR_COORDINATES, false);
cursorNames = preferences.getBoolean(CURSOR_NAMES, false); cursorNames = preferences.getBoolean(CURSOR_NAMES, false);
checkDefaultObjects = preferences.getBoolean(CHECK_DEFAULT_OBJECTS, false);
if (dataDirectory == null) if (dataDirectory == null)
{ {
@ -546,6 +549,18 @@ public class EditorFrame extends JFrame
preferences.putBoolean(CURSOR_NAMES, cursorNames); preferences.putBoolean(CURSOR_NAMES, cursorNames);
} }
public boolean getCheckDefaultObjects()
{
return checkDefaultObjects;
}
public void setCheckDefaultObjects(boolean value)
{
checkDefaultObjects = value;
preferences.putBoolean(CHECK_DEFAULT_OBJECTS, checkDefaultObjects);
}
private void updateRecentFiles(String filename) private void updateRecentFiles(String filename)
{ {
recentFiles.remove(filename); recentFiles.remove(filename);
@ -1410,6 +1425,7 @@ public class EditorFrame extends JFrame
setInteractiveFixes(preferencesDialog.getInteractiveFixes()); setInteractiveFixes(preferencesDialog.getInteractiveFixes());
setCursorCoordinates(preferencesDialog.getCursorCoordinates()); setCursorCoordinates(preferencesDialog.getCursorCoordinates());
setCursorNames(preferencesDialog.getCursorNames()); setCursorNames(preferencesDialog.getCursorNames());
setCheckDefaultObjects(preferencesDialog.getCheckDefaultObjects());
readDefaultSurfaces(); readDefaultSurfaces();
readDefaultObjects(); readDefaultObjects();
view.redrawCircuit(); view.redrawCircuit();

View File

@ -35,6 +35,7 @@ public class PreferencesDialog extends JDialog
private JCheckBox interactiveFixesCheckBox = null; private JCheckBox interactiveFixesCheckBox = null;
private JCheckBox cursorCoordinatesCheckBox = null; private JCheckBox cursorCoordinatesCheckBox = null;
private JCheckBox cursorNamesCheckBox = null; private JCheckBox cursorNamesCheckBox = null;
private JCheckBox checkDefaultObjectsCheckBox = null;
private JButton okButton = null; private JButton okButton = null;
private JButton cancelButton = null; private JButton cancelButton = null;
@ -98,6 +99,7 @@ public class PreferencesDialog extends JDialog
jPanel.add(getInteractiveFixesCheckBox(), null); jPanel.add(getInteractiveFixesCheckBox(), null);
jPanel.add(getCursorCoordinatesCheckBox(), null); jPanel.add(getCursorCoordinatesCheckBox(), null);
jPanel.add(getCursorNamesCheckBox(), null); jPanel.add(getCursorNamesCheckBox(), null);
jPanel.add(getCheckDefaultObjectsCheckBox(), null);
jPanel.add(getOkButton(), null); jPanel.add(getOkButton(), null);
jPanel.add(getCancelButton(), null); jPanel.add(getCancelButton(), null);
} }
@ -301,6 +303,18 @@ public class PreferencesDialog extends JDialog
return cursorNamesCheckBox; return cursorNamesCheckBox;
} }
private JCheckBox getCheckDefaultObjectsCheckBox()
{
if (checkDefaultObjectsCheckBox == null)
{
checkDefaultObjectsCheckBox = new JCheckBox();
checkDefaultObjectsCheckBox.setBounds(200, 205, 290, 23);
checkDefaultObjectsCheckBox.setText("Check Default Objects");
checkDefaultObjectsCheckBox.setSelected(editorFrame.getCheckDefaultObjects());
}
return checkDefaultObjectsCheckBox;
}
private JButton getOkButton() private JButton getOkButton()
{ {
if (okButton == null) if (okButton == null)
@ -394,6 +408,11 @@ public class PreferencesDialog extends JDialog
return getCursorNamesCheckBox().isSelected(); return getCursorNamesCheckBox().isSelected();
} }
public boolean getCheckDefaultObjects()
{
return getCheckDefaultObjectsCheckBox().isSelected();
}
protected void processWindowEvent(WindowEvent e) protected void processWindowEvent(WindowEvent e)
{ {
super.processWindowEvent(e); super.processWindowEvent(e);

View File

@ -34,7 +34,7 @@ public class Properties
private static Properties instance = new Properties(); private static Properties instance = new Properties();
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>(); private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
public final String title = "sd2-trackeditor"; public final String title = "sd2-trackeditor";
public final String version = "1.4.50"; public final String version = "1.4.51";
private String path; private String path;
private double imageScale = 1; private double imageScale = 1;