From 07b1c00aeb4961d0afff40397a4f683e79af81ae Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Fri, 16 Sep 2022 08:59:53 +0200
Subject: [PATCH] [Build] Updated .pro file with new code structure

---
 SkywardHub.pro | 263 ++++++++++++++++++++++++-------------------------
 1 file changed, 130 insertions(+), 133 deletions(-)

diff --git a/SkywardHub.pro b/SkywardHub.pro
index a88ef2da..1ad02952 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -9,151 +9,148 @@ CONFIG += c++11
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 # MacOs app icon
-ICON = Resources/Icons/SkywardHub.icns
+ICON = src/entrypoints/groundstation/assets/icons/SkywardHub.icns
 
 # Windows app icon
-RC_ICONS = Resources/Icons/SkywardHub.ico
+RC_ICONS = src/entrypoints/groundstation/assets/icons/SkywardHub.ico
 
 SOURCES += \
-    Components/ContextMenuSeparator/contextmenuseparator.cpp \
-    Components/ModulesPicker/modulespicker.cpp \
-    Components/SaveConfigurationDialog/saveconfigurationdialog.cpp \
-    Components/SubscriptionsPanel/subscriptionspanel.cpp \
-    Components/ToggleButton/togglebutton.cpp \
-    Components/ErrorDisplayer/error.cpp \
-    Components/ErrorDisplayer/errordisplayer.cpp \
-    Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp \
-    Components/TopicFilterSelector/topicfilterselector.cpp \
-    Core/Message/messagefield.cpp \
-    Core/Message/modulemessage.cpp \
-    Core/Message/topic.cpp \
-    Core/Message/topicandfieldfilter.cpp \
-    Core/Message/topicfilter.cpp \
-    Core/QCustomPlot/QCustomPlot.cpp \
-    Core/module.cpp \
-    Core/moduleeventshandler.cpp \
-    Core/modulemessagesbroker.cpp \
-    Core/modulesmanager.cpp \
-    Core/skywardhubcore.cpp \
-    Core/xmlobject.cpp \
-    Modules/CommandPad/CommandPad.cpp \
-    Modules/CommandPad/MessageFormElement.cpp \
-    Modules/CompactCommandPad/CompactCommandPad.cpp \
-    Modules/CompactCommandPad/CommandSelector.cpp \
-    Modules/DefaultModule/defaultmodule.cpp \
-    Modules/Empty/emptymodule.cpp \
-    Modules/FileStream/filestreammodule.cpp \
-    Modules/Graph/Graph.cpp \
-    Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp \
-    Modules/MainWindow/skywardhubmainwindow.cpp \
-    Modules/MainWindow/window.cpp \
-    Modules/Mavlink/mavlinkcommandadapter.cpp \
-    Modules/Mavlink/mavlinkmodule.cpp \
-    Modules/Mavlink/mavlinkreader.cpp \
-    Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp \
-    Modules/Mavlink/mavlinkwriter.cpp \
-    Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp \
-    Modules/SkywardHub/deployer.cpp \
-    Modules/SkywardHub/deployerpathpicker.cpp \
-    Modules/SkywardHub/prefabdialog.cpp \
-    Modules/SkywardHub/prefabviewelement.cpp \
-    Modules/SkywardHub/skywardhubmodule.cpp \
-    Modules/Splitter/Splitter.cpp \
-    Modules/StateViewer/StateViewer.cpp \
-    Modules/Tabs/tabsmodule.cpp \
-    Modules/Test/testmodule.cpp \
-    Modules/TimerController/timercontrollermodule.cpp \
-    Modules/ValuesConverterViewer/valueelement.cpp \
-    Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp \
-    Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp \
-    Modules/moduleinfo.cpp \
-    Modules/moduleslist.cpp \
-    main.cpp
+    src/shared/Components/ContextMenuSeparator/contextmenuseparator.cpp \
+    src/shared/Components/ModulesPicker/modulespicker.cpp \
+    src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.cpp \
+    src/shared/Components/SubscriptionsPanel/subscriptionspanel.cpp \
+    src/shared/Components/ToggleButton/togglebutton.cpp \
+    src/shared/Components/ErrorDisplayer/error.cpp \
+    src/shared/Components/ErrorDisplayer/errordisplayer.cpp \
+    src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp \
+    src/shared/Components/TopicFilterSelector/topicfilterselector.cpp \
+    src/shared/Core/Message/messagefield.cpp \
+    src/shared/Core/Message/modulemessage.cpp \
+    src/shared/Core/Message/topic.cpp \
+    src/shared/Core/Message/topicandfieldfilter.cpp \
+    src/shared/Core/Message/topicfilter.cpp \
+    src/shared/Core/QCustomPlot/QCustomPlot.cpp \
+    src/shared/Core/module.cpp \
+    src/shared/Core/moduleeventshandler.cpp \
+    src/shared/Core/modulemessagesbroker.cpp \
+    src/shared/Core/modulesmanager.cpp \
+    src/shared/Core/skywardhubcore.cpp \
+    src/shared/Core/xmlobject.cpp \
+    src/shared/Modules/CommandPad/CommandPad.cpp \
+    src/shared/Modules/CommandPad/MessageFormElement.cpp \
+    src/shared/Modules/CompactCommandPad/CompactCommandPad.cpp \
+    src/shared/Modules/CompactCommandPad/CommandSelector.cpp \
+    src/shared/Modules/DefaultModule/defaultmodule.cpp \
+    src/shared/Modules/Empty/emptymodule.cpp \
+    src/shared/Modules/FileStream/filestreammodule.cpp \
+    src/shared/Modules/Graph/Graph.cpp \
+    src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp \
+    src/shared/Modules/MainWindow/skywardhubmainwindow.cpp \
+    src/shared/Modules/MainWindow/window.cpp \
+    src/shared/Modules/Mavlink/mavlinkcommandadapter.cpp \
+    src/shared/Modules/Mavlink/mavlinkmodule.cpp \
+    src/shared/Modules/Mavlink/mavlinkreader.cpp \
+    src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp \
+    src/shared/Modules/Mavlink/mavlinkwriter.cpp \
+    src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp \
+    src/shared/Modules/SkywardHub/deployer.cpp \
+    src/shared/Modules/SkywardHub/deployerpathpicker.cpp \
+    src/shared/Modules/SkywardHub/prefabdialog.cpp \
+    src/shared/Modules/SkywardHub/prefabviewelement.cpp \
+    src/shared/Modules/SkywardHub/skywardhubmodule.cpp \
+    src/shared/Modules/Splitter/Splitter.cpp \
+    src/shared/Modules/StateViewer/StateViewer.cpp \
+    src/shared/Modules/Tabs/tabsmodule.cpp \
+    src/shared/Modules/Test/testmodule.cpp \
+    src/shared/Modules/TimerController/timercontrollermodule.cpp \
+    src/shared/Modules/ValuesConverterViewer/valueelement.cpp \
+    src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp \
+    src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp \
+    src/shared/Modules/moduleinfo.cpp \
+    src/shared/Modules/moduleslist.cpp \
+    src/shared/groundstation/main.cpp
 
 HEADERS += \
