From 996fd73c0cf7eb015d34cbb1beba623d0dcb12bd Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Wed, 8 Oct 2008 21:59:31 +0000
Subject: [PATCH] - let F12 pop up radio settings dialog (used to be Ctrl-r) -
 disable "reload global preferences", which is semi-broken

---
 Input/Keyboard/multikey.xml | 5 +++--
 Nasal/gui.nas               | 3 ++-
 Nasal/multikey.nas          | 6 +++---
 keyboard.xml                | 9 +++++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Input/Keyboard/multikey.xml b/Input/Keyboard/multikey.xml
index face6e947..bf48a2373 100644
--- a/Input/Keyboard/multikey.xml
+++ b/Input/Keyboard/multikey.xml
@@ -424,14 +424,15 @@
 			</binding>
 		</key>
 
-		<key n="121">
+		<!--key n="121">
+				this is bad: overwrites userarchive entries, causes errors and a segfault
 			<name>y</name>
 			<desc>Reload global preferences</desc>
 			<exit/>
 			<binding>
 				<command>preferences-load</command>
 			</binding>
-		</key>
+		</key-->
 	</key>
 
 	<!-- Autopilot multikey commands -->
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index a91525b2a..f2f469e0b 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -988,7 +988,8 @@ var common_aircraft_keys = {
         { name : "Ctrl-T",    desc : "AP: toggle terrain lock" },
         { name : "Ctrl-W",    desc : "AP: toggle wing leveler" },
         { name : "F6",        desc : "AP: toggle heading mode" },
-        { name : "F11",       desc : "pop up autopilot (AP) dialog" },
+        { name : "F11",       desc : "open autopilot dialog" },
+        { name : "F12",       desc : "open radio settings dialog" },
         { name : "Shift-F5",  desc : "scroll 2D panel down" },
         { name : "Shift-F6",  desc : "scroll 2D panel up" },
         { name : "Shift-F7",  desc : "scroll 2D panel left" },
diff --git a/Nasal/multikey.nas b/Nasal/multikey.nas
index 5039cff1d..02c2b3fd4 100644
--- a/Nasal/multikey.nas
+++ b/Nasal/multikey.nas
@@ -128,10 +128,10 @@ var Dialog = {
 			var g = dlg.addChild("group");
 			g.set("layout", "table");
 			g.set("default-padding", 2);
-			var column_height = numopt / (1 + (numopt > 15) + (numopt > 30));
+			var numrows = numopt / (1 + (numopt > 15) + (numopt > 30));
 			forindex (var i; options) {
-				var col = 3 * int(i / column_height);
-				var row = math.mod(i, column_height);
+				var col = 3 * int(i / numrows);
+				var row = math.mod(i, numrows);
 
 				var desc = (options[i].getNode("desc", 1).getValue() or "") ~ "  ";
 				var name = "  " ~ options[i].getNode("name", 1).getValue();
diff --git a/keyboard.xml b/keyboard.xml
index cde4184db..bbdbb676a 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -1200,6 +1200,15 @@ top down before the key bindings are parsed.
   </binding>
  </key>
 
+ <key n="268">
+  <name>F12</name>
+  <desc>Pop up radio settings dialog</desc>
+  <binding>
+   <command>dialog-show</command>
+   <dialog-name>radios</dialog-name>
+  </binding>
+ </key>
+
  <key n="269">
   <name>Enter</name>
   <desc>Move rudder right</desc>