diff --git a/ATC/KEMT.taxi b/ATC/KEMT.taxi deleted file mode 100644 index 09beec587..000000000 --- a/ATC/KEMT.taxi +++ /dev/null @@ -1,27 +0,0 @@ -N 0 -118.0372167 34.08178333 0.0 J E-01-19 "rwy 01" -N 1 -118.0321833 34.09066667 0.0 J E-01-19 "rwy 19" -N 2 -118.0369167 34.08166667 0.0 H E "" -N 3 -118.03185 34.0906 0.0 H E "" -N 4 -118.03515 34.0848 0.0 T E "" -N 5 -118.0349667 34.08511667 0.0 T E "" -N 6 -118.0348333 34.08466667 0.0 T E "" -G 7 -118.0347333 34.08483333 0.0 GS 10 "" -N 8 -118.03465 34.08498333 0.0 T E "" -N 9 -118.0346 34.08456667 0.0 T E "" -G 10 -118.0345167 34.08473333 0.0 GS 10 "" -N 11 -118.0344167 34.0849 0.0 T E "" -A 0 1 R N "" -A 0 2 T N "" -A 1 3 T N "" -A 2 4 T N "" -A 4 5 T N "" -A 3 5 T N "" -A 4 6 T N "" -A 6 9 T Y "" -A 5 8 T Y "" -A 8 11 T Y "" -A 6 7 T Y "" -A 7 8 T Y "" -A 9 10 T Y "" -A 10 11 T Y "" -[End] \ No newline at end of file diff --git a/Nasal/gui.nas b/Nasal/gui.nas index ea098f99a..2d2d9c52b 100644 --- a/Nasal/gui.nas +++ b/Nasal/gui.nas @@ -155,7 +155,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func { menubarAutoVisibilityListener = setlistener( "/devices/status/mice/mouse/y", func(n) { if( n.getValue() == nil ) return; if( mouseMode.getValue() != 0 ) return; - + if( n.getValue() <= menubarAutoVisibilityEdge.getValue() ) menubarVisibility.setBoolValue( 1 ); @@ -372,10 +372,10 @@ var OverlaySelector = { var m = Dialog.new(data.getNode("dialog", 1), "gui/dialogs/overlay-select.xml", name); m.parents = [OverlaySelector, Dialog]; - + # resolve the path in FG_ROOT, and --fg-aircraft dir, etc m.dir = resolvepath(dir) ~ "/"; - + var relpath = func(p) substr(p, p[0] == `/`); m.nameprop = relpath(nameprop); m.sortprop = relpath(sortprop or nameprop); @@ -724,8 +724,17 @@ var showWeightDialog = func { dialog[name].set("name", name); dialog[name].set("layout", "vbox"); - var header = dialog[name].addChild("text"); - header.set("label", title); + var header = dialog[name].addChild("group"); + header.set("layout", "hbox"); + header.addChild("empty").set("stretch", "1"); + header.addChild("text").set("label", title); + header.addChild("empty").set("stretch", "1"); + var w = header.addChild("button"); + w.set("pref-width", 16); + w.set("pref-height", 16); + w.set("legend", ""); + w.set("default", 0); + w.setBinding("dialog-close"); dialog[name].addChild("hrule"); @@ -801,15 +810,17 @@ var showWeightDialog = func { weightitem = nil; } + dialog[name].addChild("hrule"); + var buttonBar = dialog[name].addChild("group"); buttonBar.set("layout", "hbox"); buttonBar.set("default-padding", 10); - var ok = buttonBar.addChild("button"); - ok.set("legend", "OK"); - ok.set("key", "esc"); - ok.setBinding("dialog-apply"); - ok.setBinding("dialog-close"); + var close = buttonBar.addChild("button"); + close.set("legend", "Close"); + close.set("default", "true"); + close.set("key", "Enter"); + close.setBinding("dialog-close"); # Temporary helper function var tcell = func(parent, type, row, col) { diff --git a/Nasal/wildfire.nas b/Nasal/wildfire.nas index 0e1188d26..cdde00c41 100644 --- a/Nasal/wildfire.nas +++ b/Nasal/wildfire.nas @@ -216,12 +216,12 @@ var parse_msg = func (source, msg) { var pos = Binary.decodeCoord(substr(msg, 6)); var radius = Binary.decodeDouble(substr(msg, 36)); resolve_retardant_drop(pos, radius, 0, 0); - } + } if (type == 4) { var pos = Binary.decodeCoord(substr(msg, 6)); var radius = Binary.decodeDouble(substr(msg, 36)); resolve_foam_drop(pos, radius, 0, 0); - } + } } ############################################################################### @@ -356,7 +356,7 @@ var FireCell = { CAFire.set_cell(me.x + d[0], me.y + d[1], FireCell.new(me.x + d[0], me.y + d[1])); - } + } } } foreach (var d; CAFire.NEIGHBOURS[1]) { @@ -385,7 +385,7 @@ var CellModel = { ############################################################ new : func (x, y, alt) { var m = { parents: [CellModel] }; - m.type = "none"; + m.type = "none"; m.model = nil; m.lat = y * CAFire.CELL_SIZE/60.0 + 0.5 * CAFire.CELL_SIZE / 60.0; m.lon = x * CAFire.CELL_SIZE/60.0 + 0.5 * CAFire.CELL_SIZE / 60.0; @@ -488,7 +488,7 @@ CAFireModels.update = func { var c = me.pending[0]; me.pending = subvec(me.pending, 1); work -= 1; - if (contains(c, "alt")) { + if (contains(c, "alt")) { if (me.grid[c.x] == nil) { me.grid[c.x] = {}; } @@ -606,7 +606,7 @@ CAFire.ignite = func (lat, lon) { # Resolve a water drop. # For now: Assume that water makes the affected cell nonflammable forever # and extinguishes it if burning. -# radius - meter : double +# radius - meter : double # Note: volume is unused ATM. CAFire.resolve_water_drop = func (lat, lon, radius, volume=0) { trace("CAFire.resolve_water_drop: Dumping water at " ~ lat ~", " ~ lon ~ @@ -652,7 +652,7 @@ CAFire.resolve_retardant_drop = func (lat, lon, radius, volume=0) { # Resolve a foam drop. # For now: Assume that water makes the affected cell nonflammable forever # and extinguishes it if burning. -# radius - meter : double +# radius - meter : double # Note: volume is unused ATM. CAFire.resolve_foam_drop = func (lat, lon, radius, volume=0) { trace("CAFire.resolve_foam_drop: Dumping foam at " ~ lat ~", " ~ lon ~ @@ -904,7 +904,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func { if (getprop(save_on_exit_pp)) CAFire.save_event_log(SAVEDIR ~ "fire_log.xml"); }); - + if (getprop(restore_on_startup_pp)) { settimer(func { # Delay loading the log until the terrain is there. Note: hack. @@ -952,7 +952,7 @@ var dialog = { me.x = x; me.y = y; me.bg = [0, 0, 0, 0.3]; # background color - me.fg = [[1.0, 1.0, 1.0, 1.0]]; + me.fg = [[1.0, 1.0, 1.0, 1.0]]; # # "private" me.title = "Wildfire"; @@ -979,12 +979,12 @@ var dialog = { titlebar.set("layout", "hbox"); titlebar.addChild("empty").set("stretch", 1); titlebar.addChild("text").set("label", "Wildfire settings"); + titlebar.addChild("empty").set("stretch", 1); var w = titlebar.addChild("button"); w.set("pref-width", 16); w.set("pref-height", 16); w.set("legend", ""); w.set("default", 0); - w.set("key", "esc"); w.setBinding("nasal", "wildfire.dialog.destroy(); "); w.setBinding("dialog-close"); me.dialog.addChild("hrule"); @@ -1011,13 +1011,25 @@ var dialog = { } me.dialog.addChild("hrule"); + # Buttons + var buttons = me.dialog.addChild("group"); + buttons.node.setValues({"layout" : "hbox"}); + # Load button. - var load = me.dialog.addChild("button"); + var load = buttons.addChild("button"); load.node.setValues({"legend" : "Load Wildfire log", "halign" : "center"}); load.setBinding("nasal", "wildfire.dialog.select_and_load()"); + # Close button + var close = buttons.addChild("button"); + close.node.setValues({"legend" : "Close", + "default" : "true", + "key" : "Esc"}); + close.setBinding("nasal", "wildfire.dialog.destroy();"); + close.setBinding("dialog-close"); + fgcommand("dialog-new", me.dialog.prop()); fgcommand("dialog-show", me.namenode); }, diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml index fda87ccb0..07d25ce9d 100644 --- a/gui/dialogs/AIcarrier.xml +++ b/gui/dialogs/AIcarrier.xml @@ -4,20 +4,33 @@ AIcarrier false vbox - + - - left - - - 0.9 - 0.9 - 0.9 - 1 - - + + hbox + 1 + + + + + + 1 + + + + + hbox @@ -170,6 +183,8 @@ + + hbox 6 @@ -218,4 +233,4 @@ true - \ No newline at end of file + diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml deleted file mode 100644 index 56898b8c9..000000000 --- a/gui/dialogs/ai.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - ai - false - vbox - - - - - - - - - - - - - - hbox - - 10 - - - - vbox - - - - - left - - /sim/ai-traffic/enabled - - - - hbox - - - left - - - - - left - /sim/ai-traffic/level - 1 - 2 - 3 - - - - - - - true - - - - - hbox - 6 - - true - - - - - - - - - - - - true - - - - diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml index e1ed9a93c..75fb36749 100644 --- a/gui/dialogs/airports.xml +++ b/gui/dialogs/airports.xml @@ -5,9 +5,27 @@ vbox true - - - + + hbox + 1 + + + + + + 1 + + + @@ -97,6 +115,8 @@ + + hbox 10 diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml index efa228b08..59f543407 100644 --- a/gui/dialogs/autopilot.xml +++ b/gui/dialogs/autopilot.xml @@ -16,17 +16,17 @@ /autopilot/settings/true-heading-deg /autopilot/settings/vertical-speed-fpm --> - + hbox 1 - + - + 1 - + + diff --git a/gui/dialogs/cockpit-view.xml b/gui/dialogs/cockpit-view.xml index 87d7b9171..a26a06468 100644 --- a/gui/dialogs/cockpit-view.xml +++ b/gui/dialogs/cockpit-view.xml @@ -8,25 +8,24 @@ hbox 1 - + - + 1 - + - + @@ -63,7 +62,7 @@ center - + /sim/rendering/redout/enabled @@ -74,7 +73,7 @@ 0 0 - + /sim/rendering/redout/enabled @@ -87,7 +86,7 @@ %2.1f true /sim/rendering/redout/parameters/blackout-onset-g - + /sim/rendering/redout/enabled @@ -101,7 +100,7 @@ dialog-apply - + /sim/rendering/redout/enabled @@ -110,7 +109,7 @@ 1 0 - + /sim/rendering/redout/enabled @@ -123,7 +122,7 @@ %2.1f true /sim/rendering/redout/parameters/blackout-complete-g - + /sim/rendering/redout/enabled @@ -137,7 +136,7 @@ dialog-apply - + /sim/rendering/redout/enabled @@ -148,7 +147,7 @@ center - + /sim/rendering/redout/enabled @@ -159,7 +158,7 @@ 0 0 - + /sim/rendering/redout/enabled @@ -172,7 +171,7 @@ %2.1f true /sim/rendering/redout/parameters/redout-onset-g - + /sim/rendering/redout/enabled @@ -186,7 +185,7 @@ dialog-apply - + /sim/rendering/redout/enabled @@ -207,7 +206,7 @@ %2.1f true /sim/rendering/redout/parameters/redout-complete-g - + /sim/rendering/redout/enabled @@ -221,10 +220,21 @@ dialog-apply - + /sim/rendering/redout/enabled + + + + diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml index dc7c39118..fbbfaabd1 100644 --- a/gui/dialogs/display.xml +++ b/gui/dialogs/display.xml @@ -5,29 +5,26 @@ false vbox - hbox - 1 - + 1 + - - 1 - - - + + 1 + + @@ -82,4 +79,15 @@ + + + + diff --git a/gui/dialogs/formation.xml b/gui/dialogs/formation.xml index 4cf76a276..a2bbf810b 100644 --- a/gui/dialogs/formation.xml +++ b/gui/dialogs/formation.xml @@ -7,17 +7,29 @@ vbox + + hbox + 1 - - left - - - 0.5 - 0.5 - 0.5 - 1 - - + + + + + 1 + + + + + hbox @@ -182,7 +194,7 @@ left - + + @@ -262,7 +280,7 @@ - @@ -341,7 +359,7 @@ @@ -92,18 +112,18 @@ - + 11 right - + runway - 12 + 12 85 - + /sim/gui/dialogs/location-on-ground/use_runway sim/gui/dialogs/location-on-ground/runway @@ -114,7 +134,7 @@ runway - + 20 /sim/gui/dialogs/location-on-ground/use_parkpos @@ -124,22 +144,24 @@ - + 21 right - + 22 - + /sim/gui/dialogs/location-on-ground/use_parkpos /sim/gui/dialogs/location-on-ground/parkpos + + hbox 10 diff --git a/gui/dialogs/pilot_offset.xml b/gui/dialogs/pilot_offset.xml index e359b1692..fec11ce33 100644 --- a/gui/dialogs/pilot_offset.xml +++ b/gui/dialogs/pilot_offset.xml @@ -4,6 +4,30 @@ pilot_offset vbox + + hbox + 1 + + + + + + 1 + + + + + + hbox @@ -19,7 +43,7 @@ /sim/current-view/x-offset-m dialog-apply - + %-0.2f m @@ -27,7 +51,7 @@ /sim/current-view/x-offset-m - + vbox @@ -71,11 +95,13 @@ + + hbox true + + + + + + table - - 0 - 280 - 75 + 0 + 1 + - 300 + 0 + 4 + - 450 + 0 + 6 - - - 0 - 240 + + + 0 + 7 + + + 1 + 0 + right com1-selected - 75 - 0 + 1 + 1 75 25 @@ -50,8 +78,8 @@ + - + - + - + - - - 400 - 60 - + + true + + diff --git a/gui/dialogs/random-failures.xml b/gui/dialogs/random-failures.xml index 2fdec4efe..3366a53c2 100644 --- a/gui/dialogs/random-failures.xml +++ b/gui/dialogs/random-failures.xml @@ -9,7 +9,7 @@ - - - + + hbox + 1 - + + + + + 1 + + + + + + left @@ -166,17 +185,17 @@ true - + true - + vbox left top true - + center @@ -332,7 +351,7 @@ - + - + center hbox vbox - + left @@ -46,14 +45,31 @@ left - + - vbox - 1 + hbox + + + left + + + true + + + left + + wireframe + /sim/rendering/wireframe + + dialog-apply + wireframe + + + @@ -144,9 +160,9 @@ precipitation - + @@ -180,7 +196,7 @@ random-vegetation - + hbox @@ -191,9 +207,9 @@ true - + @@ -218,7 +234,7 @@ 3d-clouds - + @@ -286,14 +302,14 @@ /sim/rendering/clouds3d-vis-range - + vbox 1 - + @@ -380,7 +396,7 @@ urban-effects - + left @@ -497,10 +513,21 @@ /sim/rendering/quality-level - + + + + + gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets")); diff --git a/gui/dialogs/replay.xml b/gui/dialogs/replay.xml index aa7056b54..17dfb2112 100644 --- a/gui/dialogs/replay.xml +++ b/gui/dialogs/replay.xml @@ -4,15 +4,34 @@ false vbox - - - + + hbox + 1 + + + + + + 1 + + + + # Populate the view combo box with a list of the available views - var combo = cmdarg().getNode("group").getNode("combo"); + var combo = cmdarg().getChildren("group")[1].getNode("combo"); combo.removeChildren("value"); var current_view = getprop("/sim/current-view/view-number"); @@ -29,7 +48,7 @@ if (v.getIndex() == current_view) { setprop("/sim/replay/view-name", name); } - + combo.getNode("value[" ~ i ~ "]", 1).setValue(name); i = i + 1; } @@ -38,25 +57,25 @@ table - + 00 right - + 01 left /sim/replay/duration - + 10 right - + 11 left @@ -65,8 +84,8 @@ dialog-apply - - + + 20 right @@ -81,7 +100,7 @@ dialog-apply - + @@ -90,7 +109,7 @@ left - + table @@ -99,31 +118,31 @@ center - + 11 left - + 20 center - + 21 left - + 30 center - + 31 left @@ -132,7 +151,7 @@ - + hbox true @@ -141,7 +160,7 @@ true true - dialog-apply + dialog-apply nasal @@ -151,10 +170,10 @@ - replay + replay - dialog-close + dialog-close true @@ -163,7 +182,7 @@ true Esc - dialog-close + dialog-close true diff --git a/gui/dialogs/route-manager.xml b/gui/dialogs/route-manager.xml index f0ad2d1ca..5510ec147 100644 --- a/gui/dialogs/route-manager.xml +++ b/gui/dialogs/route-manager.xml @@ -21,7 +21,7 @@ command interface /autopilot/route-manager/input: var ft = getprop("/sim/startup/units") == "feet"; var dlg = props.globals.getNode("/sim/gui/dialogs/route-manager", 1); var selection = dlg.getNode("selection", 1); - var input = dlg.getNode("input", 1); + var input = dlg.getNode("input", 1); var routem = props.globals.getNode("/autopilot/route-manager", 1); selection.setIntValue(-1); @@ -32,7 +32,7 @@ command interface /autopilot/route-manager/input: var route = routem.getNode("route", 1); var dep = routem.getNode("departure", 1); var dest = routem.getNode("destination", 1); - + var sel_index = func { return int(selection.getValue()); } @@ -47,10 +47,10 @@ command interface /autopilot/route-manager/input: # when selection index is valid, insert *after* the waypoint insertIndex = insertIndex + 1; } - + cmd.setValue("@insert" ~ insertIndex ~ ":" ~ input.getValue()); input.setValue(""); - + if (insertIndex >= 0) { selection.setValue(insertIndex); gui.dialog_update("route-manager"); @@ -60,15 +60,15 @@ command interface /autopilot/route-manager/input: var remove = func { cmd.setValue("@delete" ~ sel_index()); } - + var route = func { cmd.setValue("@route" ~ sel_index()); } - + var jump_to = func { cmd.setValue("@jump" ~ sel_index()); } - + var load_route = func(path) { routem.getNode("file-path", 1).setValue(path.getValue()); cmd.setValue("@load"); @@ -80,26 +80,26 @@ command interface /autopilot/route-manager/input: cmd.setValue("@save"); gui.dialog_update("route-manager"); } - + var file_selector = gui.FileSelector.new(load_route, "Load flight-plan", "Load"); var save_selector = gui.FileSelector.new(save_route, "Save flight-plan", "Save"); var activate_fp = func { cmd.setValue("@activate"); } - + var departureRunways = dlg.getNode("departure-runways", 1); var destRunways = dlg.getNode("destination-runways", 1); var sids = dlg.getNode("sids", 1); var stars = dlg.getNode("stars", 1); - - var updateRunways = func { + + var updateRunways = func { var depIcao = dep.getNode("airport").getValue(); departureRunways.removeChildren("value"); var currentRunway = dep.getNode("runway").getValue(); var foundCurrent = 0; - + var apt = airportinfo(depIcao); if (apt != nil) { var i=0; @@ -111,16 +111,16 @@ command interface /autopilot/route-manager/input: } } } - + if (!foundCurrent) { dep.getNode("runway").clearValue(); } - + var destIcao = dest.getNode("airport").getValue(); destRunways.removeChildren("value"); currentRunway = dest.getNode("runway").getValue(); foundCurrent = 0; - + var apt = airportinfo(destIcao); if (apt != nil) { var i=0; @@ -132,15 +132,15 @@ command interface /autopilot/route-manager/input: } } } - + if (!foundCurrent) { dest.getNode("runway").clearValue(); } - + print("updated runways"); gui.dialog_update("route-manager"); } - + var updateSIDs = func { sids.removeChildren("value"); var depIcao = dep.getNode("airport").getValue(); @@ -151,17 +151,17 @@ command interface /autopilot/route-manager/input: gui.dialog_update("route-manager", "sid"); return; } - + sids.getNode("value[0]", 1).setValue("(none)"); var i=1; foreach (var s; apt.runways[rwy].sids) { sids.getNode("value[" ~ i ~ "]", 1).setValue(s); i += 1; } - + gui.dialog_update("route-manager", "sid"); } - + var updateSTARs = func { stars.removeChildren("value"); var icao = dest.getNode("airport").getValue(); @@ -172,20 +172,20 @@ command interface /autopilot/route-manager/input: gui.dialog_update("route-manager", "star"); return; } - + var i=1; stars.getNode("value[0]", 1).setValue("(none)"); foreach (var s; apt.runways[rwy].stars) { stars.getNode("value[" ~ i ~ "]", 1).setValue(s); i += 1; } - + gui.dialog_update("route-manager", "star"); } - + # initialise departure values based on current position cmd.setValue("@posinit"); - + updateRunways(); updateSIDs(); updateSTARs(); @@ -222,14 +222,19 @@ command interface /autopilot/route-manager/input: - + - hbox + table + 0 + 0 + right - 80 + 0 + 1 + left departure-airport 60 /autopilot/route-manager/departure/airport @@ -238,31 +243,38 @@ command interface /autopilot/route-manager/input: dialog-apply departure-airport - + nasal - + + 0 + 2 %s /autopilot/route-manager/departure/name true true fill - + + 0 + 3 + right + 0 + 4 + left departure-runway - 60 /autopilot/route-manager/departure/runway false /sim/gui/dialogs/route-manager/departure-runways - + dialog-apply departure-runway @@ -272,33 +284,40 @@ command interface /autopilot/route-manager/input: - + + 0 + 5 + right + 0 + 6 + left sid - 100 /autopilot/route-manager/departure/sid false /sim/gui/dialogs/route-manager/sids - + dialog-apply sid - - - - hbox + + 1 + 0 + right - 80 - destination-airport + 1 + 1 + left 60 + destination-airport /autopilot/route-manager/destination/airport true @@ -311,44 +330,57 @@ command interface /autopilot/route-manager/input: + 1 + 2 true + 200 %s /autopilot/route-manager/destination/name true fill - + + 1 + 3 + right + 1 + 4 + left destination-runway - 60 /autopilot/route-manager/destination/runway false /sim/gui/dialogs/route-manager/destination-runways - + dialog-apply destination-runway - + nasal - + + 1 + 5 + right + 1 + 6 + left star - 100 /autopilot/route-manager/destination/star false /sim/gui/dialogs/route-manager/stars - + dialog-apply star @@ -369,38 +401,38 @@ command interface /autopilot/route-manager/input: 150 /autopilot/route-manager/alternate/airport - + --> hbox + right - 80 cruise-speed true - fill + left true - 150 + 100 /autopilot/route-manager/cruise/speed-kts - + - 80 + right cruise-alt true - fill + left true - 150 + 100 /autopilot/route-manager/cruise/altitude-ft - + @@ -560,7 +592,7 @@ command interface /autopilot/route-manager/input: - + true + diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml index 3b05adada..d0d32f594 100644 --- a/gui/dialogs/scenario.xml +++ b/gui/dialogs/scenario.xml @@ -30,7 +30,7 @@ true - + true @@ -49,6 +49,13 @@ + + + + + + + hbox @@ -64,6 +71,7 @@ + hbox @@ -172,7 +180,7 @@ scnNode.setValue( src.getNode("name",1).getValue() ); i+=1; } - } + } } var path = getprop("/sim/fg-root") ~ "/AI"; diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml index 4b58249d4..337661c72 100644 --- a/gui/dialogs/sound.xml +++ b/gui/dialogs/sound.xml @@ -8,9 +8,27 @@ 400 vbox - - - + + hbox + 1 + + + + + + 1 + + + @@ -49,7 +67,7 @@ 10 - + 0 1 @@ -139,7 +157,7 @@ /sim/sound/enabled - + 3 1 @@ -173,7 +191,7 @@ /sim/sound/enabled - + 4 1 @@ -219,7 +237,7 @@ /sim/sound/enabled - + 5 1 @@ -262,7 +280,7 @@ hbox 10 - + + @@ -57,6 +75,8 @@ + + hbox 10 @@ -66,10 +86,10 @@ true true - dialog-apply + dialog-apply - dialog-close + dialog-close true @@ -77,7 +97,7 @@ Apply true - dialog-apply + dialog-apply true @@ -85,7 +105,7 @@ Reset true - dialog-update + dialog-update true @@ -93,7 +113,7 @@ Cancel Esc - dialog-close + dialog-close diff --git a/gui/dialogs/stereoscopic-view-options.xml b/gui/dialogs/stereoscopic-view-options.xml index b873861fa..a5c55fd90 100644 --- a/gui/dialogs/stereoscopic-view-options.xml +++ b/gui/dialogs/stereoscopic-view-options.xml @@ -105,4 +105,16 @@ + + + + + diff --git a/gui/dialogs/system-failures.xml b/gui/dialogs/system-failures.xml index 77e6b4799..64be83cc4 100644 --- a/gui/dialogs/system-failures.xml +++ b/gui/dialogs/system-failures.xml @@ -10,12 +10,12 @@ # Code to populate the engine entries. var groups = cmdarg().getChildren("group"); - var group = groups[3].getChildren("group")[2]; + var group = groups[1].getChildren("group")[2]; var engines = props.globals.getNode("/engines"); var row = 4; var engine = 0; var i = 0; - + group.removeChildren("checkbox"); group.removeChildren("input"); group.removeChildren("text"); @@ -28,66 +28,78 @@ target = group.getNode("text[" ~ i ~ "]", 1); props.copy(group.getNode("mtbf-label"), target); i += 1; - + foreach (var e; engines.getChildren("engine")) { - if ((e.getChild("starter") != nil) or (e.getChild("running") != nil)) { + if (((e.getChild("starter") != nil) and (e.getChild("starter") != "")) or + ((e.getChild("running") != nil) and (e.getChild("running") != "")) ) { row = row + 1; - + # Set up the label target = group.getNode("text[" ~ i ~ "]", 1); props.copy(group.getNode("text-template"), target); target.getNode("row").setValue(row); - + if (size(engines.getChildren("engine")) == 1) { target.getNode("label").setValue("Engine"); } else { # Engines are indexed from 1 in the GUI. target.getNode("label").setValue("Engine " ~ (engine + 1)); } - + # Now the checkbox target = group.getNode("checkbox[" ~ i ~ "]", 1); - props.copy(group.getChild("checkbox-template"), target); + props.copy(group.getChild("checkbox-template"), target); target.getNode("row").setValue(row); var failure = "/sim/failure-manager/engines/engine[" ~ engine ~ "]/serviceable"; target.getNode("property").setValue(failure); - + # Finally the MTBF target = group.getNode("input[" ~ i ~ "]", 1); props.copy(group.getChild("input-template"), target); target.getNode("row").setValue(row); i += 1; - + var mtbf = "/sim/failure-manager/engines/engine[" ~ engine ~ "]/mtbf"; target.getNode("property").setValue(mtbf); engine += 1; } } - - + + hbox + 1 + + + 1 + + - - hbox - - + - - hbox + left - - - - + + + + hbox @@ -103,7 +115,7 @@ 0 - + 0 2 @@ -192,57 +204,57 @@ right - + 5 1 /sim/failure-manager/controls/flight/aileron/serviceable - + 5 2 /sim/failure-manager/controls/flight/aileron/mtbf - + 6 0 right - + 6 1 /sim/failure-manager/controls/flight/elevator/serviceable - + 6 2 /sim/failure-manager/controls/flight/elevator/mtbf - + 7 0 right - + 7 1 /sim/failure-manager/controls/flight/rudder/serviceable - + 7 2 /sim/failure-manager/controls/flight/rudder/mtbf - + @@ -252,7 +264,7 @@ table center top - + 0 0 @@ -264,58 +276,58 @@ 2 - + 1 0 right - + 1 1 /gear/serviceable - + 1 2 /sim/failure-manager/controls/gear/gear-down/mcbf - + 2 0 right - + 2 1 /sim/failure-manager/controls/flight/flaps/serviceable - + 2 2 /sim/failure-manager/controls/flight/flaps/mcbf - + 3 0 right - + 3 1 /sim/failure-manager/controls/flight/speedbrake/serviceable - + 3 2 @@ -324,46 +336,48 @@ - + table center top - + 0 0 - + 0 2 - + 0 right - + 1 - + 2 - + + + hbox diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml index 7d79fefc4..50688ff21 100644 --- a/gui/dialogs/timeofday.xml +++ b/gui/dialogs/timeofday.xml @@ -9,18 +9,17 @@ hbox 1 - + - + 1 - + - - 6 - - - - 6 - - true @@ -261,4 +252,15 @@ + + + + diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml index b105ee1db..7d71cc515 100644 --- a/gui/dialogs/view.xml +++ b/gui/dialogs/view.xml @@ -5,15 +5,37 @@ false vbox + + hbox + 1 + + + + + + 1 + + + + + + - - - + - var group = cmdarg().getNode("group"); + var group = cmdarg().getChildren("group")[1]; var ac = getprop("/sim/aircraft"); group.removeChildren("checkbox"); group.removeChildren("hrule"); @@ -64,6 +86,8 @@ + + + @@ -55,7 +56,7 @@ hbox - + /sim/gui/dialogs/weather-scenario/state @@ -73,7 +74,7 @@ 0 1 - + /sim/gui/dialogs/weather-scenario/state @@ -83,7 +84,7 @@ 0 2 80 - + /sim/gui/dialogs/weather-scenario/state @@ -92,7 +93,7 @@ 0 3 - + /sim/gui/dialogs/weather-scenario/state @@ -405,7 +406,7 @@ hbox - + /sim/gui/dialogs/weather-scenario/state @@ -423,7 +424,7 @@ 0 0 - + /sim/gui/dialogs/weather-scenario/state @@ -432,7 +433,7 @@ 0 1 - + /sim/gui/dialogs/weather-scenario/state @@ -477,7 +478,7 @@ 0 3 - + /sim/gui/dialogs/weather-scenario/state @@ -526,7 +527,7 @@ vbox - + vbox @@ -1140,7 +1141,7 @@ hbox - + /sim/gui/dialogs/weather-scenario/state @@ -1159,7 +1160,7 @@ 0 0 - + /sim/gui/dialogs/weather-scenario/state @@ -1169,7 +1170,7 @@ 1 2 - + /sim/gui/dialogs/weather-scenario/state @@ -1178,7 +1179,7 @@ 0 3 - + /sim/gui/dialogs/weather-scenario/state @@ -1187,7 +1188,7 @@ 0 4 - + /sim/gui/dialogs/weather-scenario/state @@ -1196,7 +1197,7 @@ 0 5 - + /sim/gui/dialogs/weather-scenario/state @@ -1436,7 +1437,7 @@ - + @@ -1548,9 +1549,20 @@ - + + + + + - - - - dialog-show - ai - -