GUI work
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.srsoftware</groupId>
|
||||
<artifactId>web4rail</artifactId>
|
||||
<version>1.2.44</version>
|
||||
<version>1.2.45</version>
|
||||
<name>Web4Rail</name>
|
||||
<packaging>jar</packaging>
|
||||
<description>Java Model Railway Control</description>
|
||||
|
||||
@@ -336,7 +336,7 @@ svg.preview circle,
|
||||
svg.preview line,
|
||||
svg.preview polygon,
|
||||
svg.preview rect{
|
||||
fill:peru;
|
||||
fill:peru !important;
|
||||
}
|
||||
|
||||
svg.Block text{
|
||||
|
||||
@@ -84,6 +84,7 @@ Direction : Richtung
|
||||
Direction\: heading {} : Richtung: nach {}
|
||||
disabled : deaktiviert
|
||||
disable {} : {} deaktivieren
|
||||
Disabled routes using this tile : Deaktivierte Routen, die diesen Abschnitt verwenden
|
||||
Display "{}" on {}. : „{}“ auf {} anzeigen.
|
||||
Drop : Verwerfen
|
||||
Dropped destination of {}. : Ziel von {} verworfen.
|
||||
|
||||
@@ -750,9 +750,7 @@ public class Route extends BaseClass {
|
||||
formInputs.add(t("Name"),new Input(NAME, name()));
|
||||
Checkbox checkbox = new Checkbox(DISABLED, t("disabled"), disabled);
|
||||
if (disabled) checkbox.clazz("disabled");
|
||||
formInputs.add(t("State"),checkbox);
|
||||
|
||||
|
||||
formInputs.add(t("State"),checkbox);
|
||||
|
||||
postForm.add(basicProperties());
|
||||
if (!turnouts.isEmpty()) postForm.add(turnouts());
|
||||
|
||||
@@ -242,14 +242,35 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
|
||||
if (!routes.isEmpty()) {
|
||||
fieldset = new Fieldset(t("Routes using this tile"));
|
||||
Tag routeList = new Tag("ol");
|
||||
boolean 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);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user