StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

ui improvements

Browse Source
This commit is contained in:
Stephan Richter
2021-04-10 18:19:04 +02:00
parent 77d82c71be
commit cac97b01d3
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.4.19</version> <version>1.4.20</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

1
resources/translations/Application.de.translation
View File

@@ -300,6 +300,7 @@ Seek in last : Durchsuche letzte
Select block : Block auswählen Select block : Block auswählen
Select car : Fahrzeug auswählen Select car : Fahrzeug auswählen
Select contact : Kotakt auswählen Select contact : Kotakt auswählen
Select destination : Ziel wählen
Select display : Anzeige auswählen Select display : Anzeige auswählen
Select from plan : Auf Plan auswählen Select from plan : Auf Plan auswählen
Select object : Objekt auswählen Select object : Objekt auswählen

3
src/main/java/de/srsoftware/web4rail/Constants.java
View File

@@ -60,8 +60,9 @@ public interface Constants {
public static final String CONTEXT = "context"; public static final String CONTEXT = "context";
public static final String DEFAULT_SPEED_UNIT = "km/h"; public static final String DEFAULT_SPEED_UNIT = "km/h";
public static final String DEFAULT_LENGTH_UNIT = "mm"; public static final String DEFAULT_LENGTH_UNIT = "mm";
public static final String DESTINATION = "destination";
public static final String DISABLED = "disabled"; public static final String DISABLED = "disabled";
public static final String DIRECTION = "direction"; public static final String DIRECTION = "direction";
public static final String GITHUB_URL = "https://github.com/srsoftware-de/Web4Rail"; public static final String GITHUB_URL = "https://github.com/srsoftware-de/Web4Rail";
public static final String ID = "id"; public static final String ID = "id";
public static final String LOCKED = "locked"; public static final String LOCKED = "locked";

2
src/main/java/de/srsoftware/web4rail/moving/Car.java
View File

@@ -319,7 +319,7 @@ public class Car extends BaseClass implements Comparable<Car>{
formInputs.add(t("Maximum Speed"),div); formInputs.add(t("Maximum Speed"),div);
if (isSet(train)) formInputs.add(t("Train"), train.link()); if (isSet(train)) formInputs.add(t("Train"), train.link());
formInputs.add(t("Current orientation"),new Tag("span").content(orientation ? t("forward") : t("reverse"))); formInputs.add(t("Current orientation"),new Tag("span").content(orientation ? t("forward") : t("reverse")));
formInputs.add(t("driven distance"),new Tag("span").content(distanceCounter+" "+Plan.lengthUnit)); formInputs.add(t("driven distance"),new Tag("span").content(BaseClass.distance(distanceCounter)));
postForm.add(maintenance()); postForm.add(maintenance());
return super.properties(preForm,formInputs,postForm,errors); return super.properties(preForm,formInputs,postForm,errors);
} }

4
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -189,7 +189,9 @@ public class Locomotive extends Car implements Constants,Device{
Button b4 = new Button(t("F4"),params); Button b4 = new Button(t("F4"),params);
if (fun4) b4.clazz("active"); if (fun4) b4.clazz("active");
b4.addTo(functions); b4.addTo(functions);
functions.addTo(fieldset); functions.addTo(fieldset);
if (isSet(train)) train.button(t("Select destination"),Map.of(ACTION,ACTION_MOVE,ASSIGN,DESTINATION)).addTo(fieldset);
return fieldset; return fieldset;
} }

2
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -74,8 +74,6 @@ public class Train extends BaseClass implements Comparable<Train> {
private static final String TAGS = "tags"; private static final String TAGS = "tags";
public static final String DESTINATION = "destination";
private static final String ACTION_REVERSE = "reverse"; private static final String ACTION_REVERSE = "reverse";
public static final String DESTINATION_PREFIX = "@"; public static final String DESTINATION_PREFIX = "@";
public static final char TURN_FLAG = '±'; public static final char TURN_FLAG = '±';