diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
index b71e08bd8..8ef19b4a0 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
@@ -51,10 +51,10 @@ handleFreqTransferHold : func (value) { return emesary.Transmitter.ReceiptStatus
handleComVol : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
handleComVolToggle : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },,
-handleDTO : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
-handleFPL : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
-handleCLR : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
-handleCLRHold : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
+handleDTO : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
+handleFPL : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
+handleClear : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
+handleClearHold : func (value) { return emesary.Transmitter.ReceiptStatus_NotProcessed; },
# By default, the FMS knobs will select a new page.
handleFMSOuter : func (value) { return me.page.mfd._pageGroupController.handleFMSOuter(value); },
@@ -71,7 +71,7 @@ handleAltInner : func (value) { return emesary.Transmitter.ReceiptStatus_NotProc
RegisterWithEmesary : func()
{
if (me._recipient == nil){
- me._recipient = emesary.Recipient.new("MFDPageController_" ~ me.page.device.designation);
+ me._recipient = emesary.Recipient.new(me.page.pageName ~ "Controller_" ~ me.page.device.designation);
var pfd_obj = me.page.device;
var controller = me;
me._recipient.Receive = func(notification)
diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/Surround/Surround.nas b/Aircraft/Instruments-3d/FG1000/Nasal/Surround/Surround.nas
index 173289b26..1662f7aa5 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/Surround/Surround.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/Surround/Surround.nas
@@ -190,7 +190,6 @@ var Surround =
assert(page != nil, "Unable to find page " ~ pageToLoad);
me.device.selectPage(page);
- me.hideMenu();
},
incrPageGroup : func(val) {
var incr_or_decr = (val > 0) ? 1 : -1;
diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/constants.nas b/Aircraft/Instruments-3d/FG1000/Nasal/constants.nas
index 03fc4f6dc..e54cee974 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/constants.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/constants.nas
@@ -99,6 +99,8 @@ FASCIA = {
NOSE_UP : 43,
NOSE_DOWN : 44,
+ JOYSTICK_PRESS : 45
+
};
var SURFACE_TYPES = {
diff --git a/gui/dialogs/fg1000.xml b/gui/dialogs/fg1000.xml
index 8b45c6460..a33ef9ff8 100644
--- a/gui/dialogs/fg1000.xml
+++ b/gui/dialogs/fg1000.xml
@@ -75,6 +75,19 @@
30
/gui/dialogs/fg1000/nav-vol
+ dialog-apply
+
+ nasal
+
+
@@ -114,12 +121,36 @@
25
25
+
+ nasal
+
+
@@ -143,8 +198,16 @@
25
0
- property-toggle
- /instrumentation/nav-selected
+ nasal
+
@@ -155,6 +218,7 @@
hdg
20
/gui/dialogs/fg1000/hdg
+ dialog-apply
@@ -323,24 +395,72 @@
25
25
+
+ nasal
+
+
@@ -399,51 +519,6 @@
append(listeners, softkey_listener);
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/fms-incr-large-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.FMS_OUTER, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/fms-incr-small-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.FMS_INNER, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/fms-decr-large-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.FMS_OUTER, Value: -1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/fms-decr-small-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.FMS_INNER, Value: -1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/range-decr-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.RANGE, Value: -1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/range-incr-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.RANGE, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/crsr-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.FMS_CRSR, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/ent-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.ENT, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
- append(listeners, setlistener("/sim/gui/dialogs/fg1000/clr-pressed", func(v) {
- var notification = notifications.PFDEventNotification.new("MFD", 1, notifications.PFDEventNotification.HardKeyPushed, { Id: fg1000.FASCIA.CLR, Value: 1.0 });
- emesary.GlobalTransmitter.NotifyAll(notification);
- } ));
-
]]>
@@ -623,6 +698,7 @@
30
/gui/dialogs/fg1000/com-vol
+ dialog-apply
@@ -662,12 +732,36 @@
25
25
+
+ nasal
+
+
@@ -691,8 +809,16 @@
25
0
- property-toggle
- /instrumentation/nav-selected
+ nasal
+
@@ -704,6 +830,7 @@
baro
20
/gui/dialogs/fg1000/baro
+ dialog-apply
@@ -723,8 +850,16 @@
75
25
- property-toggle
- /instrumentation/com-selected
+ nasal
+
@@ -744,9 +879,16 @@
25
25
- property-assign
- /sim/gui/dialogs/fg1000/range-incr-pressed
- 1
+ nasal
+
@@ -772,6 +921,18 @@
25
map-up
+
+ nasal
+
+
@@ -813,6 +1022,18 @@
25
DTO
+
+ nasal
+
+
@@ -876,9 +1147,16 @@
25
25
- property-assign
- /sim/gui/dialogs/fg1000/fms-decr-large-pressed
- 1
+ nasal
+
@@ -922,9 +1221,16 @@
50
25
- property-assign
- /sim/gui/dialogs/fg1000/crsr-pressed
- 1
+ nasal
+