minor improvements
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -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.5.23</version>
|
<version>1.5.24</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>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ var messageOpacity = 0;
|
|||||||
var pendingAssignment = null;
|
var pendingAssignment = null;
|
||||||
var clickHistory = [];
|
var clickHistory = [];
|
||||||
var messages = [];
|
var messages = [];
|
||||||
|
var android = false;
|
||||||
|
|
||||||
function addClass(data){
|
function addClass(data){
|
||||||
parts = data.split(" ");
|
parts = data.split(" ");
|
||||||
@@ -82,7 +83,7 @@ function clickLegend(ev){
|
|||||||
$(ev.target).addClass('front');
|
$(ev.target).addClass('front');
|
||||||
$('.window > fieldset').hide();
|
$('.window > fieldset').hide();
|
||||||
$('#'+lastTab).show();
|
$('#'+lastTab).show();
|
||||||
$('#'+lastTab+" input:not([type=hidden])").first().focus().select();
|
if (!android) $('#'+lastTab+" input:not([type=hidden])").first().focus().select();
|
||||||
if (!('no-update' in ev)) remember(lastTab);
|
if (!('no-update' in ev)) remember(lastTab);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -361,7 +362,7 @@ function updateMessages() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
window.onload = function () {
|
window.onload = function () {
|
||||||
var isDragging = false;
|
android = navigator.userAgent.toLowerCase().includes('android')
|
||||||
$('.menu > div').click(closeMenu);
|
$('.menu > div').click(closeMenu);
|
||||||
$('.menu .addtile .list svg').click(enableAdding);
|
$('.menu .addtile .list svg').click(enableAdding);
|
||||||
$('.menu .move .list div').click(enableMove);
|
$('.menu .move .list div').click(enableMove);
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ AlterDirection : Fahrtrichtung ändern
|
|||||||
AndCondition : Und-Bedingung
|
AndCondition : Und-Bedingung
|
||||||
Application will load "{}" on next launch and will now quit! : Anwendung wird beim nächsten Start „{}“ laden und wird jetzt beendet.
|
Application will load "{}" on next launch and will now quit! : Anwendung wird beim nächsten Start „{}“ laden und wird jetzt beendet.
|
||||||
Apply : Übernehmen
|
Apply : Übernehmen
|
||||||
|
Are you sure you want to delete {}? : Sind Sie sicher, dass Sie {} löschen möchten?
|
||||||
Aspect : Signalbild
|
Aspect : Signalbild
|
||||||
Aspects : Signalbilder
|
Aspects : Signalbilder
|
||||||
Auto pilot : Autopilot
|
Auto pilot : Autopilot
|
||||||
@@ -144,6 +145,7 @@ DetermineCarAtPosition : Fahrzeug im Zug bestimmen
|
|||||||
DetermineTrainInBlock : Zug im Block bestimmen
|
DetermineTrainInBlock : Zug im Block bestimmen
|
||||||
Determine, which car is at position {} of the current train : Bestimmen, welches Fahrzeug sich an Position {} des Zuges befindet
|
Determine, which car is at position {} of the current train : Bestimmen, welches Fahrzeug sich an Position {} des Zuges befindet
|
||||||
Determine, which train is in {} : Bestimmen, welcher Zug sich in {} befindet
|
Determine, which train is in {} : Bestimmen, welcher Zug sich in {} befindet
|
||||||
|
Determine, which train is parked in {} : Bestimmen, welcher Zug in {} abgestellt ist
|
||||||
Direction : Richtung
|
Direction : Richtung
|
||||||
Direction\: heading {} : Richtung: nach {}
|
Direction\: heading {} : Richtung: nach {}
|
||||||
directional : fahrtrichtungs-abhängig
|
directional : fahrtrichtungs-abhängig
|
||||||
@@ -237,6 +239,7 @@ Locomotives and cars : Lokomotiven und Waggons
|
|||||||
lookup tables : Wertetabellen
|
lookup tables : Wertetabellen
|
||||||
Lookup table : Wertetabelle
|
Lookup table : Wertetabelle
|
||||||
LookupTable : Wertetabelle
|
LookupTable : Wertetabelle
|
||||||
|
LookupValue : Wert aus Tabelle laden
|
||||||
Loop : Wiederholung
|
Loop : Wiederholung
|
||||||
Lower speed limit : Minimale Geschwindigkeit
|
Lower speed limit : Minimale Geschwindigkeit
|
||||||
Maintenance : Wartung
|
Maintenance : Wartung
|
||||||
@@ -378,6 +381,7 @@ SetPower : Strom schalten
|
|||||||
Set speed to : Geschwindigkeit setzen
|
Set speed to : Geschwindigkeit setzen
|
||||||
SetTurnout : Weiche stellen
|
SetTurnout : Weiche stellen
|
||||||
Setup actions : Vorbereitung-Aktionen
|
Setup actions : Vorbereitung-Aktionen
|
||||||
|
show : zeigen
|
||||||
ShowText : Text anzeigen
|
ShowText : Text anzeigen
|
||||||
Shunting : Rangieren
|
Shunting : Rangieren
|
||||||
shunting destination : Rangier-Ziel
|
shunting destination : Rangier-Ziel
|
||||||
|
|||||||
@@ -294,7 +294,10 @@ public class LookupTable extends BaseClass{
|
|||||||
Vector<Object> head = new Vector<Object>();
|
Vector<Object> head = new Vector<Object>();
|
||||||
head.add("");
|
head.add("");
|
||||||
if (LENGTH.equals(colType)) {
|
if (LENGTH.equals(colType)) {
|
||||||
for (Object col : cols) head.add("< "+col);
|
for (Object col : cols) {
|
||||||
|
if ("".equals(col)) continue;
|
||||||
|
head.add("< "+col);
|
||||||
|
}
|
||||||
} else head.addAll(cols);
|
} else head.addAll(cols);
|
||||||
|
|
||||||
table.addHead(head.toArray());
|
table.addHead(head.toArray());
|
||||||
|
|||||||
@@ -76,7 +76,8 @@ public class DetermineTrainInBlock extends Action {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return isSet(block) ? t("Determine, which train is in {}",block) : "["+t("Click here to select block!")+"]";
|
if (isSet(block)) return parked ? t("Determine, which train is parked in {}",block) : t("Determine, which train is in {}",block);
|
||||||
|
return "["+t("Click here to select block!")+"]";
|
||||||
};
|
};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -89,6 +89,6 @@ public class DisableEnableTile extends Action {
|
|||||||
if (newTile instanceof Shadow) newTile = ((Shadow)newTile).overlay();
|
if (newTile instanceof Shadow) newTile = ((Shadow)newTile).overlay();
|
||||||
if (isSet(newTile)) tile = newTile;
|
if (isSet(newTile)) tile = newTile;
|
||||||
disable = !"enable".equals(params.get(STATE));
|
disable = !"enable".equals(params.get(STATE));
|
||||||
return properties();
|
return parent().properties();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user