Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #830 - Update TopSky colours and settings #831

Merged
merged 19 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
4. Bug - Fix squawk colors on SMR profiles - thanks to @kristiankunc (Kristián Kunc)
5. Enhancement - Added VRPs to TopSky maps - thanks to @SamLefevre (Samuel Lefevre)
6. Enhancement - Add CID to feedback link in LogonDetails.py - thanks to @BenWalker01 (Ben Walker)
7. Enhancement - Updated TopSky colours and settings for realism and ease of use - thanks to @SamLefevre (Samuel Lefevre)

# Changes from release 2024/07 to 2024/08
1. Enhancement - CPDLC Auto open settings window - thanks to @kye-taylor (Kye Taylor)
Expand Down
6 changes: 5 additions & 1 deletion UK/Data/Plugin/TopSky_NERC/TopSkySettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -30,6 +33,7 @@ Window_HoldList_MaxListItems=20
FlightLeg_AutoShow=1
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -166,7 +170,7 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,975,0
Window_CPDLC_Current=1,1064,0

//MSAW System Settings
MSAW_Buffer_IFR=100
Expand Down
33 changes: 27 additions & 6 deletions UK/Data/Plugin/TopSky_NERC/TopSkySettingsLocal.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
//Darker colour palette for TopSky. Delete this file if you like the lighter grey.
//Delete this file if you like the lighter grey.

//Signs TopSky in on callsign change to determine colours and other settings.
Setup_AutoSignIn=1

Color_Background=38,38,38
Color_Border=19,19,19
Color_WM_Bg=81,81,81
Color_WM_Border=54,54,54
Color_WM_Fg=200,200,200
//NERC/iFACTS colours
Color_Background=180,180,180
Color_Border=150,150,150
Color_CARD_Min_Sep=120,120,120
Color_CPDLC_Controller_Late=212,128,44
Color_CPDLC_Discarded
Color_CPDLC_DM_Request=0,0,205
Color_CPDLC_Failed=212,128,44
Color_CPDLC_Pilot_Late=212,124,44
Color_CPDLC_Standby=212,128,44
Color_CPDLC_UM_Clearance=0,0,205
Color_CPDLC_Unable=212,128,44
Color_CPDLC_Urgency
Color_Foreground=0,0,0
Color_Inactive_Sector=100,100,100
Color_WM_Active_Fg=0,0,0
Color_WM_Bg=135,135,135
Color_WM_Border=80,80,80
Color_WM_Fg=0,0,0

//Dark Grey
//Color_Background=38,38,38
//Color_Border=19,19,19
//Color_WM_Bg=81,81,81
//Color_WM_Border=54,54,54
//Color_WM_Fg=200,200,200
12 changes: 8 additions & 4 deletions UK/Data/Plugin/TopSky_NODE/TopSkySettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -27,9 +30,10 @@ Label_CFL_DefaultValue=1
Label_DAPs=1
Menu_DAPs=1
Window_HoldList_MaxListItems=20
FlightLeg_AutoShow=1
FlightLeg_AutoShow=0
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -166,8 +170,8 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,975,0
Window_CPDLC_Setting=1
Window_CPDLC_Current=0,1064,0
Window_CPDLC_Setting=0

//MSAW System Settings
MSAW_Buffer_IFR=100
Expand All @@ -184,7 +188,7 @@ System_UseAUP=1
Window_ASM=1

//Radio Direction Finder Settings
RDF_Mode=2
RDF_Mode=0
RDF_Accuracy=5
RDF_Floor=2500

Expand Down
18 changes: 13 additions & 5 deletions UK/Data/Plugin/TopSky_NODE/TopSkySettingsLocal.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
Setup_AutoSignIn=1

//Darker colour palette for TopSky UI. Delete these lines if you like the lighter grey.
Color_Background=38,38,38
Color_Border=19,19,19
Color_WM_Bg=81,81,81
Color_WM_Border=54,54,54
Color_WM_Fg=200,200,200

//Dark Grey
//Color_Background=38,38,38
//Color_Border=19,19,19
//Color_WM_Bg=81,81,81
//Color_WM_Border=54,54,54
//Color_WM_Fg=200,200,200

//NODE colours
Color_Background=0,0,0
Color_Border=10,10,10
Color_WM_Bg=169,109,99
Color_WM_Border=10,10,10
Color_WM_Fg=255,255,255
20 changes: 7 additions & 13 deletions UK/Data/Plugin/TopSky_NOVA/TopSkySettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -27,9 +30,10 @@ Label_CFL_DefaultValue=1
Label_DAPs=1
Menu_DAPs=1
Window_HoldList_MaxListItems=20
FlightLeg_AutoShow=1
FlightLeg_AutoShow=0
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -165,7 +169,7 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,1025,0
Window_CPDLC_Current=0,1064,0

