fly/fgdata
1
0
Fork 0
Code Activity

- let F12 pop up radio settings dialog (used to be Ctrl-r)

Browse source 
- disable "reload global preferences", which is semi-broken
This commit is contained in:
mfranz 2008-10-08 21:59:31 +00:00
parent 483ce7b71b
commit 996fd73c0c
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Input/Keyboard/multikey.xml
View file

@ -424,14 +424,15 @@
</binding> </binding>
</key> </key>
<key n="121"> <!--key n="121">
this is bad: overwrites userarchive entries, causes errors and a segfault
<name>y</name> <name>y</name>
<desc>Reload global preferences</desc> <desc>Reload global preferences</desc>
<exit/> <exit/>
<binding> <binding>
<command>preferences-load</command> <command>preferences-load</command>
</binding> </binding>
</key> </key-->
</key> </key>
<!-- Autopilot multikey commands --> <!-- Autopilot multikey commands -->

3
Nasal/gui.nas
View file

@ -988,7 +988,8 @@ var common_aircraft_keys = {
{ name : "Ctrl-T", desc : "AP: toggle terrain lock" }, { name : "Ctrl-T", desc : "AP: toggle terrain lock" },
{ name : "Ctrl-W", desc : "AP: toggle wing leveler" }, { name : "Ctrl-W", desc : "AP: toggle wing leveler" },
{ name : "F6", desc : "AP: toggle heading mode" }, { 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-F5", desc : "scroll 2D panel down" },
{ name : "Shift-F6", desc : "scroll 2D panel up" }, { name : "Shift-F6", desc : "scroll 2D panel up" },
{ name : "Shift-F7", desc : "scroll 2D panel left" }, { name : "Shift-F7", desc : "scroll 2D panel left" },

6
Nasal/multikey.nas
View file

@ -128,10 +128,10 @@ var Dialog = {
var g = dlg.addChild("group"); var g = dlg.addChild("group");
g.set("layout", "table"); g.set("layout", "table");
g.set("default-padding", 2); 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) { forindex (var i; options) {
var col = 3 * int(i / column_height); var col = 3 * int(i / numrows);
var row = math.mod(i, column_height); var row = math.mod(i, numrows);
var desc = (options[i].getNode("desc", 1).getValue() or "") ~ " "; var desc = (options[i].getNode("desc", 1).getValue() or "") ~ " ";
var name = " " ~ options[i].getNode("name", 1).getValue(); var name = " " ~ options[i].getNode("name", 1).getValue();

9
keyboard.xml
View file

@ -1200,6 +1200,15 @@ top down before the key bindings are parsed.
</binding> </binding>
</key> </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"> <key n="269">
<name>Enter</name> <name>Enter</name>
<desc>Move rudder right</desc> <desc>Move rudder right</desc>