From 821fae4a030056a992387c8bbdd1f6554c5718fb Mon Sep 17 00:00:00 2001 From: willie Date: Tue, 7 Sep 2010 19:59:00 +0100 Subject: [PATCH] further changes to the menu structure split AI carrier options to its own menu moved "advanced" menu items to Debug removed several redundant items rationalised the placement of some items started adding keyboard shortcuts TODO: reinstate AI Scenario menu item (position to be conmfirmed) get feedback add more : keyboard shortcuts --- gui/dialogs/AIcarrier.xml | 221 ++++++ gui/dialogs/ai.xml | 74 ++ gui/menubar.xml | 318 +++++---- gui/menubar.xml~ | 752 ++++++++++++++++++++ keyboard.xml | 2 +- keyboard.xml~ | 1415 +++++++++++++++++++++++++++++++++++++ 6 files changed, 2653 insertions(+), 129 deletions(-) create mode 100644 gui/dialogs/AIcarrier.xml create mode 100644 gui/dialogs/ai.xml create mode 100644 gui/menubar.xml~ create mode 100644 keyboard.xml~ diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml new file mode 100644 index 000000000..fda87ccb0 --- /dev/null +++ b/gui/dialogs/AIcarrier.xml @@ -0,0 +1,221 @@ + + + + AIcarrier + false + vbox + + + + + + left + + + 0.9 + 0.9 + 0.9 + 1 + + + + + hbox + + 10 + + + + vbox + + + left + + /ai/models/carrier/controls/turn-to-launch-hdg + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/turn-to-recovery-hdg + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/turn-to-base-course + true + + dialog-apply + + + nasal + + + + + + left + + /ai/models/carrier/controls/elevators + + dialog-apply + + + nasal + + + + + + left + + /sim/current-view/lso-commentary + + dialog-apply + + + + + left + + /sim/current-view/deck-park + + dialog-apply + + + + + left + + /ai/models/carrier/controls/lighting/deck-lights + + dialog-apply + + + nasal + + + + + + left + + + + + left + 75 + 25 + /ai/models/carrier/controls/lighting/flood-lights-red-norm + + nasal + + + + + + + + true + + + + + hbox + 6 + + true + + + + + + + + + + + + true + + + \ No newline at end of file diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml new file mode 100644 index 000000000..bba1c22eb --- /dev/null +++ b/gui/dialogs/ai.xml @@ -0,0 +1,74 @@ + + + + + + ai + false + vbox + + + + + + + + + + + + + + hbox + + 10 + + + + vbox + + + + + left + + /sim/ai-traffic/enabled + + + + hbox + + + left + + + + + left + /sim/ai-traffic/level + 1 + 2 + 3 + + + + + + + true + + + \ No newline at end of file diff --git a/gui/menubar.xml b/gui/menubar.xml index f108b6a69..ec36d8598 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -4,7 +4,7 @@ - + nasal @@ -12,33 +12,42 @@ - + nasal + + + + dialog-show + scenario + + + - + reset - + nasal + - + old-print-dialog @@ -65,23 +87,7 @@ - - - nasal - - - - - - - - dialog-show - logging - - - - - + dialog-show exit @@ -109,7 +115,7 @@ - + dialog-show view @@ -140,30 +146,28 @@ + + + + nasal + + + + - + + + dialog-show replay - - - - - dialog-show - static-lod - - - - - - - dialog-show - osg-display-settings - - - + @@ -193,7 +197,7 @@ - + H property-assign /sim/presets/trim @@ -234,7 +238,7 @@ autopilot - + dialog-show autopilot @@ -265,7 +269,7 @@ - + - - - - dialog-show - map - - + @@ -312,14 +310,6 @@ - - - - dialog-show - timeofday - - - @@ -328,14 +318,6 @@ - - - - nasal - - - - @@ -351,11 +333,45 @@ local_weather_tiles + + + + + + dialog-show + timeofday + + + + + + + nasal + + + + + + + + + dialog-show + map + + + + + + dialog-show + stopwatch-dialog + + + fuel-and-payload @@ -366,7 +382,7 @@ - + dialog-show radios @@ -389,14 +405,12 @@ - - - - dialog-show - stopwatch-dialog - - + + + + + @@ -424,24 +438,25 @@ - + + + + dialog-show + ai + + + - + ATC-freq-search - - - - dialog-show - atc-ai - - + - + tanker false @@ -450,13 +465,14 @@ - - - - dialog-show - scenario - - + + + + dialog-show + AIcarrier + + + @@ -464,7 +480,7 @@ multiplayer - + dialog-show chat-full @@ -487,11 +503,8 @@ - - - - + nasal + + @@ -539,13 +554,13 @@ - - - - reinit - io - - + + + + reinit + io + + @@ -603,20 +618,60 @@ 1 - + + + + + + + + + + nasal + + + + + + + + dialog-show + logging + + + + + + + + + dialog-show + static-lod + + + + + + + dialog-show + osg-display + + + dialog-show + about + + -settings + + + + + - - - dialog-show - about - - - - + old-help-dialog @@ -632,7 +687,11 @@ - + + + + + nasal @@ -648,24 +707,19 @@ - + nasal - - - - nasal - - - + + + + + + @@ -685,6 +739,14 @@ + + + + + dialog-show + about + + diff --git a/gui/menubar.xml~ b/gui/menubar.xml~ new file mode 100644 index 000000000..4c7c3a016 --- /dev/null +++ b/gui/menubar.xml~ @@ -0,0 +1,752 @@ + + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + dialog-show + scenario + + + + + + + reset + + + + + + + + nasal + + + + + + + + old-print-dialog + + + + + + + dialog-show + sound-dialog + + + + + + + dialog-show + exit + + + + + + + + + + + dialog-show + display + + + + + + + dialog-show + rendering + + + + + + + dialog-show + view + + + + + + + dialog-show + cockpit-view + + + + + + + dialog-show + pilot_offset + + + + + + + dialog-show + hud + + + + + + + nasal + + + + + + + + + + dialog-show + replay + + + + + + + + + + + dialog-show + location-on-ground + + + + + + + dialog-show + location-in-air + + + + + + + dialog-show + airports + + + + + H + + property-assign + /sim/presets/trim + false + + + property-randomize + /orientation/pitch-deg + 0 + 360 + + + property-randomize + /orientation/roll-deg + 0 + 360 + + + property-randomize + /orientation/heading-deg + 0 + 360 + + + + + + + dialog-show + location-of-tower + + + + + + + + autopilot + + + + + dialog-show + autopilot + + + + + + + dialog-show + route-manager + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + + + dialog-show + weather_scenario + + + + + + + dialog-show + weather + + + + + + + dialog-show + clouds + + + + + + + dialog-show + rainsnow + + + + + + + dialog-show + local_weather + + + + + + + dialog-show + local_weather_tiles + + + + + + + + dialog-show + timeofday + + + + + + + nasal + + + + + + + + + + + + + dialog-show + map + + + + + + + dialog-show + stopwatch-dialog + + + + + + fuel-and-payload + + nasal + + + + + + + + dialog-show + radios + + + + + + + dialog-show + gps + + + + + + + dialog-show + instruments + + + + + + + + + + + + + dialog-show + random-failures + + + + + + + dialog-show + system-failures + + + + + + + dialog-show + instrument-failures + + + + + + + + + + dialog-show + ai + + + + + + + ATC-freq-search + + + + + + + + tanker + false + + dialog-show + tanker + + + + + + + dialog-show + AIcarrier + + + + + + + + multiplayer + + + + + dialog-show + chat-full + + + + + + + dialog-show + chat-menu + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + reinit + gui + + + + + + + reinit + input + + + + + + + panel-load + + + + + + + reinit + xml-autopilot + + + + + + + reinit + io + + + + + + + dialog-show + nasal-console + + + + + + + nasal + + + + + + + + dialog-show + devel-extensions + + + + + + + nasal + + + + + + + + dump-scenegraph + + + + + + + property-assign + /sim/rendering/print-statistics + true + + + + + + + property-adjust + /sim/rendering/on-screen-statistics + 1 + + + + + + + + + + + + nasal + + + + + + + + dialog-show + logging + + + + + + + + + dialog-show + static-lod + + + + + + + dialog-show + osg-display + + + dialog-show + about + + -settings + + + + + + + + + + + + + old-help-dialog + + + + + + joystick-info + + dialog-show + joystick-info + + + + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + nasal + + + + + + + + + + + + + + tutorial-start + + dialog-show + tutorial + + + + + + tutorial-stop + false + + nasal + + + + + + + + dialog-show + about + + + + + diff --git a/keyboard.xml b/keyboard.xml index e4010ac4d..d61f3d731 100644 --- a/keyboard.xml +++ b/keyboard.xml @@ -272,7 +272,7 @@ top down before the key bindings are parsed. SPACE - PTT - Push To Talk (via VoIP) + PTT - Push To Talk (via FGCom) nasal diff --git a/keyboard.xml~ b/keyboard.xml~ new file mode 100644 index 000000000..d61f3d731 --- /dev/null +++ b/keyboard.xml~ @@ -0,0 +1,1415 @@ + + + + + + + + + + Ctrl-A + Toggle autopilot altitude lock + + nasal + + + + + + Ctrl-B + Toggle speedbrake + + property-toggle + /controls/flight/speedbrake + + + + + Ctrl-C + Toggle clickable panel hotspots + + property-toggle + /sim/panel-hotspots + + + + + Ctrl-G + Toggle autopilot glide slope lock + + nasal + + + + + + Ctrl-H + Toggle autopilot heading lock + + nasal + + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Ctrl-N + Toggle autopilot nav1 lock + + nasal + + + + + + Ctrl-P + Toggle pitch hold + + nasal + + + + + + Ctrl-R + Activate the instant replay system + + replay + + + + + Ctrl-S + Toggle auto-throttle lock + + nasal + + + + + + Ctrl-T + Toggle autopilot terrain lock + + nasal + + + + + + Ctrl-U + [Cheat] Add 1000ft of emergency altitude + + property-adjust + /position/altitude-ft + 1000.0 + + + property-assign + /sim/startup/onground + false + + + + + Ctrl-V + Select initial view (view 0) + + property-assign + /sim/current-view/view-number + 0 + + + + + Ctrl-W + Toggle autopilot wing leveler + + nasal + + + + + + Ctrl-X + Reset zoom to default + + property-assign + /sim/current-view/field-of-view + /sim/view/config/default-field-of-view-deg + + + + + ESC + Prompt and quit FlightGear + + dialog-show + exit + + + Reset FlightGear + + reset + + + + + + SPACE + PTT - Push To Talk (via FGCom) + + nasal + + + + + nasal + + + + + + nasal + + + + + nasal + + + + + + + + ! + Select first engine + + nasal + + + + + + # + Select third engine + + nasal + + + + + + $ + Select fourth engine + + nasal + + + + + + ' + Display a dialog relevant to the tuned in ATC service (if any) + + ATC-dialog + + + + + + + Let ATC/instructor repeat last message + + nasal + + + + + + , + Left brake + + nasal + + + + + nasal + + + + + + + - + false + Chat Menu + + dialog-show + chat-menu + + + + + . + Right brake + + nasal + + + + + nasal + + + + + + + / + Open property browser + + + + /sim/input/property-key-handler + + + nasal + + + + + /sim/input/property-key-handler + + nasal + + + + + + 0 + Move rudder left + true + + property-adjust + /controls/flight/rudder + -0.05 + + + + + 1 + Decrease elevator trim + true + + property-adjust + /controls/flight/elevator-trim + -0.001 + + + Look back left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-left-direction-deg + + + + + + 2 + Increase elevator or autopilot altitude + true + + nasal + + + + Look back + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-direction-deg + + + + + + 3 + Decrease throttle or autopilot autothrottle + true + + nasal + + + + Look back right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-right-direction-deg + + + + + + 4 + Move aileron left (or adjust AP heading.) + true + + nasal + + + + Look left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/left-direction-deg + + + + + + 5 + Center aileron, elevator, and rudder + + nasal + + + + + + 6 + Move aileron right (or adjust AP heading.) + true + + nasal + + + + Look right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/right-direction-deg + + + + + + 7 + Increase elevator trim + true + + property-adjust + /controls/flight/elevator-trim + 0.001 + + + Look front left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-left-direction-deg + + + + + + 8 + Decrease elevator or autopilot altitude + true + + nasal + + + + Look forward + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-direction-deg + + + + + + 9 + Increase throttle or autopilot autothrottle + true + + nasal + + + + Look front right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-right-direction-deg + + + + + + : + Start multikey command + + nasal + + + + + + ? + Show help dialog + + nasal + + + + + + @ + Select second engine + + nasal + + + + + + A + Decrease speed-up + + property-adjust + /sim/speed-up + 1 + -1 + + + + + B + Toggle parking brake on or off + + nasal + + + + + nasal + + + + + + + G + Gear down + + nasal + + + + + nasal + + + + + + + H + Cycle HUD Brightness + + nasal + + + + + + I + Switch to and toggle alternative HUD types + + nasal + + + + + + M + Mixture leaner + true + + nasal + + + + + + N + Propeller Coarser + true + + nasal + + + + + + P + Toggle panel + + property-toggle + /sim/panel/visibility + + + + + S + Swap panels + + + + /sim/allow-toggle-cockpit + + + property-swap + /sim/panel/path + /sim/panel_2/path + + + + + /sim/allow-toggle-cockpit + + + panel-load + + + + + T + Decrease warp delta + + property-adjust + /sim/time/warp-delta + -30 + + + + + V + Scroll in reverse through views + + nasal + + + + + + W + Decrease warp + + property-adjust + /sim/time/warp + -60 + + + + + X + Increase field of view + true + + nasal + + + + + + Z + Decrease Visibility + true + + decrease-visibility + + + + + [ + Decrease flaps + + nasal + + + + + nasal + + + + + + + ] + Increase flaps + + nasal + + + + + nasal + + + + + + + _ + false + Compose Chat + + nasal + + + + + + a + Increase speed-up + + property-adjust + /sim/speed-up + 1 + 1 + + + + + b + Apply all brakes + + nasal + + + + + nasal + + + + + + + c + Toggle 3D/2D cockpit + + nasal + + + + + + g + Gear Up + + nasal + + + + + nasal + + + + + + + h + HUD Master Switch + + nasal + + + + + + i + Normal HUD + + nasal + + + + + + j + Decrease spoilers + + nasal + + + + + + k + Increase spoilers + + nasal + + + + + + l + Toggle tail-wheel lock + + property-toggle + /controls/gear/tailwheel-lock + + + + + m + Mixture richer + true + + nasal + + + + + + n + Propeller Finer + true + + nasal + + + + + + p + Toggle the pause state of the sim + + property-toggle + /sim/freeze/master + + + property-toggle + /sim/freeze/clock + + + + /sim/freeze/replay-state + + property-assign + /sim/freeze/replay-state + 0 + + + + + s + Fire Starter on Selected Engine(s) + + nasal + + + + + nasal + + + + + + + + + + + t + Increase warp delta + + property-adjust + /sim/time/warp-delta + 30 + + + nasal + + + + + nasal + + + + + + + v + Scroll through views + + nasal + + + + + + w + Increase warp + + property-adjust + /sim/time/warp + 60 + + + + + x + Decrease field of view + true + + nasal + + + + + + z + Increase Visibility + true + + increase-visibility + + + + + { + Decrease Magneto on Selected Engine + + nasal + + + + + nasal + + + + + + + } + Increase Magneto on Selected Engine + + nasal + + + + + nasal + + + + + + + ~ + Select all engines + + nasal + + + + + + F1 + + Load flight + + load + + + + + + + Save flight + + save + false + + + + + + F3 + Capture screen + + nasal + + + + Load panel + + panel-load + + + + + + F5 + true + + Scroll panel down + + property-adjust + /sim/panel/y-offset + -5 + + + + + + F6 + Toggle Autopilot Heading Mode + true + + nasal + + + + Scroll panel up + + property-adjust + /sim/panel/y-offset + 5 + + + + + + F7 + true + + Scroll panel left + + property-adjust + /sim/panel/x-offset + -5 + + + + + + F8 + + true + + Scroll panel right + + property-adjust + /sim/panel/x-offset + 5 + + + + + + F10 + Toggle menubar + + property-toggle + /sim/menubar/visibility + + + Switch to next GUI style + + nasal + + + + + + + F11 + Pop up autopilot dialog + + dialog-show + autopilot + + + + + F12 + Pop up radio settings dialog + + dialog-show + radios + + + + + Enter + Move rudder right + true + + property-adjust + /controls/flight/rudder + 0.05 + + + + + Keypad 5 + Center aileron, elevator, and rudder + + nasal + + + + + + Left + Move aileron left (or adjust AP heading.) + true + + nasal + + + + Look left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/left-direction-deg + + + + + + Up + Increase elevator or autopilot altitude + true + + nasal + + + + Look forward + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-direction-deg + + + + + + Right + Move aileron right (or adjust AP heading.) + true + + nasal + + 0.05 + + + Look right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/right-direction-deg + + + + + + Down + Decrease elevator or autopilot altitude + true + + nasal + + + + Look backwards + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-direction-deg + + + + + + PageUp + Increase throttle or autopilot autothrottle + true + + nasal + + + + Look front right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-right-direction-deg + + + + + + PageDown + Decrease throttle or autopilot autothrottle + true + + nasal + + + + Look back right + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-right-direction-deg + + + + + + Home + Increase elevator trim + true + + property-adjust + /controls/flight/elevator-trim + 0.001 + + + Look front left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/front-left-direction-deg + + + + + + End + Decrease elevator trim + true + + property-adjust + /controls/flight/elevator-trim + -0.001 + + + Look back left + + property-assign + /sim/current-view/goal-heading-offset-deg + /sim/view/config/back-left-direction-deg + + + + + + Insert + Move rudder left + true + + property-adjust + /controls/flight/rudder + -0.05 + + + + + +