//MSAW System Settings
MSAW_Buffer_IFR=100
Expand All @@ -182,7 +186,7 @@ System_UseAUP=1
Window_ASM=1

//Radio Direction Finder Settings
RDF_Mode=2
RDF_Mode=0
RDF_Accuracy=5
RDF_Floor=2500

Expand All @@ -199,16 +203,6 @@ WXR_Echo_dBZ_Hi=20
WXR_Echo_dBZ_Med=15
WXR_Echo_dBZ_Lo=12

[_CTR]
Window_CARD=1,100,750
Window_MsgIn=0,311,40
Window_Shortcut=1,1430,0
Window_SepList=1500,620

Window_LostList_Auto=0
Window_CARD_View_Risk=0
Window_CARD_View_Future=0

[EGAA_]
Setup_ScreenLat=EGAA
//Colour settings
Expand Down
34 changes: 28 additions & 6 deletions UK/Data/Plugin/TopSky_NOVA/TopSkySettingsLocal.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
//Delete this file if you like the lighter grey.

//Signs TopSky in on callsign change to determine colours and other settings.
Setup_AutoSignIn=1

//Darker colour palette for TopSky UI. Delete these lines if you like the lighter grey.
Color_Background=38,38,38
Color_Border=19,19,19
Color_WM_Bg=81,81,81
Color_WM_Border=54,54,54
Color_WM_Fg=200,200,200
//NOVA colours
Color_Background=180,180,180
Color_Border=150,150,150
Color_CARD_Min_Sep=120,120,120
Color_CPDLC_Controller_Late=212,128,44
Color_CPDLC_Discarded
Color_CPDLC_DM_Request=0,0,205
Color_CPDLC_Failed=212,128,44
Color_CPDLC_Pilot_Late=212,124,44
Color_CPDLC_Standby=212,128,44
Color_CPDLC_UM_Clearance=0,0,205
Color_CPDLC_Unable=212,128,44
Color_CPDLC_Urgency
Color_Foreground=0,0,0
Color_Inactive_Sector=100,100,100
Color_WM_Active_Fg=255,255,255
Color_WM_Bg=0,140,200
Color_WM_Border=80,80,80
Color_WM_Fg=230,230,230

//Dark Grey
//Color_Background=38,38,38
//Color_Border=19,19,19
//Color_WM_Bg=81,81,81
//Color_WM_Border=54,54,54
//Color_WM_Fg=200,200,200
6 changes: 5 additions & 1 deletion UK/Data/Plugin/TopSky_iTEC/TopSkySettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ System_GUI_Scale_Windows=1
System_GUI_Scale_Menus=1
System_GUI_Scale_GlobalMenu=1
System_GUI_Scale_Screen=1
System_GUI_Font_Fixed_1=Consolas
System_GUI_Font_Fixed_1_Size=11

//System wide settings
Setup_COOPANS=1
Expand All @@ -19,6 +21,7 @@ System_MagModel_Year=2020
System_RepHdg_Correction=2
System_UseReportedGS=1
System_RawVideo=0
System_TransferConfirmation=0
Label_Rev_Highlight_Delta_ETN=15
Label_AHDG_HideDctIfCOPX=0
Label_AHDG_ShowDct=2
Expand All @@ -32,6 +35,7 @@ FlightLeg_AutoShow=1
FlightLeg_AssumeTime=2
RwyAppLines_Auto=0
Label_N_Default=0
List_STCA=1700,700

//Airspace Related Settings
Airspace_C_Flag=
Expand Down Expand Up @@ -219,7 +223,7 @@ CPDLC_CFL=1
CPDLC_DCT=1
CPDLC_AHDG=1
CPDLC_ASP=1
Window_CPDLC_Current=1,975,0
Window_CPDLC_Current=1,1064,0
Window_CPDLC_Setting=1

