From abcfc2073b434c341f1b5defb75455ffb923a2e9 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Fri, 7 Dec 2012 22:42:18 +0000
Subject: [PATCH] Allow users to reset their joystick configuration from the
 Joystick Configuration dialog.

---
 Nasal/joystick.nas              | 16 +++++++++++++---
 gui/dialogs/joystick-config.xml | 26 +++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/Nasal/joystick.nas b/Nasal/joystick.nas
index c5a69d9f7..9ed5eb2ae 100644
--- a/Nasal/joystick.nas
+++ b/Nasal/joystick.nas
@@ -632,12 +632,20 @@ var readConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {
   }
 }
 
-var writeConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {  
+var writeConfig = func(dialog_root="/sim/gui/dialogs/joystick-config", reset=0) {  
 
   # Write out the joystick file.
   var config = props.Node.new();
   var id = getprop(dialog_root ~ "/selected-joystick");
-  config.getNode("name", 1).setValue(id);
+  
+  if (reset == 1) {
+    # We've been asked to reset the joystick config to the default.  As we can't
+    # delete the configuration file, we achieve this by setting an invalid name 
+    # tag that won't match. 
+    config.getNode("name", 1).setValue("UNUSED INVALID CONFIG");
+  } else {
+    config.getNode("name", 1).setValue(id);
+  }
   
   var axes = props.globals.getNode(dialog_root).getChildren("axis");
   forindex (var axis; axes) {
@@ -690,4 +698,6 @@ var writeConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {
   io.write_properties(getprop("/sim/fg-home") ~ "/Input/Joysticks/" ~ filename ~ ".xml", config);
 }
 
-
+var resetConfig = func(dialog_root="/sim/gui/dialogs/joystick-config") {
+  writeConfig(dialog_root, 1);
+}
diff --git a/gui/dialogs/joystick-config.xml b/gui/dialogs/joystick-config.xml
index 78e2f5ecc..739829a1c 100644
--- a/gui/dialogs/joystick-config.xml
+++ b/gui/dialogs/joystick-config.xml
@@ -188,12 +188,12 @@ var updateConfig = func() {
 	
 	<text>
 	  <halign>left</halign>
-	  <label>To configure your joystick(s):</label>
+	  <label>To configure your joystick/yoke/pedals:</label>
   </text>
 
 	<text>
 	  <halign>left</halign>
-	  <label>  1) Select the joystick your wish to configure below.</label>
+	  <label>  1) Select the device your wish to configure from the drop-down.</label>
   </text>
 
 	<text>
@@ -203,7 +203,7 @@ var updateConfig = func() {
 
 	<text>
 	  <halign>left</halign>
-	  <label>  3) Using the drop down or dialog button, select what you want the control to do.  "Custom" indicates a manually configured command.</label>
+	  <label>  3) Using the drop-down or dialog button, select what you want the control to do.  "Custom" indicates a manually configured command.</label>
   </text>
 
 	<text>
@@ -218,7 +218,7 @@ var updateConfig = func() {
 
 	<text>
 	  <halign>left</halign>
-	  <label>Your modified joystick configuration is saved automatically to a new configuration file.</label>
+	  <label>Your modified joystick configuration is saved automatically.  You can reset the configuration to the default by pressing Reset Configuration.</label>
   </text>
   
   <hrule/>
@@ -259,6 +259,22 @@ var updateConfig = func() {
       <row>0</row>
       <col>2</col>
       <halign>center</halign>
+      <legend>Reset Configuration</legend>
+      <binding>
+        <command>nasal</command>
+        <script>
+          joystick.resetConfig();
+          fgcommand("reinit", props.Node.new({"subsystem": "input"}));
+          fgcommand("dialog-close", props.Node.new({"dialog-name": "joystick-config"}));
+          fgcommand("dialog-show", props.Node.new({"dialog-name": "joystick-config"}));
+        </script>
+      </binding>
+    </button>
+
+    <button>
+      <row>0</row>
+      <col>3</col>
+      <halign>center</halign>
       <legend>Refresh Joysticks</legend>
       <binding>
         <command>nasal</command>
@@ -281,7 +297,7 @@ var updateConfig = func() {
 	  <text>
 	    <row>1</row>
 	    <col>1</col>
-	    <colspan>2</colspan>
+	    <colspan>3</colspan>
 	    <halign>left</halign>
 	    <label>Joystick Confgig</label>
 	    <property>/sim/gui/dialogs/joystick-config/selected-joystick-config</property>