From 5c4142ed6dd97301646b0c01c11e2849b5dc48cb Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 12 Mar 2013 21:45:06 +0000 Subject: [PATCH] Option to disable mouse-mode feedback. Drive off the 'show view names' checkbox in the view dialog for now, this might evolve into a generic 'on-screen hints' control to avoid an explosion of GUI checkboxes. Also add a GUI checkbox (oh the irony...) to disable mouse flight-controls, to keep AndersG and Emilian happy. --- Nasal/controls.nas | 4 ++++ gui/dialogs/interface-config.xml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/Nasal/controls.nas b/Nasal/controls.nas index 5f0b01a4f..b4152389a 100644 --- a/Nasal/controls.nas +++ b/Nasal/controls.nas @@ -536,6 +536,10 @@ var cycleMouseMode = func(node) if (mode == 3) mode = 0; modeNode.setIntValue(mode); + # this is really a 'show on-screen hints' control + if (getprop('/sim/view-name-popup') == 0) + return; + if (mode == 1) { setprop("/sim/messages/copilot", "Mouse is controlling flight controls. Press TAB to change."); } elsif (mode == 2) { diff --git a/gui/dialogs/interface-config.xml b/gui/dialogs/interface-config.xml index 41f4e6f2b..0ef36d287 100644 --- a/gui/dialogs/interface-config.xml +++ b/gui/dialogs/interface-config.xml @@ -133,6 +133,22 @@ + + + 5 + 0 + + 10 + + + + 5 + 1 + /sim/mouse/skip-flight-controls-mode + + dialog-apply + +