trackeditor: adjust properties dialog sizes

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8250 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 81daaeec73b47cd3fc9596d1b18261e5599935de
Former-commit-id: 5a9a78dbacf7f471829771730bdc8a81250b84f1
This commit is contained in:
iobyte 2022-06-23 20:50:57 +00:00
parent 1a4007b035
commit a2bd3ff48a
16 changed files with 236 additions and 236 deletions

View file

@ -78,7 +78,7 @@ public class CameraProperties extends PropertyPanel
if (addCameraButton == null)
{
addCameraButton = new JButton();
addCameraButton.setBounds(10, 230, 120, 25);
addCameraButton.setBounds(10, 250, 120, 25);
addCameraButton.setText("Add Camera");
addCameraButton.addActionListener(new java.awt.event.ActionListener()
{
@ -107,7 +107,7 @@ public class CameraProperties extends PropertyPanel
if (deleteCameraButton == null)
{
deleteCameraButton = new JButton();
deleteCameraButton.setBounds(150, 230, 120, 25);
deleteCameraButton.setBounds(150, 250, 120, 25);
deleteCameraButton.setText("Delete Camera");
deleteCameraButton.addActionListener(new java.awt.event.ActionListener()
{
@ -134,7 +134,7 @@ public class CameraProperties extends PropertyPanel
{
tabbedPane = new JTabbedPane();
tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
tabbedPane.setBounds(10, 10, 460, 210);
tabbedPane.setBounds(10, 10, 460, 230);
Vector<Camera> cameras = Editor.getProperties().getCameras();

View file

@ -173,11 +173,11 @@ public class EnvMapProperties extends PropertyPanel
{
setLayout(null);
addLabel(this, 0, nameLabel, "Name", 100);
addLabel(this, 1, envMapLabel, "Environment Map", 100);
addLabel(this, 0, nameLabel, "Name", 120);
addLabel(this, 1, envMapLabel, "Environment Map", 120);
addTextField(this, 0, nameTextField, name, 115, 60);
addTextField(this, 1, envMapTextField, environmentMap, 115, 250);
addTextField(this, 0, nameTextField, name, 130, 60);
addTextField(this, 1, envMapTextField, environmentMap, 130, 230);
add(getEnvMapButton(), null);
}
@ -192,7 +192,7 @@ public class EnvMapProperties extends PropertyPanel
if (envMapButton == null)
{
envMapButton = new JButton();
envMapButton.setBounds(370, 33, 80, 25);
envMapButton.setBounds(370, 36, 80, 25);
envMapButton.setText("Browse");
envMapButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -92,9 +92,9 @@ public class GeneralProperties extends PropertyPanel
add(getVersionComboBox(), null);
add(getSkyVersionComboBox(), null);
addTextField(this, 5, pathTextField, Editor.getProperties().getPath(), 80, 305);
addTextField(this, 6, authorTextField, Editor.getProperties().getHeader().getAuthor(), 80, 390);
addTextField(this, 7, descriptionTextField, Editor.getProperties().getHeader().getDescription(), 80, 390);
addTextField(this, 5, pathTextField, Editor.getProperties().getPath(), 85, 300);
addTextField(this, 6, authorTextField, Editor.getProperties().getHeader().getAuthor(), 85, 385);
addTextField(this, 7, descriptionTextField, Editor.getProperties().getHeader().getDescription(), 85, 385);
add(getPathButton(), null);
}
@ -110,7 +110,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"circuit", "development", "dirt", "gprix", "karting", "oval", "road", "speedway", "test"};
categoryComboBox = new JComboBox<String>(items);
categoryComboBox.setBounds(130, 35, 100, 20);
categoryComboBox.setBounds(130, 37, 100, 23);
categoryComboBox.setSelectedItem(Editor.getProperties().getHeader().getCategory());
}
return categoryComboBox;
@ -127,7 +127,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"none", "short", "long"};
subcategoryComboBox = new JComboBox<String>(items);
subcategoryComboBox.setBounds(130, 60, 100, 20);
subcategoryComboBox.setBounds(130, 64, 100, 23);
String subcategory = Editor.getProperties().getHeader().getSubcategory();
if (subcategory == null)
subcategory = "none";
@ -147,7 +147,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"3", "4", "5"};
versionComboBox = new JComboBox<String>(items);
versionComboBox.setBounds(130, 85, 100, 20);
versionComboBox.setBounds(130, 91, 100, 23);
versionComboBox.setSelectedItem(Editor.getProperties().getHeader().getVersion() + "");
}
return versionComboBox;
@ -164,7 +164,7 @@ public class GeneralProperties extends PropertyPanel
{
String[] items = {"none", "1"};
skyVersionComboBox = new JComboBox<String>(items);
skyVersionComboBox.setBounds(130, 110, 100, 20);
skyVersionComboBox.setBounds(130, 118, 100, 23);
int version = Editor.getProperties().getHeader().getSkyVersion();
String stringVersion;
if (version == Integer.MAX_VALUE)
@ -186,7 +186,7 @@ public class GeneralProperties extends PropertyPanel
if (pathButton == null)
{
pathButton = new JButton();
pathButton.setBounds(390, 132, 80, 25);
pathButton.setBounds(390, 144, 80, 25);
pathButton.setText("Browse");
pathButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -109,53 +109,53 @@ public class GraphicProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, descriptionLabel, "Description", 130);
addLabel(this, 1, descriptionNightLabel, "Description Night", 130);
addLabel(this, 2, descriptionRainNightLabel, "Description Rain Night", 130);
addLabel(this, 3, backgroundImageLabel, "Background Image", 130);
addLabel(this, 4, backgroundTypeLabel, "Background Type", 130);
addLabel(this, 5, backgroundColorRLabel, "Background Color R", 130);
addLabel(this, 6, backgroundColorGLabel, "Background Color G", 130);
addLabel(this, 7, backgroundColorBLabel, "Background Color B", 130);
addLabel(this, 8, ambientColorRLabel, "Ambient Color R", 130);
addLabel(this, 9, ambientColorGLabel, "Ambient Color G", 130);
addLabel(this, 10, ambientColorBLabel, "Ambient Color B", 130);
addLabel(this, 11, diffuseColorRLabel, "Diffuse Color R", 130);
addLabel(this, 12, diffuseColorGLabel, "Diffuse Color G", 130);
addLabel(this, 13, diffuseColorBLabel, "Diffuse Color B", 130);
addLabel(this, 14, specularColorRLabel, "Specular Color R", 130);
addLabel(this, 15, specularColorGLabel, "Specular Color G", 130);
addLabel(this, 16, specularColorBLabel, "Specular Color B", 130);
addLabel(this, 17, lightPositionXLabel, "Light Position X", 130);
addLabel(this, 18, lightPositionYLabel, "Light Position Y", 130);
addLabel(this, 19, lightPositionZLabel, "Light Position Z", 130);
addLabel(this, 20, shininessLabel, "Shininess", 130);
addLabel(this, 21, fovFactorLabel, "Fov Factor", 130);
addLabel(this, 0, descriptionLabel, "Description", 150);
addLabel(this, 1, descriptionNightLabel, "Description Night", 150);
addLabel(this, 2, descriptionRainNightLabel, "Description Rain Night", 150);
addLabel(this, 3, backgroundImageLabel, "Background Image", 150);
addLabel(this, 4, backgroundTypeLabel, "Background Type", 150);
addLabel(this, 5, backgroundColorRLabel, "Background Color R", 150);
addLabel(this, 6, backgroundColorGLabel, "Background Color G", 150);
addLabel(this, 7, backgroundColorBLabel, "Background Color B", 150);
addLabel(this, 8, ambientColorRLabel, "Ambient Color R", 150);
addLabel(this, 9, ambientColorGLabel, "Ambient Color G", 150);
addLabel(this, 10, ambientColorBLabel, "Ambient Color B", 150);
addLabel(this, 11, diffuseColorRLabel, "Diffuse Color R", 150);
addLabel(this, 12, diffuseColorGLabel, "Diffuse Color G", 150);
addLabel(this, 13, diffuseColorBLabel, "Diffuse Color B", 150);
addLabel(this, 14, specularColorRLabel, "Specular Color R", 150);
addLabel(this, 15, specularColorGLabel, "Specular Color G", 150);
addLabel(this, 16, specularColorBLabel, "Specular Color B", 150);
addLabel(this, 17, lightPositionXLabel, "Light Position X", 150);
addLabel(this, 18, lightPositionYLabel, "Light Position Y", 150);
addLabel(this, 19, lightPositionZLabel, "Light Position Z", 150);
addLabel(this, 20, shininessLabel, "Shininess", 150);
addLabel(this, 21, fovFactorLabel, "Fov Factor", 150);
addTextField(this, 0, descriptionTextField, Editor.getProperties().getGraphic().getDescription(), 140, 150);
addTextField(this, 1, descriptionNightTextField, Editor.getProperties().getGraphic().getDescriptionNight(), 140, 150);
addTextField(this, 2, descriptionRainNightTextField, Editor.getProperties().getGraphic().getDescriptionRainNight(), 140, 150);
addTextField(this, 3, backgroundImageTextField, Editor.getProperties().getGraphic().getBackgroundImage(), 140, 245);
addTextField(this, 0, descriptionTextField, Editor.getProperties().getGraphic().getDescription(), 160, 150);
addTextField(this, 1, descriptionNightTextField, Editor.getProperties().getGraphic().getDescriptionNight(), 160, 150);
addTextField(this, 2, descriptionRainNightTextField, Editor.getProperties().getGraphic().getDescriptionRainNight(), 160, 150);
addTextField(this, 3, backgroundImageTextField, Editor.getProperties().getGraphic().getBackgroundImage(), 160, 225);
add(getBackgroundTypeComboBox(), null);
addTextField(this, 5, backgroundColorRTextField, Editor.getProperties().getGraphic().getBackgroundColorR(), 140, 80);
addTextField(this, 6, backgroundColorGTextField, Editor.getProperties().getGraphic().getBackgroundColorG(), 140, 80);
addTextField(this, 7, backgroundColorBTextField, Editor.getProperties().getGraphic().getBackgroundColorB(), 140, 80);
addTextField(this, 8, ambientColorRTextField, Editor.getProperties().getGraphic().getAmbientColorR(), 140, 80);
addTextField(this, 9, ambientColorGTextField, Editor.getProperties().getGraphic().getAmbientColorG(), 140, 80);
addTextField(this, 10, ambientColorBTextField, Editor.getProperties().getGraphic().getAmbientColorB(), 140, 80);
addTextField(this, 11, diffuseColorRTextField, Editor.getProperties().getGraphic().getDiffuseColorR(), 140, 80);
addTextField(this, 12, diffuseColorGTextField, Editor.getProperties().getGraphic().getDiffuseColorG(), 140, 80);
addTextField(this, 13, diffuseColorBTextField, Editor.getProperties().getGraphic().getDiffuseColorB(), 140, 80);
addTextField(this, 14, specularColorRTextField, Editor.getProperties().getGraphic().getSpecularColorR(), 140, 80);
addTextField(this, 15, specularColorGTextField, Editor.getProperties().getGraphic().getSpecularColorG(), 140, 80);
addTextField(this, 16, specularColorBTextField, Editor.getProperties().getGraphic().getSpecularColorB(), 140, 80);
addTextField(this, 17, lightPositionXTextField, Editor.getProperties().getGraphic().getLightPositionX(), 140, 80);
addTextField(this, 18, lightPositionYTextField, Editor.getProperties().getGraphic().getLightPositionY(), 140, 80);
addTextField(this, 19, lightPositionZTextField, Editor.getProperties().getGraphic().getLightPositionZ(), 140, 80);
addTextField(this, 20, shininessTextField, Editor.getProperties().getGraphic().getShininess(), 140, 80);
addTextField(this, 21, fovFactorTextField, Editor.getProperties().getGraphic().getFovFactor(), 140, 80);
addTextField(this, 5, backgroundColorRTextField, Editor.getProperties().getGraphic().getBackgroundColorR(), 160, 80);
addTextField(this, 6, backgroundColorGTextField, Editor.getProperties().getGraphic().getBackgroundColorG(), 160, 80);
addTextField(this, 7, backgroundColorBTextField, Editor.getProperties().getGraphic().getBackgroundColorB(), 160, 80);
addTextField(this, 8, ambientColorRTextField, Editor.getProperties().getGraphic().getAmbientColorR(), 160, 80);
addTextField(this, 9, ambientColorGTextField, Editor.getProperties().getGraphic().getAmbientColorG(), 160, 80);
addTextField(this, 10, ambientColorBTextField, Editor.getProperties().getGraphic().getAmbientColorB(), 160, 80);
addTextField(this, 11, diffuseColorRTextField, Editor.getProperties().getGraphic().getDiffuseColorR(), 160, 80);
addTextField(this, 12, diffuseColorGTextField, Editor.getProperties().getGraphic().getDiffuseColorG(), 160, 80);
addTextField(this, 13, diffuseColorBTextField, Editor.getProperties().getGraphic().getDiffuseColorB(), 160, 80);
addTextField(this, 14, specularColorRTextField, Editor.getProperties().getGraphic().getSpecularColorR(), 160, 80);
addTextField(this, 15, specularColorGTextField, Editor.getProperties().getGraphic().getSpecularColorG(), 160, 80);
addTextField(this, 16, specularColorBTextField, Editor.getProperties().getGraphic().getSpecularColorB(), 160, 80);
addTextField(this, 17, lightPositionXTextField, Editor.getProperties().getGraphic().getLightPositionX(), 160, 80);
addTextField(this, 18, lightPositionYTextField, Editor.getProperties().getGraphic().getLightPositionY(), 160, 80);
addTextField(this, 19, lightPositionZTextField, Editor.getProperties().getGraphic().getLightPositionZ(), 160, 80);
addTextField(this, 20, shininessTextField, Editor.getProperties().getGraphic().getShininess(), 160, 80);
addTextField(this, 21, fovFactorTextField, Editor.getProperties().getGraphic().getFovFactor(), 160, 80);
add(getBackgroundImageButton(), null);
}
@ -172,7 +172,7 @@ public class GraphicProperties extends PropertyPanel
String[] types = {"none", "0", "2", "4"};
backgroundTypeComboBox = new JComboBox<String>();
backgroundTypeComboBox.setModel(new DefaultComboBoxModel<String>(types));
backgroundTypeComboBox.setBounds(140, 110, 80, 20);
backgroundTypeComboBox.setBounds(160, 118, 80, 23);
int value = Editor.getProperties().getGraphic().getBackgroundType();
if (value != Integer.MAX_VALUE)
backgroundTypeComboBox.setSelectedItem(String.valueOf(value));
@ -190,7 +190,7 @@ public class GraphicProperties extends PropertyPanel
if (backgroundImageButton == null)
{
backgroundImageButton = new JButton();
backgroundImageButton.setBounds(390, 82, 80, 25);
backgroundImageButton.setBounds(390, 90, 80, 25);
backgroundImageButton.setText("Browse");
backgroundImageButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -84,7 +84,7 @@ public class ImageProperties extends PropertyPanel
if (pathButton == null)
{
pathButton = new JButton();
pathButton.setBounds(390, 7, 80, 25);
pathButton.setBounds(390, 9, 80, 25);
pathButton.setText("Browse");
pathButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -70,23 +70,23 @@ public class LocalInfoProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, stationLabel, "Station", 140);
addLabel(this, 1, timezoneLabel, "Timezone", 140);
addLabel(this, 2, overallRainLikelyhoodLabel, "Overall Rain Likelyhood", 140);
addLabel(this, 3, littleRainLikelyhoodLabel, "Little Rain Likelyhood", 140);
addLabel(this, 4, mediumRainLikelyhoodLabel, "Medium Rain Likelyhood", 140);
addLabel(this, 5, timeOfDayLabel, "Time Of Day", 140);
addLabel(this, 6, sunAscensionLabel, "Sun Ascension", 140);
addLabel(this, 7, altitudeLabel, "Altitude", 140);
addLabel(this, 0, stationLabel, "Station", 150);
addLabel(this, 1, timezoneLabel, "Timezone", 150);
addLabel(this, 2, overallRainLikelyhoodLabel, "Overall Rain Likelyhood", 150);
addLabel(this, 3, littleRainLikelyhoodLabel, "Little Rain Likelyhood", 150);
addLabel(this, 4, mediumRainLikelyhoodLabel, "Medium Rain Likelyhood", 150);
addLabel(this, 5, timeOfDayLabel, "Time Of Day", 150);
addLabel(this, 6, sunAscensionLabel, "Sun Ascension", 150);
addLabel(this, 7, altitudeLabel, "Altitude", 150);
addTextField(this, 0, stationTextField, Editor.getProperties().getLocalInfo().getStation(), 160, 100);
addTextField(this, 1, timezoneTextField, Editor.getProperties().getLocalInfo().getTimezone(), 160, 100);
addTextField(this, 2, overallRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getOverallRainLikelyhood(), 160, 100);
addTextField(this, 3, littleRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getLittleRainLikelyhood(), 160, 100);
addTextField(this, 4, mediumRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getMediumRainLikelyhood(), 160, 100);
addTextField(this, 5, timeOfDayTextField, Editor.getProperties().getLocalInfo().getTimeOfDay(), 160, 100);
addTextField(this, 6, sunAscensionTextField, Editor.getProperties().getLocalInfo().getSunAscension(), 160, 100);
addTextField(this, 7, altitudeTextField, Editor.getProperties().getLocalInfo().getAltitude(), 160, 100);
addTextField(this, 0, stationTextField, Editor.getProperties().getLocalInfo().getStation(), 170, 100);
addTextField(this, 1, timezoneTextField, Editor.getProperties().getLocalInfo().getTimezone(), 170, 100);
addTextField(this, 2, overallRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getOverallRainLikelyhood(), 170, 100);
addTextField(this, 3, littleRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getLittleRainLikelyhood(), 170, 100);
addTextField(this, 4, mediumRainLikelyhoodTextField, Editor.getProperties().getLocalInfo().getMediumRainLikelyhood(), 170, 100);
addTextField(this, 5, timeOfDayTextField, Editor.getProperties().getLocalInfo().getTimeOfDay(), 170, 100);
addTextField(this, 6, sunAscensionTextField, Editor.getProperties().getLocalInfo().getSunAscension(), 170, 100);
addTextField(this, 7, altitudeTextField, Editor.getProperties().getLocalInfo().getAltitude(), 170, 100);
}
/**

View file

@ -82,7 +82,7 @@ public class ObjectProperties extends PropertyPanel
if (addObjectButton == null)
{
addObjectButton = new JButton();
addObjectButton.setBounds(10, 230, 100, 25);
addObjectButton.setBounds(10, 250, 100, 25);
addObjectButton.setText("Add Object");
addObjectButton.addActionListener(new java.awt.event.ActionListener()
{
@ -111,7 +111,7 @@ public class ObjectProperties extends PropertyPanel
if (deleteObjectButton == null)
{
deleteObjectButton = new JButton();
deleteObjectButton.setBounds(130, 230, 120, 25);
deleteObjectButton.setBounds(140, 250, 120, 25);
deleteObjectButton.setText("Delete Object");
deleteObjectButton.addActionListener(new java.awt.event.ActionListener()
{
@ -138,7 +138,7 @@ public class ObjectProperties extends PropertyPanel
{
tabbedPane = new JTabbedPane();
tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
tabbedPane.setBounds(10, 10, 460, 210);
tabbedPane.setBounds(10, 10, 460, 230);
Vector<TrackObject> objects = Editor.getProperties().getObjects();
@ -237,7 +237,7 @@ public class ObjectProperties extends PropertyPanel
{
String[] items = {"none", "random", "standard"};
orientationTypeComboBox = new JComboBox<String>(items);
orientationTypeComboBox.setBounds(120, 85, 120, 20);
orientationTypeComboBox.setBounds(120, 91, 120, 23);
}
return orientationTypeComboBox;
}
@ -252,7 +252,7 @@ public class ObjectProperties extends PropertyPanel
if (objectButton == null)
{
objectButton = new JButton();
objectButton.setBounds(370, 32, 80, 25);
objectButton.setBounds(370, 36, 80, 25);
objectButton.setText("Browse");
objectButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -91,37 +91,37 @@ public class PitProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, styleLabel, "Type", 130);
addLabel(this, 1, sideLabel, "Side", 130);
addLabel(this, 2, entryLabel, "Entry", 130);
addLabel(this, 3, startLabel, "Start", 130);
addLabel(this, 4, startBuildingsLabel, "Start Buildings", 130);
addLabel(this, 5, stopBuildingsLabel, "Stop Buildings", 130);
addLabel(this, 6, maxPitsLabel, "Max Pits", 130);
addLabel(this, 7, endLabel, "End", 130);
addLabel(this, 8, exitLabel, "Exit", 130);
addLabel(this, 9, widthLabel, "Width", 130);
addLabel(this, 10, lengthLabel, "Length", 130);
addLabel(this, 11, indicatorLabel, "Indicator", 130);
addLabel(this, 12, speedLimitLabel, "Speed Limit", 130);
addLabel(this, 0, generatePitsLabel, "Generate Pits", 240, 100);
addLabel(this, 0, styleLabel, "Type", 110);
addLabel(this, 1, sideLabel, "Side", 110);
addLabel(this, 2, entryLabel, "Entry", 110);
addLabel(this, 3, startLabel, "Start", 110);
addLabel(this, 4, startBuildingsLabel, "Start Buildings", 110);
addLabel(this, 5, stopBuildingsLabel, "Stop Buildings", 110);
addLabel(this, 6, maxPitsLabel, "Max Pits", 110);
addLabel(this, 7, endLabel, "End", 110);
addLabel(this, 8, exitLabel, "Exit", 110);
addLabel(this, 9, widthLabel, "Width", 110);
addLabel(this, 10, lengthLabel, "Length", 110);
addLabel(this, 11, indicatorLabel, "Indicator", 110);
addLabel(this, 12, speedLimitLabel, "Speed Limit", 110);
addLabel(this, 0, generatePitsLabel, "Generate Pits", 280, 100);
add(getStyleComboBox(), null);
add(getSideComboBox(), null);
addTextField(this, 2, entryTextField, Editor.getProperties().getMainTrack().getPits().getEntry(), 100, 100);
addTextField(this, 3, startTextField, Editor.getProperties().getMainTrack().getPits().getStart(), 100, 100);
addTextField(this, 4, startBuildingsTextField, Editor.getProperties().getMainTrack().getPits().getStartBuildings(), 100, 100);
addTextField(this, 5, stopBuildingsTextField, Editor.getProperties().getMainTrack().getPits().getStopBuildings(), 100, 100);
addTextField(this, 6, maxPitsTextField, Editor.getProperties().getMainTrack().getPits().getMaxPits(), 100, 100);
addTextField(this, 7, endTextField, Editor.getProperties().getMainTrack().getPits().getEnd(), 100, 100);
addTextField(this, 8, exitTextField, Editor.getProperties().getMainTrack().getPits().getExit(), 100, 100);
addTextField(this, 9, widthTextField, Editor.getProperties().getMainTrack().getPits().getWidth(), 100, 40);
addTextField(this, 10, lengthTextField, Editor.getProperties().getMainTrack().getPits().getLength(), 100, 40);
addTextField(this, 2, entryTextField, Editor.getProperties().getMainTrack().getPits().getEntry(), 120, 100);
addTextField(this, 3, startTextField, Editor.getProperties().getMainTrack().getPits().getStart(), 120, 100);
addTextField(this, 4, startBuildingsTextField, Editor.getProperties().getMainTrack().getPits().getStartBuildings(), 120, 100);
addTextField(this, 5, stopBuildingsTextField, Editor.getProperties().getMainTrack().getPits().getStopBuildings(), 120, 100);
addTextField(this, 6, maxPitsTextField, Editor.getProperties().getMainTrack().getPits().getMaxPits(), 120, 100);
addTextField(this, 7, endTextField, Editor.getProperties().getMainTrack().getPits().getEnd(), 120, 100);
addTextField(this, 8, exitTextField, Editor.getProperties().getMainTrack().getPits().getExit(), 120, 100);
addTextField(this, 9, widthTextField, Editor.getProperties().getMainTrack().getPits().getWidth(), 120, 40);
addTextField(this, 10, lengthTextField, Editor.getProperties().getMainTrack().getPits().getLength(), 120, 40);
add(getIndicatorComboBox(), null);
addTextField(this, 12, speedLimitTextField, Editor.getProperties().getMainTrack().getPits().getSpeedLimit(), 100, 40);
addTextField(this, 12, speedLimitTextField, Editor.getProperties().getMainTrack().getPits().getSpeedLimit(), 120, 40);
add(getGeneratePitsCheckBox(), null);
}
@ -136,7 +136,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "no pits", "on track side", "on separate path", "no building"};
styleComboBox = new JComboBox<String>(items);
styleComboBox.setBounds(100, 10, 120, 20);
styleComboBox.setBounds(120, 10, 120, 23);
int style = Editor.getProperties().getMainTrack().getPits().getStyle();
if (style == Integer.MAX_VALUE)
style = 0;
@ -157,7 +157,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "right", "left"};
sideComboBox = new JComboBox<String>(items);
sideComboBox.setBounds(100, 35, 80, 20);
sideComboBox.setBounds(120, 37, 80, 23);
String side = Editor.getProperties().getMainTrack().getPits().getSide();
if (side == null || side.isEmpty())
side = "none";
@ -177,7 +177,7 @@ public class PitProperties extends PropertyPanel
{
String[] items = {"none", "no", "yes"};
indicatorComboBox = new JComboBox<String>(items);
indicatorComboBox.setBounds(100, 285, 80, 20);
indicatorComboBox.setBounds(120, 307, 80, 23);
int indicator = Editor.getProperties().getMainTrack().getPits().getIndicator();
if (indicator == Integer.MAX_VALUE)
indicator = 0;
@ -444,7 +444,7 @@ public class PitProperties extends PropertyPanel
private JCheckBox getGeneratePitsCheckBox() {
if (generatePitsCheckBox == null) {
generatePitsCheckBox = new JCheckBox();
generatePitsCheckBox.setBounds(328, 10, 20, 20);
generatePitsCheckBox.setBounds(388, 10, 20, 20);
generatePitsCheckBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e)
{

View file

@ -77,12 +77,12 @@ public class PropertiesDialog extends JDialog
private void initialize()
{
this.setContentPane(getPane());
this.setSize(500, 760);
this.setSize(500, 780);
this.setModal(true);
this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
this.setResizable(false);
this.setTitle("Properties");
this.getPane().setSize(447, 531);
// this.getPane().setSize(447, 531);
}
/**
* This method initializes tabbedPane

View file

@ -236,34 +236,34 @@ public class PropertyPanel extends JPanel
protected void addLabel(JPanel panel, int index, JLabel label, String text, int length)
{
label.setText(text);
label.setBounds(10, 10 + (index * 25), length, 20);
label.setBounds(10, 10 + (index * 27), length, 23);
panel.add(label);
}
protected void addLabel(JPanel panel, int index, JLabel label, String text, int offset, int length)
{
label.setText(text);
label.setBounds(offset, 10 + (index * 25), length, 20);
label.setBounds(offset, 10 + (index * 27), length, 23);
panel.add(label);
}
protected void addTextField(JPanel panel, int index, JTextField textField, String text, int offset, int length)
{
textField.setBounds(offset, 10 + (index * 25), length, 20);
textField.setBounds(offset, 10 + (index * 27), length, 23);
setTextField(textField, text);
panel.add(textField);
}
protected void addTextField(JPanel panel, int index, JTextField textField, double value, int offset, int length)
{
textField.setBounds(offset, 10 + (index * 25), length, 20);
textField.setBounds(offset, 10 + (index * 27), length, 23);
setTextField(textField, value);
panel.add(textField);
}
protected void addTextField(JPanel panel, int index, JTextField textField, int value, int offset, int length)
{
textField.setBounds(offset, 10 + (index * 25), length, 20);
textField.setBounds(offset, 10 + (index * 27), length, 23);
setTextField(textField, value);
panel.add(textField);
}

View file

@ -67,21 +67,21 @@ public class StartingGridProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, rowsLabel, "Rows", 170);
addLabel(this, 1, polePositionSideLabel, "Pole Position Side", 170);
addLabel(this, 2, distanceToStartLabel, "Distance To Start", 170);
addLabel(this, 3, distanceBetweenColumnsLabel, "Distance Between Columns", 170);
addLabel(this, 4, offsetWithinAColumnLabel, "Offset Within A Column", 170);
addLabel(this, 5, initialHeightLabel, "Initial Height", 170);
addLabel(this, 0, rowsLabel, "Rows", 180);
addLabel(this, 1, polePositionSideLabel, "Pole Position Side", 180);
addLabel(this, 2, distanceToStartLabel, "Distance To Start", 180);
addLabel(this, 3, distanceBetweenColumnsLabel, "Distance Between Columns", 180);
addLabel(this, 4, offsetWithinAColumnLabel, "Offset Within A Column", 180);
addLabel(this, 5, initialHeightLabel, "Initial Height", 180);
addTextField(this, 0, rowsTextField, Editor.getProperties().getStartingGrid().getRows(), 180, 100);
addTextField(this, 0, rowsTextField, Editor.getProperties().getStartingGrid().getRows(), 190, 100);
add(getPolePositionSideComboBox(), null);
addTextField(this, 2, distanceToStartTextField, Editor.getProperties().getStartingGrid().getDistanceToStart(), 180, 100);
addTextField(this, 3, distanceBetweenColumnsTextField, Editor.getProperties().getStartingGrid().getDistanceBetweenColumns(), 180, 100);
addTextField(this, 4, offsetWithinAColumnTextField, Editor.getProperties().getStartingGrid().getOffsetWithinAColumn(), 180, 100);
addTextField(this, 5, initialHeightTextField, Editor.getProperties().getStartingGrid().getInitialHeight(), 180, 100);
addTextField(this, 2, distanceToStartTextField, Editor.getProperties().getStartingGrid().getDistanceToStart(), 190, 100);
addTextField(this, 3, distanceBetweenColumnsTextField, Editor.getProperties().getStartingGrid().getDistanceBetweenColumns(), 190, 100);
addTextField(this, 4, offsetWithinAColumnTextField, Editor.getProperties().getStartingGrid().getOffsetWithinAColumn(), 190, 100);
addTextField(this, 5, initialHeightTextField, Editor.getProperties().getStartingGrid().getInitialHeight(), 190, 100);
}
/**
@ -95,7 +95,7 @@ public class StartingGridProperties extends PropertyPanel
{
String[] items = {"none", "right", "left"};
polePositionSideComboBox = new JComboBox<String>(items);
polePositionSideComboBox.setBounds(180, 35, 80, 20);
polePositionSideComboBox.setBounds(190, 37, 80, 23);
String side = Editor.getProperties().getStartingGrid().getPolePositionSide();
if (side == null || side.isEmpty())
side = "none";

View file

@ -82,7 +82,7 @@ public class SurfaceProperties extends PropertyPanel
if (addSurfaceButton == null)
{
addSurfaceButton = new JButton();
addSurfaceButton.setBounds(10, 610, 120, 25);
addSurfaceButton.setBounds(10, 650, 120, 25);
addSurfaceButton.setText("Add Surface");
addSurfaceButton.addActionListener(new java.awt.event.ActionListener()
{
@ -111,7 +111,7 @@ public class SurfaceProperties extends PropertyPanel
if (deleteSurfaceButton == null)
{
deleteSurfaceButton = new JButton();
deleteSurfaceButton.setBounds(150, 610, 120, 25);
deleteSurfaceButton.setBounds(150, 650, 120, 25);
deleteSurfaceButton.setText("Delete Surface");
deleteSurfaceButton.addActionListener(new java.awt.event.ActionListener()
{
@ -138,7 +138,7 @@ public class SurfaceProperties extends PropertyPanel
{
tabbedPane = new JTabbedPane();
tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
tabbedPane.setBounds(10, 10, 460, 590);
tabbedPane.setBounds(10, 10, 460, 630);
Vector<Surface> surfaces = Editor.getProperties().getSurfaces();
@ -218,58 +218,58 @@ public class SurfaceProperties extends PropertyPanel
{
setLayout(null);
addLabel(this, 0, nameLabel, "Name", 160);
addLabel(this, 1, colorR1Label, "Color R1", 160);
addLabel(this, 2, colorG1Label, "Color G1", 160);
addLabel(this, 3, colorB1Label, "Color B1", 160);
addLabel(this, 4, colorR2Label, "Color R2", 160);
addLabel(this, 5, colorG2Label, "Color G2", 160);
addLabel(this, 6, colorB2Label, "Color B2", 160);
addLabel(this, 7, textureNameLabel, "Texture Name", 160);
addLabel(this, 8, textureTypeLabel, "Texture Type", 160);
addLabel(this, 9, textureSizeLabel, "Texture Size", 160);
addLabel(this, 10, textureLinkWithPreviousLabel, "Texture Link With Previous", 160);
addLabel(this, 11, textureStartOnBoundaryLabel, "Texture Start On Boundary", 160);
addLabel(this, 12, textureMipMapLabel, "Texture MipMap", 160);
addLabel(this, 13, frictionLabel, "Friction", 160);
addLabel(this, 14, rollingResistanceLabel, "Rolling Resistance", 160);
addLabel(this, 15, bumpNameLabel, "Bump Name", 160);
addLabel(this, 16, bumpSizeLabel, "Bump Size", 160);
addLabel(this, 17, roughnessLabel, "Roughness", 160);
addLabel(this, 18, roughnessWavelengthLabel, "Roughness Wavelength", 160);
addLabel(this, 19, racelineNameLabel, "Raceline Name", 160);
addLabel(this, 20, damageLabel, "Damage", 160);
addLabel(this, 21, reboundLabel, "Rebound", 160);
addLabel(this, 0, nameLabel, "Name", 180);
addLabel(this, 1, colorR1Label, "Color R1", 180);
addLabel(this, 2, colorG1Label, "Color G1", 180);
addLabel(this, 3, colorB1Label, "Color B1", 180);
addLabel(this, 4, colorR2Label, "Color R2", 180);
addLabel(this, 5, colorG2Label, "Color G2", 180);
addLabel(this, 6, colorB2Label, "Color B2", 180);
addLabel(this, 7, textureNameLabel, "Texture Name", 180);
addLabel(this, 8, textureTypeLabel, "Texture Type", 180);
addLabel(this, 9, textureSizeLabel, "Texture Size", 180);
addLabel(this, 10, textureLinkWithPreviousLabel, "Texture Link With Previous", 180);
addLabel(this, 11, textureStartOnBoundaryLabel, "Texture Start On Boundary", 180);
addLabel(this, 12, textureMipMapLabel, "Texture MipMap", 180);
addLabel(this, 13, frictionLabel, "Friction", 180);
addLabel(this, 14, rollingResistanceLabel, "Rolling Resistance", 180);
addLabel(this, 15, bumpNameLabel, "Bump Name", 180);
addLabel(this, 16, bumpSizeLabel, "Bump Size", 180);
addLabel(this, 17, roughnessLabel, "Roughness", 180);
addLabel(this, 18, roughnessWavelengthLabel, "Roughness Wavelength", 180);
addLabel(this, 19, racelineNameLabel, "Raceline Name", 180);
addLabel(this, 20, damageLabel, "Damage", 180);
addLabel(this, 21, reboundLabel, "Rebound", 180);
addTextField(this, 0, nameTextField, surface.getName(), 180, 100);
addTextField(this, 1, colorR1TextField, getString(surface.getColorR1()), 180, 100);
addTextField(this, 2, colorG1TextField, getString(surface.getColorG1()), 180, 100);
addTextField(this, 3, colorB1TextField, getString(surface.getColorB1()), 180, 100);
addTextField(this, 4, colorR2TextField, getString(surface.getColorR2()), 180, 100);
addTextField(this, 5, colorG2TextField, getString(surface.getColorG2()), 180, 100);
addTextField(this, 6, colorB2TextField, getString(surface.getColorB2()), 180, 100);
addTextField(this, 7, textureNameTextField, surface.getTextureName(), 180, 180);
addTextField(this, 0, nameTextField, surface.getName(), 190, 100);
addTextField(this, 1, colorR1TextField, getString(surface.getColorR1()), 190, 100);
addTextField(this, 2, colorG1TextField, getString(surface.getColorG1()), 190, 100);
addTextField(this, 3, colorB1TextField, getString(surface.getColorB1()), 190, 100);
addTextField(this, 4, colorR2TextField, getString(surface.getColorR2()), 190, 100);
addTextField(this, 5, colorG2TextField, getString(surface.getColorG2()), 190, 100);
addTextField(this, 6, colorB2TextField, getString(surface.getColorB2()), 190, 100);
addTextField(this, 7, textureNameTextField, surface.getTextureName(), 190, 170);
add(getTextureTypeComboBox(), null);
getTextureTypeComboBox().setSelectedItem(getString(surface.getTextureType()));
addTextField(this, 9, textureSizeTextField, getString(surface.getTextureSize()), 180, 100);
addTextField(this, 9, textureSizeTextField, getString(surface.getTextureSize()), 190, 100);
add(getTextureLinkWithPreviousComboBox(), null);
getTextureLinkWithPreviousComboBox().setSelectedItem(getString(surface.getTextureLinkWithPrevious()));
add(getTextureStartOnBoundaryComboBox(), null);
getTextureStartOnBoundaryComboBox().setSelectedItem(getString(surface.getTextureStartOnBoundary()));
addTextField(this, 12, textureMipMapTextField, getString(surface.getTextureMipMap()), 180, 100);
addTextField(this, 13, frictionTextField, getString(surface.getFriction()), 180, 100);
addTextField(this, 14, rollingResistanceTextField, getString(surface.getRollingResistance()), 180, 100);
addTextField(this, 15, bumpNameTextField, surface.getBumpName(), 180, 100);
addTextField(this, 16, bumpSizeTextField, getString(surface.getBumpSize()), 180, 100);
addTextField(this, 17, roughnessTextField, getString(surface.getRoughness()), 180, 100);
addTextField(this, 18, roughnessWavelengthTextField, getString(surface.getRoughnessWavelength()), 180, 100);
addTextField(this, 19, racelineNameTextField, surface.getRacelineName(), 180, 180);
addTextField(this, 20, damageTextField, surface.getDammage(), 180, 100);
addTextField(this, 21, reboundTextField, getString(surface.getRebound()), 180, 100);
addTextField(this, 12, textureMipMapTextField, getString(surface.getTextureMipMap()), 190, 100);
addTextField(this, 13, frictionTextField, getString(surface.getFriction()), 190, 100);
addTextField(this, 14, rollingResistanceTextField, getString(surface.getRollingResistance()), 190, 100);
addTextField(this, 15, bumpNameTextField, surface.getBumpName(), 190, 100);
addTextField(this, 16, bumpSizeTextField, getString(surface.getBumpSize()), 190, 100);
addTextField(this, 17, roughnessTextField, getString(surface.getRoughness()), 190, 100);
addTextField(this, 18, roughnessWavelengthTextField, getString(surface.getRoughnessWavelength()), 190, 100);
addTextField(this, 19, racelineNameTextField, surface.getRacelineName(), 190, 170);
addTextField(this, 20, damageTextField, surface.getDammage(), 190, 100);
addTextField(this, 21, reboundTextField, getString(surface.getRebound()), 190, 100);
add(getTextureNameButton(), null);
add(getRacelineNameButton(), null);
@ -296,7 +296,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "discrete", "continuous"};
textureTypeComboBox = new JComboBox<String>(items);
textureTypeComboBox.setBounds(180, 210, 120, 20);
textureTypeComboBox.setBounds(190, 226, 120, 23);
}
return textureTypeComboBox;
}
@ -307,7 +307,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "yes", "no"};
textureLinkWithPreviousComboBox = new JComboBox<String>(items);
textureLinkWithPreviousComboBox.setBounds(180, 260, 120, 20);
textureLinkWithPreviousComboBox.setBounds(190, 280, 120, 23);
}
return textureLinkWithPreviousComboBox;
}
@ -318,7 +318,7 @@ public class SurfaceProperties extends PropertyPanel
{
String[] items = {"none", "yes", "no"};
textureStartOnBoundaryComboBox = new JComboBox<String>(items);
textureStartOnBoundaryComboBox.setBounds(180, 285, 120, 20);
textureStartOnBoundaryComboBox.setBounds(190, 307, 120, 23);
}
return textureStartOnBoundaryComboBox;
}
@ -333,7 +333,7 @@ public class SurfaceProperties extends PropertyPanel
if (textureNameButton == null)
{
textureNameButton = new JButton();
textureNameButton.setBounds(370, 183, 80, 25);
textureNameButton.setBounds(370, 198, 80, 25);
textureNameButton.setText("Browse");
textureNameButton.addActionListener(new java.awt.event.ActionListener()
{
@ -384,7 +384,7 @@ public class SurfaceProperties extends PropertyPanel
if (racelineNameButton == null)
{
racelineNameButton = new JButton();
racelineNameButton.setBounds(370, 482, 80, 25);
racelineNameButton.setBounds(370, 522, 80, 25);
racelineNameButton.setText("Browse");
racelineNameButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -113,30 +113,30 @@ public class TerrainProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, trackStepLabel, "Track Step", 100);
addLabel(this, 1, borderMarginLabel, "Border Margin", 100);
addLabel(this, 2, borderStepLabel, "Border Step", 100);
addLabel(this, 3, borderHeightLabel, "Border Height", 100);
addLabel(this, 4, orientationLabel, "Orientation", 100);
addLabel(this, 5, maximumAltitudeLabel, "Maximum Altitude", 100);
addLabel(this, 6, minimumAltitudeLabel, "Minimum Altitude", 100);
addLabel(this, 7, groupSizeLabel, "Group Size", 100);
addLabel(this, 8, elevationMapLabel, "Elevation Map", 100);
addLabel(this, 9, reliefFileLabel, "Reliefe File", 100);
addLabel(this, 10, surfaceLabel, "Surface", 100);
addLabel(this, 0, trackStepLabel, "Track Step", 120);
addLabel(this, 1, borderMarginLabel, "Border Margin", 120);
addLabel(this, 2, borderStepLabel, "Border Step", 120);
addLabel(this, 3, borderHeightLabel, "Border Height", 120);
addLabel(this, 4, orientationLabel, "Orientation", 120);
addLabel(this, 5, maximumAltitudeLabel, "Maximum Altitude", 120);
addLabel(this, 6, minimumAltitudeLabel, "Minimum Altitude", 120);
addLabel(this, 7, groupSizeLabel, "Group Size", 120);
addLabel(this, 8, elevationMapLabel, "Elevation Map", 120);
addLabel(this, 9, reliefFileLabel, "Reliefe File", 120);
addLabel(this, 10, surfaceLabel, "Surface", 120);
addTextField(this, 0, trackStepTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getTrackStep(), 120, 100);
addTextField(this, 1, borderMarginTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderMargin(), 120, 100);
addTextField(this, 2, borderStepTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderStep(), 120, 100);
addTextField(this, 3, borderHeightTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderHeight(), 120, 100);
addTextField(this, 0, trackStepTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getTrackStep(), 140, 100);
addTextField(this, 1, borderMarginTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderMargin(), 140, 100);
addTextField(this, 2, borderStepTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderStep(), 140, 100);
addTextField(this, 3, borderHeightTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getBorderHeight(), 140, 100);
this.add(getOrientationComboBox(), null);
addTextField(this, 5, maximumAltitudeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getMaximumAltitude(), 120, 100);
addTextField(this, 6, minimumAltitudeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getMinimumAltitude(), 120, 100);
addTextField(this, 7, groupSizeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getGroupSize(), 120, 100);
addTextField(this, 8, elevationMapTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getElevationMap(), 120, 265);
addTextField(this, 9, reliefFileTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getReliefFile(), 120, 265);
addTextField(this, 5, maximumAltitudeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getMaximumAltitude(), 140, 100);
addTextField(this, 6, minimumAltitudeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getMinimumAltitude(), 140, 100);
addTextField(this, 7, groupSizeTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getGroupSize(), 140, 100);
addTextField(this, 8, elevationMapTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getElevationMap(), 140, 245);
addTextField(this, 9, reliefFileTextField, Editor.getProperties().getGraphic().getTerrainGeneration().getReliefFile(), 140, 245);
this.add(getSurfaceComboBox(), null);
this.add(getDefaultButton(), null);
@ -180,7 +180,7 @@ public class TerrainProperties extends PropertyPanel
String[] items =
{"none", "clockwise", "counter-clockwise"};
orientationComboBox = new JComboBox<String>(items);
orientationComboBox.setBounds(120, 110, 120, 20);
orientationComboBox.setBounds(140, 118, 120, 23);
String orientation = Editor.getProperties().getGraphic().getTerrainGeneration().getOrientation();
if (orientation == null || orientation.isEmpty())
orientation = "none";
@ -199,7 +199,7 @@ public class TerrainProperties extends PropertyPanel
if (surfaceComboBox == null)
{
surfaceComboBox = new JComboBox<String>();
surfaceComboBox.setBounds(120, 260, 140, 20);
surfaceComboBox.setBounds(140, 280, 180, 23);
String surface = Editor.getProperties().getGraphic().getTerrainGeneration().getSurface();
if (surface != null)
{
@ -233,7 +233,7 @@ public class TerrainProperties extends PropertyPanel
if (elevationMapButton == null)
{
elevationMapButton = new JButton();
elevationMapButton.setBounds(390, 207, 80, 25);
elevationMapButton.setBounds(390, 225, 80, 25);
elevationMapButton.setText("Browse");
elevationMapButton.addActionListener(new java.awt.event.ActionListener()
{
@ -256,7 +256,7 @@ public class TerrainProperties extends PropertyPanel
if (reliefFileButton == null)
{
reliefFileButton = new JButton();
reliefFileButton.setBounds(390, 232, 80, 25);
reliefFileButton.setBounds(390, 252, 80, 25);
reliefFileButton.setText("Browse");
reliefFileButton.addActionListener(new java.awt.event.ActionListener()
{
@ -401,7 +401,7 @@ public class TerrainProperties extends PropertyPanel
if (addObjectMapButton == null)
{
addObjectMapButton = new JButton();
addObjectMapButton.setBounds(10, 400, 130, 25);
addObjectMapButton.setBounds(10, 420, 130, 25);
addObjectMapButton.setText("Add Object Map");
addObjectMapButton.addActionListener(new java.awt.event.ActionListener()
{
@ -427,7 +427,7 @@ public class TerrainProperties extends PropertyPanel
if (deleteObjectMapButton == null)
{
deleteObjectMapButton = new JButton();
deleteObjectMapButton.setBounds(155, 400, 140, 25);
deleteObjectMapButton.setBounds(155, 420, 140, 25);
deleteObjectMapButton.setText("Delete Object Map");
deleteObjectMapButton.addActionListener(new java.awt.event.ActionListener()
{
@ -454,7 +454,7 @@ public class TerrainProperties extends PropertyPanel
{
tabbedPane = new JTabbedPane();
tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
tabbedPane.setBounds(10, 285, 460, 100);
tabbedPane.setBounds(10, 312, 460, 100);
Vector<ObjectMap> objectMaps = Editor.getProperties().getGraphic().getTerrainGeneration().getObjectMaps();
@ -491,11 +491,11 @@ public class TerrainProperties extends PropertyPanel
{
setLayout(null);
addLabel(this, 0, nameLabel, "Name", 90);
addLabel(this, 1, objectMapLabel, "Environment Map", 90);
addLabel(this, 0, nameLabel, "Name", 120);
addLabel(this, 1, objectMapLabel, "Environment Map", 120);
addTextField(this, 0, nameTextField, name, 115, 60);
addTextField(this, 1, objectMapTextField, objectMap, 115, 250);
addTextField(this, 0, nameTextField, name, 130, 60);
addTextField(this, 1, objectMapTextField, objectMap, 130, 235);
add(getObjectMapButton(), null);
}
@ -510,7 +510,7 @@ public class TerrainProperties extends PropertyPanel
if (objectMapButton == null)
{
objectMapButton = new JButton();
objectMapButton.setBounds(370, 32, 80, 25);
objectMapButton.setBounds(370, 36, 80, 25);
objectMapButton.setText("Browse");
objectMapButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -81,7 +81,7 @@ public class TrackLightProperties extends PropertyPanel
if (addTrackLightButton == null)
{
addTrackLightButton = new JButton();
addTrackLightButton.setBounds(10, 410, 140, 25);
addTrackLightButton.setBounds(10, 435, 140, 25);
addTrackLightButton.setText("Add Track Light");
addTrackLightButton.addActionListener(new java.awt.event.ActionListener()
{
@ -110,7 +110,7 @@ public class TrackLightProperties extends PropertyPanel
if (deleteTrackLightButton == null)
{
deleteTrackLightButton = new JButton();
deleteTrackLightButton.setBounds(170, 410, 140, 25);
deleteTrackLightButton.setBounds(170, 435, 140, 25);
deleteTrackLightButton.setText("Delete Track Light");
deleteTrackLightButton.addActionListener(new java.awt.event.ActionListener()
{
@ -137,7 +137,7 @@ public class TrackLightProperties extends PropertyPanel
{
tabbedPane = new JTabbedPane();
tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
tabbedPane.setBounds(10, 10, 460, 390);
tabbedPane.setBounds(10, 10, 460, 415);
Vector<TrackLight> lights = Editor.getProperties().getTrackLights();
@ -255,7 +255,7 @@ public class TrackLightProperties extends PropertyPanel
if (textureOnButton == null)
{
textureOnButton = new JButton();
textureOnButton.setBounds(370, 208, 80, 25);
textureOnButton.setBounds(370, 225, 80, 25);
textureOnButton.setText("Browse");
textureOnButton.addActionListener(new java.awt.event.ActionListener()
{
@ -273,7 +273,7 @@ public class TrackLightProperties extends PropertyPanel
if (textureOffButton == null)
{
textureOffButton = new JButton();
textureOffButton.setBounds(370, 233, 80, 25);
textureOffButton.setBounds(370, 252, 80, 25);
textureOffButton.setText("Browse");
textureOffButton.addActionListener(new java.awt.event.ActionListener()
{

View file

@ -84,21 +84,21 @@ public class TrackProperties extends PropertyPanel
this.setLayout(null);
this.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, widthLabel, "Width", 130);
addLabel(this, 1, surfaceLabel, "Surface", 130);
addLabel(this, 2, profilStepsLengthLabel, "Profil Steps Length", 130);
addLabel(this, 3, racelineWidthscaleLabel, "Raceline Width Scale", 130);
addLabel(this, 4, racelineIntLabel, "Raceline Int", 130);
addLabel(this, 5, racelineExtLabel, "Raceline Ext", 130);
addLabel(this, 0, widthLabel, "Width", 140);
addLabel(this, 1, surfaceLabel, "Surface", 140);
addLabel(this, 2, profilStepsLengthLabel, "Profil Steps Length", 140);
addLabel(this, 3, racelineWidthscaleLabel, "Raceline Width Scale", 140);
addLabel(this, 4, racelineIntLabel, "Raceline Int", 140);
addLabel(this, 5, racelineExtLabel, "Raceline Ext", 140);
addTextField(this, 0, widthTextField, Editor.getProperties().getMainTrack().getWidth(), 140, 50);
addTextField(this, 0, widthTextField, Editor.getProperties().getMainTrack().getWidth(), 150, 50);
this.add(getSurfaceComboBox(), null);
addTextField(this, 2, profilStepsLengthTextField, Editor.getProperties().getMainTrack().getProfilStepsLength(), 140, 50);
addTextField(this, 3, racelineWidthscaleTextField, Editor.getProperties().getMainTrack().getRacelineWidthscale(), 140, 50);
addTextField(this, 4, racelineIntTextField, Editor.getProperties().getMainTrack().getRacelineInt(), 140, 50);
addTextField(this, 5, racelineExtTextField, Editor.getProperties().getMainTrack().getRacelineExt(), 140, 50);
addTextField(this, 2, profilStepsLengthTextField, Editor.getProperties().getMainTrack().getProfilStepsLength(), 150, 50);
addTextField(this, 3, racelineWidthscaleTextField, Editor.getProperties().getMainTrack().getRacelineWidthscale(), 150, 50);
addTextField(this, 4, racelineIntTextField, Editor.getProperties().getMainTrack().getRacelineInt(), 150, 50);
addTextField(this, 5, racelineExtTextField, Editor.getProperties().getMainTrack().getRacelineExt(), 150, 50);
Vector<Surface> surfaces = Editor.getProperties().getSurfaces();
for (int i = 0; i < surfaces.size(); i++)
@ -131,7 +131,7 @@ public class TrackProperties extends PropertyPanel
if (surfaceComboBox == null)
{
surfaceComboBox = new JComboBox<String>();
surfaceComboBox.setBounds(140, 35, 140, 20);
surfaceComboBox.setBounds(150, 37, 180, 23);
String surface = Editor.getProperties().getMainTrack().getSurface();
if (surface != null)
{

View file

@ -66,15 +66,15 @@ public class TurnMarksProperties extends PropertyPanel
setLayout(null);
setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));
addLabel(this, 0, widthLabel, "Width", 100);
addLabel(this, 1, heightLabel, "Height", 100);
addLabel(this, 2, verticalSpaceLabel, "Vertical Space", 100);
addLabel(this, 3, horizontalSpaceLabel, "Horizontal Space", 100);
addLabel(this, 0, widthLabel, "Width", 120);
addLabel(this, 1, heightLabel, "Height", 120);
addLabel(this, 2, verticalSpaceLabel, "Vertical Space", 120);
addLabel(this, 3, horizontalSpaceLabel, "Horizontal Space", 120);
addTextField(this, 0, widthTextField, Editor.getProperties().getGraphic().getTurnMarks().getWidth(), 120, 100);
addTextField(this, 1, heightTextField, Editor.getProperties().getGraphic().getTurnMarks().getHeight(), 120, 100);
addTextField(this, 2, verticalSpaceTextField, Editor.getProperties().getGraphic().getTurnMarks().getVerticalSpace(), 120, 100);
addTextField(this, 3, horizontalSpaceTextField, Editor.getProperties().getGraphic().getTurnMarks().getHorizontalSpace(), 120, 100);
addTextField(this, 0, widthTextField, Editor.getProperties().getGraphic().getTurnMarks().getWidth(), 130, 100);
addTextField(this, 1, heightTextField, Editor.getProperties().getGraphic().getTurnMarks().getHeight(), 130, 100);
addTextField(this, 2, verticalSpaceTextField, Editor.getProperties().getGraphic().getTurnMarks().getVerticalSpace(), 130, 100);
addTextField(this, 3, horizontalSpaceTextField, Editor.getProperties().getGraphic().getTurnMarks().getHorizontalSpace(), 130, 100);
add(getDefaultButton(), null);
add(getDeleteButton(), null);