From b98a091e0be6b9aad18e498560a97855dbecdde1 Mon Sep 17 00:00:00 2001
From: Durk Talsma <durk@localhost.(none)>
Date: Sun, 21 Aug 2011 14:28:36 +0200
Subject: [PATCH 01/10] Fix axis bindings for windows. Make compatible with
 windows.

---
 Input/Joysticks/Saitek/Pro-Flight-Yoke.xml | 558 +++++++++++----------
 1 file changed, 297 insertions(+), 261 deletions(-)

diff --git a/Input/Joysticks/Saitek/Pro-Flight-Yoke.xml b/Input/Joysticks/Saitek/Pro-Flight-Yoke.xml
index f64f7b4dc..b4d5ffd04 100644
--- a/Input/Joysticks/Saitek/Pro-Flight-Yoke.xml
+++ b/Input/Joysticks/Saitek/Pro-Flight-Yoke.xml
@@ -1,265 +1,301 @@
 <?xml version="1.0"?>
 <!-- Saitek Pro Flight Yoke
-
-  Copyright (C) 2008  Oliver Schroeder  (fgfs(at)o-schroeder.de)
-  This file is released under the GPL license.
--->
+     
+     Copyright (C) 2008  Oliver Schroeder  (fgfs(at)o-schroeder.de)
+     This file is released under the GPL license.
+     -->
 <PropertyList>
