From 12026dd396fe83f28dec866da1c8f976718e9527 Mon Sep 17 00:00:00 2001 From: LelouchTwT <jpantoniazitonello@gmail.com> Date: Tue, 10 Dec 2024 11:41:04 -0300 Subject: [PATCH 1/4] fix: Added missing tooltips declarations and changed autobrake tooltip key --- .../model/behaviour/fcu.xml | 2 +- fbw-a380x/src/localization/msfs/en-US.locPak | 53 ++++++++++++++++--- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/fcu.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/fcu.xml index 25a8c5bf6d8..9067f9b9326 100644 --- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/fcu.xml +++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/fcu.xml @@ -62,7 +62,7 @@ <UseTemplate Name="FBW_AUTOPILOT_Push_Template"> <NODE_ID>PUSH_FCU_TRUEMAG</NODE_ID> - <TOOLTIPID>%((L:A32NX_PUSH_TRUE_REF, bool))%{if}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_AP_ON%{else}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_AP_OFF%{end}</TOOLTIPID> + <TOOLTIPID>%((L:A32NX_PUSH_TRUE_REF, bool))%{if}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_SWITCH_TO_TRUE_HEADING%{else}TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_SWITCH_TO_MAG_HEADING%{end}</TOOLTIPID> <NO_INDICATOR>True</NO_INDICATOR> <NO_TEXT_EMISSIVE>True</NO_TEXT_EMISSIVE> diff --git a/fbw-a380x/src/localization/msfs/en-US.locPak b/fbw-a380x/src/localization/msfs/en-US.locPak index 95fd584cf80..81d504e68b1 100644 --- a/fbw-a380x/src/localization/msfs/en-US.locPak +++ b/fbw-a380x/src/localization/msfs/en-US.locPak @@ -20,13 +20,13 @@ "A380X.COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_LEFT": "Adjust selected heading to the left (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", "A380X.COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_RIGHT": "Adjust selected heading to the right (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_RTO": "Arm rejected take-off autobrake (RTO)", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_TOOLTIP": "Auto brake selector", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_DISARM": "Set auto brake to DISARM", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_LO": "Set auto brake to LO", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_BTV": "Set auto brake to brake-to-vacate (BTV)", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_2": "Set auto brake to 2", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_3": "Set auto brake to 3", - "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_HI": "Set auto brake to HI", + "A380X.TOOLTIPS.AUTOBRAKE_TOOLTIP": "Auto brake selector", + "A380X.TOOLTIPS.AUTOBRAKE_DISARM": "Set auto brake to DISARM", + "A380X.TOOLTIPS.AUTOBRAKE_LO": "Set auto brake to LO", + "A380X.TOOLTIPS.AUTOBRAKE_BTV": "Set auto brake to brake-to-vacate (BTV)", + "A380X.TOOLTIPS.AUTOBRAKE_2": "Set auto brake to 2", + "A380X.TOOLTIPS.AUTOBRAKE_3": "Set auto brake to 3", + "A380X.TOOLTIPS.AUTOBRAKE_HI": "Set auto brake to HI", "A380X.TOOLTIPS.STATE_ESS": "ESS", "A380X.TOOLTIPS.STATE_APU": "APU", "A380X.TOOLTIPS.BAT_SELECTOR_TITLE": "Battery Voltage Selector", @@ -131,7 +131,44 @@ "A380X.TOOLTIPS.DOORS_ARM_DISARM": "Arm or disarm slides for passenger door", "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_LEFT": "Adjust selected heading to the left (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", - "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_RIGHT": "Adjust selected heading to the right (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)" + "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_RIGHT": "Adjust selected heading to the right (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", + + "COCKPIT.TOOLTIPS.ENGINE3_MASTER_TURN_OFF":"Turn Off Engine 3 MASTER", + "COCKPIT.TOOLTIPS.ENGINE3_MASTER_TURN_ON":"Turn On Engine 3 MASTER", + "COCKPIT.TOOLTIPS.ENGINE4_MASTER_TURN_OFF":"Turn Off Engine 4 MASTER", + "COCKPIT.TOOLTIPS.ENGINE4_MASTER_TURN_ON":"Turn On Engine 4 MASTER", + + "COCKPIT.TOOLTIPS.ELAC3_TURN_OFF":"Turn Off ELAC 3", + "COCKPIT.TOOLTIPS.ELAC3_TURN_ON":"Turn On ELAC 3", + + "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_ESS_ON":"Turn ESS Battery Off", + "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_ESS_OFF":"Turn ESS Battery On", + "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_APU_ON":"Turn APU Battery Off", + "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_APU_OFF":"Turn APU Battery On", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_ON_1":"Turn Off Engine 1 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_1":"Turn On Engine 1 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_ON_2":"Turn Off Engine 2 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_2":"Turn On Engine 2 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_ON_3":"Turn Off Engine 3 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_3":"Turn On Engine 3 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_ON_4":"Turn Off Engine 4 ANTI-ICE", + "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_4":"Turn On Engine 4 ANTI-ICE", + + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_EWD_INCREASE":"Increase EWD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_SD_INCREASE":"Increase SD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_L_MFD_INCREASE":"Increase LEFT MFD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_R_MFD_INCREASE":"Increase Right MFD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_EWD_DECREASE":"Decrease EWD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_SD_DECREASE":"Decrease SD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_L_MFD_DECREASE":"Decrease LEFT MFD Brightness", + "COCKPIT.TOOLTIPS.LIGHTING_KNOB_R_MFD_DECREASE":"Decrease Right MFD Brightness", + "COCKPIT.TOOLTIPS.EFIS_CP_ND_MODE":"Set Navigation Display Mode", + "COCKPIT.TOOLTIPS.EFIS_CP_ND_RANGE":"Set Navigation Display Range", + + "COCKPIT.TOOLTIPS.LIGHTS_SEATBELT_AUTO":"Turn AUTO SeatBelt Prompt Light", + "COCKPIT.TOOLTIPS.LIGHTS_NOSMOKE_AUTO":"Turn AUTO \"NO SMOKE\" Prompt Light", + "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_SWITCH_TO_TRUE_HEADING":"Switch To True Heading", + "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_SWITCH_TO_MAG_HEADING":"Switch To Magnetic Heading", } } } From ea1425c045b7bde6da1219f6a33231f073b4682c Mon Sep 17 00:00:00 2001 From: LelouchTwT <jpantoniazitonello@gmail.com> Date: Tue, 10 Dec 2024 11:50:32 -0300 Subject: [PATCH 2/4] docs: added my changes to changelog --- .github/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index c3e36e82dfd..9926b6563b4 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1522,3 +1522,4 @@ Discord) 1. [EFB] Restructured APIs and made Navigraph Auth a reusable component - @MicahBCode (Mischa Binder) 1. [ECAM] Added F units to CRZ and COND pages for Cabin temps. Currently tied to kg/lbs option in EFB -Patrick Macken (@PatM on Discord) +1. [MISC] Added missing tooltips declarations and update autobrake tooltip key. - @LelouchTwT From 369fb87f6dfc7f30ff38cde5654c788b7796e92b Mon Sep 17 00:00:00 2001 From: LelouchTwT <jpantoniazitonello@gmail.com> Date: Tue, 10 Dec 2024 11:58:46 -0300 Subject: [PATCH 3/4] fix: updated xml autobreak tooltip key --- .../FlyByWire_A380_842/model/behaviour/mip.xml | 14 +++++++------- fbw-a380x/src/localization/msfs/en-US.locPak | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/mip.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/mip.xml index dbc6db08676..e949a16fc75 100644 --- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/mip.xml +++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/mip.xml @@ -34,19 +34,19 @@ <ANIMCURSOR_MIN>0</ANIMCURSOR_MIN> <ANIMCURSOR_MAX>1</ANIMCURSOR_MAX> <ANIM_LAG>1000</ANIM_LAG> - <TOOLTIPID>TT:A380X.TOOLTIPS.AUTOBRAKE_TOOLTIP</TOOLTIPID> + <TOOLTIPID>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_TOOLTIP</TOOLTIPID> <ANIMTIP_0_ON_PERCENT>0</ANIMTIP_0_ON_PERCENT> <ANIMTIP_1_ON_PERCENT>.2</ANIMTIP_1_ON_PERCENT> <ANIMTIP_2_ON_PERCENT>.4</ANIMTIP_2_ON_PERCENT> <ANIMTIP_3_ON_PERCENT>.6</ANIMTIP_3_ON_PERCENT> <ANIMTIP_4_ON_PERCENT>.8</ANIMTIP_4_ON_PERCENT> <ANIMTIP_5_ON_PERCENT>1</ANIMTIP_5_ON_PERCENT> - <ANIMTIP_0>TT:A380X.TOOLTIPS.AUTOBRAKE_DISARM</ANIMTIP_0> - <ANIMTIP_1>TT:A380X.TOOLTIPS.AUTOBRAKE_BTV</ANIMTIP_1> - <ANIMTIP_2>TT:A380X.TOOLTIPS.AUTOBRAKE_LO</ANIMTIP_2> - <ANIMTIP_3>TT:A380X.TOOLTIPS.AUTOBRAKE_2</ANIMTIP_3> - <ANIMTIP_4>TT:A380X.TOOLTIPS.AUTOBRAKE_3</ANIMTIP_4> - <ANIMTIP_5>TT:A380X.TOOLTIPS.AUTOBRAKE_HI</ANIMTIP_5> + <ANIMTIP_0>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_DISARM</ANIMTIP_0> + <ANIMTIP_1>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_BTV</ANIMTIP_1> + <ANIMTIP_2>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_LO</ANIMTIP_2> + <ANIMTIP_3>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_2</ANIMTIP_3> + <ANIMTIP_4>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_3</ANIMTIP_4> + <ANIMTIP_5>TT:A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_HI</ANIMTIP_5> <STATE0_TEST>(L:A32NX_AUTOBRAKES_DISARM_KNOB_REQ) 1 ==</STATE0_TEST> </UseTemplate> </Component> diff --git a/fbw-a380x/src/localization/msfs/en-US.locPak b/fbw-a380x/src/localization/msfs/en-US.locPak index 81d504e68b1..7161733cacf 100644 --- a/fbw-a380x/src/localization/msfs/en-US.locPak +++ b/fbw-a380x/src/localization/msfs/en-US.locPak @@ -20,13 +20,13 @@ "A380X.COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_LEFT": "Adjust selected heading to the left (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", "A380X.COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_RIGHT": "Adjust selected heading to the right (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_RTO": "Arm rejected take-off autobrake (RTO)", - "A380X.TOOLTIPS.AUTOBRAKE_TOOLTIP": "Auto brake selector", - "A380X.TOOLTIPS.AUTOBRAKE_DISARM": "Set auto brake to DISARM", - "A380X.TOOLTIPS.AUTOBRAKE_LO": "Set auto brake to LO", - "A380X.TOOLTIPS.AUTOBRAKE_BTV": "Set auto brake to brake-to-vacate (BTV)", - "A380X.TOOLTIPS.AUTOBRAKE_2": "Set auto brake to 2", - "A380X.TOOLTIPS.AUTOBRAKE_3": "Set auto brake to 3", - "A380X.TOOLTIPS.AUTOBRAKE_HI": "Set auto brake to HI", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_TOOLTIP": "Auto brake selector", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_DISARM": "Set auto brake to DISARM", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_LO": "Set auto brake to LO", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_BTV": "Set auto brake to brake-to-vacate (BTV)", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_2": "Set auto brake to 2", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_3": "Set auto brake to 3", + "A380X.COCKPIT.TOOLTIPS.AUTOBRAKE_HI": "Set auto brake to HI", "A380X.TOOLTIPS.STATE_ESS": "ESS", "A380X.TOOLTIPS.STATE_APU": "APU", "A380X.TOOLTIPS.BAT_SELECTOR_TITLE": "Battery Voltage Selector", From a0798c8b3a09703510d0713021d093fe2d834819 Mon Sep 17 00:00:00 2001 From: LelouchTwT <jpantoniazitonello@gmail.com> Date: Tue, 10 Dec 2024 12:28:23 -0300 Subject: [PATCH 4/4] style: removed whitespaces --- fbw-a380x/src/localization/msfs/en-US.locPak | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fbw-a380x/src/localization/msfs/en-US.locPak b/fbw-a380x/src/localization/msfs/en-US.locPak index 7161733cacf..4c0a797f38a 100644 --- a/fbw-a380x/src/localization/msfs/en-US.locPak +++ b/fbw-a380x/src/localization/msfs/en-US.locPak @@ -132,15 +132,12 @@ "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_LEFT": "Adjust selected heading to the left (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_HDG_TUNING_RIGHT": "Adjust selected heading to the right (%((A:AUTOPILOT HEADING LOCK DIR:1,degrees))%!d!°)", - "COCKPIT.TOOLTIPS.ENGINE3_MASTER_TURN_OFF":"Turn Off Engine 3 MASTER", "COCKPIT.TOOLTIPS.ENGINE3_MASTER_TURN_ON":"Turn On Engine 3 MASTER", "COCKPIT.TOOLTIPS.ENGINE4_MASTER_TURN_OFF":"Turn Off Engine 4 MASTER", "COCKPIT.TOOLTIPS.ENGINE4_MASTER_TURN_ON":"Turn On Engine 4 MASTER", - "COCKPIT.TOOLTIPS.ELAC3_TURN_OFF":"Turn Off ELAC 3", "COCKPIT.TOOLTIPS.ELAC3_TURN_ON":"Turn On ELAC 3", - "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_ESS_ON":"Turn ESS Battery Off", "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_ESS_OFF":"Turn ESS Battery On", "COCKPIT.TOOLTIPS.MASTER_SWITCH_BAT_APU_ON":"Turn APU Battery Off", @@ -153,7 +150,6 @@ "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_3":"Turn On Engine 3 ANTI-ICE", "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_ON_4":"Turn Off Engine 4 ANTI-ICE", "COCKPIT.TOOLTIPS.DEICE_PUSH_ENG_ONLY_OFF_4":"Turn On Engine 4 ANTI-ICE", - "COCKPIT.TOOLTIPS.LIGHTING_KNOB_EWD_INCREASE":"Increase EWD Brightness", "COCKPIT.TOOLTIPS.LIGHTING_KNOB_SD_INCREASE":"Increase SD Brightness", "COCKPIT.TOOLTIPS.LIGHTING_KNOB_L_MFD_INCREASE":"Increase LEFT MFD Brightness", @@ -164,7 +160,6 @@ "COCKPIT.TOOLTIPS.LIGHTING_KNOB_R_MFD_DECREASE":"Decrease Right MFD Brightness", "COCKPIT.TOOLTIPS.EFIS_CP_ND_MODE":"Set Navigation Display Mode", "COCKPIT.TOOLTIPS.EFIS_CP_ND_RANGE":"Set Navigation Display Range", - "COCKPIT.TOOLTIPS.LIGHTS_SEATBELT_AUTO":"Turn AUTO SeatBelt Prompt Light", "COCKPIT.TOOLTIPS.LIGHTS_NOSMOKE_AUTO":"Turn AUTO \"NO SMOKE\" Prompt Light", "COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_SWITCH_TO_TRUE_HEADING":"Switch To True Heading",