From a571440567ac73e507e6848f249f774bfbca93fd Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sat, 10 May 2008 11:09:33 +0000
Subject: [PATCH] - let Ctrl-g have the same meaning as g (necessary for LMB
 emulation) - more cosmetics

---
 Aircraft/ufo/ufo-set.xml | 15 +++++++++++++++
 Aircraft/ufo/ufo.nas     | 15 +++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Aircraft/ufo/ufo-set.xml b/Aircraft/ufo/ufo-set.xml
index 7729afe78..811a3ebdb 100644
--- a/Aircraft/ufo/ufo-set.xml
+++ b/Aircraft/ufo/ufo-set.xml
@@ -183,6 +183,21 @@
 				</binding>
 			</key>
 
+			<key n="7">
+				<name>Ctrl-G</name>
+				<desc>Gear Up.</desc>
+				<binding>
+					<command>nasal</command>
+					<script>controls.gearDown(-1)</script>
+				</binding>
+				<mod-up>
+					<binding>
+						<command>nasal</command>
+						<script>controls.gearDown(0)</script>
+					</binding>
+				</mod-up>
+			</key>
+
 			<key n="9">
 				<name>Ctrl-I</name>
 				<desc>Show object adjustment dialog</desc>
diff --git a/Aircraft/ufo/ufo.nas b/Aircraft/ufo/ufo.nas
index e7bb0efd2..506302a76 100644
--- a/Aircraft/ufo/ufo.nas
+++ b/Aircraft/ufo/ufo.nas
@@ -201,7 +201,7 @@ var scan_models = func(base) {
 	if (list == nil)
 		return result;
 
-	var extensions = { ".ac": 1, ".osg": 2, ".xml": 3 }; # priority
+	var ext = { ".ac": 1, ".osg": 2, ".xml": 3 }; # extension priorities
 	var files = {};
 	foreach (var d; list) {
 		if (d[0] == `.` or d == "CVS")
@@ -213,10 +213,10 @@ var scan_models = func(base) {
 				append(result, s);
 			continue;
 		}
-		foreach (var e; keys(extensions)) {
+		foreach (var e; keys(ext)) {
 			if (substr(d, -size(e)) == e) {
 				var basepath = base ~ "/" ~ substr(d, 0, size(d) - size(e));
-				if (!contains(files, basepath) or extensions[e] > extensions[files[basepath]])
+				if (!contains(files, basepath) or ext[e] > ext[files[basepath]])
 					files[basepath] = e;
 				break;
 			}
@@ -666,7 +666,7 @@ var ModelMgr = {
 var scan_dirs = func(csv) {
 	var list = ["Aircraft/ufo/Models/sign.ac", "Aircraft/ufo/Models/cursor.ac"];
 	foreach (var dir; split(",", csv))
-		foreach(var m; scan_models(dir))
+		foreach (var m; scan_models(dir))
 			append(list, m);
 
 	return sort(list, cmp);
@@ -811,16 +811,15 @@ var file_selector = nil;
 
 # called via l-key (load object from disk)
 var file_select_model = func {
-	if (file_selector == nil) {
+	if (file_selector == nil)
 		file_selector = gui.FileSelector.new(fsel_callback,
 				"Select 3D model file", "Load Model",
 				["*.ac", "*.osg", "*.xml"], getprop("/sim/fg-root"));
-	}
 	file_selector.open();
 }
 
-var fsel_callback = func {
-	var model = cmdarg().getValue();
+var fsel_callback = func(n) {
+	var model = n.getValue();
 	var root = string.fixpath(getprop("/sim/fg-root")) ~ "/";
 	if (substr(model, 0, size(root)) == root)
 		model = substr(model, size(root));