From 99bcbe8ea5e77bffa7d88fb731793cdfcdb1b89e Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sat, 3 Nov 2007 14:08:39 +0000
Subject: [PATCH] change global dynamic-view flag from
 /sim/view[0]/dynamic/enabled to /sim/current-view/dynamic-view. There are
 additionally <dynamic-view> settings per view, but those only enable it for
 that view if it's globally turned on.

---
 Nasal/dynamic_view.nas | 4 ++--
 gui/menubar.xml        | 2 +-
 preferences.xml        | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Nasal/dynamic_view.nas b/Nasal/dynamic_view.nas
index 655870e64..947e2ee3f 100644
--- a/Nasal/dynamic_view.nas
+++ b/Nasal/dynamic_view.nas
@@ -323,7 +323,7 @@ view_manager.default_helicopter = func {
 
 
 # Update loop for the whole dynamic view manager. It only runs if
-# /sim/view[0]/dynamic/enabled is true.
+# /sim/current-view/dynamic-view is true.
 #
 var main_loop = func(id) {
 	id == loop_id or return;
@@ -427,7 +427,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
 	}
 
 	settimer(func {
-		setlistener("/sim/view/dynamic/enabled", func(n) {
+		setlistener("/sim/current-view/dynamic-view", func(n) {
 			dynamic_view = n.getBoolValue();
 			loop_id += 1;
 			view.resetView();
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 34fbfb725..558989e3e 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -109,7 +109,7 @@
    <binding>
     <command>nasal</command>
     <script>
-     var p = "/sim/view/dynamic/enabled";
+     var p = "/sim/current-view/dynamic-view";
      setprop(p, var i = !getprop(p));
      gui.popupTip("Dynamic View " ~ (i ? "enabled" : "disabled"));
     </script>
diff --git a/preferences.xml b/preferences.xml
index 5881f01cc..83bac4c87 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -167,6 +167,7 @@ Started September 2000 by David Megginson, david@megginson.com
   <current-view>
     <field-of-view type="double">55.0</field-of-view>
     <aspect-ratio-multiplier type="double">1.0</aspect-ratio-multiplier>
+    <dynamic-view type="bool" userarchive="y">false</dynamic-view>
   </current-view>
   <panel>
    <path>Aircraft/Generic/Panels/generic-vfr-panel.xml</path>
@@ -280,9 +281,6 @@ Started September 2000 by David Megginson, david@megginson.com
       <front-right-direction-deg type="double">315</front-right-direction-deg>
       <dynamic-view type="bool">true</dynamic-view>
     </config>
-    <dynamic>
-      <enabled type="bool" userarchive="y">false</enabled>
-    </dynamic>
   </view>
 
   <view>