diff --git a/gui/dialogs/NTPS_target_task.xml b/gui/dialogs/NTPS_target_task.xml index b2c5b860e..d0bfcc67f 100644 --- a/gui/dialogs/NTPS_target_task.xml +++ b/gui/dialogs/NTPS_target_task.xml @@ -38,7 +38,7 @@ - + hbox diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml index 59a5dd1ec..8804783d4 100644 --- a/gui/dialogs/airports.xml +++ b/gui/dialogs/airports.xml @@ -8,7 +8,7 @@ - + diff --git a/gui/dialogs/atc-ai.xml b/gui/dialogs/atc-ai.xml index 8482cd4aa..e5f544939 100755 --- a/gui/dialogs/atc-ai.xml +++ b/gui/dialogs/atc-ai.xml @@ -11,7 +11,7 @@ - + hbox @@ -56,7 +56,7 @@ true - + left diff --git a/gui/dialogs/atc-dialog.xml b/gui/dialogs/atc-dialog.xml index db54cd2a6..1391f2676 100644 --- a/gui/dialogs/atc-dialog.xml +++ b/gui/dialogs/atc-dialog.xml @@ -8,7 +8,7 @@ - + transmission-choice diff --git a/gui/dialogs/atc-freq-display.xml b/gui/dialogs/atc-freq-display.xml index 2c4346c74..192452a0a 100644 --- a/gui/dialogs/atc-freq-display.xml +++ b/gui/dialogs/atc-freq-display.xml @@ -7,7 +7,7 @@ - + frequency-list diff --git a/gui/dialogs/atc-freq-search.xml b/gui/dialogs/atc-freq-search.xml index 4d7bc8e4d..789f411ac 100644 --- a/gui/dialogs/atc-freq-search.xml +++ b/gui/dialogs/atc-freq-search.xml @@ -7,7 +7,7 @@ - + quick-buttons diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml index d3e6eb49c..93829a054 100644 --- a/gui/dialogs/autopilot.xml +++ b/gui/dialogs/autopilot.xml @@ -20,7 +20,7 @@ - + @@ -227,7 +227,7 @@ - + hbox @@ -291,7 +291,7 @@ - + @@ -451,7 +451,7 @@ - + hbox @@ -469,7 +469,7 @@ - + - + diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml index 073e8c57b..2d1744d5c 100644 --- a/gui/dialogs/location-in-air.xml +++ b/gui/dialogs/location-in-air.xml @@ -40,7 +40,7 @@ - + diff --git a/gui/dialogs/location-of-tower.xml b/gui/dialogs/location-of-tower.xml index 58f618914..718107490 100644 --- a/gui/dialogs/location-of-tower.xml +++ b/gui/dialogs/location-of-tower.xml @@ -7,7 +7,7 @@ - + table diff --git a/gui/dialogs/location-on-ground.xml b/gui/dialogs/location-on-ground.xml index f840c047d..f66822e22 100644 --- a/gui/dialogs/location-on-ground.xml +++ b/gui/dialogs/location-on-ground.xml @@ -8,7 +8,7 @@ - + diff --git a/gui/dialogs/marker-adjust.xml b/gui/dialogs/marker-adjust.xml index 99566f229..ae1eb92db 100644 --- a/gui/dialogs/marker-adjust.xml +++ b/gui/dialogs/marker-adjust.xml @@ -35,7 +35,7 @@ - + diff --git a/gui/dialogs/nasal-console.xml b/gui/dialogs/nasal-console.xml index 1ebca41a7..8d89c3cad 100644 --- a/gui/dialogs/nasal-console.xml +++ b/gui/dialogs/nasal-console.xml @@ -10,7 +10,7 @@ - + fill diff --git a/gui/dialogs/property-browser.xml b/gui/dialogs/property-browser.xml index ef8bc05aa..1e31f8932 100644 --- a/gui/dialogs/property-browser.xml +++ b/gui/dialogs/property-browser.xml @@ -14,9 +14,16 @@ 16 16 2 + nasal - + @@ -42,7 +49,7 @@ - + property-list @@ -114,7 +121,7 @@ } squeeze = func(s, n) { - if (size(s) <= n or n < 7) { + if (n >= size(s) or 7 > n ) { return s; } var l = substr(s, 0, (n - 3) / 2); @@ -165,10 +172,10 @@ } } - clone = func { + clone = func(startdir) { var name = "property-browser--" ~ int(rand() * 10000000); var base = "/sim/gui/dialogs/" ~ name ~ "/"; - setprop(base ~ "/last", dir); + setprop(base ~ "/last", startdir); self.setValues({ "name": name, "dialog-name": name, diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml index b335e147c..3303d450d 100644 --- a/gui/dialogs/rendering.xml +++ b/gui/dialogs/rendering.xml @@ -9,7 +9,7 @@ - + vbox @@ -115,7 +115,7 @@ - + 8 @@ -200,7 +200,7 @@ - + 8 diff --git a/gui/dialogs/replay.xml b/gui/dialogs/replay.xml index e79fbcbec..4f34f6a0e 100644 --- a/gui/dialogs/replay.xml +++ b/gui/dialogs/replay.xml @@ -7,7 +7,7 @@ - + table diff --git a/gui/dialogs/route-manager.xml b/gui/dialogs/route-manager.xml index 28268191a..e236abfaf 100644 --- a/gui/dialogs/route-manager.xml +++ b/gui/dialogs/route-manager.xml @@ -20,7 +20,7 @@ command interface /autopilot/route-manager/input: - + @@ -34,7 +34,7 @@ command interface /autopilot/route-manager/input: var list = cmdarg().getNode("list"); var cmd = props.globals.getNode("/autopilot/route-manager/input", 1); - var routemgr = props.globals.getNode("/autopilot/route-manager/route", 1); + var route = props.globals.getNode("/autopilot/route-manager/route", 1); sel_index = func { var s = selection.getValue(); @@ -58,7 +58,7 @@ command interface /autopilot/route-manager/input: route_changed = func { list.removeChildren("value"); - var wp = routemgr.getChildren("wp"); + var wp = route.getChildren("wp"); forindex (var i; wp) { var id = wp[i].getNode("id").getValue(); var lon = wp[i].getNode("longitude-deg").getValue(); diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml index da079044d..1bb6f3792 100644 --- a/gui/dialogs/sound.xml +++ b/gui/dialogs/sound.xml @@ -10,7 +10,7 @@ - + hbox diff --git a/gui/dialogs/static-lod.xml b/gui/dialogs/static-lod.xml index b9b124d57..2e424f29b 100755 --- a/gui/dialogs/static-lod.xml +++ b/gui/dialogs/static-lod.xml @@ -8,7 +8,7 @@ - + table diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml index 2b76c808c..29336d170 100644 --- a/gui/dialogs/timeofday.xml +++ b/gui/dialogs/timeofday.xml @@ -10,7 +10,7 @@ - + hbox @@ -28,7 +28,7 @@ 6 - + 6 @@ -41,7 +41,7 @@ 6 - + 6 diff --git a/gui/dialogs/tutorial.xml b/gui/dialogs/tutorial.xml index 12aa9d29f..b51f17480 100644 --- a/gui/dialogs/tutorial.xml +++ b/gui/dialogs/tutorial.xml @@ -9,11 +9,10 @@ - + - tutorial.stopTutorial(); var list = cmdarg().getNode("group[1]/group/list"); var node = props.globals.getNode("/sim/tutorials", 1); var tut = node.getChildren("tutorial"); @@ -30,7 +29,7 @@ list.getChild("value", i, 1).setValue(name); } - select = func { + var select = func { var name = current.getValue(); foreach (var t; tut) { if (t.getNode("name").getValue() == name) { @@ -43,7 +42,6 @@ "dialog-name": "tutorial"})); } - if (current.getType() == "NONE" or current.getValue() == "") { current.setValue(tut[0].getNode("name").getValue()); select(); diff --git a/gui/dialogs/weather_scenario.xml b/gui/dialogs/weather_scenario.xml index 815836683..bb9738a3d 100644 --- a/gui/dialogs/weather_scenario.xml +++ b/gui/dialogs/weather_scenario.xml @@ -9,7 +9,7 @@ - +