From bbb91f7c64f92480c43032f400722ed19f2e449d Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 2 Apr 2013 18:01:59 +0100
Subject: [PATCH 1/2] Scenarios can be loaded/unloaded at runtime.

State is saved to autosave.xml, and --disable-scenarios still avoids
loading any scenario at launch. At runtime scenarios can be added or
removed as normal.
---
 gui/dialogs/scenario.xml | 61 +++++++++-------------------------------
 1 file changed, 14 insertions(+), 47 deletions(-)

diff --git a/gui/dialogs/scenario.xml b/gui/dialogs/scenario.xml
index cf2f97b71..84a93ceec 100644
--- a/gui/dialogs/scenario.xml
+++ b/gui/dialogs/scenario.xml
@@ -61,24 +61,10 @@
     </binding>
   </checkbox>
 
-  <checkbox>
-    <halign>left</halign>
-    <label>Enable AI scenarios (requires restart)</label>
-    <name>enable-ai-scenarios</name>
-    <property>/sim/ai/scenarios-enabled</property>
-    <binding>
-        <command>dialog-apply</command>
-        <object-name>enable-ai-scenarios</object-name>
-    </binding>
-  </checkbox>
-
   <text><label/></text>
 
   <text>
-    <label>Choose active scenario(s) for the next program start</label>
-    <enable>
-      <property>/sim/ai/scenarios-enabled</property>
-    </enable>
+    <label>Choose active scenario(s) </label>
   </text>
 
   <hrule/>
@@ -105,23 +91,7 @@
       <halign>center</halign>
 
     <button>
-      <legend>OK</legend>
-      <equal>true</equal>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>nasal</command>
-        <script>apply()</script>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-
-    <button>
-      <legend>Cancel</legend>
-      <equal>true</equal>
+      <legend>Close</legend>
       <key>Esc</key>
       <binding>
         <command>dialog-close</command>
@@ -165,26 +135,23 @@
         var label = string.replace(file, "_", " ");
         if (nameN != nil)
             label = nameN.getValue();
+        
         cb.getNode("label",1).setValue(label);
         cb.getNode("name",1).setValue(file);
-        cb.getNode("enable/property",1).setValue("/sim/ai/scenarios-enabled");
+        
+        var applyBind = cb.addChild("binding", 0);
+        applyBind.getNode("command", 1).setValue("dialog-apply");
+        
+        var bind = cb.addChild("binding", 1);
+        bind.getNode("command", 1).setValue("load-scenario");
+        bind.getNode("name", 1).setValue(file);
+        bind.getNode("load-property", 1).setValue(propertyRoot.getNode("selected").getPath());
+        
+        #cb.getNode("enable/property",1).setValue("/sim/ai/scenarios-enabled");
+        
         group.getNode("empty",1).getNode("stretch",1).setValue("true");
       }
 
-      var apply = func {
-        var targetRoot = props.globals.getNode("sim/ai",1);
-        targetRoot.removeChildren("scenario");
-        var i = 0;
-        foreach( var src; props.globals.getNode("sim/gui/dialogs/scenario",1).getChildren( "scenario" ) ) {
-          if( src.getNode("selected",1).getValue() ) {
-            var scnNode = targetRoot.getChild("scenario", i, 1 );
-            scnNode.setAttribute("userarchive",1);
-            scnNode.setValue( src.getNode("name",1).getValue() );
-            i+=1;
-          }
-        }
-      }
-
       var path = getprop("/sim/fg-root") ~ "/AI";
       var i = -1;
       foreach(var file; sort(directory(path), cmp))

From ccfdd519ae4d55766a522d0472eede64dd172ab8 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 2 Apr 2013 18:08:05 +0100
Subject: [PATCH 2/2] Fix frequency range on the kx165.

---
 Aircraft/Instruments-3d/kx165/kx165-1.xml | 4 ++--
 Aircraft/Instruments-3d/kx165/kx165-2.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Aircraft/Instruments-3d/kx165/kx165-1.xml b/Aircraft/Instruments-3d/kx165/kx165-1.xml
index cbaf841bf..cc7b8d3b1 100644
--- a/Aircraft/Instruments-3d/kx165/kx165-1.xml
+++ b/Aircraft/Instruments-3d/kx165/kx165-1.xml
@@ -677,8 +677,8 @@
         <command>property-adjust</command>
         <property alias="../../../../params/nav-frq-standby"/>
         <factor>1</factor>
-        <min>118.0</min>
-        <max>137.0</max>
+        <min>108.0</min>
+        <max>118.0</max>
         <wrap>true</wrap>
       </binding>
     </action>
diff --git a/Aircraft/Instruments-3d/kx165/kx165-2.xml b/Aircraft/Instruments-3d/kx165/kx165-2.xml
index dd5b48747..9bb7c0dce 100644
--- a/Aircraft/Instruments-3d/kx165/kx165-2.xml
+++ b/Aircraft/Instruments-3d/kx165/kx165-2.xml
@@ -676,8 +676,8 @@
         <command>property-adjust</command>
         <property alias="../../../../params/nav-frq-standby"/>
         <factor>1</factor>
-        <min>118.0</min>
-        <max>137.0</max>
+        <min>108.0</min>
+        <max>118.0</max>
         <wrap>true</wrap>
       </binding>
     </action>