From 30bf47f75363447f54d04c2fe20e20308373f657 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 28 Sep 2018 22:12:42 -0400 Subject: [PATCH] Sim: Add MCDU dialogs! --- A320-main.xml | 18 + Models/Instruments/MCDU/MCDU.nas | 8 +- Models/Instruments/MCDU/MCDU1.xml | 15 +- Models/Instruments/MCDU/MCDU2.xml | 15 +- Systems/mcdu1-dlg.xml | 1322 +++++++++++++++++++++++++++++ Systems/mcdu2-dlg.xml | 1322 +++++++++++++++++++++++++++++ revision.txt | 2 +- 7 files changed, 2695 insertions(+), 7 deletions(-) create mode 100644 Systems/mcdu1-dlg.xml create mode 100644 Systems/mcdu2-dlg.xml diff --git a/A320-main.xml b/A320-main.xml index 336ec80f..649dd032 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -328,6 +328,24 @@ + + + + nasal + + + + + + + nasal + + + diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 3efd934f..2dde783d 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1741,13 +1741,13 @@ var MCDU_update_fast = maketimer(0.125, func { }); var showMCDU1 = func { - var dlg = canvas.Window.new([512, 432], "dialog").set("resize", 1); - dlg.setCanvas(MCDU1_display); + var mcdu1_dlg = gui.Dialog.new("sim/gui/dialogs/mcdu1/dialog", "Aircraft/IDG-A32X/Systems/mcdu1-dlg.xml"); + mcdu1_dlg.open(); } var showMCDU2 = func { - var dlg = canvas.Window.new([512, 432], "dialog").set("resize", 1); - dlg.setCanvas(MCDU2_display); + var mcdu2_dlg = gui.Dialog.new("sim/gui/dialogs/mcdu2/dialog", "Aircraft/IDG-A32X/Systems/mcdu2-dlg.xml"); + mcdu2_dlg.open(); } setlistener("/MCDU[0]/page", func { diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml index feaa9c6d..551db650 100644 --- a/Models/Instruments/MCDU/MCDU1.xml +++ b/Models/Instruments/MCDU/MCDU1.xml @@ -9,7 +9,20 @@ res/MCDU1.ac - + + + pick + mcdu1.screen + + + false + + nasal + + + + + pick radnav diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml index d8e7d13d..3dfb0167 100644 --- a/Models/Instruments/MCDU/MCDU2.xml +++ b/Models/Instruments/MCDU/MCDU2.xml @@ -9,7 +9,20 @@ res/MCDU2.ac - + + + pick + mcdu2.screen + + + false + + nasal + + + + + pick radnav diff --git a/Systems/mcdu1-dlg.xml b/Systems/mcdu1-dlg.xml new file mode 100644 index 00000000..e3d6d50e --- /dev/null +++ b/Systems/mcdu1-dlg.xml @@ -0,0 +1,1322 @@ + + + + + + + mcdu1 + table + 0 + 0 + + + 0 + 0 + hbox + + left + + + + + + + 1 + 0 + + + + 2 + 0 + hbox + + + vbox + + + + + + + + + + + + + + + + + + + + + + + + mcdu1 + fill + fill + false + 251 + 216 + + + + + + + + + + + + vbox + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 0 + hbox + + + + + + + + + + + + + + + + + + 4 + 0 + hbox + + + + + + + + + + + + + + + + + + 5 + 0 + hbox + + + vbox + + + table + + + + + + + + + + + + + + + + table + + + + + + + + + + + + + + + + + + + + + + + + + + + + + table + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Systems/mcdu2-dlg.xml b/Systems/mcdu2-dlg.xml new file mode 100644 index 00000000..fbbd8786 --- /dev/null +++ b/Systems/mcdu2-dlg.xml @@ -0,0 +1,1322 @@ + + + + + + + mcdu2 + table + 0 + 0 + + + 0 + 0 + hbox + + left + + + + + + + 1 + 0 + + + + 2 + 0 + hbox + + + vbox + + + + + + + + + + + + + + + + + + + + + + + + mcdu2 + fill + fill + false + 251 + 216 + + + + + + + + + + + + vbox + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 0 + hbox + + + + + + + + + + + + + + + + + + 4 + 0 + hbox + + + + + + + + + + + + + + + + + + 5 + 0 + hbox + + + vbox + + + table + + + + + + + + + + + + + + + + table + + + + + + + + + + + + + + + + + + + + + + + + + + + + + table + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/revision.txt b/revision.txt index 4c7368f7..36aa6d66 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4661 \ No newline at end of file +4662 \ No newline at end of file