From e427ac73211387e2804398de4817a90d682943be Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Thu, 26 Dec 2024 16:03:00 +0100
Subject: [PATCH] refactor(cmake): Sort file list

---
 src/core/CMakeLists.txt  |  254 +++---
 src/gui/CMakeLists.txt   | 1697 +++++++++++++++++++-------------------
 src/input/CMakeLists.txt |    6 +-
 src/misc/CMakeLists.txt  |  278 +++----
 src/sound/CMakeLists.txt |  102 +--
 5 files changed, 1168 insertions(+), 1169 deletions(-)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 2e1a3a243..c19bb7f89 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -3,38 +3,38 @@
 
 add_library(core SHARED
         # AFV
-        afv/audio/output.h
-        afv/audio/output.cpp
         afv/audio/callsigndelaycache.cpp
-        afv/audio/soundcardsampleprovider.h
-        afv/audio/callsignsampleprovider.h
         afv/audio/callsigndelaycache.h
-        afv/audio/soundcardsampleprovider.cpp
-        afv/audio/receiversampleprovider.cpp
         afv/audio/callsignsampleprovider.cpp
-        afv/audio/input.h
+        afv/audio/callsignsampleprovider.h
         afv/audio/input.cpp
+        afv/audio/input.h
+        afv/audio/output.cpp
+        afv/audio/output.h
+        afv/audio/receiversampleprovider.cpp
         afv/audio/receiversampleprovider.h
-        afv/crypto/cryptodtochannel.cpp
-        afv/crypto/cryptodtoserializer.cpp
-        afv/crypto/cryptodtomode.h
-        afv/crypto/cryptodtochannel.h
-        afv/crypto/cryptodtoserializer.h
-        afv/crypto/cryptodtoheaderdto.h
-        afv/model/atcstationmodel.h
-        afv/model/atcstationmodel.cpp
-        afv/model/afvmapreader.h
-        afv/model/afvmapreader.cpp
-        afv/dto.h
-        afv/clients/afvclient.h
+        afv/audio/soundcardsampleprovider.cpp
+        afv/audio/soundcardsampleprovider.h
         afv/clients/afvclient.cpp
-        afv/connection/clientconnection.h
+        afv/clients/afvclient.h
         afv/connection/apiserverconnection.cpp
         afv/connection/apiserverconnection.h
         afv/connection/clientconnection.cpp
+        afv/connection/clientconnection.h
         afv/connection/clientconnectiondata.cpp
         afv/connection/clientconnectiondata.h
         afv/constants.h
+        afv/crypto/cryptodtochannel.cpp
+        afv/crypto/cryptodtochannel.h
+        afv/crypto/cryptodtoheaderdto.h
+        afv/crypto/cryptodtomode.h
+        afv/crypto/cryptodtoserializer.cpp
+        afv/crypto/cryptodtoserializer.h
+        afv/dto.h
+        afv/model/afvmapreader.cpp
+        afv/model/afvmapreader.h
+        afv/model/atcstationmodel.cpp
+        afv/model/atcstationmodel.h
 
         # Application
         application/applicationsettings.h
@@ -44,42 +44,42 @@ add_library(core SHARED
         audio/audiosettings.h
 
         # Context
-        context/contextapplicationproxy.cpp
-        context/contextownaircraftproxy.h
+        context/context.cpp
         context/context.h
-        context/contextsimulator.h
+        context/contextapplication.cpp
+        context/contextapplication.h
+        context/contextapplicationempty.h
+        context/contextapplicationimpl.cpp
+        context/contextapplicationimpl.h
+        context/contextapplicationproxy.cpp
+        context/contextapplicationproxy.h
         context/contextaudio.cpp
         context/contextaudio.h
-        context/contextapplicationimpl.cpp
-        context/contextsimulatorproxy.cpp
-        context/contextownaircraft.h
-        context/contextownaircraftimpl.cpp
-        context/contextnetwork.cpp
-        context/contextapplication.h
-        context/contextsimulatorempty.h
-        context/contextapplication.cpp
         context/contextaudioimpl.cpp
-        context/contextapplicationempty.h
-        context/contextownaircraft.cpp
-        context/contextnetworkproxy.h
-        context/contextsimulatorimpl.cpp
-        context/contextapplicationproxy.h
-        context/contextapplicationimpl.h
-        context/contextsimulatorproxy.h
-        context/contextaudioproxy.h
         context/contextaudioimpl.h
-        context/contextownaircraftproxy.cpp
-        context/contextsimulator.cpp
         context/contextaudioproxy.cpp
+        context/contextaudioproxy.h
+        context/contextnetwork.cpp
         context/contextnetwork.h
-        context/context.cpp
         context/contextnetworkempty.h
-        context/contextnetworkproxy.cpp
-        context/contextownaircraftimpl.h
-        context/contextsimulatorimpl.h
         context/contextnetworkimpl.cpp
         context/contextnetworkimpl.h
+        context/contextnetworkproxy.cpp
+        context/contextnetworkproxy.h
+        context/contextownaircraft.cpp
+        context/contextownaircraft.h
         context/contextownaircraftempty.h
+        context/contextownaircraftimpl.cpp
+        context/contextownaircraftimpl.h
+        context/contextownaircraftproxy.cpp
+        context/contextownaircraftproxy.h
+        context/contextsimulator.cpp
+        context/contextsimulator.h
+        context/contextsimulatorempty.h
+        context/contextsimulatorimpl.cpp
+        context/contextsimulatorimpl.h
+        context/contextsimulatorproxy.cpp
+        context/contextsimulatorproxy.h
 
         # Data
         data/authenticateduser.h
@@ -94,110 +94,110 @@ add_library(core SHARED
         data/vatsimsetup.h
 
         # DB
-        db/backgrounddataupdater.cpp
         db/airportdatareader.cpp
-        db/databaseutils.h
-        db/modeldatareader.h
-        db/infodatareader.h
-        db/databasereader.h
-        db/databaseauthentication.cpp
-        db/databasewriter.cpp
-        db/databasereaderconfig.h
-        db/backgrounddataupdater.h
-        db/databaseutils.cpp
-        db/modeldatareader.cpp
-        db/databasereader.cpp
-        db/databasereaderconfig.cpp
-        db/infodatareader.cpp
-        db/icaodatareader.cpp
-        db/databaseauthentication.h
-        db/icaodatareader.h
-        db/databasewriter.h
         db/airportdatareader.h
+        db/backgrounddataupdater.cpp
+        db/backgrounddataupdater.h
+        db/databaseauthentication.cpp
+        db/databaseauthentication.h
+        db/databasereader.cpp
+        db/databasereader.h
+        db/databasereaderconfig.cpp
+        db/databasereaderconfig.h
+        db/databaseutils.cpp
+        db/databaseutils.h
+        db/databasewriter.cpp
+        db/databasewriter.h
+        db/icaodatareader.cpp
+        db/icaodatareader.h
+        db/infodatareader.cpp
+        db/infodatareader.h
+        db/modeldatareader.cpp
+        db/modeldatareader.h
 
         # FSD
-        fsd/fsdidentification.cpp
-        fsd/clientresponse.cpp
-        fsd/planeinforequestfsinn.cpp
-        fsd/textmessage.cpp
-        fsd/killrequest.cpp
-        fsd/revbclientparts.cpp
-        fsd/clientidentification.cpp
-        fsd/visualpilotdatatoggle.h
-        fsd/rehost.h
-        fsd/visualpilotdataupdate.cpp
-        fsd/planeinformationfsinn.h
-        fsd/clientquery.h
-        fsd/flightplan.cpp
-        fsd/pong.cpp
-        fsd/planeinformationfsinn.cpp
-        fsd/addatc.h
-        fsd/servererror.h
-        fsd/servererror.cpp
-        fsd/fsdclient.cpp
-        fsd/atcdataupdate.h
-        fsd/authchallenge.h
-        fsd/atcdataupdate.cpp
-        fsd/ping.h
-        fsd/messagebase.h
-        fsd/visualpilotdataupdate.h
-        fsd/rehost.cpp
-        fsd/interimpilotdataupdate.h
-        fsd/authresponse.h
         fsd/addatc.cpp
-        fsd/textmessage.h
-        fsd/visualpilotdataperiodic.cpp
-        fsd/visualpilotdatastopped.h
+        fsd/addatc.h
+        fsd/addpilot.cpp
+        fsd/addpilot.h
+        fsd/atcdataupdate.cpp
+        fsd/atcdataupdate.h
+        fsd/authchallenge.cpp
+        fsd/authchallenge.h
         fsd/authresponse.cpp
-        fsd/pilotdataupdate.cpp
-        fsd/ping.cpp
+        fsd/authresponse.h
+        fsd/clientidentification.cpp
+        fsd/clientidentification.h
+        fsd/clientquery.cpp
+        fsd/clientquery.h
+        fsd/clientresponse.cpp
+        fsd/clientresponse.h
+        fsd/deleteatc.cpp
+        fsd/deleteatc.h
+        fsd/deletepilot.cpp
+        fsd/deletepilot.h
+        fsd/enums.h
+        fsd/euroscopesimdata.cpp
+        fsd/euroscopesimdata.h
+        fsd/flightplan.cpp
+        fsd/flightplan.h
+        fsd/fsdclient.cpp
+        fsd/fsdclient.h
+        fsd/fsdidentification.cpp
+        fsd/fsdidentification.h
+        fsd/interimpilotdataupdate.cpp
+        fsd/interimpilotdataupdate.h
+        fsd/killrequest.cpp
+        fsd/killrequest.h
         fsd/messagebase.cpp
+        fsd/messagebase.h
         fsd/mute.cpp
         fsd/mute.h
-        fsd/enums.h
-        fsd/deleteatc.h
-        fsd/clientidentification.h
-        fsd/revbclientparts.h
-        fsd/deletepilot.h
-        fsd/fsdclient.h
-        fsd/flightplan.h
         fsd/pbh.h
-        fsd/killrequest.h
-        fsd/planeinforequest.h
-        fsd/addpilot.h
-        fsd/planeinformation.cpp
-        fsd/clientquery.cpp
-        fsd/addpilot.cpp
-        fsd/deleteatc.cpp
-        fsd/authchallenge.cpp
-        fsd/planeinformation.h
-        fsd/serializer.cpp
-        fsd/euroscopesimdata.cpp
-        fsd/pong.h
-        fsd/euroscopesimdata.h
-        fsd/interimpilotdataupdate.cpp
-        fsd/clientresponse.h
-        fsd/visualpilotdatatoggle.cpp
-        fsd/planeinforequestfsinn.h
-        fsd/planeinforequest.cpp
-        fsd/deletepilot.cpp
+        fsd/pilotdataupdate.cpp
         fsd/pilotdataupdate.h
+        fsd/ping.cpp
+        fsd/ping.h
+        fsd/planeinforequest.cpp
+        fsd/planeinforequest.h
+        fsd/planeinforequestfsinn.cpp
+        fsd/planeinforequestfsinn.h
+        fsd/planeinformation.cpp
+        fsd/planeinformation.h
+        fsd/planeinformationfsinn.cpp
+        fsd/planeinformationfsinn.h
+        fsd/pong.cpp
+        fsd/pong.h
+        fsd/rehost.cpp
+        fsd/rehost.h
+        fsd/revbclientparts.cpp
+        fsd/revbclientparts.h
+        fsd/serializer.cpp
         fsd/serializer.h
-        fsd/visualpilotdatastopped.cpp
-        fsd/fsdidentification.h
+        fsd/servererror.cpp
+        fsd/servererror.h
+        fsd/textmessage.cpp
+        fsd/textmessage.h
+        fsd/visualpilotdataperiodic.cpp
         fsd/visualpilotdataperiodic.h
+        fsd/visualpilotdatastopped.cpp
+        fsd/visualpilotdatastopped.h
+        fsd/visualpilotdatatoggle.cpp
+        fsd/visualpilotdatatoggle.h
+        fsd/visualpilotdataupdate.cpp
+        fsd/visualpilotdataupdate.h
 
         # VATSIM
         vatsim/vatsimdatafilereader.cpp
         vatsim/vatsimdatafilereader.h
         vatsim/vatsimmetarreader.cpp
         vatsim/vatsimmetarreader.h
+        vatsim/vatsimserverfilereader.cpp
+        vatsim/vatsimserverfilereader.h
         vatsim/vatsimsettings.cpp
         vatsim/vatsimsettings.h
         vatsim/vatsimstatusfilereader.cpp
         vatsim/vatsimstatusfilereader.h
-        vatsim/vatsimserverfilereader.cpp
-        vatsim/vatsimserverfilereader.h
 
         # Main
         actionbind.cpp
@@ -210,7 +210,6 @@ add_library(core SHARED
         airspacemonitor.h
         application.cpp
         application.h
-        swiftcoreexport.h
         cookiemanager.cpp
         cookiemanager.h
         corefacade.cpp
@@ -235,6 +234,7 @@ add_library(core SHARED
         setupreader.h
         simulator.cpp
         simulator.h
+        swiftcoreexport.h
         threadedreader.cpp
         threadedreader.h
         webdataservices.cpp
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 0fcf70052..497272735 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -2,885 +2,884 @@
 # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 add_library(gui SHARED
-        showhidebar.cpp
-        dockwidget.cpp
-        labelandicon.cpp
         altitudeedit.cpp
-        overlaymessages.h
-        stylesheetutility.h
-        systemtraywindow.h
-        singleapplicationui.h
-        dockwidgetinfobar.h
-        loginmodebuttons.ui
-        elidedpushbutton.cpp
-        models/liveryfilter.cpp
-        models/distributorlistmodel.h
-        models/actionmodel.h
-        models/airportlistmodel.h
-        models/liverylistmodel.h
-        models/listmodelcallsignobjects.cpp
-        models/liverylistmodel.cpp
-        models/listmodeltimestampobjects.h
-        models/statusmessagelistmodel.cpp
-        models/userlistmodel.h
-        models/aircraftcategorylistmodel.h
-        models/aircrafticaolistmodel.h
-        models/actionitem.cpp
-        models/listmodeldbobjects.cpp
-        models/identifierlistmodel.cpp
-        models/listmodelbasesimulation.cpp
-        models/listmodelbasenontemplate.h
-        models/distributorfilter.cpp
-        models/columns.h
-        models/aircraftsituationchangelistmodel.h
-        models/actionhotkeylistmodel.cpp
-        models/listmodelbaseaviation.cpp
-        models/interpolationsetupmodel.cpp
-        models/matchingstatisticsmodel.h
-        models/modelfilter.cpp
-        models/aircrafticaolistmodel.cpp
-        models/columnformatters.h
-        models/distributorfilter.h
-        models/allmodelcontainers.h
-        models/audiodeviceinfolistmodel.cpp
-        models/serverlistmodel.h
-        models/aircraftmodelfilter.cpp
-        models/simulatedaircraftlistmodel.cpp
-        models/aircraftsituationlistmodel.cpp
-        models/namevariantpairlistmodel.h
-        models/aircraftsituationchangelistmodel.cpp
-        models/airlineicaolistmodel.cpp
-        models/interpolationsetupmodel.h
-        models/airlineicaofilter.h
-        models/columns.cpp
-        models/liveryfilter.h
-        models/textmessagelistmodel.cpp
-        models/allmodels.h
-        models/textmessagelistmodel.h
-        models/actionmodel.cpp
-        models/listmodelbasenetwork.cpp
-        models/countryfilter.h
-        models/aircraftpartslistmodel.h
-        models/listmodelbaseweather.cpp
-        models/aircraftpartslistmodel.cpp
-        models/aircraftsituationlistmodel.h
-        models/aircraftmodelfilter.h
-        models/listmodeldbobjects.h
-        models/selectionmodel.h
-        models/clientlistmodel.h
-        models/aircraftmodellistmodel.cpp
-        models/listmodeltimestampobjects.cpp
-        models/distributorlistmodel.cpp
-        models/matchingstatisticsmodel.cpp
-        models/aircrafticaofilter.cpp
-        models/listmodelcallsignobjects.h
-        models/columnformatters.cpp
-        models/atcstationtreemodel.h
-        models/clientlistmodel.cpp
-        models/aircrafticaofilter.h
-        models/atcstationlistmodel.cpp
-        models/simulatedaircraftlistmodel.h
-        models/statusmessagelistmodel.h
-        models/aircraftcategorytreemodel.cpp
-        models/aircraftmodellistmodel.h
-        models/countrylistmodel.cpp
-        models/aircraftcategorylistmodel.cpp
-        models/namevariantpairlistmodel.cpp
-        models/actionitem.h
-        models/listmodelbase.cpp
-        models/audiodeviceinfolistmodel.h
-        models/listmodelbasemisc.cpp
-        models/listmodelbase.h
-        models/aircraftcategorytreemodel.h
-        models/airlineicaolistmodel.h
-        models/statusmessagefilter.h
-        models/listmodelbasenontemplate.cpp
-        models/countrylistmodel.h
-        models/serverlistmodel.cpp
-        models/countryfilter.cpp
-        models/applicationinfolistmodel.h
-        models/identifierlistmodel.h
-        models/modelfilter.h
-        models/userlistmodel.cpp
-        models/airportlistmodel.cpp
-        models/actionhotkeylistmodel.h
-        models/atcstationtreemodel.cpp
-        models/applicationinfolistmodel.cpp
-        models/statusmessagefilter.cpp
-        models/airlineicaofilter.cpp
-        models/atcstationlistmodel.h
-        enableforviewbasedindicator.h
-        pluginconfigwindow.h
-        views/interpolationsetupview.cpp
-        views/userview.h
-        views/aircraftcategorytreeview.h
-        views/viewtimestampobjects.cpp
-        views/aircrafticaoview.h
-        views/viewbase.h
-        views/viewbasemisc.cpp
-        views/distributorview.h
-        views/checkboxdelegate.cpp
-        views/viewbaseproxystyle.cpp
-        views/serverview.cpp
-        views/distributorview.cpp
-        views/aircraftpartsview.cpp
-        views/radarview.h
-        views/serverview.h
-        views/airportview.h
-        views/audiodeviceinfoview.h
-        views/viewtimestampobjects.h
-        views/atcstationview.h
-        views/aircraftsituationview.cpp
-        views/viewbaseproxystyle.h
-        views/identifierview.h
-        views/simulatedaircraftview.cpp
-        views/airportview.cpp
-        views/aircraftpartsview.h
-        views/airlineicaoview.cpp
-        views/applicationinfoview.h
-        views/userview.cpp
-        views/aircrafticaoview.cpp
-        views/simulatedaircraftview.h
-        views/clientview.h
-        views/viewbasenontemplate.cpp
-        views/airlineicaoview.h
-        views/matchingstatisticsview.h
-        views/aircraftsituationview.h
-        views/matchingstatisticsview.cpp
-        views/aircraftsituationchangeview.h
-        views/aircraftmodelstatisticsdialog.cpp
-        views/textmessageview.cpp
-        views/identifierview.cpp
-        views/viewbase.cpp
-        views/aircraftmodelvalidationdialog.cpp
-        views/viewdbobjects.cpp
-        views/viewcallsignobjects.h
-        views/aircraftmodelvalidationdialog.h
-        views/viewbaseaviation.cpp
-        views/interpolationsetupview.h
-        views/namevariantpairview.h
-        views/textmessageview.h
-        views/aircraftmodelstatisticsdialog.ui
-        views/aircraftmodelstatisticsdialog.h
-        views/audiodeviceinfoview.cpp
-        views/clientview.cpp
-        views/viewbaseitemdelegate.cpp
-        views/aircraftsituationchangeview.cpp
-        views/viewbasenetwork.cpp
-        views/viewbaseitemdelegate.h
-        views/flightplandialog.ui
-        views/atcstationtreeview.cpp
-        views/aircraftmodelview.h
-        views/namevariantpairview.cpp
-        views/statusmessageview.cpp
-        views/viewdbobjects.h
-        views/aircraftmodelvalidationdialog.ui
-        views/statusmessageview.h
-        views/viewcallsignobjects.cpp
-        views/aircraftcategoryview.h
-        views/applicationinfoview.cpp
-        views/atcstationtreeview.h
-        views/aircraftcategorytreeview.cpp
-        views/atcstationview.cpp
-        views/aircraftcategoryview.cpp
-        views/countryview.h
-        views/aircraftmodelview.cpp
-        views/checkboxdelegate.h
-        views/flightplandialog.h
-        views/radarview.cpp
-        views/liveryview.cpp
-        views/viewbasesimulation.cpp
-        views/countryview.cpp
-        views/liveryview.h
-        views/flightplandialog.cpp
-        plugindetailswindow.h
-        shortcut.cpp
-        led.cpp
-        qml
-        qml/Transceiver.qml
-        qml/qml.qrc
-        qml/AFVMap.qml
-        qml/AtcRing.qml
-        textmessagetextedit.cpp
-        labelandicon.ui
-        editors/fsdsetupform.cpp
-        editors/liveryform.ui
-        editors/relativeaircraftposition.ui
-        editors/fsdsetupform.h
-        editors/cockpitcomform.cpp
-        editors/situationform.ui
-        editors/coordinateform.h
-        editors/liveryform.h
-        editors/situationform.h
-        editors/aircraftmodelform.h
-        editors/fsdsetupform.ui
-        editors/aircraftpartsform.cpp
-        editors/ownmodelsetform.h
-        editors/pilotform.cpp
-        editors/interpolationsetupform.ui
-        editors/matchingform.ui
-        editors/distributorform.cpp
-        editors/ownmodelsetform.ui
-        editors/coordinateform.cpp
-        editors/matchingform.h
-        editors/pilotform.h
-        editors/cockpitcomform.ui
-        editors/relativeaircraftposition.cpp
-        editors/matchingform.cpp
-        editors/modelmappingform.ui
-        editors/pilotform.ui
-        editors/form.h
-        editors/modelmappingmodifyform.h
-        editors/modelmappingmodifyform.cpp
-        editors/serverform.h
-        editors/liveryform.cpp
-        editors/validationindicator.h
-        editors/modelmappingform.h
-        editors/modelmappingform.cpp
-        editors/distributorform.ui
-        editors/aircrafticaoform.h
-        editors/aircraftpartsform.ui
-        editors/serverform.cpp
-        editors/modelmappingmodifyform.ui
-        editors/pbhsform.cpp
-        editors/validationindicator.ui
-        editors/aircraftpartsform.h
-        editors/pbhsform.ui
-        editors/coordinateform.ui
-        editors/distributorform.h
-        editors/airlineicaoform.cpp
-        editors/airlineicaoform.ui
-        editors/relativeaircraftposition.h
-        editors/form.cpp
-        editors/validationindicator.cpp
-        editors/interpolationsetupform.h
-        editors/situationform.cpp
-        editors/aircraftmodelform.cpp
-        editors/serverform.ui
-        editors/ownmodelsetform.cpp
-        editors/aircraftmodelform.ui
-        editors/airlineicaoform.h
-        editors/interpolationsetupform.cpp
-        editors/aircrafticaoform.ui
-        editors/pbhsform.h
-        editors/aircrafticaoform.cpp
-        editors/cockpitcomform.h
-        swiftguiexport.h
-        pluginselector.cpp
-        levelmeter.cpp
-        loadindicator.h
-        pluginselector.h
-        infoarea.cpp
-        overlaymessagesframe.cpp
-        managedstatusbar.h
-        lineedithistory.cpp
-        dropsite.h
-        horizontalcombobox.h
-        dropsite.cpp
-        led.h
-        pluginconfigwindow.cpp
-        mainwindowaccess.cpp
-        guiapplication.h
-        labelandicon.h
-        loginmodebuttons.cpp
-        dockwidgetinfoarea.h
-        enableforframelesswindow.h
-        lineedithistory.h
-        showhidebar.h
-        overlaymessagesframe.h
-        loginmodebuttons.h
-        dockwidget.h
-        ticklabel.h
-        sharedstringlistcompleter.h
-        plugindetailswindow.cpp
-        enablefordockwidgetinfoarea.cpp
-        levelmeter.h
-        registermetadata.cpp
-        guiutility.cpp
-        showhidebar.ui
-        dropbase.cpp
-        windowfinder.cpp
-        textmessagetextedit.h
-        guiactionbind.cpp
-        components/interpolationcomponent.cpp
-        components/statusmessageform.h
-        components/firstmodelsetdialog.ui
-        components/legalinfocomponent.ui
-        components/cockpitcomaudiodialog.ui
-        components/dbmodelkeycompleter.cpp
-        components/radarcomponent.cpp
-        components/dbmappingcomponentaware.h
-        components/serverlistselector.cpp
-        components/settingssimulatorcomponent.h
-        components/settingsswiftplugin.cpp
-        components/updateinfodialog.h
-        components/rawfsdmessagesdialog.h
-        components/installxswiftbusdialog.cpp
-        components/distributorpreferencescomponent.ui
-        components/modelmatcherlogenable.ui
-        components/settingsxswiftbuscomponent.ui
-        components/selcalcodeselector.cpp
-        components/audionotificationcomponent.h
-        components/updateinfodialog.ui
-        components/aircraftpartshistory.ui
-        components/autopublishdialog.ui
-        components/logincomponent.h
-        components/audionotificationcomponent.ui
-        components/settingsfontdialog.cpp
-        components/matchingstatisticscomponent.ui
-        components/modelmatcherlogcomponent.ui
-        components/ownaircraftcomponent.h
-        components/autopublishdialog.cpp
-        components/dbairlineicaocomponent.h
-        components/aircraftpartscomponent.ui
-        components/aircraftmodelstringcompleter.cpp
-        components/dbliveryselectorcomponent.ui
-        components/transpondermodecomponent.ui
-        components/autopublishcomponent.h
-        components/audioadvanceddistributeddialog.ui
-        components/settingsadvancedcomponent.h
-        components/airportdialog.h
-        components/settingsmatchingdialog.cpp
-        components/modelmatcherlogcomponent.h
-        components/settingsmodelcomponent.h
-        components/coreinfoareacomponent.cpp
-        components/aircraftcomponent.h
-        components/modelconverterxsetupcomponent.ui
-        components/maininfoareacomponent.ui
-        components/altitudedialog.ui
-        components/callsigncompleter.cpp
-        components/audioadvanceddistributeddialog.h
-        components/mainkeypadareacomponent.h
-        components/textmessagecomponent.h
-        components/networkdetailscomponent.ui
-        components/settingsnetworkcomponent.h
-        components/infobarwebreadersstatussmallcomponent.ui
-        components/legalinfocomponent.cpp
-        components/usercomponent.ui
-        components/dbreducemodelduplicates.ui
-        components/installfsxterrainprobecomponent.cpp
-        components/interpolationsetupcomponent.h
-        components/registermetadatacomponents.cpp
-        components/networkaircraftvaluescomponent.h
-        components/datainfoareacomponent.ui
-        components/settingstextmessageinlinecomponent.h
-        components/cockpitcomaudiodialog.h
-        components/dbautosimulatorstashingcomponent.h
-        components/settingsswiftplugin.ui
-        components/dbliverycolorsearchdialog.cpp
-        components/atcbuttoncomponent.cpp
-        components/cockpitcomcomponent.ui
-        components/dbreducemodelduplicates.cpp
-        components/countryselector.ui
-        components/coordinatedialog.ui
-        #components/dbquickmappingwizard.h
-        components/dbmodelcomponent.cpp
-        components/modelconverterxsetupcomponent.cpp
-        components/logcomponent.h
-        components/dbstashcomponent.cpp
-        components/texteditdialog.ui
-        components/dbownmodelsetcomponent.ui
-        components/scalescreenfactor.h
-        components/rawfsdmessagesdialog.cpp
-        components/flightplancomponent.h
-        components/dbownmodelsetcomponent.cpp
-        components/settingsmatchingdialog.h
-        components/aircraftmodelvalidationcomponent.h
-        components/autopublishdialog.h
-        components/maininfoareacomponent.h
-        components/commandinput.h
-        components/configsimulatorcomponent.ui
-        components/datamaininfoareacomponent.cpp
-        components/applicationclosedialog.cpp
-        components/settingshotkeycomponent.h
-        components/datamaininfoareacomponent.h
-        components/settingsnetworkserverscomponent.ui
-        components/settingsmodelcomponent.ui
-        components/dbaircrafticaoselectorcomponent.h
-        components/corestatuscomponent.cpp
-        components/audioadvanceddistributedcomponent.ui
-        components/settingsfontcomponent.cpp
-        components/colorselector.cpp
-        components/aircraftmodelvalidationcomponent.cpp
-        components/settingsguicomponent.h
-        components/dbaircrafticaocomponent.cpp
-        components/setuploadingdialog.ui
-        components/dbmappingcomponent.ui
-        components/mappingcomponent.cpp
-        components/settingsfontdialog.h
-        components/dbownmodelsetdialog.cpp
-        components/statusmessageform.ui
-        components/distributorpreferencescomponent.h
-        components/firstmodelsetdialog.cpp
-        components/cockpitcomaudiodialog.cpp
-        components/dbairlineicaoselectorcomponent.ui
-        components/modelmatchercomponent.ui
-        components/dblogincomponent.h
-        components/coordinatedialog.h
-        components/settingsadvancedcomponent.cpp
-        components/dbdistributorselectorcomponent.ui
-        components/dbliverycomponent.h
-        components/dbairlineicaocomponent.ui
-        components/radarcomponent.h
-        components/coresettingsdialog.ui
-        components/simulatorcomponent.ui
-        components/simulatorcomponent.h
-        components/airportsmallcompleter.h
-        components/dbusserveraddressselector.ui
-        components/settingscomponent.ui
-        components/settingstextmessagestyle.ui
-        components/dbownmodelsdialog.h
-        components/settingsvatsimreaderscomponent.cpp
-        components/settingscomponent.h
-        components/updateinfocomponent.ui
-        components/infobarwebreadersstatuscomponent.h
-        components/setuploadingdialog.cpp
-        components/flightplancomponent.ui
-        components/dbautosimulatorstashingcomponent.ui
-        components/downloaddialog.ui
-        components/hotkeydialog.h
-        components/dbloaddatadialog.h
-        components/dbcountryselectorcomponent.cpp
-        components/interpolationlogdisplay.ui
-        components/statusmessagesdetail.ui
-        components/firstmodelsetcomponent.h
-        components/internalscomponent.ui
-        components/dbmappingcomponent.cpp
-        components/ownaircraftcomponent.cpp
-        components/dbcountrycomponent.cpp
-        components/otherswiftversionscomponent.ui
-        components/logcomponent.ui
-        components/settingsmatchingdialog.ui
-        components/settingsfontdialog.ui
-        components/simulatorselector.ui
-        components/aircraftcomponent.ui
-        components/scalescreenfactor.ui
-        components/settingsmatchingcomponent.h
-        components/autopublishcomponent.ui
-        components/modelmatchercomponent.cpp
-        components/dbmodelmappingmodifydialog.ui
-        components/dbliverycolorsearch.cpp
-        components/rawfsdmessagescomponent.h
-        components/settingsswiftplugin.h
-        components/simbriefdownloaddialog.ui
-        components/atcstationcomponent.cpp
-        components/initialdataloadcomponent.h
-        components/airportsmallcompleter.cpp
-        components/dbownmodelsetdialog.ui
-        components/applicationclosedialog.ui
-        components/modelbrowsercomponent.ui
-        components/installsimulatorspecificwizardpage.h
-        components/dbliverycomponent.cpp
-        components/aircraftmodelvalidationcomponent.ui
-        components/settingsnetworkserverscomponent.h
-        components/copymodelsfromotherswiftversionsdialog.h
-        components/ownaircraftcomponent.ui
-        components/networkaircraftvaluescomponent.cpp
-        components/settingsxswiftbuscomponent.cpp
-        components/installxswiftbuscomponent.ui
-        components/aircraftmodelsetvalidationdialog.ui
-        components/dbloadoverviewcomponent.ui
-        components/dbliverycolorsearchdialog.ui
-        components/dbmodelkeycompleter.h
-        components/firstmodelsetdialog.h
-        components/audionotificationcomponent.cpp
-        components/dbownmodelsetformdialog.ui
-        components/registercomponent.ui
-        components/infobarwebreadersstatussmallcomponent.cpp
-        components/otherswiftversionsdialog.cpp
-        components/dbloadoverviewcomponent.cpp
-        components/airportsmallcompleter.ui
-        components/internalscomponent.cpp
-        components/interpolationlogdisplaydialog.h
-        components/mappingcomponent.ui
-        components/datasettingscomponent.h
-        components/dbmodelworkbenchcomponent.cpp
-        #components/dbquickmappingwizard.ui
-        components/aircraftpartshistory.cpp
-        components/radarcomponent.ui
-        components/simbriefdownloaddialog.h
-        components/dbownmodelscomponent.ui
-        components/texteditdialog.h
-        components/interpolationcomponent.ui
-        components/dbownmodelsetformdialog.h
-        components/airportcompleter.cpp
-        components/modelmatcherlogenable.h
-        components/updateinfocomponent.h
-        components/countryselector.cpp
-        components/infobarstatuscomponent.h
-        components/dbownmodelscomponent.h
-        components/hotkeydialog.cpp
-        components/configsimulatorcomponent.h
-        components/dbloaddatadialog.cpp
-        components/settingscomponent.cpp
-        components/dbairlinenameselectorcomponent.h
-        components/matchingstatisticscomponent.cpp
-        components/dbliveryselectorcomponent.cpp
-        components/firstmodelsetcomponent.cpp
-        components/cgsourceselector.ui
-        components/modelconverterxsetupcomponent.h
-        components/aircraftpartscomponent.h
-        components/settingsviewupdatetimes.cpp
-        components/dbaircrafticaoselectorcomponent.ui
-        components/textmessagecomponenttab.h
-        components/modelmatcherlogenable.cpp
-        components/aircraftcombinedtypeselector.cpp
-        components/modelbrowserdialog.ui
-        components/dbcountryselectorcomponent.ui
-        components/dbusserveraddressselector.h
-        components/copysettingsandcachescomponent.cpp
-        components/colorselector.ui
-        components/dbusserveraddressselector.cpp
-        components/audioadvanceddistributedcomponent.h
-        components/initialdataloadcomponent.ui
-        components/copymodelsfromotherswiftversionsdialog.ui
-        components/settingssimulatorcomponent.ui
-        components/initialdataloadcomponent.cpp
-        components/dbaircraftcategorycomponent.cpp
-        components/dbmappingcomponentaware.cpp
-        components/coreinfoareacomponent.ui
-        components/coordinatedialog.cpp
-        components/dbliveryselectorcomponent.h
-        components/dbmodelcomponent.h
-        components/networkdetailscomponent.cpp
-        components/downloadcomponent.cpp
+        altitudeedit.h
         components/aboutdialog.cpp
-        components/dbliverycolorsearch.h
-        components/aircraftpartscomponent.cpp
-        components/settingssimulatorbasicscomponent.cpp
-        components/hotkeydialog.ui
-        components/dbcountryselectorcomponent.h
-        components/configurationwizard.ui
-        components/coresettingsdialog.cpp
-        components/modelbrowsercomponent.h
+        components/aboutdialog.h
+        components/aboutdialog.ui
+        components/abouthtmlcomponent.cpp
         components/abouthtmlcomponent.h
         components/abouthtmlcomponent.ui
-        components/dbairlinenameselectorcomponent.ui
-        components/dbdistributorcomponent.h
-        components/autopublishcomponent.cpp
-        components/statusmessageformsmall.ui
-        components/audiodevicevolumesetupcomponent.h
-        components/applicationclosedialog.h
-        components/dbmappingcomponent.h
-        components/modelmatchercomponent.h
-        components/simulatorcomponent.cpp
-        components/allmaininfoareacomponents.h
-        components/downloaddialog.h
-        components/statusmessagesdetail.h
-        components/settingsfontcomponent.ui
-        components/remoteaircraftselector.ui
-        components/aircraftcombinedtypeselector.ui
-        components/infobarwebreadersstatuscomponent.cpp
-        components/dbdistributorselectorcomponent.cpp
-        components/networkdetailscomponent.h
-        components/otherswiftversionsdialog.h
-        components/coresettingsdialog.h
-        components/serverlistselector.h
-        components/navigatordialog.ui
-        components/installxswiftbuscomponent.cpp
-        components/cockpitcomponent.ui
-        components/navigatordialog.h
-        components/logincomponent.cpp
-        components/callsigncompleter.ui
-        components/cockpitcomponent.cpp
-        components/simbriefdownloaddialog.cpp
-        components/simulatorselector.cpp
-        components/audiodevicevolumesetupcomponent.ui
-        components/dbloaddatadialog.ui
-        components/mainkeypadareacomponent.cpp
-        components/modelmodeselector.ui
-        components/copymodelsfromotherswiftversionscomponent.h
-        components/corestatuscomponent.h
-        components/countryselector.h
-        components/settingsviewupdatetimes.h
-        components/dbstashcomponent.ui
-        components/dbdistributorcomponent.cpp
-        components/settingssimulatormessagescomponent.h
-        components/texteditdialog.cpp
-        components/dbairlineicaoselectorbase.cpp
-        components/aircraftmodelstringcompleter.h
-        components/modelbrowserdialog.cpp
-        components/airportdialog.cpp
-        components/rawfsdmessagescomponent.ui
-        components/transpondercodespinbox.h
-        components/cockpitcomcomponent.h
-        components/interpolationsetupcomponent.cpp
-        components/infobarstatuscomponent.cpp
-        components/registermetadatacomponents.h
-        components/modelmodeselector.h
-        components/settingsviewupdatetimes.ui
-        components/airportcompleter.h
-        components/cockpitinfoareacomponent.cpp
-        components/cockpittranspondermodeledscomponent.cpp
-        components/installfsxterrainprobecomponent.h
-        components/interpolationlogdisplay.h
-        components/selcalcodeselector.ui
-        components/stringlistdialog.h
-        components/matchingstatisticscomponent.h
-        components/dbloadoverviewcomponent.h
-        components/dbdistributorselectorcomponent.h
-        components/setuploadingdialog.h
-        components/copysettingsandcachescomponent.h
-        components/downloaddialog.cpp
-        components/callsigncompleter.h
-        components/altitudedialog.cpp
-        components/copymodelsfromotherswiftversionscomponent.cpp
-        components/settingssimulatormessagescomponent.cpp
-        components/dbaircraftcategorycomponent.ui
-        components/cockpitcomtransmissioncomponent.ui
-        components/interpolationlogdisplay.cpp
-        components/dblogincomponent.cpp
-        components/aircraftmodelsetvalidationdialog.h
-        components/audiodevicevolumesetupcomponent.cpp
-        components/aboutdialog.h
-        components/textmessagecomponent.ui
-        components/aircraftmodelsetvalidationdialog.cpp
-        components/coreinfoareacomponent.h
-        components/rawfsdmessagesdialog.ui
-        components/dbautostashingcomponent.h
-        components/transpondermodecomponent.h
-        components/remoteaircraftselector.cpp
-        components/stringlistdialog.cpp
-        components/atcstationcomponent.ui
-        components/mainkeypadareacomponent.ui
-        components/settingssimulatorcomponent.cpp
-        components/dbairlineicaoselectorbase.h
-        components/dbownmodelsdialog.ui
-        components/dbmodelcomponent.ui
-        components/modelmatcherlogcomponent.cpp
-        components/airportcompleter.ui
-        components/cgsourceselector.h
-        components/legalinfocomponent.h
-        components/settingsvatsimreaderscomponent.ui
-        components/infobarwebreadersstatuscomponent.ui
-        components/dbmodelmappingmodifydialog.cpp
-        components/dbliverycolorsearchdialog.h
-        components/modelbrowserdialog.h
-        components/aboutdialog.ui
-        components/cockpitcomcomponent.cpp
-        components/logcomponent.cpp
-        components/configurationwizard.cpp
-        components/downloadcomponent.ui
-        #components/dbquickmappingwizard.cpp
+        components/aircraftcombinedtypeselector.cpp
         components/aircraftcombinedtypeselector.h
-        components/dbownmodelsetformdialog.cpp
-        components/dbmodelworkbenchcomponent.ui
-        components/otherswiftversionsdialog.ui
-        components/dbreducemodelduplicates.h
-        components/colorselector.h
-        components/dbstashcomponent.h
-        components/transpondercodespinbox.cpp
-        components/interpolationcomponent.h
-        components/dbairlineicaoselectorcomponent.h
-        components/maininfoareacomponent.cpp
-        components/mappingcomponent.h
-        components/dbautostashingcomponent.ui
-        components/copysettingsandcachescomponent.ui
-        components/dbaircraftcategorycomponent.h
-        components/copymodelsfromotherswiftversionscomponent.ui
-        components/settingsnetworkserverscomponent.cpp
-        components/aircraftmodelstringcompleter.ui
-        components/altitudedialog.h
-        components/textmessagecomponent.cpp
-        components/flightplancomponent.cpp
-        components/usercomponent.cpp
-        components/cockpitinfoareacomponent.h
-        components/interpolationlogdisplaydialog.ui
-        components/installxswiftbusdialog.h
-        components/settingssimulatorbasicscomponent.ui
-        components/scalescreenfactor.cpp
-        components/downloadcomponent.h
-        components/audioadvanceddistributeddialog.cpp
-        components/configurationwizard.h
-        components/atcbuttoncomponent.ui
-        components/transpondermodeselector.h
-        components/statusmessageformsmall.h
-        components/dbaircrafticaoselectorcomponent.cpp
-        components/infobarstatuscomponent.ui
-        components/interpolationlogdisplaydialog.cpp
-        components/dbdistributorcomponent.ui
-        components/cockpittranspondermodeledscomponent.h
-        components/settingssimulatormessagescomponent.ui
-        components/settingsmatchingcomponent.cpp
-        components/modelbrowsercomponent.cpp
-        components/settingsguicomponent.ui
-        components/dbautostashingcomponent.cpp
-        components/transpondermodecomponent.cpp
-        components/configsimulatorcomponent.cpp
-        components/atcbuttoncomponent.h
-        components/cockpitinfoareacomponent.ui
-        components/settingssimulatorbasicscomponent.h
-        components/settingsvatsimreaderscomponent.h
-        components/marginsinput.ui
+        components/aircraftcombinedtypeselector.ui
         components/aircraftcomponent.cpp
-        components/settingsmodelcomponent.cpp
-        components/logincomponent.ui
-        components/stringlistdialog.ui
-        components/dbcountrycomponent.ui
-        components/selcalcodeselector.h
-        components/navigatordialog.cpp
-        components/dblogincomponent.ui
-        components/usercomponent.h
-        components/dbairlinenameselectorcomponent.cpp
-        components/dbautosimulatorstashingcomponent.cpp
-        components/statusmessageformsmall.cpp
-        components/marginsinput.cpp
-        components/dbliverycolorsearch.ui
-        components/dbcountrycomponent.h
-        components/transpondermodeselector.cpp
-        components/dbownmodelsetcomponent.h
-        components/networkaircraftvaluescomponent.ui
-        components/dbaircrafticaocomponent.h
-        components/corestatuscomponent.ui
-        components/datasettingscomponent.ui
-        components/cockpitcomtransmissioncomponent.cpp
-        components/firstmodelsetcomponent.ui
-        components/settingsnetworkcomponent.ui
-        components/cgsourceselector.cpp
-        components/statusmessagesdetail.cpp
-        components/otherswiftversionscomponent.cpp
-        components/audioadvanceddistributedcomponent.cpp
-        components/dbmodelmappingmodifydialog.h
-        components/interpolationsetupcomponent.ui
-        components/datasettingscomponent.cpp
-        components/dbownmodelsetdialog.h
-        components/infobarwebreadersstatussmallcomponent.h
-        components/installxswiftbusdialog.ui
-        components/dbmodelworkbenchcomponent.h
-        components/updateinfodialog.cpp
-        components/copymodelsfromotherswiftversionsdialog.cpp
-        components/settingsadvancedcomponent.ui
-        components/datainfoareacomponent.h
-        components/dbownmodelscomponent.cpp
-        components/marginsinput.h
-        components/registercomponent.cpp
-        components/statusmessageform.cpp
-        components/settingsxswiftbuscomponent.h
-        components/datainfoareacomponent.cpp
-        components/dbownmodelsdialog.cpp
-        components/updateinfocomponent.cpp
-        components/rawfsdmessagescomponent.cpp
-        components/dbairlineicaoselectorcomponent.cpp
-        components/abouthtmlcomponent.cpp
-        components/settingsmatchingcomponent.ui
-        components/otherswiftversionscomponent.h
-        components/settingsfontcomponent.h
-        components/commandinput.cpp
-        components/settingstextmessageinlinecomponent.cpp
-        components/atcstationcomponent.h
-        components/settingsguicomponent.cpp
-        components/cockpitcomtransmissioncomponent.h
-        components/modelmodeselector.cpp
-        components/remoteaircraftselector.h
-        components/installxswiftbuscomponent.h
-        components/installfsxterrainprobecomponent.ui
-        components/internalscomponent.h
-        components/settingshotkeycomponent.ui
-        components/settingstextmessagestyle.cpp
-        components/dbaircrafticaocomponent.ui
-        components/simulatorselector.h
-        components/distributorpreferencescomponent.cpp
-        components/settingsnetworkcomponent.cpp
-        components/airportdialog.ui
-        components/registercomponent.h
-        components/cockpitcomponent.h
-        components/datamaininfoareacomponent.ui
-        components/dbairlineicaocomponent.cpp
+        components/aircraftcomponent.h
+        components/aircraftcomponent.ui
+        components/aircraftmodelsetvalidationdialog.cpp
+        components/aircraftmodelsetvalidationdialog.h
+        components/aircraftmodelsetvalidationdialog.ui
+        components/aircraftmodelstringcompleter.cpp
+        components/aircraftmodelstringcompleter.h
+        components/aircraftmodelstringcompleter.ui
+        components/aircraftmodelvalidationcomponent.cpp
+        components/aircraftmodelvalidationcomponent.h
+        components/aircraftmodelvalidationcomponent.ui
+        components/aircraftpartscomponent.cpp
+        components/aircraftpartscomponent.h
+        components/aircraftpartscomponent.ui
+        components/aircraftpartshistory.cpp
         components/aircraftpartshistory.h
-        components/settingshotkeycomponent.cpp
-        components/settingstextmessagestyle.h
+        components/aircraftpartshistory.ui
+        components/airportcompleter.cpp
+        components/airportcompleter.h
+        components/airportcompleter.ui
+        components/airportdialog.cpp
+        components/airportdialog.h
+        components/airportdialog.ui
+        components/airportsmallcompleter.cpp
+        components/airportsmallcompleter.h
+        components/airportsmallcompleter.ui
+        components/allmaininfoareacomponents.h
+        components/altitudedialog.cpp
+        components/altitudedialog.h
+        components/altitudedialog.ui
+        components/applicationclosedialog.cpp
+        components/applicationclosedialog.h
+        components/applicationclosedialog.ui
+        components/atcbuttoncomponent.cpp
+        components/atcbuttoncomponent.h
+        components/atcbuttoncomponent.ui
+        components/atcstationcomponent.cpp
+        components/atcstationcomponent.h
+        components/atcstationcomponent.ui
+        components/audioadvanceddistributedcomponent.cpp
+        components/audioadvanceddistributedcomponent.h
+        components/audioadvanceddistributedcomponent.ui
+        components/audioadvanceddistributeddialog.cpp
+        components/audioadvanceddistributeddialog.h
+        components/audioadvanceddistributeddialog.ui
+        components/audiodevicevolumesetupcomponent.cpp
+        components/audiodevicevolumesetupcomponent.h
+        components/audiodevicevolumesetupcomponent.ui
+        components/audionotificationcomponent.cpp
+        components/audionotificationcomponent.h
+        components/audionotificationcomponent.ui
+        components/autopublishcomponent.cpp
+        components/autopublishcomponent.h
+        components/autopublishcomponent.ui
+        components/autopublishdialog.cpp
+        components/autopublishdialog.h
+        components/autopublishdialog.ui
+        components/callsigncompleter.cpp
+        components/callsigncompleter.h
+        components/callsigncompleter.ui
+        components/cgsourceselector.cpp
+        components/cgsourceselector.h
+        components/cgsourceselector.ui
+        components/cockpitcomaudiodialog.cpp
+        components/cockpitcomaudiodialog.h
+        components/cockpitcomaudiodialog.ui
+        components/cockpitcomcomponent.cpp
+        components/cockpitcomcomponent.h
+        components/cockpitcomcomponent.ui
+        components/cockpitcomponent.cpp
+        components/cockpitcomponent.h
+        components/cockpitcomponent.ui
+        components/cockpitcomtransmissioncomponent.cpp
+        components/cockpitcomtransmissioncomponent.h
+        components/cockpitcomtransmissioncomponent.ui
+        components/cockpitinfoareacomponent.cpp
+        components/cockpitinfoareacomponent.h
+        components/cockpitinfoareacomponent.ui
+        components/cockpittranspondermodeledscomponent.cpp
+        components/cockpittranspondermodeledscomponent.h
+        components/colorselector.cpp
+        components/colorselector.h
+        components/colorselector.ui
+        components/commandinput.cpp
+        components/commandinput.h
+        components/configsimulatorcomponent.cpp
+        components/configsimulatorcomponent.h
+        components/configsimulatorcomponent.ui
+        components/configurationwizard.cpp
+        components/configurationwizard.h
+        components/configurationwizard.ui
+        components/coordinatedialog.cpp
+        components/coordinatedialog.h
+        components/coordinatedialog.ui
+        components/copymodelsfromotherswiftversionscomponent.cpp
+        components/copymodelsfromotherswiftversionscomponent.h
+        components/copymodelsfromotherswiftversionscomponent.ui
+        components/copymodelsfromotherswiftversionsdialog.cpp
+        components/copymodelsfromotherswiftversionsdialog.h
+        components/copymodelsfromotherswiftversionsdialog.ui
+        components/copysettingsandcachescomponent.cpp
+        components/copysettingsandcachescomponent.h
+        components/copysettingsandcachescomponent.ui
+        components/coreinfoareacomponent.cpp
+        components/coreinfoareacomponent.h
+        components/coreinfoareacomponent.ui
+        components/coresettingsdialog.cpp
+        components/coresettingsdialog.h
+        components/coresettingsdialog.ui
+        components/corestatuscomponent.cpp
+        components/corestatuscomponent.h
+        components/corestatuscomponent.ui
+        components/countryselector.cpp
+        components/countryselector.h
+        components/countryselector.ui
+        components/datainfoareacomponent.cpp
+        components/datainfoareacomponent.h
+        components/datainfoareacomponent.ui
+        components/datamaininfoareacomponent.cpp
+        components/datamaininfoareacomponent.h
+        components/datamaininfoareacomponent.ui
+        components/datasettingscomponent.cpp
+        components/datasettingscomponent.h
+        components/datasettingscomponent.ui
+        components/dbaircraftcategorycomponent.cpp
+        components/dbaircraftcategorycomponent.h
+        components/dbaircraftcategorycomponent.ui
+        components/dbaircrafticaocomponent.cpp
+        components/dbaircrafticaocomponent.h
+        components/dbaircrafticaocomponent.ui
+        components/dbaircrafticaoselectorcomponent.cpp
+        components/dbaircrafticaoselectorcomponent.h
+        components/dbaircrafticaoselectorcomponent.ui
+        components/dbairlineicaocomponent.cpp
+        components/dbairlineicaocomponent.h
+        components/dbairlineicaocomponent.ui
+        components/dbairlineicaoselectorbase.cpp
+        components/dbairlineicaoselectorbase.h
+        components/dbairlineicaoselectorcomponent.cpp
+        components/dbairlineicaoselectorcomponent.h
+        components/dbairlineicaoselectorcomponent.ui
+        components/dbairlinenameselectorcomponent.cpp
+        components/dbairlinenameselectorcomponent.h
+        components/dbairlinenameselectorcomponent.ui
+        components/dbautosimulatorstashingcomponent.cpp
+        components/dbautosimulatorstashingcomponent.h
+        components/dbautosimulatorstashingcomponent.ui
+        components/dbautostashingcomponent.cpp
+        components/dbautostashingcomponent.h
+        components/dbautostashingcomponent.ui
+        components/dbcountrycomponent.cpp
+        components/dbcountrycomponent.h
+        components/dbcountrycomponent.ui
+        components/dbcountryselectorcomponent.cpp
+        components/dbcountryselectorcomponent.h
+        components/dbcountryselectorcomponent.ui
+        components/dbdistributorcomponent.cpp
+        components/dbdistributorcomponent.h
+        components/dbdistributorcomponent.ui
+        components/dbdistributorselectorcomponent.cpp
+        components/dbdistributorselectorcomponent.h
+        components/dbdistributorselectorcomponent.ui
+        components/dbliverycolorsearch.cpp
+        components/dbliverycolorsearch.h
+        components/dbliverycolorsearch.ui
+        components/dbliverycolorsearchdialog.cpp
+        components/dbliverycolorsearchdialog.h
+        components/dbliverycolorsearchdialog.ui
+        components/dbliverycomponent.cpp
+        components/dbliverycomponent.h
         components/dbliverycomponent.ui
-        elidedpushbutton.h
-        enableforframelesswindow.cpp
-        overlaymessages.cpp
-        stylesheetutility.cpp
-        dropbase.h
-        eventfilter.cpp
-        copyxswiftbusdialog.h
-        infoarea.h
-        altitudeedit.h
+        components/dbliveryselectorcomponent.cpp
+        components/dbliveryselectorcomponent.h
+        components/dbliveryselectorcomponent.ui
+        components/dbloaddatadialog.cpp
+        components/dbloaddatadialog.h
+        components/dbloaddatadialog.ui
+        components/dbloadoverviewcomponent.cpp
+        components/dbloadoverviewcomponent.h
+        components/dbloadoverviewcomponent.ui
+        components/dblogincomponent.cpp
+        components/dblogincomponent.h
+        components/dblogincomponent.ui
+        components/dbmappingcomponent.cpp
+        components/dbmappingcomponent.h
+        components/dbmappingcomponent.ui
+        components/dbmappingcomponentaware.cpp
+        components/dbmappingcomponentaware.h
+        components/dbmodelcomponent.cpp
+        components/dbmodelcomponent.h
+        components/dbmodelcomponent.ui
+        components/dbmodelkeycompleter.cpp
+        components/dbmodelkeycompleter.h
+        components/dbmodelmappingmodifydialog.cpp
+        components/dbmodelmappingmodifydialog.h
+        components/dbmodelmappingmodifydialog.ui
+        components/dbmodelworkbenchcomponent.cpp
+        components/dbmodelworkbenchcomponent.h
+        components/dbmodelworkbenchcomponent.ui
+        components/dbownmodelscomponent.cpp
+        components/dbownmodelscomponent.h
+        components/dbownmodelscomponent.ui
+        components/dbownmodelsdialog.cpp
+        components/dbownmodelsdialog.h
+        components/dbownmodelsdialog.ui
+        components/dbownmodelsetcomponent.cpp
+        components/dbownmodelsetcomponent.h
+        components/dbownmodelsetcomponent.ui
+        components/dbownmodelsetdialog.cpp
+        components/dbownmodelsetdialog.h
+        components/dbownmodelsetdialog.ui
+        components/dbownmodelsetformdialog.cpp
+        components/dbownmodelsetformdialog.h
+        components/dbownmodelsetformdialog.ui
+        #components/dbquickmappingwizard.cpp
+        #components/dbquickmappingwizard.h
+        #components/dbquickmappingwizard.ui
+        components/dbreducemodelduplicates.cpp
+        components/dbreducemodelduplicates.h
+        components/dbreducemodelduplicates.ui
+        components/dbstashcomponent.cpp
+        components/dbstashcomponent.h
+        components/dbstashcomponent.ui
+        components/dbusserveraddressselector.cpp
+        components/dbusserveraddressselector.h
+        components/dbusserveraddressselector.ui
+        components/distributorpreferencescomponent.cpp
+        components/distributorpreferencescomponent.h
+        components/distributorpreferencescomponent.ui
+        components/downloadcomponent.cpp
+        components/downloadcomponent.h
+        components/downloadcomponent.ui
+        components/downloaddialog.cpp
+        components/downloaddialog.h
+        components/downloaddialog.ui
+        components/firstmodelsetcomponent.cpp
+        components/firstmodelsetcomponent.h
+        components/firstmodelsetcomponent.ui
+        components/firstmodelsetdialog.cpp
+        components/firstmodelsetdialog.h
+        components/firstmodelsetdialog.ui
+        components/flightplancomponent.cpp
+        components/flightplancomponent.h
+        components/flightplancomponent.ui
+        components/hotkeydialog.cpp
+        components/hotkeydialog.h
+        components/hotkeydialog.ui
+        components/infobarstatuscomponent.cpp
+        components/infobarstatuscomponent.h
+        components/infobarstatuscomponent.ui
+        components/infobarwebreadersstatuscomponent.cpp
+        components/infobarwebreadersstatuscomponent.h
+        components/infobarwebreadersstatuscomponent.ui
+        components/infobarwebreadersstatussmallcomponent.cpp
+        components/infobarwebreadersstatussmallcomponent.h
+        components/infobarwebreadersstatussmallcomponent.ui
+        components/initialdataloadcomponent.cpp
+        components/initialdataloadcomponent.h
+        components/initialdataloadcomponent.ui
+        components/installfsxterrainprobecomponent.cpp
+        components/installfsxterrainprobecomponent.h
+        components/installfsxterrainprobecomponent.ui
+        components/installsimulatorspecificwizardpage.h
+        components/installxswiftbuscomponent.cpp
+        components/installxswiftbuscomponent.h
+        components/installxswiftbuscomponent.ui
+        components/installxswiftbusdialog.cpp
+        components/installxswiftbusdialog.h
+        components/installxswiftbusdialog.ui
+        components/internalscomponent.cpp
+        components/internalscomponent.h
+        components/internalscomponent.ui
+        components/interpolationcomponent.cpp
+        components/interpolationcomponent.h
+        components/interpolationcomponent.ui
+        components/interpolationlogdisplay.cpp
+        components/interpolationlogdisplay.h
+        components/interpolationlogdisplay.ui
+        components/interpolationlogdisplaydialog.cpp
+        components/interpolationlogdisplaydialog.h
+        components/interpolationlogdisplaydialog.ui
+        components/interpolationsetupcomponent.cpp
+        components/interpolationsetupcomponent.h
+        components/interpolationsetupcomponent.ui
+        components/legalinfocomponent.cpp
+        components/legalinfocomponent.h
+        components/legalinfocomponent.ui
+        components/logcomponent.cpp
+        components/logcomponent.h
+        components/logcomponent.ui
+        components/logincomponent.cpp
+        components/logincomponent.h
+        components/logincomponent.ui
+        components/maininfoareacomponent.cpp
+        components/maininfoareacomponent.h
+        components/maininfoareacomponent.ui
+        components/mainkeypadareacomponent.cpp
+        components/mainkeypadareacomponent.h
+        components/mainkeypadareacomponent.ui
+        components/mappingcomponent.cpp
+        components/mappingcomponent.h
+        components/mappingcomponent.ui
+        components/marginsinput.cpp
+        components/marginsinput.h
+        components/marginsinput.ui
+        components/matchingstatisticscomponent.cpp
+        components/matchingstatisticscomponent.h
+        components/matchingstatisticscomponent.ui
+        components/modelbrowsercomponent.cpp
+        components/modelbrowsercomponent.h
+        components/modelbrowsercomponent.ui
+        components/modelbrowserdialog.cpp
+        components/modelbrowserdialog.h
+        components/modelbrowserdialog.ui
+        components/modelconverterxsetupcomponent.cpp
+        components/modelconverterxsetupcomponent.h
+        components/modelconverterxsetupcomponent.ui
+        components/modelmatchercomponent.cpp
+        components/modelmatchercomponent.h
+        components/modelmatchercomponent.ui
+        components/modelmatcherlogcomponent.cpp
+        components/modelmatcherlogcomponent.h
+        components/modelmatcherlogcomponent.ui
+        components/modelmatcherlogenable.cpp
+        components/modelmatcherlogenable.h
+        components/modelmatcherlogenable.ui
+        components/modelmodeselector.cpp
+        components/modelmodeselector.h
+        components/modelmodeselector.ui
+        components/navigatordialog.cpp
+        components/navigatordialog.h
+        components/navigatordialog.ui
+        components/networkaircraftvaluescomponent.cpp
+        components/networkaircraftvaluescomponent.h
+        components/networkaircraftvaluescomponent.ui
+        components/networkdetailscomponent.cpp
+        components/networkdetailscomponent.h
+        components/networkdetailscomponent.ui
+        components/otherswiftversionscomponent.cpp
+        components/otherswiftversionscomponent.h
+        components/otherswiftversionscomponent.ui
+        components/otherswiftversionsdialog.cpp
+        components/otherswiftversionsdialog.h
+        components/otherswiftversionsdialog.ui
+        components/ownaircraftcomponent.cpp
+        components/ownaircraftcomponent.h
+        components/ownaircraftcomponent.ui
+        components/radarcomponent.cpp
+        components/radarcomponent.h
+        components/radarcomponent.ui
+        components/rawfsdmessagescomponent.cpp
+        components/rawfsdmessagescomponent.h
+        components/rawfsdmessagescomponent.ui
+        components/rawfsdmessagesdialog.cpp
+        components/rawfsdmessagesdialog.h
+        components/rawfsdmessagesdialog.ui
+        components/registercomponent.cpp
+        components/registercomponent.h
+        components/registercomponent.ui
+        components/registermetadatacomponents.cpp
+        components/registermetadatacomponents.h
+        components/remoteaircraftselector.cpp
+        components/remoteaircraftselector.h
+        components/remoteaircraftselector.ui
+        components/scalescreenfactor.cpp
+        components/scalescreenfactor.h
+        components/scalescreenfactor.ui
+        components/selcalcodeselector.cpp
+        components/selcalcodeselector.h
+        components/selcalcodeselector.ui
+        components/serverlistselector.cpp
+        components/serverlistselector.h
+        components/settingsadvancedcomponent.cpp
+        components/settingsadvancedcomponent.h
+        components/settingsadvancedcomponent.ui
+        components/settingscomponent.cpp
+        components/settingscomponent.h
+        components/settingscomponent.ui
+        components/settingsfontcomponent.cpp
+        components/settingsfontcomponent.h
+        components/settingsfontcomponent.ui
+        components/settingsfontdialog.cpp
+        components/settingsfontdialog.h
+        components/settingsfontdialog.ui
+        components/settingsguicomponent.cpp
+        components/settingsguicomponent.h
+        components/settingsguicomponent.ui
+        components/settingshotkeycomponent.cpp
+        components/settingshotkeycomponent.h
+        components/settingshotkeycomponent.ui
+        components/settingsmatchingcomponent.cpp
+        components/settingsmatchingcomponent.h
+        components/settingsmatchingcomponent.ui
+        components/settingsmatchingdialog.cpp
+        components/settingsmatchingdialog.h
+        components/settingsmatchingdialog.ui
+        components/settingsmodelcomponent.cpp
+        components/settingsmodelcomponent.h
+        components/settingsmodelcomponent.ui
+        components/settingsnetworkcomponent.cpp
+        components/settingsnetworkcomponent.h
+        components/settingsnetworkcomponent.ui
+        components/settingsnetworkserverscomponent.cpp
+        components/settingsnetworkserverscomponent.h
+        components/settingsnetworkserverscomponent.ui
+        components/settingssimulatorbasicscomponent.cpp
+        components/settingssimulatorbasicscomponent.h
+        components/settingssimulatorbasicscomponent.ui
+        components/settingssimulatorcomponent.cpp
+        components/settingssimulatorcomponent.h
+        components/settingssimulatorcomponent.ui
+        components/settingssimulatormessagescomponent.cpp
+        components/settingssimulatormessagescomponent.h
+        components/settingssimulatormessagescomponent.ui
+        components/settingsswiftplugin.cpp
+        components/settingsswiftplugin.h
+        components/settingsswiftplugin.ui
+        components/settingstextmessageinlinecomponent.cpp
+        components/settingstextmessageinlinecomponent.h
+        components/settingstextmessagestyle.cpp
+        components/settingstextmessagestyle.h
+        components/settingstextmessagestyle.ui
+        components/settingsvatsimreaderscomponent.cpp
+        components/settingsvatsimreaderscomponent.h
+        components/settingsvatsimreaderscomponent.ui
+        components/settingsviewupdatetimes.cpp
+        components/settingsviewupdatetimes.h
+        components/settingsviewupdatetimes.ui
+        components/settingsxswiftbuscomponent.cpp
+        components/settingsxswiftbuscomponent.h
+        components/settingsxswiftbuscomponent.ui
+        components/setuploadingdialog.cpp
+        components/setuploadingdialog.h
+        components/setuploadingdialog.ui
+        components/simbriefdownloaddialog.cpp
+        components/simbriefdownloaddialog.h
+        components/simbriefdownloaddialog.ui
+        components/simulatorcomponent.cpp
+        components/simulatorcomponent.h
+        components/simulatorcomponent.ui
+        components/simulatorselector.cpp
+        components/simulatorselector.h
+        components/simulatorselector.ui
+        components/statusmessageform.cpp
+        components/statusmessageform.h
+        components/statusmessageform.ui
+        components/statusmessageformsmall.cpp
+        components/statusmessageformsmall.h
+        components/statusmessageformsmall.ui
+        components/statusmessagesdetail.cpp
+        components/statusmessagesdetail.h
+        components/statusmessagesdetail.ui
+        components/stringlistdialog.cpp
+        components/stringlistdialog.h
+        components/stringlistdialog.ui
+        components/texteditdialog.cpp
+        components/texteditdialog.h
+        components/texteditdialog.ui
+        components/textmessagecomponent.cpp
+        components/textmessagecomponent.h
+        components/textmessagecomponent.ui
+        components/textmessagecomponenttab.h
+        components/transpondercodespinbox.cpp
+        components/transpondercodespinbox.h
+        components/transpondermodecomponent.cpp
+        components/transpondermodecomponent.h
+        components/transpondermodecomponent.ui
+        components/transpondermodeselector.cpp
+        components/transpondermodeselector.h
+        components/updateinfocomponent.cpp
+        components/updateinfocomponent.h
+        components/updateinfocomponent.ui
+        components/updateinfodialog.cpp
+        components/updateinfodialog.h
+        components/updateinfodialog.ui
+        components/usercomponent.cpp
+        components/usercomponent.h
+        components/usercomponent.ui
         copyxswiftbusdialog.cpp
-        ecosystemcombobox.h
+        copyxswiftbusdialog.h
+        dockwidget.cpp
+        dockwidget.h
         dockwidgetinfoarea.cpp
-        guiutility.h
-        uppercasevalidator.cpp
-        mainwindowaccess.h
-        eventfilter.h
-        singleapplicationui.cpp
-        ecosystemcombobox.cpp
-        menus/fontmenus.h
-        menus/menuaction.h
-        menus/aircraftmodelmenus.h
-        menus/fontmenus.cpp
-        menus/menuaction.cpp
-        menus/menudelegate.h
-        menus/aircraftmodelmenus.cpp
+        dockwidgetinfoarea.h
         dockwidgetinfobar.cpp
-        splashscreen.cpp
-        filters/aircraftmodelfilterbar.cpp
-        filters/countryfilterbar.ui
-        filters/aircraftmodelfilterbar.ui
-        filters/liveryfilterbar.ui
-        filters/distributorfilterbar.ui
-        filters/airlineicaofilterbar.cpp
-        filters/countryfilterbar.cpp
+        dockwidgetinfobar.h
+        dropbase.cpp
+        dropbase.h
+        dropsite.cpp
+        dropsite.h
+        ecosystemcombobox.cpp
+        ecosystemcombobox.h
+        editors/aircrafticaoform.cpp
+        editors/aircrafticaoform.h
+        editors/aircrafticaoform.ui
+        editors/aircraftmodelform.cpp
+        editors/aircraftmodelform.h
+        editors/aircraftmodelform.ui
+        editors/aircraftpartsform.cpp
+        editors/aircraftpartsform.h
+        editors/aircraftpartsform.ui
+        editors/airlineicaoform.cpp
+        editors/airlineicaoform.h
+        editors/airlineicaoform.ui
+        editors/cockpitcomform.cpp
+        editors/cockpitcomform.h
+        editors/cockpitcomform.ui
+        editors/coordinateform.cpp
+        editors/coordinateform.h
+        editors/coordinateform.ui
+        editors/distributorform.cpp
+        editors/distributorform.h
+        editors/distributorform.ui
+        editors/form.cpp
+        editors/form.h
+        editors/fsdsetupform.cpp
+        editors/fsdsetupform.h
+        editors/fsdsetupform.ui
+        editors/interpolationsetupform.cpp
+        editors/interpolationsetupform.h
+        editors/interpolationsetupform.ui
+        editors/liveryform.cpp
+        editors/liveryform.h
+        editors/liveryform.ui
+        editors/matchingform.cpp
+        editors/matchingform.h
+        editors/matchingform.ui
+        editors/modelmappingform.cpp
+        editors/modelmappingform.h
+        editors/modelmappingform.ui
+        editors/modelmappingmodifyform.cpp
+        editors/modelmappingmodifyform.h
+        editors/modelmappingmodifyform.ui
+        editors/ownmodelsetform.cpp
+        editors/ownmodelsetform.h
+        editors/ownmodelsetform.ui
+        editors/pbhsform.cpp
+        editors/pbhsform.h
+        editors/pbhsform.ui
+        editors/pilotform.cpp
+        editors/pilotform.h
+        editors/pilotform.ui
+        editors/relativeaircraftposition.cpp
+        editors/relativeaircraftposition.h
+        editors/relativeaircraftposition.ui
+        editors/serverform.cpp
+        editors/serverform.h
+        editors/serverform.ui
+        editors/situationform.cpp
+        editors/situationform.h
+        editors/situationform.ui
+        editors/validationindicator.cpp
+        editors/validationindicator.h
+        editors/validationindicator.ui
+        elidedpushbutton.cpp
+        elidedpushbutton.h
+        enablefordockwidgetinfoarea.cpp
+        enablefordockwidgetinfoarea.h
+        enableforframelesswindow.cpp
+        enableforframelesswindow.h
+        enableforviewbasedindicator.cpp
+        enableforviewbasedindicator.h
+        eventfilter.cpp
+        eventfilter.h
         filters/aircrafticaofilterbar.cpp
-        filters/aircraftmodelfilterdialog.h
-        filters/airlineicaofilterbar.ui
+        filters/aircrafticaofilterbar.h
         filters/aircrafticaofilterbar.ui
-        filters/distributorfilterbar.h
+        filters/aircraftmodelfilterbar.cpp
+        filters/aircraftmodelfilterbar.h
+        filters/aircraftmodelfilterbar.ui
         filters/aircraftmodelfilterdialog.cpp
-        filters/statusmessagefilterdialog.ui
+        filters/aircraftmodelfilterdialog.h
+        filters/aircraftmodelfilterdialog.ui
+        filters/airlineicaofilterbar.cpp
+        filters/airlineicaofilterbar.h
+        filters/airlineicaofilterbar.ui
+        filters/countryfilterbar.cpp
+        filters/countryfilterbar.h
+        filters/countryfilterbar.ui
+        filters/distributorfilterbar.cpp
+        filters/distributorfilterbar.h
+        filters/distributorfilterbar.ui
+        filters/filterbarbuttons.cpp
+        filters/filterbarbuttons.h
+        filters/filterbarbuttons.ui
+        filters/filterdialog.cpp
+        filters/filterdialog.h
         filters/filterwidget.cpp
-        filters/liveryfilterbar.h
-        filters/statusmessagefilterdialog.cpp
+        filters/filterwidget.h
         filters/liveryfilterbar.cpp
+        filters/liveryfilterbar.h
+        filters/liveryfilterbar.ui
         filters/statusmessagefilterbar.cpp
         filters/statusmessagefilterbar.h
         filters/statusmessagefilterbar.ui
-        filters/filterwidget.h
-        filters/aircraftmodelfilterdialog.ui
-        filters/aircraftmodelfilterbar.h
-        filters/countryfilterbar.h
-        filters/airlineicaofilterbar.h
-        filters/distributorfilterbar.cpp
-        filters/aircrafticaofilterbar.h
-        filters/filterbarbuttons.h
-        filters/filterbarbuttons.cpp
-        filters/filterdialog.h
-        filters/filterbarbuttons.ui
+        filters/statusmessagefilterdialog.cpp
         filters/statusmessagefilterdialog.h
-        filters/filterdialog.cpp
-        pluginconfig.h
-        ticklabel.cpp
+        filters/statusmessagefilterdialog.ui
+        guiactionbind.cpp
         guiactionbind.h
         guiapplication.cpp
-        registermetadata.h
-        enablefordockwidgetinfoarea.h
-        shortcut.h
-        plugindetailswindow.ui
-        loadindicator.cpp
+        guiapplication.h
+        guiutility.cpp
+        guiutility.h
         horizontalcombobox.cpp
+        horizontalcombobox.h
+        infoarea.cpp
+        infoarea.h
+        labelandicon.cpp
+        labelandicon.h
+        labelandicon.ui
+        led.cpp
+        led.h
+        levelmeter.cpp
+        levelmeter.h
+        lineedithistory.cpp
+        lineedithistory.h
+        loadindicator.cpp
+        loadindicator.h
+        loginmodebuttons.cpp
+        loginmodebuttons.h
+        loginmodebuttons.ui
+        mainwindowaccess.cpp
+        mainwindowaccess.h
+        managedstatusbar.cpp
+        managedstatusbar.h
+        menus/aircraftmodelmenus.cpp
+        menus/aircraftmodelmenus.h
+        menus/fontmenus.cpp
+        menus/fontmenus.h
+        menus/menuaction.cpp
+        menus/menuaction.h
+        menus/menudelegate.h
+        models/actionhotkeylistmodel.cpp
+        models/actionhotkeylistmodel.h
+        models/actionitem.cpp
+        models/actionitem.h
+        models/actionmodel.cpp
+        models/actionmodel.h
+        models/aircraftcategorylistmodel.cpp
+        models/aircraftcategorylistmodel.h
+        models/aircraftcategorytreemodel.cpp
+        models/aircraftcategorytreemodel.h
+        models/aircrafticaofilter.cpp
+        models/aircrafticaofilter.h
+        models/aircrafticaolistmodel.cpp
+        models/aircrafticaolistmodel.h
+        models/aircraftmodelfilter.cpp
+        models/aircraftmodelfilter.h
+        models/aircraftmodellistmodel.cpp
+        models/aircraftmodellistmodel.h
+        models/aircraftpartslistmodel.cpp
+        models/aircraftpartslistmodel.h
+        models/aircraftsituationchangelistmodel.cpp
+        models/aircraftsituationchangelistmodel.h
+        models/aircraftsituationlistmodel.cpp
+        models/aircraftsituationlistmodel.h
+        models/airlineicaofilter.cpp
+        models/airlineicaofilter.h
+        models/airlineicaolistmodel.cpp
+        models/airlineicaolistmodel.h
+        models/airportlistmodel.cpp
+        models/airportlistmodel.h
+        models/allmodelcontainers.h
+        models/allmodels.h
+        models/applicationinfolistmodel.cpp
+        models/applicationinfolistmodel.h
+        models/atcstationlistmodel.cpp
+        models/atcstationlistmodel.h
+        models/atcstationtreemodel.cpp
+        models/atcstationtreemodel.h
+        models/audiodeviceinfolistmodel.cpp
+        models/audiodeviceinfolistmodel.h
+        models/clientlistmodel.cpp
+        models/clientlistmodel.h
+        models/columnformatters.cpp
+        models/columnformatters.h
+        models/columns.cpp
+        models/columns.h
+        models/countryfilter.cpp
+        models/countryfilter.h
+        models/countrylistmodel.cpp
+        models/countrylistmodel.h
+        models/distributorfilter.cpp
+        models/distributorfilter.h
+        models/distributorlistmodel.cpp
+        models/distributorlistmodel.h
+        models/identifierlistmodel.cpp
+        models/identifierlistmodel.h
+        models/interpolationsetupmodel.cpp
+        models/interpolationsetupmodel.h
+        models/listmodelbase.cpp
+        models/listmodelbase.h
+        models/listmodelbaseaviation.cpp
+        models/listmodelbasemisc.cpp
+        models/listmodelbasenetwork.cpp
+        models/listmodelbasenontemplate.cpp
+        models/listmodelbasenontemplate.h
+        models/listmodelbasesimulation.cpp
+        models/listmodelbaseweather.cpp
+        models/listmodelcallsignobjects.cpp
+        models/listmodelcallsignobjects.h
+        models/listmodeldbobjects.cpp
+        models/listmodeldbobjects.h
+        models/listmodeltimestampobjects.cpp
+        models/listmodeltimestampobjects.h
+        models/liveryfilter.cpp
+        models/liveryfilter.h
+        models/liverylistmodel.cpp
+        models/liverylistmodel.h
+        models/matchingstatisticsmodel.cpp
+        models/matchingstatisticsmodel.h
+        models/modelfilter.cpp
+        models/modelfilter.h
+        models/namevariantpairlistmodel.cpp
+        models/namevariantpairlistmodel.h
+        models/selectionmodel.h
+        models/serverlistmodel.cpp
+        models/serverlistmodel.h
+        models/simulatedaircraftlistmodel.cpp
+        models/simulatedaircraftlistmodel.h
+        models/statusmessagefilter.cpp
+        models/statusmessagefilter.h
+        models/statusmessagelistmodel.cpp
+        models/statusmessagelistmodel.h
+        models/textmessagelistmodel.cpp
+        models/textmessagelistmodel.h
+        models/userlistmodel.cpp
+        models/userlistmodel.h
+        overlaymessages.cpp
+        overlaymessages.h
+        overlaymessages.ui
+        overlaymessagesframe.cpp
+        overlaymessagesframe.h
+        pluginconfig.h
+        pluginconfigwindow.cpp
+        pluginconfigwindow.h
+        plugindetailswindow.cpp
+        plugindetailswindow.h
+        plugindetailswindow.ui
+        pluginselector.cpp
+        pluginselector.h
+        qml
+        qml/AFVMap.qml
+        qml/AtcRing.qml
+        qml/Transceiver.qml
+        qml/qml.qrc
+        registermetadata.cpp
+        registermetadata.h
+        settings/dockwidgetsettings.cpp
         settings/dockwidgetsettings.h
-        settings/navigatorsettings.h
+        settings/guisettings.cpp
         settings/guisettings.h
-        settings/viewupdatesettings.h
+        settings/navigatorsettings.cpp
+        settings/navigatorsettings.h
+        settings/textmessagesettings.cpp
+        settings/textmessagesettings.h
         settings/updatenotification.h
         settings/viewupdatesettings.cpp
-        settings/navigatorsettings.cpp
-        settings/guisettings.cpp
-        settings/textmessagesettings.h
-        settings/dockwidgetsettings.cpp
-        settings/textmessagesettings.cpp
-        managedstatusbar.cpp
+        settings/viewupdatesettings.h
         sharedstringlistcompleter.cpp
-        overlaymessages.ui
-        windowfinder.h
+        sharedstringlistcompleter.h
+        shortcut.cpp
+        shortcut.h
+        showhidebar.cpp
+        showhidebar.h
+        showhidebar.ui
+        singleapplicationui.cpp
+        singleapplicationui.h
+        splashscreen.cpp
         splashscreen.h
-        enableforviewbasedindicator.cpp
-        uppercasevalidator.h
+        stylesheetutility.cpp
+        stylesheetutility.h
+        swiftguiexport.h
         systemtraywindow.cpp
-
+        systemtraywindow.h
+        textmessagetextedit.cpp
+        textmessagetextedit.h
+        ticklabel.cpp
+        ticklabel.h
+        uppercasevalidator.cpp
+        uppercasevalidator.h
+        views/aircraftcategorytreeview.cpp
+        views/aircraftcategorytreeview.h
+        views/aircraftcategoryview.cpp
+        views/aircraftcategoryview.h
+        views/aircrafticaoview.cpp
+        views/aircrafticaoview.h
+        views/aircraftmodelstatisticsdialog.cpp
+        views/aircraftmodelstatisticsdialog.h
+        views/aircraftmodelstatisticsdialog.ui
+        views/aircraftmodelvalidationdialog.cpp
+        views/aircraftmodelvalidationdialog.h
+        views/aircraftmodelvalidationdialog.ui
+        views/aircraftmodelview.cpp
+        views/aircraftmodelview.h
+        views/aircraftpartsview.cpp
+        views/aircraftpartsview.h
+        views/aircraftsituationchangeview.cpp
+        views/aircraftsituationchangeview.h
+        views/aircraftsituationview.cpp
+        views/aircraftsituationview.h
+        views/airlineicaoview.cpp
+        views/airlineicaoview.h
+        views/airportview.cpp
+        views/airportview.h
+        views/applicationinfoview.cpp
+        views/applicationinfoview.h
+        views/atcstationtreeview.cpp
+        views/atcstationtreeview.h
+        views/atcstationview.cpp
+        views/atcstationview.h
+        views/audiodeviceinfoview.cpp
+        views/audiodeviceinfoview.h
+        views/checkboxdelegate.cpp
+        views/checkboxdelegate.h
+        views/clientview.cpp
+        views/clientview.h
+        views/countryview.cpp
+        views/countryview.h
+        views/distributorview.cpp
+        views/distributorview.h
+        views/flightplandialog.cpp
+        views/flightplandialog.h
+        views/flightplandialog.ui
+        views/identifierview.cpp
+        views/identifierview.h
+        views/interpolationsetupview.cpp
+        views/interpolationsetupview.h
+        views/liveryview.cpp
+        views/liveryview.h
+        views/matchingstatisticsview.cpp
+        views/matchingstatisticsview.h
+        views/namevariantpairview.cpp
+        views/namevariantpairview.h
+        views/radarview.cpp
+        views/radarview.h
+        views/serverview.cpp
+        views/serverview.h
+        views/simulatedaircraftview.cpp
+        views/simulatedaircraftview.h
+        views/statusmessageview.cpp
+        views/statusmessageview.h
+        views/textmessageview.cpp
+        views/textmessageview.h
+        views/userview.cpp
+        views/userview.h
+        views/viewbase.cpp
+        views/viewbase.h
+        views/viewbaseaviation.cpp
+        views/viewbaseitemdelegate.cpp
+        views/viewbaseitemdelegate.h
+        views/viewbasemisc.cpp
+        views/viewbasenetwork.cpp
+        views/viewbasenontemplate.cpp
+        views/viewbaseproxystyle.cpp
+        views/viewbaseproxystyle.h
+        views/viewbasesimulation.cpp
+        views/viewcallsignobjects.cpp
+        views/viewcallsignobjects.h
+        views/viewdbobjects.cpp
+        views/viewdbobjects.h
+        views/viewtimestampobjects.cpp
+        views/viewtimestampobjects.h
+        windowfinder.cpp
+        windowfinder.h
         )
 
 if(WIN32)
diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
index f44e94dc4..ebf3c6790 100644
--- a/src/input/CMakeLists.txt
+++ b/src/input/CMakeLists.txt
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 add_library(input SHARED
-        swiftinputexport.h
         joystick.cpp
         joystick.h
         keyboard.cpp
         keyboard.h
+        swiftinputexport.h
 )
 
 if(WIN32)
@@ -20,10 +20,10 @@ if(WIN32)
     target_link_libraries(input PUBLIC dxguid ole32 dinput8 User32)
 elseif(APPLE)
     target_sources(input PRIVATE
-        macos/joystickmacos.mm
         macos/joystickmacos.h
-        macos/keyboardmacos.mm
+        macos/joystickmacos.mm
         macos/keyboardmacos.h
+        macos/keyboardmacos.mm
         macos/macosinpututils.h
         macos/macosinpututils.mm
     )
diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt
index 36a78e5b1..fdace92f8 100644
--- a/src/misc/CMakeLists.txt
+++ b/src/misc/CMakeLists.txt
@@ -87,9 +87,9 @@ add_library(misc SHARED
         aviation/modulator.cpp
         aviation/modulator.h
         aviation/navsystem.h
-        aviation/percallsign.h
         aviation/ongroundinfo.cpp
         aviation/ongroundinfo.h
+        aviation/percallsign.h
         aviation/registermetadataaviation.cpp
         aviation/registermetadataaviation.h
         aviation/selcal.cpp
@@ -170,13 +170,12 @@ add_library(misc SHARED
 
         # Main
         algorithm.h
-        applicationinfo.h
         applicationinfo.cpp
+        applicationinfo.h
         applicationinfolist.cpp
         applicationinfolist.h
         atomicfile.cpp
         atomicfile.h
-        swiftmiscexport.h
         cachesettingsutils.cpp
         cachesettingsutils.h
         collection.h
@@ -260,6 +259,7 @@ add_library(misc SHARED
         metaclass.h
         metadatautils.cpp
         metadatautils.h
+        misc.qrc
         namevariantpair.cpp
         namevariantpair.h
         namevariantpairlist.cpp
@@ -318,6 +318,7 @@ add_library(misc SHARED
         stringutils.h
         swiftdirectories.cpp
         swiftdirectories.h
+        swiftmiscexport.h
         threadutils.cpp
         threadutils.h
         timestampbased.cpp
@@ -344,7 +345,6 @@ add_library(misc SHARED
         windllutils.h
         worker.cpp
         worker.h
-        misc.qrc
 
         # Math
         math/constants.h
@@ -363,8 +363,6 @@ add_library(misc SHARED
         mixin/mixinstring.h
 
         # Network
-        network/data/lastserver.h
-        network/settings/serversettings.h
         network/authenticateduser.cpp
         network/authenticateduser.h
         network/client.cpp
@@ -375,6 +373,7 @@ add_library(misc SHARED
         network/clientprovider.h
         network/connectionstatus.cpp
         network/connectionstatus.h
+        network/data/lastserver.h
         network/ecosystem.cpp
         network/ecosystem.h
         network/ecosystemlist.cpp
@@ -411,6 +410,7 @@ add_library(misc SHARED
         network/server.h
         network/serverlist.cpp
         network/serverlist.h
+        network/settings/serversettings.h
         network/textmessage.cpp
         network/textmessage.h
         network/textmessagelist.cpp
@@ -455,6 +455,16 @@ add_library(misc SHARED
         pq/units.h
 
         # Shared state
+        sharedstate/activemutator.cpp
+        sharedstate/activemutator.h
+        sharedstate/activeobserver.cpp
+        sharedstate/activeobserver.h
+        sharedstate/datalink.cpp
+        sharedstate/datalink.h
+        sharedstate/datalinkdbus.cpp
+        sharedstate/datalinkdbus.h
+        sharedstate/datalinklocal.cpp
+        sharedstate/datalinklocal.h
         sharedstate/dbus/duplex.cpp
         sharedstate/dbus/duplex.h
         sharedstate/dbus/dupleximpl.cpp
@@ -467,16 +477,6 @@ add_library(misc SHARED
         sharedstate/dbus/hubimpl.h
         sharedstate/dbus/hubproxy.cpp
         sharedstate/dbus/hubproxy.h
-        sharedstate/activemutator.cpp
-        sharedstate/activemutator.h
-        sharedstate/activeobserver.cpp
-        sharedstate/activeobserver.h
-        sharedstate/datalink.cpp
-        sharedstate/datalink.h
-        sharedstate/datalinkdbus.cpp
-        sharedstate/datalinkdbus.h
-        sharedstate/datalinklocal.cpp
-        sharedstate/datalinklocal.h
         sharedstate/listjournal.cpp
         sharedstate/listjournal.h
         sharedstate/listmutator.cpp
@@ -495,156 +495,156 @@ add_library(misc SHARED
         sharedstate/scalarobserver.h
 
         # Simulation
-        simulation/distributorlistpreferences.h
+        simulation/aircraftmatchersetup.cpp
         simulation/aircraftmatchersetup.h
-        simulation/simulatorplugininfo.cpp
-        simulation/matchingutils.cpp
-        simulation/categorymatcher.cpp
-        simulation/matchingstatisticsentry.cpp
-        simulation/matchinglog.cpp
-        simulation/simulatorinfo.h
-        simulation/simulatedaircraftlist.h
-        simulation/ownaircraftproviderdummy.h
-        simulation/matchingscript.cpp
+        simulation/aircraftmodel.cpp
+        simulation/aircraftmodel.h
+        simulation/aircraftmodelinterfaces.h
+        simulation/aircraftmodellist.cpp
+        simulation/aircraftmodellist.h
+        simulation/aircraftmodelloader.cpp
+        simulation/aircraftmodelloader.h
+        simulation/aircraftmodelloaderprovider.cpp
         simulation/aircraftmodelloaderprovider.h
         simulation/aircraftmodelsetprovider.cpp
-        simulation/simulatorinternals.cpp
-        simulation/fscommon/vpilotrulesreader.h
-        simulation/fscommon/vpilotmodelruleset.cpp
-        simulation/fscommon/aircraftcfgparser.cpp
-        simulation/fscommon/vpilotrulesreader.cpp
-        simulation/fscommon/aircraftcfgentries.h
-        simulation/fscommon/fscommonutil.h
-        simulation/fscommon/bcdconversions.h
-        simulation/fscommon/fscommonutil.cpp
-        simulation/fscommon/fsdirectories.cpp
-        simulation/fscommon/aircraftcfgentrieslist.cpp
-        simulation/fscommon/fsdirectories.h
-        simulation/fscommon/bcdconversions.cpp
-        simulation/fscommon/aircraftcfgentrieslist.h
+        simulation/aircraftmodelsetprovider.h
+        simulation/aircraftmodelutils.cpp
+        simulation/aircraftmodelutils.h
+        simulation/airspaceaircraftsnapshot.cpp
+        simulation/airspaceaircraftsnapshot.h
+        simulation/autopublishdata.cpp
+        simulation/autopublishdata.h
+        simulation/backgroundvalidation.cpp
+        simulation/backgroundvalidation.h
+        simulation/categorymatcher.cpp
+        simulation/categorymatcher.h
+        simulation/data/lastmodel.h
+        simulation/data/modelcaches.cpp
+        simulation/data/modelcaches.h
+        simulation/distributor.cpp
+        simulation/distributor.h
+        simulation/distributorlist.cpp
+        simulation/distributorlist.h
+        simulation/distributorlistpreferences.cpp
+        simulation/distributorlistpreferences.h
+        simulation/flightgear/aircraftmodelloaderflightgear.cpp
+        simulation/flightgear/aircraftmodelloaderflightgear.h
+        simulation/flightgear/flightgearutil.cpp
+        simulation/flightgear/flightgearutil.h
         simulation/fscommon/aircraftcfgentries.cpp
+        simulation/fscommon/aircraftcfgentries.h
+        simulation/fscommon/aircraftcfgentrieslist.cpp
+        simulation/fscommon/aircraftcfgentrieslist.h
+        simulation/fscommon/aircraftcfgparser.cpp
+        simulation/fscommon/aircraftcfgparser.h
+        simulation/fscommon/bcdconversions.cpp
+        simulation/fscommon/bcdconversions.h
+        simulation/fscommon/fscommon.h
+        simulation/fscommon/fscommonutil.cpp
+        simulation/fscommon/fscommonutil.h
+        simulation/fscommon/fsdirectories.cpp
+        simulation/fscommon/fsdirectories.h
         simulation/fscommon/vpilotmodelrule.cpp
         simulation/fscommon/vpilotmodelrule.h
-        simulation/fscommon/fscommon.h
-        simulation/fscommon/aircraftcfgparser.h
+        simulation/fscommon/vpilotmodelruleset.cpp
         simulation/fscommon/vpilotmodelruleset.h
-        simulation/aircraftmodel.cpp
-        simulation/distributor.cpp
-        simulation/interpolation/interpolatorspline.h
-        simulation/distributorlist.cpp
-        simulation/registermetadatasimulation.cpp
-        simulation/interpolation/interpolatormulti.h
-        simulation/interpolation/interpolationsetupprovider.h
-        simulation/aircraftmodellist.h
-        simulation/interpolation/interpolationsetupprovider.cpp
-        simulation/interpolation/interpolationstatus.cpp
-        simulation/interpolation/interpolationstatus.h
-        simulation/interpolation/interpolatorlinear.h
-        simulation/backgroundvalidation.cpp
-        simulation/airspaceaircraftsnapshot.cpp
-        simulation/autopublishdata.h
+        simulation/fscommon/vpilotrulesreader.cpp
+        simulation/fscommon/vpilotrulesreader.h
+        simulation/fsx/fsx.h
+        simulation/fsx/simconnectutilities.cpp
+        simulation/fsx/simconnectutilities.h
+        simulation/interpolation/interpolant.h
+        simulation/interpolation/interpolationlogger.cpp
+        simulation/interpolation/interpolationlogger.h
+        simulation/interpolation/interpolationrenderingsetup.cpp
         simulation/interpolation/interpolationrenderingsetup.h
         simulation/interpolation/interpolationresult.cpp
         simulation/interpolation/interpolationresult.h
-        simulation/matchingscriptmisc.h
         simulation/interpolation/interpolationsetuplist.cpp
-        simulation/remoteaircraftprovider.h
-        simulation/interpolation/interpolant.h
-        simulation/ownaircraftprovider.cpp
-        simulation/backgroundvalidation.h
-        simulation/xplane/xswiftbusconfigwriter.cpp
-        simulation/xplane/navdatareference.h
-        simulation/xplane/navdatareference.cpp
-        simulation/xplane/xplaneutil.h
-        simulation/xplane/aircraftmodelloaderxplane.h
-        simulation/xplane/xplaneutil.cpp
-        simulation/xplane/qtfreeutils.h
-        simulation/xplane/aircraftmodelloaderxplane.cpp
-        simulation/xplane/xswiftbusconfigwriter.h
-        simulation/matchingutils.h
-        simulation/registermetadatasimulation.h
-        simulation/interpolation/interpolatorlinearpbh.h
-        simulation/fsx/simconnectutilities.h
-        simulation/fsx/simconnectutilities.cpp
-        simulation/fsx/fsx.h
-        simulation/aircraftmodelinterfaces.h
-        simulation/interpolation/interpolationlogger.h
-        simulation/interpolation/interpolatormulti.cpp
-        simulation/remoteaircraftprovider.cpp
-        simulation/modelconverterx.cpp
-        simulation/simulatorinfolist.h
-        simulation/simulationenvironmentprovider.cpp
+        simulation/interpolation/interpolationsetuplist.h
+        simulation/interpolation/interpolationsetupprovider.cpp
+        simulation/interpolation/interpolationsetupprovider.h
+        simulation/interpolation/interpolationstatus.cpp
+        simulation/interpolation/interpolationstatus.h
+        simulation/interpolation/interpolator.cpp
         simulation/interpolation/interpolator.h
-        simulation/interpolation/interpolatorspline.cpp
-        simulation/aircraftmodelloaderprovider.cpp
-        simulation/simulatorplugininfolist.h
-        simulation/remoteaircraftproviderdummy.cpp
-        simulation/interpolation/interpolationlogger.cpp
-        simulation/matchingscript.h
-        simulation/categorymatcher.h
-        simulation/flightgear/flightgearutil.h
-        simulation/flightgear/aircraftmodelloaderflightgear.h
-        simulation/flightgear/aircraftmodelloaderflightgear.cpp
-        simulation/flightgear/flightgearutil.cpp
-        simulation/aircraftmodelloader.h
-        simulation/simulatedaircraft.cpp
-        simulation/aircraftmodellist.cpp
-        simulation/aircraftmodel.h
-        simulation/interpolation/interpolatorlinear.cpp
-        simulation/data/lastmodel.h
-        simulation/data/modelcaches.h
-        simulation/data/modelcaches.cpp
-        simulation/airspaceaircraftsnapshot.h
         simulation/interpolation/interpolatorfunctions.h
-        simulation/ownaircraftprovider.h
-        simulation/distributorlistpreferences.cpp
+        simulation/interpolation/interpolatorlinear.cpp
+        simulation/interpolation/interpolatorlinear.h
         simulation/interpolation/interpolatorlinearpbh.cpp
-        simulation/reverselookup.h
-        simulation/autopublishdata.cpp
-        simulation/simulationenvironmentprovider.h
-        simulation/simulatorplugininfo.h
-        simulation/interpolation/interpolationrenderingsetup.cpp
-        simulation/simulatorinfo.cpp
+        simulation/interpolation/interpolatorlinearpbh.h
+        simulation/interpolation/interpolatormulti.cpp
+        simulation/interpolation/interpolatormulti.h
+        simulation/interpolation/interpolatorpbh.h
+        simulation/interpolation/interpolatorspline.cpp
+        simulation/interpolation/interpolatorspline.h
+        simulation/matchinglog.cpp
+        simulation/matchinglog.h
+        simulation/matchingscript.cpp
+        simulation/matchingscript.h
+        simulation/matchingscriptmisc.cpp
+        simulation/matchingscriptmisc.h
         simulation/matchingstatistics.cpp
+        simulation/matchingstatistics.h
+        simulation/matchingstatisticsentry.cpp
+        simulation/matchingstatisticsentry.h
+        simulation/matchingutils.cpp
+        simulation/matchingutils.h
+        simulation/modelconverterx.cpp
+        simulation/modelconverterx.h
+        simulation/ownaircraftprovider.cpp
+        simulation/ownaircraftprovider.h
         simulation/ownaircraftproviderdummy.cpp
+        simulation/ownaircraftproviderdummy.h
         simulation/partsstatus.cpp
         simulation/partsstatus.h
-        simulation/simulatorinfolist.cpp
-        simulation/aircraftmodelloader.cpp
-        simulation/distributor.h
-        simulation/matchinglog.h
+        simulation/registermetadatasimulation.cpp
+        simulation/registermetadatasimulation.h
+        simulation/remoteaircraftprovider.cpp
+        simulation/remoteaircraftprovider.h
+        simulation/remoteaircraftproviderdummy.cpp
         simulation/remoteaircraftproviderdummy.h
-        simulation/simulatorplugininfolist.cpp
-        simulation/aircraftmodelsetprovider.h
-        simulation/simulatorinternals.h
-        simulation/distributorlist.h
-        simulation/aircraftmodelutils.h
-        simulation/interpolation/interpolator.cpp
-        simulation/matchingstatistics.h
-        simulation/modelconverterx.h
+        simulation/reverselookup.h
+        simulation/settings/fgswiftbussettings.cpp
+        simulation/settings/fgswiftbussettings.h
+        simulation/settings/fgswiftbussettings.h
+        simulation/settings/interpolationrenderingsetupsettings.h
+        simulation/settings/modelmatchersettings.h
         simulation/settings/modelsettings.cpp
+        simulation/settings/modelsettings.h
         simulation/settings/simulatorsettings.cpp
+        simulation/settings/simulatorsettings.h
+        simulation/settings/swiftpluginsettings.cpp
+        simulation/settings/swiftpluginsettings.h
         simulation/settings/xswiftbussettings.cpp
         simulation/settings/xswiftbussettings.h
-        simulation/settings/fgswiftbussettings.h
         simulation/settings/xswiftbussettingsqtfree.h
-        simulation/settings/modelsettings.h
         simulation/settings/xswiftbussettingsqtfree.inc
-        simulation/settings/fgswiftbussettings.h
-        simulation/settings/fgswiftbussettings.cpp
-        simulation/settings/modelmatchersettings.h
-        simulation/settings/swiftpluginsettings.cpp
-        simulation/settings/interpolationrenderingsetupsettings.h
-        simulation/settings/simulatorsettings.h
-        simulation/settings/swiftpluginsettings.h
-        simulation/aircraftmatchersetup.cpp
-        simulation/matchingscriptmisc.cpp
+        simulation/simulatedaircraft.cpp
         simulation/simulatedaircraft.h
-        simulation/aircraftmodelutils.cpp
         simulation/simulatedaircraftlist.cpp
-        simulation/matchingstatisticsentry.h
-        simulation/interpolation/interpolationsetuplist.h
-        simulation/interpolation/interpolatorpbh.h
+        simulation/simulatedaircraftlist.h
+        simulation/simulationenvironmentprovider.cpp
+        simulation/simulationenvironmentprovider.h
+        simulation/simulatorinfo.cpp
+        simulation/simulatorinfo.h
+        simulation/simulatorinfolist.cpp
+        simulation/simulatorinfolist.h
+        simulation/simulatorinternals.cpp
+        simulation/simulatorinternals.h
+        simulation/simulatorplugininfo.cpp
+        simulation/simulatorplugininfo.h
+        simulation/simulatorplugininfolist.cpp
+        simulation/simulatorplugininfolist.h
+        simulation/xplane/aircraftmodelloaderxplane.cpp
+        simulation/xplane/aircraftmodelloaderxplane.h
+        simulation/xplane/navdatareference.cpp
+        simulation/xplane/navdatareference.h
+        simulation/xplane/qtfreeutils.h
+        simulation/xplane/xplaneutil.cpp
+        simulation/xplane/xplaneutil.h
+        simulation/xplane/xswiftbusconfigwriter.cpp
+        simulation/xplane/xswiftbusconfigwriter.h
 
         # Test
         test/testdata.cpp
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index 537df3563..3427d303d 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -2,61 +2,61 @@
 # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 add_library(sound SHARED
-        notificationplayer.h
-        sampleprovider/sinusgenerator.h
-        sampleprovider/samples.cpp
-        sampleprovider/simplecompressoreffect.h
-        sampleprovider/resourcesoundsampleprovider.cpp
-        sampleprovider/resourcesoundsampleprovider.h
-        sampleprovider/equalizersampleprovider.cpp
-        sampleprovider/resourcesound.cpp
-        sampleprovider/bufferedwaveprovider.h
-        sampleprovider/samples.h
-        sampleprovider/volumesampleprovider.h
-        sampleprovider/pinknoisegenerator.h
-        sampleprovider/mixingsampleprovider.h
-        sampleprovider/sampleprovider.h
-        sampleprovider/sawtoothgenerator.cpp
-        sampleprovider/resourcesound.h
-        sampleprovider/volumesampleprovider.cpp
-        sampleprovider/sawtoothgenerator.h
-        sampleprovider/pinknoisegenerator.cpp
-        sampleprovider/bufferedwaveprovider.cpp
-        sampleprovider/mixingsampleprovider.cpp
-        sampleprovider/simplecompressoreffect.cpp
-        sampleprovider/equalizersampleprovider.h
-        sampleprovider/sinusgenerator.cpp
-        tonepair.h
-        selcalplayer.cpp
-        dsp/SimpleGate.h
-        dsp/SimpleGate.cpp
-        dsp/biquadfilter.cpp
-        dsp/SimpleHeader.h
-        dsp/SimpleComp.h
-        dsp/SimpleLimit.cpp
-        dsp/SimpleLimitProcess.inl
-        dsp/SimpleGain.h
-        dsp/SimpleComp.cpp
-        dsp/SimpleLimit.h
-        dsp/biquadfilter.h
-        dsp/SimpleEnvelope.h
-        dsp/SimpleCompProcess.inl
-        dsp/SimpleGateProcess.inl
-        dsp/SimpleEnvelope.cpp
-        selcalplayer.h
-        wav/wavfile.h
-        wav/wavfile.cpp
-        threadedtonepairplayer.cpp
-        notificationplayer.cpp
-        tonepair.cpp
-        swiftsoundexport.h
-        audioutilities.h
-        threadedtonepairplayer.h
         audioutilities.cpp
-        codecs/opusencoder.cpp
+        audioutilities.h
         codecs/opusdecoder.cpp
         codecs/opusdecoder.h
+        codecs/opusencoder.cpp
         codecs/opusencoder.h
+        dsp/SimpleComp.cpp
+        dsp/SimpleComp.h
+        dsp/SimpleCompProcess.inl
+        dsp/SimpleEnvelope.cpp
+        dsp/SimpleEnvelope.h
+        dsp/SimpleGain.h
+        dsp/SimpleGate.cpp
+        dsp/SimpleGate.h
+        dsp/SimpleGateProcess.inl
+        dsp/SimpleHeader.h
+        dsp/SimpleLimit.cpp
+        dsp/SimpleLimit.h
+        dsp/SimpleLimitProcess.inl
+        dsp/biquadfilter.cpp
+        dsp/biquadfilter.h
+        notificationplayer.cpp
+        notificationplayer.h
+        sampleprovider/bufferedwaveprovider.cpp
+        sampleprovider/bufferedwaveprovider.h
+        sampleprovider/equalizersampleprovider.cpp
+        sampleprovider/equalizersampleprovider.h
+        sampleprovider/mixingsampleprovider.cpp
+        sampleprovider/mixingsampleprovider.h
+        sampleprovider/pinknoisegenerator.cpp
+        sampleprovider/pinknoisegenerator.h
+        sampleprovider/resourcesound.cpp
+        sampleprovider/resourcesound.h
+        sampleprovider/resourcesoundsampleprovider.cpp
+        sampleprovider/resourcesoundsampleprovider.h
+        sampleprovider/sampleprovider.h
+        sampleprovider/samples.cpp
+        sampleprovider/samples.h
+        sampleprovider/sawtoothgenerator.cpp
+        sampleprovider/sawtoothgenerator.h
+        sampleprovider/simplecompressoreffect.cpp
+        sampleprovider/simplecompressoreffect.h
+        sampleprovider/sinusgenerator.cpp
+        sampleprovider/sinusgenerator.h
+        sampleprovider/volumesampleprovider.cpp
+        sampleprovider/volumesampleprovider.h
+        selcalplayer.cpp
+        selcalplayer.h
+        swiftsoundexport.h
+        threadedtonepairplayer.cpp
+        threadedtonepairplayer.h
+        tonepair.cpp
+        tonepair.h
+        wav/wavfile.cpp
+        wav/wavfile.h
         )
 
 # Copy resources