-    Components/ContextMenuSeparator/contextmenuseparator.h \
-    Components/ModulesPicker/modulespicker.h \
-    Components/SaveConfigurationDialog/saveconfigurationdialog.h \
-    Components/SubscriptionsPanel/subscriptionspanel.h \
-    Components/ToggleButton/togglebutton.h \
-    Components/ErrorDisplayer/error.h \
-    Components/ErrorDisplayer/errordisplayer.h \
-    Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h \
-    Components/TopicFilterSelector/topicfilterselector.h \
-    Core/Message/messagefield.h \
-    Core/Message/modulemessage.h \
-    Core/Message/topic.h \
-    Core/Message/topicandfieldfilter.h \
-    Core/Message/topicfilter.h \
-    Core/QCustomPlot/QCustomPlot.h \
-    Core/module.h \
-    Core/moduleeventshandler.h \
-    Core/modulemessagesbroker.h \
-    Core/modulesmanager.h \
-    Core/skywardhubcore.h \
-    Core/xmlobject.h \
-    Modules/CommandPad/CommandPad.h \
-    Modules/CommandPad/MessageFormElement.h \
-    Modules/CommandPad/MessagesList.h \
-    Modules/CompactCommandPad/CompactCommandPad.h \
-    Modules/CompactCommandPad/CommandSelector.h \
-    Modules/DefaultModule/defaultmodule.h \
-    Modules/Empty/emptymodule.h \
-    Modules/FileStream/filestreammodule.h \
-    Modules/Graph/Graph.h \
-    Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h \
-    Modules/MainWindow/skywardhubmainwindow.h \
-    Modules/MainWindow/window.h \
-    Modules/Mavlink/mavlinkcommandadapter.h \
-    Modules/Mavlink/mavlinkmodule.h \
-    Modules/Mavlink/mavlinkreader.h \
-    Modules/Mavlink/mavlinkrocketmsgtestingmodule.h \
-    Modules/Mavlink/mavlinkversionheader.h \
-    Modules/Mavlink/mavlinkversionheader.h \
-    Modules/Mavlink/mavlinkwriter.h \
-    Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h \
-    Modules/SkywardHub/deployer.h \
-    Modules/SkywardHub/deployerpathpicker.h \
-    Modules/SkywardHub/prefabdialog.h \
-    Modules/SkywardHub/prefabviewelement.h \
-    Modules/SkywardHub/skywardhubmodule.h \
-    Modules/Splitter/Splitter.h \
-    Modules/StateViewer/StateViewer.h \
-    Modules/Tabs/tabsmodule.h \
-    Modules/Test/testmodule.h \
-    Modules/TimerController/timercontrollermodule.h \
-    Modules/ValuesConverterViewer/valueelement.h \
-    Modules/ValuesConverterViewer/valuesconverterviewermodule.h \
-    Modules/ValuesConverterViewer/valuesviewerconfigpanel.h \
-    Modules/moduleinfo.h \
-    Modules/moduleslist.h \
-    Modules/skywardhubstrings.h
+    src/shared/Components/CsontextMenuSeparator/contextmenuseparator.h \
+    src/shared/Components/ModulesPicker/modulespicker.h \
+    src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.h \
+    src/shared/Components/SubscriptionsPanel/subscriptionspanel.h \
+    src/shared/Components/ToggleButton/togglebutton.h \
+    src/shared/Components/ErrorDisplayer/error.h \
+    src/shared/Components/ErrorDisplayer/errordisplayer.h \
+    src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h \
+    src/shared/Components/TopicFilterSelector/topicfilterselector.h \
+    src/shared/Core/Message/messagefield.h \
+    src/shared/Core/Message/modulemessage.h \
+    src/shared/Core/Message/topic.h \
+    src/shared/Core/Message/topicandfieldfilter.h \
+    src/shared/Core/Message/topicfilter.h \
+    src/shared/Core/QCustomPlot/QCustomPlot.h \
+    src/shared/Core/module.h \
+    src/shared/Core/moduleeventshandler.h \
+    src/shared/Core/modulemessagesbroker.h \
+    src/shared/Core/modulesmanager.h \
+    src/shared/Core/skywardhubcore.h \
+    src/shared/Core/xmlobject.h \
+    src/shared/Modules/CommandPad/CommandPad.h \
+    src/shared/Modules/CommandPad/MessageFormElement.h \
+    src/shared/Modules/CommandPad/MessagesList.h \
+    src/shared/Modules/CompactCommandPad/CompactCommandPad.h \
+    src/shared/Modules/CompactCommandPad/CommandSelector.h \
+    src/shared/Modules/DefaultModule/defaultmodule.h \
+    src/shared/Modules/Empty/emptymodule.h \
+    src/shared/Modules/FileStream/filestreammodule.h \
+    src/shared/Modules/Graph/Graph.h \
+    src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h \
+    src/shared/Modules/MainWindow/skywardhubmainwindow.h \
+    src/shared/Modules/MainWindow/window.h \
+    src/shared/Modules/Mavlink/mavlinkcommandadapter.h \
+    src/shared/Modules/Mavlink/mavlinkmodule.h \
+    src/shared/Modules/Mavlink/mavlinkreader.h \
+    src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h \
+    src/shared/Modules/Mavlink/mavlinkversionheader.h \
+    src/shared/Modules/Mavlink/mavlinkversionheader.h \
+    src/shared/Modules/Mavlink/mavlinkwriter.h \
+    src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h \
+    src/shared/Modules/SkywardHub/deployer.h \
+    src/shared/Modules/SkywardHub/deployerpathpicker.h \
+    src/shared/Modules/SkywardHub/prefabdialog.h \
+    src/shared/Modules/SkywardHub/prefabviewelement.h \
+    src/shared/Modules/SkywardHub/skywardhubmodule.h \
+    src/shared/Modules/Splitter/Splitter.h \
+    src/shared/Modules/StateViewer/StateViewer.h \
+    src/shared/Modules/Tabs/tabsmodule.h \
+    src/shared/Modules/Test/testmodule.h \
+    src/shared/Modules/TimerController/timercontrollermodule.h \
+    src/shared/Modules/ValuesConverterViewer/valueelement.h \
+    src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.h \
+    src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h \
+    src/shared/Modules/moduleinfo.h \
+    src/shared/Modules/moduleslist.h \
+    src/shared/Modules/skywardhubstrings.h
 
 FORMS += \
