From 2901d032c48f4e2715c2a078bb924bd525d7762f Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 5 May 2018 12:48:40 -0400 Subject: [PATCH] System: Update ACCONFIG to V1.5.0 --- A320-main.xml | 1 + AircraftConfig/about.xml | 3 +- AircraftConfig/acconfig.nas | 12 +++-- .../{du-framerate.xml => du-quality.xml} | 6 +-- AircraftConfig/error-mismatch.xml | 4 +- AircraftConfig/help.xml | 5 ++ AircraftConfig/main.xml | 48 +++++++++++++++++-- AircraftConfig/welcome.xml | 15 ++++++ revision.txt | 2 +- 9 files changed, 80 insertions(+), 16 deletions(-) rename AircraftConfig/{du-framerate.xml => du-quality.xml} (96%) diff --git a/A320-main.xml b/A320-main.xml index 96dc0c99..cc657706 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -731,6 +731,7 @@ 0 + 0 0 0 diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index 6b8d249c..676e9acd 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -12,7 +12,6 @@ aircraft-config-about vbox - 800 hbox @@ -66,7 +65,7 @@ left - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index ab3c31ac..ca253478 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -87,6 +87,7 @@ setprop("/systems/acconfig/out-of-date", 0); setprop("/systems/acconfig/mismatch-code", "0x000"); setprop("/systems/acconfig/mismatch-reason", "XX"); setprop("/systems/acconfig/options/keyboard-mode", 0); +setprop("/systems/acconfig/options/laptop-mode", 0); setprop("/systems/acconfig/options/adirs-skip", 0); setprop("/systems/acconfig/options/welcome-skip", 0); setprop("/systems/acconfig/options/pfd-rate", 1); @@ -107,7 +108,7 @@ var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircr var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/IDG-A32X/AircraftConfig/updated.xml"); var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml"); var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml"); -var du_framerate = gui.Dialog.new("sim/gui/dialogs/acconfig/du-framerate/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-framerate.xml"); +var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml"); spinning.start(); init_dlg.open(); @@ -127,18 +128,20 @@ setlistener("/systems/acconfig/new-revision", func { var mismatch_chk = func { if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201730) { setprop("/systems/acconfig/mismatch-code", "0x121"); - setprop("/systems/acconfig/mismatch-reason", "FGFS version older than 2017.3.0, please update FlightGear."); + setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2017.3.0."); if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } print("Mismatch: 0x121"); + welcome_dlg.close(); } else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) { setprop("/systems/acconfig/mismatch-code", "0x223"); - setprop("/systems/acconfig/mismatch-reason", "The aircraft position is invalid for initialization. Check your scenery."); + setprop("/systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery."); if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } print("Mismatch: 0x223"); + welcome_dlg.close(); } else if (getprop("/systems/acconfig/libraries-loaded") != 1) { setprop("/systems/acconfig/mismatch-code", "0x247"); setprop("/systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft."); @@ -146,6 +149,7 @@ var mismatch_chk = func { error_mismatch.open(); } print("Mismatch: 0x247"); + welcome_dlg.close(); } } @@ -170,11 +174,13 @@ setlistener("/sim/signals/fdm-initialized", func { var readSettings = func { io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options"); setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode")); + setprop("/options/system/laptop-mode", getprop("/systems/acconfig/options/laptop-mode")); setprop("/controls/adirs/skip", getprop("/systems/acconfig/options/adirs-skip")); } var writeSettings = func { setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode")); + setprop("/systems/acconfig/options/laptop-mode", getprop("/options/system/laptop-mode")); setprop("/systems/acconfig/options/adirs-skip", getprop("/controls/adirs/skip")); io.write_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options"); } diff --git a/AircraftConfig/du-framerate.xml b/AircraftConfig/du-quality.xml similarity index 96% rename from AircraftConfig/du-framerate.xml rename to AircraftConfig/du-quality.xml index 78ec2657..8b60725d 100644 --- a/AircraftConfig/du-framerate.xml +++ b/AircraftConfig/du-quality.xml @@ -10,14 +10,14 @@ - aircraft-config-du-framerate + aircraft-config-du-quality vbox hbox left - + @@ -357,6 +372,29 @@ true + + + left + + /systems/acconfig/extra-stuff + + /options/system/laptop-mode + + property-toggle + /options/system/laptop-mode + + + dialog-apply + + + nasal + + + true + + left diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index 19de2518..7b303da6 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -19,6 +19,21 @@ left + 1 +