From a963b55607e7bd1e1031100babb2f265f9ffcb7c Mon Sep 17 00:00:00 2001 From: Arron Hartley Date: Thu, 31 Dec 2020 20:08:33 +0000 Subject: [PATCH] Added new Baro Settings popup to the G3X. This is activated by clicking on the baro reference value under the altimeter. In order to bring this popup up, an ID was required to be added to the baro reference text in the shared Altimeter.js. --- .../NavSystems/AS3X_Touch/AS3X_Touch.css | 64 ++++++- .../NavSystems/AS3X_Touch/AS3X_Touch.html | 47 ++++- .../NavSystems/AS3X_Touch/AS3X_Touch.js | 173 ++++++++++++++++++ .../Shared/Templates/Altimeter/Altimeter.js | 1 + 4 files changed, 275 insertions(+), 10 deletions(-) diff --git a/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.css b/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.css index a57400c25f..e238badd9c 100755 --- a/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.css +++ b/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.css @@ -1,4 +1,4 @@ -:root { +:root { --bodyHeightScale: 1; } @keyframes TemporaryShow { @@ -1610,11 +1610,11 @@ as3x-touch-element { top: 0%; left: 30%; width: 39%; } - as3x-touch-element #MFD #timeKeyboard #TK_Bksp, as3x-touch-element #MFD #timeKeyboard #SK_Bksp, as3x-touch-element #MFD #timeKeyboard #AK_Bksp, as3x-touch-element #MFD #speedKeyboard #TK_Bksp, as3x-touch-element #MFD #speedKeyboard #SK_Bksp, as3x-touch-element #MFD #speedKeyboard #AK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #TK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #SK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #AK_Bksp { + as3x-touch-element #MFD #timeKeyboard #TK_Bksp, as3x-touch-element #MFD #timeKeyboard #SK_Bksp, as3x-touch-element #MFD #timeKeyboard #AK_Bksp, as3x-touch-element #MFD #speedKeyboard #TK_Bksp, as3x-touch-element #MFD #speedKeyboard #SK_Bksp, as3x-touch-element #MFD #speedKeyboard #AK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #TK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #SK_Bksp, as3x-touch-element #MFD #altitudeKeyboard #AK_Bksp, as3x-touch-element #MFD #BaroKeyboard #BARO_Bksp { position: absolute; width: 20%; right: 5%; } - as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #timeKeyboard #SK_Display, as3x-touch-element #MFD #timeKeyboard #AK_Display, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #speedKeyboard #SK_Display, as3x-touch-element #MFD #speedKeyboard #AK_Display, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #altitudeKeyboard #SK_Display, as3x-touch-element #MFD #altitudeKeyboard #AK_Display { + as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #timeKeyboard #SK_Display, as3x-touch-element #MFD #timeKeyboard #AK_Display, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #speedKeyboard #SK_Display, as3x-touch-element #MFD #speedKeyboard #AK_Display, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay, as3x-touch-element #MFD #altitudeKeyboard #SK_Display, as3x-touch-element #MFD #altitudeKeyboard #AK_Display, as3x-touch-element #MFD #BaroKeyboard #BARO_Display { position: absolute; width: 30%; left: 35%; @@ -1624,26 +1624,26 @@ as3x-touch-element { padding-top: 0.6vh; text-align: center; font-size: 4.2vh; } - as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writed { + as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writed, as3x-touch-element #MFD #BaroKeyboard #BARO_Display .Writed { background-color: none; color: aqua; } - as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #timeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #timeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #speedKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .ToWrite { + as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #timeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #timeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #speedKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #speedKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .ToWrite, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .ToWrite, as3x-touch-element #MFD #BaroKeyboard #BARO_Display .ToWrite { background-color: none; color: dimgray; } - as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writing { + as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #timeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #timeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #speedKeyboard #SK_Display .Writing, as3x-touch-element #MFD #speedKeyboard #AK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Writing, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Writing, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Writing, as3x-touch-element #MFD #BaroKeyboard #BARO_Display .Writing { animation: SelectedCharBlinkFreqEdit 1s infinite; min-width: 0.5vw; min-height: 3.6vh; display: inline-block; } - as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Fixed { + as3x-touch-element #MFD #timeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #timeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #timeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #speedKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #speedKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #TK_TimeDisplay .Fixed, as3x-touch-element #MFD #altitudeKeyboard #SK_Display .Fixed, as3x-touch-element #MFD #altitudeKeyboard #AK_Display .Fixed, as3x-touch-element #MFD #BaroKeyboard #BARO_Display .Fixed { background-color: aqua; } - as3x-touch-element #MFD #timeKeyboard #KeyBoard, as3x-touch-element #MFD #speedKeyboard #KeyBoard, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard { + as3x-touch-element #MFD #timeKeyboard #KeyBoard, as3x-touch-element #MFD #speedKeyboard #KeyBoard, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard, as3x-touch-element #MFD #BaroKeyboard #KeyBoard { position: absolute; top: 20%; height: 60%; width: 60%; left: 23%; } - as3x-touch-element #MFD #timeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #speedKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard .roundButton { + as3x-touch-element #MFD #timeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #speedKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #altitudeKeyboard #KeyBoard .roundButton, as3x-touch-element #MFD #BaroKeyboard #KeyBoard .roundButton { width: 9vh; height: 9vh; line-height: 9vh; @@ -1661,6 +1661,40 @@ as3x-touch-element { position: absolute; bottom: 2%; right: 2%; } + +as3x-touch-element #MFD #BaroKeyboard .gradientButton .mainText { + font-size: 2.4vh; + text-align: center; + height: 100%; +} + +as3x-touch-element #MFD #BaroKeyboard .BottomButtons .gradientButton { + position: absolute; + bottom: 2%; + width: 30%; +} + +as3x-touch-element #MFD #BaroKeyboard .BottomButtons #BARO_Enter { + right: 2%; +} + +as3x-touch-element #MFD #BaroKeyboard .BottomButtons #BARO_Cancel { + left: 2%; +} + +as3x-touch-element #MFD #BaroKeyboard #BARO_STD { + position: absolute; + left: 6%; + top: 7%; + width: 20%; +} + +as3x-touch-element #MFD #BaroKeyboard #BARO_Bksp { + position: absolute; + right: 6%; + top: 7%; +} + as3x-touch-element #MFD #fullKeyboard #Keyboard_LetterTable, as3x-touch-element #MFD #fullKeyboard #Keyboard_NumberTable { display: none; } @@ -2161,6 +2195,18 @@ as3x-touch-element { line-height: 3.5vh; background: none; vertical-align: bottom; } + as3x-touch-element .gradientButton .small-title { + position: absolute; + height: 20%; + width: 100%; + bottom: 4%; + text-align: center; + color: white; + font-size: 2.0vh; + line-height: 2.0vh; + background: none; + vertical-align: bottom; + } as3x-touch-element .gradientButton .topText { color: white; text-align: left; diff --git a/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.html b/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.html index a042269fa2..e210aa122b 100755 --- a/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.html +++ b/src/workingtitle-vcockpits-instruments-navsystems-gx/html_ui/WorkingTitle/Pages/VCockpit/Instruments/NavSystems/AS3X_Touch/AS3X_Touch.html @@ -1,4 +1,4 @@ -