-    Components/ModulesPicker/modulespicker.ui \
-    Components/SaveConfigurationDialog/saveconfigurationdialog.ui \
-    Components/SubscriptionsPanel/subscriptionspanel.ui \
-    Modules/Empty/emptymodule.ui \
-    Modules/FileStream/filestreammodule.ui \
-    Modules/MainWindow/window.ui \
-    Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui \
-    Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui \
-    Modules/SkywardHub/deployerpathpicker.ui \
-    Modules/SkywardHub/prefabdialog.ui \
-    Modules/SkywardHub/prefabviewelement.ui \
-    Modules/SkywardHub/skywardhubmodule.ui \
-    Modules/Test/testmodule.ui \
-    Modules/TimerController/timercontrollermodule.ui \
-    Modules/ValuesConverterViewer/valuesconverterviewermodule.ui \
-    Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui
+    src/shared/Components/ModulesPicker/modulespicker.ui \
+    src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.ui \
+    src/shared/Components/SubscriptionsPanel/subscriptionspanel.ui \
+    src/shared/Modules/Empty/emptymodule.ui \
+    src/shared/Modules/FileStream/filestreammodule.ui \
+    src/shared/Modules/MainWindow/window.ui \
+    src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui \
+    src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui \
+    src/shared/Modules/SkywardHub/deployerpathpicker.ui \
+    src/shared/Modules/SkywardHub/prefabdialog.ui \
+    src/shared/Modules/SkywardHub/prefabviewelement.ui \
+    src/shared/Modules/SkywardHub/skywardhubmodule.ui \
+    src/shared/Modules/Test/testmodule.ui \
+    src/shared/Modules/TimerController/timercontrollermodule.ui \
+    src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.ui \
+    src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-DISTFILES += \
-    format.astylerc
-
 RESOURCES += \
-    application.qrc
+    src/shared/groundstation/application.qrc
-- 
GitLab