- <name>Saitek Saitek Pro Flight Yoke</name>
- <name>Saitek Pro Flight Yoke</name>
-
- <axis n="0">
-  <desc>Aileron</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/aileron</property>
-   <squared type="bool">true</squared>
-  </binding>
- </axis>
- <axis n="1">
-  <desc>Elevator</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/elevator</property>
-   <factor type="double">-1.0</factor>
-   <squared type="bool">true</squared>
-  </binding>
- </axis>
- <!-- Throttle Quadrant -->
- <axis n="2">
-  <desc>Throttle</desc>
-  <binding>
-   <command>nasal</command>
-   <script>controls.throttleAxis()</script>
-  </binding>
- </axis>
- <axis n="3">
-  <desc>Prop Pitch</desc>
-  <binding>
-   <command>nasal</command>
-   <script>controls.propellerAxis()</script>
-  </binding>
- </axis>
- <axis n="4">
-  <desc>Mixture </desc>
-  <binding>
-   <command>nasal</command>
-   <script>controls.mixtureAxis()</script>
-  </binding>
- </axis>
-
- <axis n="5">
-  <desc>View Direction</desc>
-  <low>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-heading-offset-deg</property>
-    <step type="double">1.0</step>
-   </binding>
-  </low>
-  <high>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-heading-offset-deg</property>
-    <step type="double">-1.0</step>
-   </binding>
-  </high>
- </axis>
-
- <axis n="6">
-  <desc>View Elevation</desc>
-  <low>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-pitch-offset-deg</property>
-    <step type="double">1.0</step>
-   </binding>
-  </low>
-  <high>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>/sim/current-view/goal-pitch-offset-deg</property>
-    <step type="double">-1.0</step>
-   </binding>
-  </high>
- </axis>
- <!-- Buttons on the Yoke -->
- <button n="0">
-     <desc>Cycle View</desc>
-     <repeatable>false</repeatable>
-     <binding>
-         <command>nasal</command>
-         <script>view.stepView(1)</script>
-     </binding>
- </button>
- <button n="1"> <!-- Labled as D -->
-  <desc>Toggle parking break</desc>
-  <binding>
-   <command>property-toggle</command>
-   <property>/controls/gear/brake-parking</property>
-  </binding>
- </button>
- <button n="2"> <!-- Labled as A1 -->
-  <desc>Elevator trim down</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.elevatorTrim(0.75)</script>
-  </binding>
- </button>
- <button n="3"> <!-- Labled as A2 -->
-  <desc>Elevator trim up</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.elevatorTrim(-0.75)</script>
-  </binding>
- </button>
- <button n="4"> <!-- Labled as B1 -->
-  <desc>Zoom In</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/sim/current-view/field-of-view</property>
-   <step type="double">-0.5</step>
-  </binding>
- </button>
- <button n="5"> <!-- LAbled as B2 -->
-  <desc>Zoom Out</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/sim/current-view/field-of-view</property>
-   <step type="double">+0.5</step>
-  </binding>
- </button>
- <button n="6"> <!-- Labled as C1 -->
-  <desc>Aileron trim left</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.aileronTrim(-0.75)</script>
-  </binding>
- </button>
- <button n="7"> <!-- Labled as C2 -->
-  <desc>Aileron trim right</desc>
-  <repeatable>true</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.aileronTrim(0.75)</script>
-  </binding>
- </button>
-
-  <!-- Buttons on the throttle Quadrant -->
- <button n="14"> <!-- Labled as T1 -->
-  <desc>Flaps up</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.flapsDown(-1)</script>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>nasal</command>
-    <script>controls.flapsDown(0)</script>
-   </binding>
-  </mod-up>
- </button>
- <button n="15"> <!-- Labled as T2 -->
-  <desc>Flaps down</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.flapsDown(1)</script>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>nasal</command>
-    <script>controls.flapsDown(0)</script>
-   </binding>
-  </mod-up>
- </button>
- <button n="16"> <!-- Labled as T3 -->
-  <desc>Gear up</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.gearDown(-1)</script>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>nasal</command>
-    <script>controls.gearDown(0)</script>
-   </binding>
-  </mod-up>
- </button>
- <button n="17"> <!-- Labled as T4 -->
-  <desc>Gear down</desc>
-  <repeatable>false</repeatable>
-  <binding>
-   <command>nasal</command>
-   <script>controls.gearDown(1)</script>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>nasal</command>
-    <script>controls.gearDown(0)</script>
-   </binding>
-  </mod-up>
- </button>
- <button n="18"> <!-- Labled as T5 -->
-     <desc>Retract Spoilers</desc>
-     <repeatable>false</repeatable>
-     <binding>
-         <command>nasal</command>
-         <script>controls.stepSpoilers(-1)</script>
-     </binding>
-     <mod-up>
-         <binding>
-             <command>nasal</command>
-             <script>controls.stepSpoilers(0)</script>
-         </binding>
-     </mod-up>
- </button>
- 
- <button n="19"> <!-- Labled as T6 -->
-     <desc>Deploy Spoilers</desc>
-     <repeatable>false</repeatable>
-     <binding>
-         <command>nasal</command>
-         <script>controls.stepSpoilers(1)</script>
-     </binding>
-     <mod-up>
-         <binding>
-             <command>nasal</command>
-             <script>controls.stepSpoilers(0)</script>
-         </binding>
-     </mod-up>
- </button>
- <button n="20">
-   <desc>thrust reverse</desc>
-     <repeatable type="bool">false</repeatable>
-     <binding>
-       <command>nasal</command>
-       <script>
-           props.setAll("/controls/engines/engine", "reverser", 1);
-           props.setAll("/controls/engines/engine", "throttle", 1);
-           gui.popupTip("Thrust reverse on!");
-       </script>
-     </binding>
-     <mod-up>
-       <binding>
-         <command>nasal</command>
-         <script>
-             props.setAll("/controls/engines/engine", "reverser", 0);
-             props.setAll("/controls/engines/engine", "throttle", 0);
-             gui.popupTip("Thrust reverse off!");
-         </script>
-       </binding>
-     </mod-up>
-        </button>
+    <name>Saitek Saitek Pro Flight Yoke</name>
+    <name>Saitek Pro Flight Yoke</name>
+    
+    <axis n="0">
+        <desc>Aileron</desc>
+        <binding>
+            <command>property-scale</command>
+            <property>/controls/flight/aileron</property>
+            <squared type="bool">true</squared>
+        </binding>
+    </axis>
+    <axis n="1">
+        <desc>Elevator</desc>
+        <binding>
+            <command>property-scale</command>
+            <property>/controls/flight/elevator</property>
+            <factor type="double">-1.0</factor>
+            <squared type="bool">true</squared>
+        </binding>
+    </axis>
+    <!-- Throttle Quadrant -->
+    <axis n="2">
+        <desc>Throttle</desc>
+        <binding>
+            <command>nasal</command>
+            <script>controls.throttleAxis()</script>
+        </binding>
+    </axis>
+    <axis>
+        <number>
+            <unix>3</unix>
+            <windows>4</windows>
+        </number>
+        <desc>Prop Pitch</desc>
+        <binding>
+            <command>nasal</command>
+            <script>controls.propellerAxis()</script>
+        </binding>
+    </axis>
+    <axis>
+        <number>
+            <unix>4</unix>
+            <windows>3</windows>
+        </number>
+        <desc>Mixture</desc>
+        <binding>
+            <command>nasal</command>
+            <script>controls.mixtureAxis()</script>
+        </binding>
+    </axis>
+    <!-- Coolie Hat -->
+    <axis>
+        <number>
+            <unix>5</unix>
+            <windows>6</windows>
+        </number>
+        <desc>View Direction</desc>
+        <low>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-heading-offset-deg</property>
+                <step type="double">1.0</step>
+            </binding>
+        </low>
+        <high>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-heading-offset-deg</property>
+                <step type="double">-1.0</step>
+            </binding>
+        </high>
+    </axis>
+    <axis>
+        <number>
+            <unix>6</unix>
+        </number>
+        <desc>View Elevation</desc>
+        <low>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-pitch-offset-deg</property>
+                <step type="double">1.0</step>
+            </binding>
+        </low>
+        <high>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-pitch-offset-deg</property>
+                <step type="double">-1.0</step>
+            </binding>
+        </high>
+    </axis>
+    <axis>
+        <number>
+            <windows>7</windows>
+        </number>
+        <desc>View Elevation</desc>
+        <low>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-pitch-offset-deg</property>
+                <step type="double">-1.0</step>
+            </binding>
+        </low>
+        <high>
+            <repeatable>true</repeatable>
+            <binding>
+                <command>property-adjust</command>
+                <property>/sim/current-view/goal-pitch-offset-deg</property>
+                <step type="double">1.0</step>
+            </binding>
+        </high>
+    </axis>
+    <!-- Buttons on the Yoke -->
+    <button n="0">
+        <desc>Cycle View</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>view.stepView(1)</script>
+        </binding>
+    </button>
+    <button n="1"> <!-- Labled as D -->
+        <desc>Toggle parking break</desc>
+        <binding>
+            <command>property-toggle</command>
+            <property>/controls/gear/brake-parking</property>
+        </binding>
+    </button>
+    <button n="2"> <!-- Labled as A1 -->
+        <desc>Elevator trim down</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.elevatorTrim(0.75)</script>
+        </binding>
+    </button>
+    <button n="3"> <!-- Labled as A2 -->
+        <desc>Elevator trim up</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.elevatorTrim(-0.75)</script>
+        </binding>
+    </button>
+    <button n="4"> <!-- Labled as B1 -->
+        <desc>Zoom In</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>property-adjust</command>
+            <property>/sim/current-view/field-of-view</property>
+            <step type="double">-0.5</step>
+        </binding>
+    </button>
+    <button n="5"> <!-- LAbled as B2 -->
+        <desc>Zoom Out</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>property-adjust</command>
+            <property>/sim/current-view/field-of-view</property>
+            <step type="double">+0.5</step>
+        </binding>
+    </button>
+    <button n="6"> <!-- Labled as C1 -->
+        <desc>Aileron trim left</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.aileronTrim(-0.75)</script>
+        </binding>
+    </button>
+    <button n="7"> <!-- Labled as C2 -->
+        <desc>Aileron trim right</desc>
+        <repeatable>true</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.aileronTrim(0.75)</script>
+        </binding>
+    </button>
+    
+    <!-- Buttons on the throttle Quadrant -->
+    <button n="14"> <!-- Labled as T1 -->
+        <desc>Flaps up</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.flapsDown(-1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.flapsDown(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    <button n="15"> <!-- Labled as T2 -->
+        <desc>Flaps down</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.flapsDown(1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.flapsDown(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    <button n="16"> <!-- Labled as T3 -->
+        <desc>Gear up</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.gearDown(-1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.gearDown(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    <button n="17"> <!-- Labled as T4 -->
+        <desc>Gear down</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.gearDown(1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.gearDown(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    <button n="18"> <!-- Labled as T5 -->
+        <desc>Retract Spoilers</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.stepSpoilers(-1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.stepSpoilers(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    
+    <button n="19"> <!-- Labled as T6 -->
+        <desc>Deploy Spoilers</desc>
+        <repeatable>false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>controls.stepSpoilers(1)</script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>controls.stepSpoilers(0)</script>
+            </binding>
+        </mod-up>
+    </button>
+    <button n="20">
+        <desc>thrust reverse</desc>
+        <repeatable type="bool">false</repeatable>
+        <binding>
+            <command>nasal</command>
+            <script>
+                props.setAll("/controls/engines/engine", "reverser", 1);
+                props.setAll("/controls/engines/engine", "throttle", 1);
+                gui.popupTip("Thrust reverse on!");
+            </script>
+        </binding>
+        <mod-up>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    props.setAll("/controls/engines/engine", "reverser", 0);
+                    props.setAll("/controls/engines/engine", "throttle", 0);
+                    gui.popupTip("Thrust reverse off!");
+                </script>
+            </binding>
+        </mod-up>
+    </button>
 </PropertyList>

From 8e7d7012ce68c0a8823a3abbc6b002f9e2b5017e Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 21 Aug 2011 15:00:45 +0200
Subject: [PATCH 02/10] Directory dialog New directory dialog - just an option
 for the existing file dialog really.

---
 Nasal/gui.nas               | 12 +++++++++++-
 gui/dialogs/file-select.xml | 24 +++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 511d664e9..bb15dd82d 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -505,7 +505,7 @@ var OverlaySelector = {
 #     selector.open();
 #
 var FileSelector = {
-    new: func(callback, title, button, pattern = nil, dir = "", file = "", dotfiles = 0) {
+    new: func(callback, title, button, pattern = nil, dir = "", file = "", dotfiles = 0, show_files=1) {
         var name = "file-select-";
         var data = props.globals.getNode("/sim/gui/dialogs/", 1);
         for (var i = 1; 1; i += 1)
@@ -520,6 +520,7 @@ var FileSelector = {
         m.set_button(button);
         m.set_directory(dir);
         m.set_file(file);
+        m.set_show_files(show_files);
         m.set_dotfiles(dotfiles);
         m.set_pattern(pattern);
         m.cblistener = setlistener(data.getNode("path", 1), callback);
@@ -530,6 +531,7 @@ var FileSelector = {
     set_button: func(button) { me.data.getNode("button", 1).setValue(button) },
     set_directory: func(dir) { me.data.getNode("directory", 1).setValue(dir) },
     set_file: func(file) { me.data.getNode("selection", 1).setValue(file) },
+    set_show_files: func(show) { me.data.getNode("show-files", 1).setValue(show) },
     set_dotfiles: func(dot) { me.data.getNode("dotfiles", 1).setBoolValue(dot) },
     set_pattern: func(pattern) {
         me.data.removeChildren("pattern");
@@ -545,6 +547,14 @@ var FileSelector = {
     },
 };
 
+##
+# DirSelector - convenience "class" (indeed using a reconfigured FileSelector)
+#
+var DirSelector = {
+  new: func(callback, title, button, dir = "") {
+     return FileSelector.new(callback, title, button, nil, dir, "", 0, show_files=0);
+  }
+};
 
 ##
 # Save/load flight menu functions.
diff --git a/gui/dialogs/file-select.xml b/gui/dialogs/file-select.xml
index 845af2f5e..52c797d66 100644
--- a/gui/dialogs/file-select.xml
+++ b/gui/dialogs/file-select.xml
@@ -94,6 +94,13 @@
 				<command>nasal</command>
 				<script>file_input()</script>
 			</binding>
+			<visible>
+				<equals>  <!-- yes, odd condition. easier ways somehow fail,
+				               since we're changing the values with Nasal below... -->
+					<value>1</value>
+					<value>1</value>
+				</equals>
+			</visible>
 		</input>
 
 		<button>
@@ -134,6 +141,9 @@
 			var path = dlg.getNode("path", 1);
 			var dotfiles = dlg.getNode("dotfiles", 1);
 			dotfiles.setBoolValue(dotfiles.getValue());
+			# disable files to show a directory dialog only
+			self.show_files = dlg.getNode("show-files",1).getValue();
+			self.getNode("group[1]/input/visible/equals/value").setValue(self.show_files);
 
 			var kbdctrl = props.globals.getNode("/devices/status/keyboard/ctrl", 1);
 			var kbdshift = props.globals.getNode("/devices/status/keyboard/shift", 1);
@@ -177,7 +187,7 @@
 
 					if (stat[11] == "dir")
 						append(dirs, e ~ "/");
-					elsif (!size(pattern) or matches(e))
+					elsif (self.show_files and (!size(pattern) or matches(e)))
 						append(files, e);
 				}
 
@@ -239,7 +249,10 @@
 
 			var ok = func {
 				dir_input();
-				file_input();
+				if (self.show_files)
+					file_input();
+				else
+					current.file = "";
 				var p = string.normpath(current.dir ~ "/" ~ current.file);
 				var stat = io.stat(p);
 				path.setValue(stat != nil and stat[11] == "dir" ? p ~ "/" : p);
@@ -254,7 +267,12 @@
 
 			var t = title.getValue();
 			if (t == nil or t == "")
-				t = "Select File";
+			{
+				if (self.show_files)
+					t = "Select Directory";
+				else
+					t = "Select File";
+			}
 			self.getNode("group[0]/text/label").setValue(t);
 
 			current.dir = (var d = dir.getValue()) != nil and d != "" ? d : getprop("/sim/fg-current");

From fb984bf8ce07384e809ed6907d9284272599de13 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 21 Aug 2011 15:17:16 +0200
Subject: [PATCH 03/10] Option to set screenshot directory.

---
 Nasal/gui.nas   | 11 +++++++++++
 gui/menubar.xml |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index bb15dd82d..debc7fba9 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -583,6 +583,17 @@ var load_flight = func {
     load_flight_sel.open();
 }
 
+##
+# Screen-shot directory menu function
+#
+var set_screenshotdir_sel = nil;
+var set_screenshotdir = func {
+    if (set_screenshotdir_sel == nil)
+        set_screenshotdir_sel = gui.DirSelector.new(
+            func(result) { setprop("/sim/paths/screenshot-dir", result.getValue()); },
+            "Select Screenshot Directory", "Ok", getprop("/sim/paths/screenshot-dir"));
+    set_screenshotdir_sel.open();
+}
 
 ##
 # Open property browser with given target path.
diff --git a/gui/menubar.xml b/gui/menubar.xml
index cd8babbdf..e75a0715d 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -62,6 +62,13 @@
 				</script>
 			</binding>
 		</item>
+		<item>
+			<label>Screenshot Directory</label>
+			<binding>
+				<command>nasal</command>
+				<script>gui.set_screenshotdir()</script>
+			</binding>
+		</item>
 		<!--
 		<item>
 		<label>Last snapshot</label>

From 3db846729f08af4ba743e907c89b9615bfa3e5db Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 21 Aug 2011 15:18:09 +0200
Subject: [PATCH 04/10] Documentation fix There is no "hide" option - but a
 "visible" option...

---
 Docs/README.gui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Docs/README.gui b/Docs/README.gui
index 9faa9124a..ad0184943 100644
--- a/Docs/README.gui
+++ b/Docs/README.gui
@@ -160,9 +160,9 @@ properties, though they will ignore any that are not relevant:
  default - true if this is the default object for when the user
    presses the [RETURN] key.
 
- hide - if set to true, hides the whole widget that it is used
+ visible - if set to false, hides the whole widget that it is used
    in, along with its children. There's no empty space reserved
-   for such widgets. The "hide" property can also be used to hide
+   for such widgets. The "visible" property can also be used to hide
    other XML groups from the layouter.
 
 Objects may appear nested within the top-level dialog or a "group"

From b4b527b600eb4cf5668d72e6872f50d5fd4c84fc Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 21 Aug 2011 15:19:02 +0200
Subject: [PATCH 05/10] Add button to select download directory

---
 gui/dialogs/terrasync.xml | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gui/dialogs/terrasync.xml b/gui/dialogs/terrasync.xml
index 0bfae2405..29f5fbd1f 100644
--- a/gui/dialogs/terrasync.xml
+++ b/gui/dialogs/terrasync.xml
@@ -67,16 +67,23 @@
       <row>3</row>
       <col>2</col><colspan>2</colspan>
       <pref-width>400</pref-width>
+      <live>true</live>
       <property>/sim/terrasync/scenery-dir</property>
-      <enable>
-        <property>/sim/terrasync/enabled</property>
-      </enable>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>scenery-dir</object-name>
-      </binding>
+      <enable><false/></enable>
     </input>
 
+    <button>
+      <legend>Change</legend>
+      <equal>true</equal>
+      <border>2</border>
+      <row>3</row>
+      <col>4</col>
+      <binding>
+        <command>nasal</command>
+        <script>controller.open()</script>
+      </binding>
+    </button>
+
     <text>
       <row>4</row>
       <col>2</col><colspan>3</colspan>
@@ -428,4 +435,16 @@
     <empty><stretch>true</stretch></empty>
   </group>
 
+  <nasal>
+    <open><![CDATA[
+        var controller = gui.DirSelector.new(
+            func(result) { setprop("/sim/terrasync/scenery-dir", result.getValue()); },
+            "Select Target Directory for Downloads", "Ok", getprop("/sim/terrasync/scenery-dir"));
+    ]]></open>
+
+    <close><![CDATA[
+      controller.close();
+    ]]></close>
+  </nasal>
+
 </PropertyList>

From b9e80543b1e2b640768bbbe4ffcb7d9734034e69 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 21 Aug 2011 21:43:27 +0100
Subject: [PATCH 06/10] Lighting update for c172p. 1) Add keyboard shortcuts
 for the panel lighting (to make life easier    in the dark. 2) Add lighting
 to the EGT gauge.

---
 Aircraft/c172p/Instruments/EGT/EGT.xml | 11 +++--
 Aircraft/c172p/c172-help.xml           |  4 ++
 Aircraft/c172p/c172p-set.xml           | 58 ++++++++++++++++++--------
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/Aircraft/c172p/Instruments/EGT/EGT.xml b/Aircraft/c172p/Instruments/EGT/EGT.xml
index ea0bb1a8e..fdaa1e46c 100644
--- a/Aircraft/c172p/Instruments/EGT/EGT.xml
+++ b/Aircraft/c172p/Instruments/EGT/EGT.xml
@@ -33,11 +33,14 @@
   <animation>
     <type>material</type>
     <object-name>egt</object-name>
+    <object-name>Needle</object-name>
+    <object-name>Bug</object-name>
+    <object-name>Face</object-name>
     <emission>
-      <red-prop>sim/model/instrument-lighting/emission/red</red-prop>
-      <green-prop>sim/model/instrument-lighting/emission/green</green-prop>
-      <blue-prop>sim/model/instrument-lighting/emission/blue</blue-prop>
-      <factor-prop>controls/lighting/instruments-norm</factor-prop>
+      <red>1.0</red>
+      <green>0.2</green>
+      <blue>0.0</blue>
+      <factor-prop>sim/model/material/instruments/factor</factor-prop>
     </emission>
   </animation>
     
diff --git a/Aircraft/c172p/c172-help.xml b/Aircraft/c172p/c172-help.xml
index bf13aadac..996c18d27 100644
--- a/Aircraft/c172p/c172-help.xml
+++ b/Aircraft/c172p/c172-help.xml
@@ -4,6 +4,10 @@
     <name>Ctrl-c</name>
     <desc>Panel hotspots and labels</desc>
   </key>
+  <key>
+    <name>l/L</name>
+    <desc>Increase/decrease panel lighting</desc>
+  </key>
   <line/>
   <line>_________Engine Start Checklist_________</line>
   <line>Mixture: Rich</line>
diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml
index 88621ed1c..0b7e7e874 100644
--- a/Aircraft/c172p/c172p-set.xml
+++ b/Aircraft/c172p/c172p-set.xml
@@ -241,23 +241,47 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
  </payload>
 
  <input>
-   <keyboard>
-     <key n="115">
-     <name>s</name>
-     <desc>Toggle Starter Switch</desc>
-     <binding>
-       <command>property-assign</command>
-       <property>/controls/switches/starter</property>
-       <value >1</value>
-     </binding>
-     <mod-up>
-       <binding>
-         <command>property-assign</command>
-         <property>/controls/switches/starter</property>
-         <value>0</value>
-       </binding>
-     </mod-up>
-    </key>
+  <keyboard>
+   <key n="76">
+    <name>L</name>
+    <desc>Decrease Panel lighting</desc>
+    <binding>
+     <command>property-adjust</command>
+     <property>controls/lighting/instruments-norm</property>
+     <step>-0.1</step>
+     <min>0</min>
+     <max>1.0</max>
+     <wrap>0</wrap>
+    </binding>
+   </key>
+   <key n="108">
+    <name>l</name>
+    <desc>Increase Panel lighting</desc>
+    <binding>
+     <command>property-adjust</command>
+     <property>controls/lighting/instruments-norm</property>
+     <step>0.1</step>
+     <min>0</min>
+     <max>1.0</max>
+     <wrap>0</wrap>
+    </binding>
+   </key>
+   <key n="115">
+   <name>s</name>
+   <desc>Toggle Starter Switch</desc>
+   <binding>
+    <command>property-assign</command>
+    <property>/controls/switches/starter</property>
+    <value >1</value>
+   </binding>
+   <mod-up>
+    <binding>
+     <command>property-assign</command>
+     <property>/controls/switches/starter</property>
+     <value>0</value>
+    </binding>
+   </mod-up>
+  </key>
   </keyboard> 
  </input>
 

From 74a9f8e1a6597bb03e0a84b9ebe78806591fcef2 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 21 Aug 2011 22:09:04 +0100
Subject: [PATCH 07/10] Extend visibility range of 3d clouds to
 /sim/rendering/clouds3d-vis-range

---
 Effects/cloud.eff    |  8 ++++++++
 Shaders/3dcloud.vert | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Effects/cloud.eff b/Effects/cloud.eff
index bb6d3c31e..8ac147507 100644
--- a/Effects/cloud.eff
+++ b/Effects/cloud.eff
@@ -4,6 +4,9 @@
   <parameters>
     <texture n ="0">
     </texture>
+    <range>
+		  <use>/sim/rendering/clouds3d-vis-range</use>
+    </range>    
   </parameters>
   <technique n="10">
     <predicate>
@@ -63,6 +66,11 @@
         <type>sampler-2d</type>
         <value type="int">0</value>
       </uniform>
+      <uniform>
+        <name>range</name>
+        <type>float</type>
+        <value><use>range</use></value>
+      </uniform>
       <vertex-program-two-side>true</vertex-program-two-side>
     </pass>
   </technique>
diff --git a/Shaders/3dcloud.vert b/Shaders/3dcloud.vert
index 6caaf7134..e69a4b7c5 100644
--- a/Shaders/3dcloud.vert
+++ b/Shaders/3dcloud.vert
@@ -3,6 +3,8 @@
 
 varying float fogFactor;
 
+uniform float range; // From /sim/rendering/clouds3d-vis-range
+
 attribute vec3 usrAttr1;
 attribute vec3 usrAttr2;
 
@@ -40,26 +42,30 @@ void main(void)
   // Determine a lighting normal based on the vertex position from the
   // center of the cloud, so that sprite on the opposite side of the cloud to the sun are darker.
   float n = dot(normalize(-gl_LightSource[0].position.xyz),
-                normalize(vec3(gl_ModelViewMatrix * vec4(- gl_Position.xyz,0.0))));
+                normalize(vec3(gl_ModelViewMatrix * vec4(- gl_Position.x, - gl_Position.y, - gl_Position.z,0.0))));
 
   // Determine the position - used for fog and shading calculations
   vec3 ecPosition = vec3(gl_ModelViewMatrix * gl_Position);
   float fogCoord = abs(ecPosition.z);
+  
+  // Determine fractional height of vertex from 0 at the bottom, and 1 at mid-height.
+  // Used to determine shading.
   float fract = smoothstep(0.0, cloud_height, gl_Position.z + cloud_height);
 
   // Final position of the sprite
   gl_Position = gl_ModelViewProjectionMatrix * gl_Position;
 
-// Determine the shading of the sprite based on its vertical position and position relative to the sun.
+  // Determine the shading of the sprite based on its vertical position and position relative to the sun.
   n = min(smoothstep(-0.5, 0.0, n), fract);
-// Determine the shading based on a mixture from the backlight to the front
+  
+  // Determine the shading based on a mixture from the backlight to the front
   vec4 backlight = gl_LightSource[0].diffuse * shade;
 
   gl_FrontColor = mix(backlight, gl_LightSource[0].diffuse, n);
   gl_FrontColor += gl_FrontLightModelProduct.sceneColor;
 
   // As we get within 100m of the sprite, it is faded out. Equally at large distances it also fades out.
-  gl_FrontColor.a = min(smoothstep(10.0, 100.0, fogCoord), 1.0 - smoothstep(15000.0, 20000.0, fogCoord));
+  gl_FrontColor.a = min(smoothstep(10.0, 100.0, fogCoord), 1.0 - smoothstep(range*0.8, range, fogCoord));
   gl_BackColor = gl_FrontColor;
 
   // Fog doesn't affect clouds as much as other objects.

From 65b1fd20e723323be7273ca98d0c201bcdb1ab07 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Mon, 22 Aug 2011 20:01:55 +0200
Subject: [PATCH 08/10] Location-in-Air: pick nearest VOR/NDB (fix#228)

When entering a duplicate VOR or NDB id into the Location-in-Air
dialog, the first entry in the database was picked. This patch
assumes that the station with the given ID nearest to the current
position was requested.
A better fix would probably be to present the user a list of found
stations - that's something for the future.
---
 gui/dialogs/location-in-air.xml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index b57a0b80c..179dff37f 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -6,8 +6,8 @@
 
   <nasal>
     <open>
-      p = props.globals.getNode("/sim/gui/dialogs/location-in-air/", 1);
-      mode = {
+      var p = props.globals.getNode("/sim/gui/dialogs/location-in-air/", 1);
+      var mode = {
         airport: p.getNode("airport", 1),
         lonlat:  p.getNode("lonlat", 1),
         vor:     p.getNode("vor", 1),
@@ -15,14 +15,14 @@
         fix:     p.getNode("fix", 1),
       };
 
-      set_radio = func(m) {
-        foreach (k; keys(mode)) {
+      var set_radio = func(m) {
+        foreach (var k; keys(mode)) {
           mode[k].setBoolValue(m == k);
         }
       }
 
-      initialized = 0;
-      foreach (k; keys(mode)) {
+      var initialized = 0;
+      foreach (var k; keys(mode)) {
         if (mode[k].getType() == "NONE") {
           mode[k].setBoolValue(0);
         }
@@ -31,6 +31,19 @@
       if (!initialized) {
         set_radio("airport");
       }
+      var pickNearest = func(type,propname,freqpropname) {
+
+        var found = navinfo(type,getprop(propname));
+        if( found == nil or size(found) == 0 ) {
+          print(type, " ", getprop(propname), " NOT found");
+          setprop(propname, "");
+          setprop(freqpropname, "");
+          return;
+        }
+        setprop(propname, found[0].id);
+        setprop(freqpropname, found[0].frequency / 100.0);
+       
+      }
     </open>
 
     <close># just kept for educational purposes :-)</close>
@@ -300,10 +313,14 @@
 
           if (!mode.vor.getBoolValue()) {
             setprop("/sim/presets/vor-id", "");
+          } else {
+            pickNearest("vor","/sim/presets/vor-id","/sim/presets/vor-freq");
           }
 
           if (!mode.ndb.getBoolValue()) {
             setprop("/sim/presets/ndb-id", "");
+          } else {
+            pickNearest("ndb","/sim/presets/ndb-id","/sim/presets/ndb-freq");
           }
 
           if (!mode.fix.getBoolValue()) {

From 70fc2c995c6cc294020304ae513f807e7a60a776 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Mon, 22 Aug 2011 21:32:56 +0100
Subject: [PATCH 09/10] Correct EGT instrument lighting.

---
 Aircraft/c172p/Instruments/EGT/EGT.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Aircraft/c172p/Instruments/EGT/EGT.xml b/Aircraft/c172p/Instruments/EGT/EGT.xml
index fdaa1e46c..dd60547f6 100644
--- a/Aircraft/c172p/Instruments/EGT/EGT.xml
+++ b/Aircraft/c172p/Instruments/EGT/EGT.xml
@@ -32,7 +32,6 @@
   
   <animation>
     <type>material</type>
-    <object-name>egt</object-name>
     <object-name>Needle</object-name>
     <object-name>Bug</object-name>
     <object-name>Face</object-name>

From 6ebf37316d357d776c1fa729f6ba53ed18c0edc7 Mon Sep 17 00:00:00 2001
From: Durk Talsma <durk@localhost.(none)>
Date: Tue, 23 Aug 2011 22:33:46 +0200
Subject: [PATCH 10/10] Added a new joystick configuration file for the Saitek
 combat pedals. Contributed by Janet Plato.

---
 .../Pro-Flight-Combat-Rudder-Pedals.xml       | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 Input/Joysticks/Saitek/Pro-Flight-Combat-Rudder-Pedals.xml

diff --git a/Input/Joysticks/Saitek/Pro-Flight-Combat-Rudder-Pedals.xml b/Input/Joysticks/Saitek/Pro-Flight-Combat-Rudder-Pedals.xml
new file mode 100644
index 000000000..f6b77c1ed
--- /dev/null
+++ b/Input/Joysticks/Saitek/Pro-Flight-Combat-Rudder-Pedals.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+* Setup for Saitek Pro Combat Rudder Pedals.
+*
+* These are USB rudder pedals with toe brakes.  Bindings are as
+* follow:
+*
+* Axis 0 (left pedal): left brake
+* Axis 1 (right pedal): right brake
+* Axis 2 (sliding both pedals): rudder (and nosewheel)
+************************************************************************
+$Id$
+-->
+
+<PropertyList>
+
+ <name>Saitek Pro Flight Combat Rudder Pedals</name>
+ <name>Saitek Saitek Pro Flight Combat Rudder Pedals</name>
+
+ <axis n="0">
+  <desc>Brake left</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/gear/brake-left</property>
+   <offset>1.0</offset>
+   <factor>0.5</factor>
+  </binding>
+ </axis>
+
+ <axis n="1">
+  <desc>Brake right</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/gear/brake-right</property>
+   <offset>1.0</offset>
+   <factor>0.5</factor>
+  </binding>
+ </axis>
+
+ <axis n="2">
+  <number>
+   <windows>3</windows>
+   <mac>2</mac>
+   <unix>2</unix>
+  </number>
+  <desc>Rudder</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/flight/rudder</property>
+   <factor>1.0</factor>
+   <offset>0.0</offset>
+   <power type="double">2.0</power>
+  </binding>
+ </axis>
+
+</PropertyList>