From f591120032d3bc1f5582ae425f527a135c085d83 Mon Sep 17 00:00:00 2001 From: Julian Smith <jules@op59.net> Date: Sun, 4 Aug 2019 17:10:47 +0100 Subject: [PATCH] Disabled old 'Model View' selector by default. It is now called 'Legacy multiplayer view selector', and enabled/disabled via new checkbox in the 'View - View Options' dialogue. --- Nasal/view.nas | 13 ++++++++++++- gui/dialogs/view.xml | 9 +++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Nasal/view.nas b/Nasal/view.nas index 7169b071f..c8209f080 100644 --- a/Nasal/view.nas +++ b/Nasal/view.nas @@ -467,10 +467,21 @@ var model_view_handler_class = { m.dialog = props.Node.new({ "dialog-name": "model-view" }); m.listener = setlistener("/sim/signals/multiplayer-updated", func m._update_(), 1); m.reset(); + _setlistener("/sim/menubar/legacy-multiplayer-view-selector/enabled", func { + var enabled = getprop("/sim/menubar/legacy-multiplayer-view-selector/enabled"); + if (enabled) { + m.start(); + } + else { + m.stop(); + } + }); return m; }, start: func() { - fgcommand("dialog-show", me.dialog); + if (getprop('/sim/menubar/legacy-multiplayer-view-selector/enabled')) { + fgcommand("dialog-show", me.dialog); + } me.next(0); }, stop: func() { diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml index 77c42287b..69a89a7d8 100644 --- a/gui/dialogs/view.xml +++ b/gui/dialogs/view.xml @@ -257,6 +257,15 @@ <label>sec.</label> </text> </group> + + <checkbox> + <halign>left</halign> + <label>Legacy multiplayer view selector</label> + <property>/sim/menubar/legacy-multiplayer-view-selector/enabled</property> + <binding> + <command>dialog-apply</command> + </binding> + </checkbox> </group>