From 28d5294c145bfe98dc9d2d26c61401fced2be06c Mon Sep 17 00:00:00 2001
From: willie <willie@glasgownet.com>
Date: Mon, 20 Sep 2010 04:55:41 +0100
Subject: [PATCH 1/4] Reinstate "Weather Scenario" - add "ATC in Range" Move
 "ATC in Range" to radios dialog

"Weather Scenario" was missing after recent changes so reinstated, "ATC in Range" added back, this time on the Radio Settings dialog.
It should probably be commented out until we are certain it is working properly.
---
 gui/dialogs/radios.xml | 14 ++++++++++++--
 gui/menubar.xml        | 15 ++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index bd8f95bc3..a4592a286 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -4,7 +4,7 @@
 
  <name>radios</name>
  <width>600</width>
- <height>330</height>
+ <height>370</height>
  <modal>false</modal>
 
  <text>
@@ -479,7 +479,7 @@
    <legend>Apply</legend>
    <equal>true</equal>
    <binding>
-    <command>dialog-apply</command>
+    <command>dialog-appl8y</command>
    </binding>
   </button>
 
@@ -505,5 +505,15 @@
   </button>
 
  </group>
+	<group>
+		<x>400</x>
+		<y>60</y>
+			<button>
+			<legend>ATC Services in range</legend>
+				<binding>
+					<command>ATC-freq-search</command>
+				</binding> 
+			</button>
+	</group>
 
 </PropertyList>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 62400a565..8b98a58cd 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -281,7 +281,7 @@
 
 		<item>
 			<label>Previous Waypoint</label>
-			<binding>
+			<binding>3
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@previous")</script>
 			</binding>
@@ -307,7 +307,7 @@
 			</binding>
 		</item>
 
-		<item>
+		<!-- <item>
 			<label>Weather Conditions</label>
 			<binding>
 				<command>dialog-show</command>
@@ -449,15 +449,8 @@
 				<dialog-name>ai</dialog-name>
 			</binding>
 		</item>
-		<!--  Not working at present        
-		<item>
-			<label>ATC Services in range</label>
-			<binding>
-				<command>ATC-freq-search</command>
-			</binding>
-		</item>
 
-		-->
+	
 
 		<item>
 			<label>AI Tanker</label>
@@ -634,7 +627,7 @@
 		</item>
 
 		<item>
-			<label>Browse Internal Properties</label>
+			<label>Browse Internal Properties    (/)</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.property_browser()</script>

From 41ad86528ce0087e4a6e05f61204de1e39fdb9f0 Mon Sep 17 00:00:00 2001
From: willie <willie@glasgownet.com>
Date: Mon, 20 Sep 2010 09:41:42 +0100
Subject: [PATCH 2/4] revert changes to top-level menu

Leave weather options alone
---
 gui/menubar.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gui/menubar.xml b/gui/menubar.xml
index 8b98a58cd..62400a565 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -281,7 +281,7 @@
 
 		<item>
 			<label>Previous Waypoint</label>
-			<binding>3
+			<binding>
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@previous")</script>
 			</binding>
@@ -307,7 +307,7 @@
 			</binding>
 		</item>
 
-		<!-- <item>
+		<item>
 			<label>Weather Conditions</label>
 			<binding>
 				<command>dialog-show</command>
@@ -449,8 +449,15 @@
 				<dialog-name>ai</dialog-name>
 			</binding>
 		</item>
+		<!--  Not working at present        
+		<item>
+			<label>ATC Services in range</label>
+			<binding>
+				<command>ATC-freq-search</command>
+			</binding>
+		</item>
 
-	
+		-->
 
 		<item>
 			<label>AI Tanker</label>
@@ -627,7 +634,7 @@
 		</item>
 
 		<item>
-			<label>Browse Internal Properties    (/)</label>
+			<label>Browse Internal Properties</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.property_browser()</script>

From aa4a2db5e421da3b9056475df5e59dfe4d96f14e Mon Sep 17 00:00:00 2001
From: willie <willie@glasgownet.com>
Date: Wed, 22 Sep 2010 22:26:10 +0100
Subject: [PATCH 3/4] renamed "General" back to "File" commented out "Load/Save
 Flight"

in response to feedback on dev list and IRC, "General" reverts to "File and "Load/Save Flight" is commented out as it doesnt work currently
---
 gui/dialogs/radios.xml | 2 +-
 gui/menubar.xml        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index a4592a286..900962601 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -479,7 +479,7 @@
    <legend>Apply</legend>
    <equal>true</equal>
    <binding>
-    <command>dialog-appl8y</command>
+    <command>dialog-apply</command>
    </binding>
   </button>
 
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 62400a565..cbe04fd6c 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -2,8 +2,8 @@
 <PropertyList>
 
 	<menu>
-		<label>General</label>
-
+		<label>File</label>
+<!--
 		<item>
 			<label>Load Flight    (Shift-F1)</label>
 			<binding>
@@ -19,7 +19,7 @@
 				<script>gui.save_flight()</script>
 			</binding>
 		</item>
-		<!--
+		
 		<item>
             <label>Scenario</label>
 			<binding>

From 0b0012d158167d20692b3701473351e6c2f9cf17 Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Thu, 23 Sep 2010 08:20:05 +0200
Subject: [PATCH 4/4] Change effect name inside the file

---
 Effects/reflect-bump-spec.eff | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
index 39d0e775e..e9dd7f0c3 100644
--- a/Effects/reflect-bump-spec.eff
+++ b/Effects/reflect-bump-spec.eff
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Reflections
+<!-- Reflections + Bumpmapping + specular
 
 PARAMETERS: There are two forms of cube map texture:- vertical cross and 6 images.
 Either can be used - alternative forms are shown in <parameters> and in <texture-unit>
@@ -25,7 +25,7 @@ define <texture n="4"> in the derived effect file
 USE: 	To use the default reflection effect (controlled by material shininess values) use 
 	
 	<effect>
-			<inherits-from>Effects/reflect</inherits-from>
+			<inherits-from>Effects/reflect-bump-spec</inherits-from>
 			<object-name>Fuselage</object-name>
 	</effect>
 	
@@ -41,14 +41,14 @@ in your model file.
 To use your own effect place your efffect file containing something like this:
 
 	<name>Effects/lightningreflect</name>
-	<inherits-from>Effects/reflect</inherits-from>
+	<inherits-from>Effects/reflect-bump-spec</inherits-from>
 	
 	and the the modified tags in the path as above
 
 EXAMPLES: You can find examples of both usages in the Hunter and Lightning models.
 -->
 <PropertyList>
-	<name>Effects/reflect</name>
+	<name>Effects/reflect-bump-spec</name>
 	<inherits-from>Effects/model-default</inherits-from>
 
 	<parameters>