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

GUI work

Browse Source
This commit is contained in:
Stephan Richter
2020-12-11 02:33:32 +01:00
parent 604b9559c4
commit 438befa969
5 changed files with 27 additions and 7 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.2.44</version> <version>1.2.45</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>

2
resources/css/style.css
View File

@@ -336,7 +336,7 @@ svg.preview circle,
svg.preview line, svg.preview line,
svg.preview polygon, svg.preview polygon,
svg.preview rect{ svg.preview rect{
fill:peru; fill:peru !important;
} }
svg.Block text{ svg.Block text{

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

@@ -84,6 +84,7 @@ Direction : Richtung
Direction\: heading {} : Richtung: nach {} Direction\: heading {} : Richtung: nach {}
disabled : deaktiviert disabled : deaktiviert
disable {} : {} deaktivieren disable {} : {} deaktivieren
Disabled routes using this tile : Deaktivierte Routen, die diesen Abschnitt verwenden
Display "{}" on {}. : „{}“ auf {} anzeigen. Display "{}" on {}. : „{}“ auf {} anzeigen.
Drop : Verwerfen Drop : Verwerfen
Dropped destination of {}. : Ziel von {} verworfen. Dropped destination of {}. : Ziel von {} verworfen.

4
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -750,9 +750,7 @@ public class Route extends BaseClass {
formInputs.add(t("Name"),new Input(NAME, name())); formInputs.add(t("Name"),new Input(NAME, name()));
Checkbox checkbox = new Checkbox(DISABLED, t("disabled"), disabled); Checkbox checkbox = new Checkbox(DISABLED, t("disabled"), disabled);
if (disabled) checkbox.clazz("disabled"); if (disabled) checkbox.clazz("disabled");
formInputs.add(t("State"),checkbox); formInputs.add(t("State"),checkbox);
postForm.add(basicProperties()); postForm.add(basicProperties());
if (!turnouts.isEmpty()) postForm.add(turnouts()); if (!turnouts.isEmpty()) postForm.add(turnouts());

25
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -242,14 +242,35 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
if (!routes.isEmpty()) { if (!routes.isEmpty()) {
fieldset = new Fieldset(t("Routes using this tile")); fieldset = new Fieldset(t("Routes using this tile"));
Tag routeList = new Tag("ol"); Tag routeList = new Tag("ol");
boolean empty = true;
for (Route route : routes) { for (Route route : routes) {
if (route.isDisabled()) continue;
Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link")); Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li); route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li); button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
li.addTo(routeList); li.addTo(routeList);
empty = false;
}
if (!empty) {
routeList.addTo(fieldset);
postForm.add(fieldset);
}
fieldset = new Fieldset(t("Disabled routes using this tile"));
routeList = new Tag("ol");
empty = true;
for (Route route : routes) {
if (!route.isDisabled()) continue;
Tag li = route.link("span", route.name()+(route.isDisabled()?" ["+t("disabled")+"]" : "")+NBSP).addTo(new Tag("li").clazz("link"));
route.button(t("delete route"),Map.of(ACTION,ACTION_DROP)).addTo(li);
button(t("simplify name"), Map.of(ACTION,ACTION_AUTO,ROUTE,route.id().toString())).addTo(li);
li.addTo(routeList);
empty = false;
}
if (!empty) {
routeList.addTo(fieldset);
postForm.add(fieldset);
} }
routeList.addTo(fieldset);
postForm.add(fieldset);
} }
return super.properties(preForm, formInputs, postForm); return super.properties(preForm, formInputs, postForm);