//MSAW System Settings
Expand Down
2 changes: 1 addition & 1 deletion UK/Data/Settings/LTC/LTC_Symbology.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NDBs:frequency:7895040:3.5:0:0:0
Runways:centerline:7895040:3.5:0:0:7
Runways:extended centerline:8421376:3.5:0:0:7
Runways:name:7895040:3.5:0:0:7
Datablock:non concerned:9211020:3.2:0:0:7
Datablock:non concerned:2337594:3.2:0:0:7
Datablock:notified:2003250:3.2:0:0:7
Datablock:assumed:4184154:3.2:0:0:7
Datablock:transfer to me initiated:14418140:3.2:0:0:7
Expand Down
2 changes: 1 addition & 1 deletion UK/Data/Settings/MPC/MPC_Symbology.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NDBs:frequency:7895040:3.5:0:0:0
Runways:centerline:7895040:3.5:0:0:7
Runways:extended centerline:8421376:3.5:0:0:7
Runways:name:7895040:3.5:0:0:7
Datablock:non concerned:9211020:3.2:0:0:7
Datablock:non concerned:2337594:3.2:0:0:7
Datablock:notified:2003250:3.2:0:0:7
Datablock:assumed:4184154:3.2:0:0:7
Datablock:transfer to me initiated:14418140:3.2:0:0:7
Expand Down
2 changes: 1 addition & 1 deletion UK/Data/Settings/STC/STC_Symbology.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NDBs:frequency:7895040:3.5:0:0:0
Runways:centerline:7895040:3.5:0:0:7
Runways:extended centerline:8421376:3.5:0:0:7
Runways:name:7895040:3.5:0:0:7
Datablock:non concerned:9211020:3.2:0:0:7
Datablock:non concerned:2337594:3.2:0:0:7
Datablock:notified:2003250:3.2:0:0:7
Datablock:assumed:4184154:3.2:0:0:7
Datablock:transfer to me initiated:14418140:3.2:0:0:7
Expand Down
2 changes: 1 addition & 1 deletion UK/Data/Settings/TC_APP/TC_APP2_Symbology.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NDBs:frequency:7895040:3.5:0:0:0
Runways:centerline:7895040:3.5:0:0:7
Runways:extended centerline:8421376:3.5:0:0:7
Runways:name:7895040:3.5:0:0:7
Datablock:non concerned:9211020:3.2:0:0:7
Datablock:non concerned:2337594:3.2:0:0:7
Datablock:notified:2003250:3.2:0:0:7
Datablock:assumed:4184154:3.2:0:0:7
Datablock:transfer to me initiated:14418140:3.2:0:0:7
Expand Down
2 changes: 1 addition & 1 deletion UK/Data/Settings/TC_APP/TC_APP_Symbology.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NDBs:frequency:7895040:3.5:0:0:0
Runways:centerline:7895040:3.5:0:0:7
Runways:extended centerline:8421376:3.5:0:0:7
Runways:name:7895040:3.5:0:0:7
Datablock:non concerned:9211020:3.2:0:0:7
Datablock:non concerned:2337594:3.2:0:0:7
Datablock:notified:2003250:3.2:0:0:7
Datablock:assumed:4184154:3.2:0:0:7
Datablock:transfer to me initiated:14418140:3.2:0:0:7
Expand Down
8 changes: 4 additions & 4 deletions UK/Data/Settings/Tags.txt
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ TAGITEM:1::1:0:8:1:CCDS-R Plugin:0:1:::0
TAGITEM:80::0:0:32:0::0:1:::1
TAGITEM:0::0:0:0:0::0:1:::1
TAGITEM:3::0:0:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::0
TAGITEM:101::0:1:0:0:UK Controller Plugin:0:1:::1
TAGITEM:20::0:1:0:0::0:1:::7
TAGTYPE:1:6:2
Expand All @@ -485,7 +485,7 @@ TAGITEM:1::1:0:8:1:CCDS-R Plugin:0:1:::0
TAGITEM:80::0:0:32:0::0:1:::1
TAGITEM:0::0:0:0:0::0:1:::1
TAGITEM:3::0:0:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::0
TAGITEM:101::0:1:0:0:UK Controller Plugin:0:1:::1
TAGITEM:20::0:1:11:0::0:1:::7
TAGITEM:0::0:0:0:0::0:1:::1
Expand Down Expand Up @@ -523,7 +523,7 @@ TAGITEM:1::1:0:8:1:CCDS-R Plugin:0:1:::0
TAGITEM:80::0:0:32:0::0:1:::1
TAGITEM:0::0:0:0:0::0:1:::1
TAGITEM:3::0:0:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::0
TAGITEM:101::0:1:0:0:UK Controller Plugin:0:1:::1
TAGITEM:20::0:1:0:0::0:1:::7
TAGTYPE:5:3:1
Expand Down Expand Up @@ -624,7 +624,7 @@ TAGITEM:1::1:0:8:1:CCDS-R Plugin:0:1:::0
TAGITEM:80::0:0:32:0::0:1:::1
TAGITEM:0::0:0:0:0::0:1:::1
TAGITEM:3::0:0:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::1
TAGITEM:4::0:1:0:0::0:1:::0
TAGITEM:101::0:1:0:0:UK Controller Plugin:0:1:::1
TAGITEM:20::0:1:11:0::0:1:::7
TAGITEM:0::0:0:0:0::0:1:::1
Expand Down
Loading