From 7280e3c1d73e0b4a50f140586c197dfe8e584355 Mon Sep 17 00:00:00 2001 From: Sergii Lisovenko <2522054+s-lisovenko@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:07:49 +0100 Subject: [PATCH 1/5] QML modules: Made FactcControls as separate qml module --- custom-example/qgroundcontrol.qrc | 14 ----------- qgroundcontrol.qrc | 14 ----------- src/AutoPilotPlugins/APM/CMakeLists.txt | 1 - src/AutoPilotPlugins/Common/CMakeLists.txt | 1 - src/AutoPilotPlugins/PX4/CMakeLists.txt | 1 - src/FactSystem/CMakeLists.txt | 5 ++-- src/FactSystem/FactControls/CMakeLists.txt | 25 ++++++------------- .../{FactControls => }/FactPanelController.cc | 0 .../{FactControls => }/FactPanelController.h | 0 src/QmlControls/CMakeLists.txt | 1 - .../QGroundControl/FactControls/qmldir | 15 ----------- .../QGroundControl/FactSystem/qmldir | 1 - src/VehicleSetup/CMakeLists.txt | 1 - 13 files changed, 10 insertions(+), 69 deletions(-) rename src/FactSystem/{FactControls => }/FactPanelController.cc (100%) rename src/FactSystem/{FactControls => }/FactPanelController.h (100%) delete mode 100644 src/QmlControls/QGroundControl/FactControls/qmldir delete mode 100644 src/QmlControls/QGroundControl/FactSystem/qmldir diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc index 0a717639462f..dbf3c1da0160 100644 --- a/custom-example/qgroundcontrol.qrc +++ b/custom-example/qgroundcontrol.qrc @@ -201,20 +201,6 @@ ../src/QmlControls/VehicleRotationCal.qml ../src/QmlControls/VehicleSummaryRow.qml ../src/PlanView/VTOLLandingPatternMapVisual.qml - ../src/FactSystem/FactControls/AltitudeFactTextField.qml - ../src/FactSystem/FactControls/FactBitmask.qml - ../src/FactSystem/FactControls/FactCheckBox.qml - ../src/FactSystem/FactControls/FactCheckBoxSlider.qml - ../src/FactSystem/FactControls/FactComboBox.qml - ../src/FactSystem/FactControls/FactLabel.qml - ../src/FactSystem/FactControls/FactTextField.qml - ../src/FactSystem/FactControls/FactTextFieldGrid.qml - ../src/FactSystem/FactControls/FactTextFieldRow.qml - ../src/FactSystem/FactControls/FactTextFieldSlider.qml - ../src/FactSystem/FactControls/FactValueSlider.qml - ../src/FactSystem/FactControls/LabelledFactComboBox.qml - ../src/FactSystem/FactControls/LabelledFactTextField.qml - ../src/QmlControls/QGroundControl/FactControls/qmldir ../src/FlightDisplay/FlightDisplayViewVideo.qml ../src/FlightDisplay/FlyView.qml ../src/FlightDisplay/FlyViewBottomRightRowLayout.qml diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 1a689064d3d4..f750aa88f009 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -205,20 +205,6 @@ src/QmlControls/VehicleRotationCal.qml src/QmlControls/VehicleSummaryRow.qml src/PlanView/VTOLLandingPatternMapVisual.qml - src/FactSystem/FactControls/AltitudeFactTextField.qml - src/FactSystem/FactControls/FactBitmask.qml - src/FactSystem/FactControls/FactCheckBox.qml - src/FactSystem/FactControls/FactCheckBoxSlider.qml - src/FactSystem/FactControls/FactComboBox.qml - src/FactSystem/FactControls/FactLabel.qml - src/FactSystem/FactControls/FactTextField.qml - src/FactSystem/FactControls/FactTextFieldGrid.qml - src/FactSystem/FactControls/FactTextFieldRow.qml - src/FactSystem/FactControls/FactTextFieldSlider.qml - src/FactSystem/FactControls/FactValueSlider.qml - src/FactSystem/FactControls/LabelledFactComboBox.qml - src/FactSystem/FactControls/LabelledFactTextField.qml - src/QmlControls/QGroundControl/FactControls/qmldir src/FlightDisplay/CustomGuidedActionsController.qml src/FlightDisplay/FlightDisplayViewVideo.qml src/FlightDisplay/FlyView.qml diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt index 4bfd953981cb..8941905d1e89 100644 --- a/src/AutoPilotPlugins/APM/CMakeLists.txt +++ b/src/AutoPilotPlugins/APM/CMakeLists.txt @@ -57,7 +57,6 @@ target_link_libraries(APMAutoPilotPlugin Qt6::Quick AutoPilotPlugins CommonAutoPilotPlugin - FactControls MAVLink VehicleSetup ) diff --git a/src/AutoPilotPlugins/Common/CMakeLists.txt b/src/AutoPilotPlugins/Common/CMakeLists.txt index ea3168cc885c..212b92783169 100644 --- a/src/AutoPilotPlugins/Common/CMakeLists.txt +++ b/src/AutoPilotPlugins/Common/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries(CommonAutoPilotPlugin Qt6::Core Qt6::Network Qt6::Quick - FactControls MAVLink VehicleSetup ) diff --git a/src/AutoPilotPlugins/PX4/CMakeLists.txt b/src/AutoPilotPlugins/PX4/CMakeLists.txt index 3cd8fecacc40..1546fea2a0af 100644 --- a/src/AutoPilotPlugins/PX4/CMakeLists.txt +++ b/src/AutoPilotPlugins/PX4/CMakeLists.txt @@ -50,7 +50,6 @@ target_link_libraries(PX4AutoPilotPlugin Qt6::Quick AutoPilotPlugins CommonAutoPilotPlugin - FactControls MAVLink VehicleSetup ) diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt index 6a33fe4c0225..474076da76cf 100644 --- a/src/FactSystem/CMakeLists.txt +++ b/src/FactSystem/CMakeLists.txt @@ -1,7 +1,5 @@ add_subdirectory(FactControls) -find_package(Qt6 REQUIRED COMPONENTS Core Qml) - qt_add_library(FactSystem STATIC Fact.cc Fact.h @@ -9,6 +7,8 @@ qt_add_library(FactSystem STATIC FactGroup.h FactMetaData.cc FactMetaData.h + FactPanelController.h + FactPanelController.cc FactValueSliderListModel.cc FactValueSliderListModel.h ParameterManager.cc @@ -22,7 +22,6 @@ target_link_libraries(FactSystem Qt6::Qml API AutoPilotPlugins - FactControls FirmwarePlugin QGC Settings diff --git a/src/FactSystem/FactControls/CMakeLists.txt b/src/FactSystem/FactControls/CMakeLists.txt index ff1b3c62498c..9eaa30a52c72 100644 --- a/src/FactSystem/FactControls/CMakeLists.txt +++ b/src/FactSystem/FactControls/CMakeLists.txt @@ -1,20 +1,11 @@ -find_package(Qt6 REQUIRED COMPONENTS Core Qml) +project(FactControlsplugin) -qt_add_library(FactControls STATIC - FactPanelController.cc - FactPanelController.h -) +file(GLOB_RECURSE MODULE_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) -target_link_libraries(FactControls - PRIVATE - Qt6::Qml - AutoPilotPlugins - FactSystem - QGC - Utilities - Vehicle - PUBLIC - Qt6::Core +qt_add_qml_module(${PROJECT_NAME} + URI QGroundControl.FactControls + VERSION 1.0 + STATIC + RESOURCE_PREFIX /qml + QML_FILES ${MODULE_QML_FILES} ) - -target_include_directories(FactControls INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/FactSystem/FactControls/FactPanelController.cc b/src/FactSystem/FactPanelController.cc similarity index 100% rename from src/FactSystem/FactControls/FactPanelController.cc rename to src/FactSystem/FactPanelController.cc diff --git a/src/FactSystem/FactControls/FactPanelController.h b/src/FactSystem/FactPanelController.h similarity index 100% rename from src/FactSystem/FactControls/FactPanelController.h rename to src/FactSystem/FactPanelController.h diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt index ae22487a1b82..c43579005303 100644 --- a/src/QmlControls/CMakeLists.txt +++ b/src/QmlControls/CMakeLists.txt @@ -78,7 +78,6 @@ target_link_libraries(QmlControls AirLink API Comms - FactControls FactSystem MAVLink MissionManager diff --git a/src/QmlControls/QGroundControl/FactControls/qmldir b/src/QmlControls/QGroundControl/FactControls/qmldir deleted file mode 100644 index cff672d70121..000000000000 --- a/src/QmlControls/QGroundControl/FactControls/qmldir +++ /dev/null @@ -1,15 +0,0 @@ -Module QGroundControl.FactControls - -AltitudeFactTextField 1.0 AltitudeFactTextField.qml -FactBitmask 1.0 FactBitmask.qml -FactCheckBox 1.0 FactCheckBox.qml -FactCheckBoxSlider 1.0 FactCheckBoxSlider.qml -FactComboBox 1.0 FactComboBox.qml -FactLabel 1.0 FactLabel.qml -FactTextField 1.0 FactTextField.qml -FactTextFieldGrid 1.0 FactTextFieldGrid.qml -FactTextFieldRow 1.0 FactTextFieldRow.qml -FactTextFieldSlider 1.0 FactTextFieldSlider.qml -FactValueSlider 1.0 FactValueSlider.qml -LabelledFactComboBox 1.0 LabelledFactComboBox.qml -LabelledFactTextField 1.0 LabelledFactTextField.qml diff --git a/src/QmlControls/QGroundControl/FactSystem/qmldir b/src/QmlControls/QGroundControl/FactSystem/qmldir deleted file mode 100644 index b47a6beece5b..000000000000 --- a/src/QmlControls/QGroundControl/FactSystem/qmldir +++ /dev/null @@ -1 +0,0 @@ -Module QGroundControl.FactSystem diff --git a/src/VehicleSetup/CMakeLists.txt b/src/VehicleSetup/CMakeLists.txt index 2ce3abb41344..dcd18164b21c 100644 --- a/src/VehicleSetup/CMakeLists.txt +++ b/src/VehicleSetup/CMakeLists.txt @@ -21,7 +21,6 @@ target_link_libraries(VehicleSetup Qt6::Core Qt6::Gui Qt6::Quick - FactControls Joystick ) From 8638f5193da3bf50ab2ddae1fb586e57263f51f4 Mon Sep 17 00:00:00 2001 From: Sergii Lisovenko <2522054+s-lisovenko@users.noreply.github.com> Date: Sat, 1 Feb 2025 20:34:44 +0100 Subject: [PATCH 2/5] QML modules: Create ScreenTools qml module + create UI qml module --- custom-example/qgroundcontrol.qrc | 4 --- qgroundcontrol.qrc | 5 --- src/API/QGCCorePlugin.cc | 2 +- src/CMakeLists.txt | 3 +- .../QGroundControl/ScreenTools/qmldir | 3 -- src/UI/CMakeLists.txt | 35 +++++++------------ src/UI/ScreenTools/CMakeLists.txt | 15 ++++++++ .../ScreenTools}/ScreenTools.qml | 0 8 files changed, 29 insertions(+), 38 deletions(-) delete mode 100644 src/QmlControls/QGroundControl/ScreenTools/qmldir create mode 100644 src/UI/ScreenTools/CMakeLists.txt rename src/{QmlControls => UI/ScreenTools}/ScreenTools.qml (100%) diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc index dbf3c1da0160..6648801180ca 100644 --- a/custom-example/qgroundcontrol.qrc +++ b/custom-example/qgroundcontrol.qrc @@ -32,7 +32,6 @@ ../src/UI/preferences/ADSBServerSettings.qml ../src/Comms/AirLink/AirLinkSettings.qml ../src/AnalyzeView/AnalyzeView.qml - ../src/UI/AppSettings.qml ../src/UI/preferences/BluetoothSettings.qml ../src/PlanView/CorridorScanEditor.qml ../src/UI/preferences/RemoteIDSettings.qml @@ -264,14 +263,11 @@ ../src/FlightMap/Widgets/QGCPitchIndicator.qml ../src/QmlControls/QGroundControl/FlightMap/qmldir ../src/FlightMap/MapItems/VehicleMapItem.qml - ../src/QmlControls/QGroundControl/ScreenTools/qmldir - ../src/QmlControls/ScreenTools.qml ../src/AutoPilotPlugins/Common/RadioComponent.qml ../src/UI/preferences/SerialSettings.qml ../src/VehicleSetup/SetupParameterEditor.qml ../src/VehicleSetup/SetupView.qml ../src/UI/preferences/SettingsPage.qml - ../src/UI/SettingsPagesModel.qml ../src/PlanView/SimpleItemEditor.qml ../src/PlanView/StructureScanEditor.qml ../src/PlanView/SurveyItemEditor.qml diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index f750aa88f009..9ab5307df1cd 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -32,7 +32,6 @@ src/UI/preferences/ADSBServerSettings.qml src/Comms/AirLink/AirLinkSettings.qml src/AnalyzeView/AnalyzeView.qml - src/UI/AppSettings.qml src/UI/preferences/BluetoothSettings.qml src/PlanView/CorridorScanEditor.qml src/UI/preferences/RemoteIDSettings.qml @@ -59,7 +58,6 @@ src/UI/preferences/LinkSettings.qml src/AnalyzeView/LogDownloadPage.qml src/UI/preferences/LogReplaySettings.qml - src/UI/MainRootWindow.qml src/UI/preferences/MapSettings.qml src/AnalyzeView/MAVLinkConsolePage.qml src/AnalyzeView/MAVLinkInspectorPage.qml @@ -273,14 +271,11 @@ src/FlightMap/Widgets/QGCPitchIndicator.qml src/QmlControls/QGroundControl/FlightMap/qmldir src/FlightMap/MapItems/VehicleMapItem.qml - src/QmlControls/QGroundControl/ScreenTools/qmldir - src/QmlControls/ScreenTools.qml src/AutoPilotPlugins/Common/RadioComponent.qml src/UI/preferences/SerialSettings.qml src/VehicleSetup/SetupParameterEditor.qml src/VehicleSetup/SetupView.qml src/UI/preferences/SettingsPage.qml - src/UI/SettingsPagesModel.qml src/PlanView/SimpleItemEditor.qml src/PlanView/StructureScanEditor.qml src/PlanView/SurveyItemEditor.qml diff --git a/src/API/QGCCorePlugin.cc b/src/API/QGCCorePlugin.cc index 856be40102e1..15d20e72e869 100644 --- a/src/API/QGCCorePlugin.cc +++ b/src/API/QGCCorePlugin.cc @@ -244,7 +244,7 @@ QQmlApplicationEngine *QGCCorePlugin::createQmlApplicationEngine(QObject *parent void QGCCorePlugin::createRootWindow(QQmlApplicationEngine *qmlEngine) { - qmlEngine->load(QUrl(QStringLiteral("qrc:/qml/MainRootWindow.qml"))); + qmlEngine->load(QUrl(QStringLiteral("qrc:/qml/QGroundControl/MainRootWindow.qml"))); } VideoReceiver *QGCCorePlugin::createVideoReceiver(QObject *parent) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 75fda8a40872..b5b0a149f9c5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,7 +32,7 @@ add_subdirectory(QmlControls) add_subdirectory(QtLocationPlugin) add_subdirectory(Settings) add_subdirectory(Terrain) -# add_subdirectory(UI) +add_subdirectory(UI) add_subdirectory(Utilities) add_subdirectory(UTMSP) add_subdirectory(Vehicle) @@ -75,7 +75,6 @@ target_link_libraries(QGC QGCLocation QmlControls Settings - # UI Utilities Vehicle VehicleSetup diff --git a/src/QmlControls/QGroundControl/ScreenTools/qmldir b/src/QmlControls/QGroundControl/ScreenTools/qmldir deleted file mode 100644 index 5b057e914f76..000000000000 --- a/src/QmlControls/QGroundControl/ScreenTools/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -Module QGroundControl.ScreenTools - -singleton ScreenTools 1.0 ScreenTools.qml diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt index e37f642e8c7b..05e7ca24e13b 100644 --- a/src/UI/CMakeLists.txt +++ b/src/UI/CMakeLists.txt @@ -1,27 +1,16 @@ -find_package(Qt6 REQUIRED COMPONENTS Core Qml) +project(UIplugin) -qt_add_library(UI STATIC) +add_subdirectory(ScreenTools) -file(GLOB_RECURSE QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) -file(GLOB QML_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/toolbar/Images/*.*) -qt_add_qml_module(UI - URI QGroundControl.UI +qt_add_qml_module(${PROJECT_NAME} + URI QGroundControl VERSION 1.0 - QML_FILES ${QML_SOURCES} - RESOURCES ${QML_RESOURCES} - OUTPUT_TARGETS UI_targets - IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY} - IMPORTS - QtQuick - QtQuick.Controls - QtQuick.Dialogs - QtQuick.Layouts - QtQuick.Window - - QGroundControl - QGroundControl.Palette - QGroundControl.Controls - QGroundControl.ScreenTools - QGroundControl.FlightDisplay - QGroundControl.FlightMap + STATIC + RESOURCE_PREFIX /qml + QML_FILES + AppSettings.qml + MainRootWindow.qml + SettingsPagesModel.qml ) + +target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Quick) diff --git a/src/UI/ScreenTools/CMakeLists.txt b/src/UI/ScreenTools/CMakeLists.txt new file mode 100644 index 000000000000..313641e09d50 --- /dev/null +++ b/src/UI/ScreenTools/CMakeLists.txt @@ -0,0 +1,15 @@ +PROJECT(ScreenToolsplugin) + +list(APPEND MODULE_QML_FILES + ScreenTools.qml +) + +set_source_files_properties(${MODULE_QML_FILES} PROPERTIES QT_QML_SINGLETON_TYPE TRUE) + +qt_add_qml_module(${PROJECT_NAME} + URI QGroundControl.ScreenTools + VERSION 1.0 + STATIC + RESOURCE_PREFIX /qml + QML_FILES ${MODULE_QML_FILES} +) diff --git a/src/QmlControls/ScreenTools.qml b/src/UI/ScreenTools/ScreenTools.qml similarity index 100% rename from src/QmlControls/ScreenTools.qml rename to src/UI/ScreenTools/ScreenTools.qml From e410e088571f789c4a1ca7410f272ae8e14db4e0 Mon Sep 17 00:00:00 2001 From: Sergii Lisovenko <2522054+s-lisovenko@users.noreply.github.com> Date: Sat, 1 Feb 2025 20:51:46 +0100 Subject: [PATCH 3/5] QML modules: Made PlanView as separate qml module --- custom-example/qgroundcontrol.qrc | 34 ------------------- qgroundcontrol.qrc | 34 ------------------- src/FlightDisplay/FlyViewMap.qml | 1 + src/FlightMap/MapItems/PlanMapItems.qml | 1 + .../MapItems/QGCMapPolygonVisuals.qml | 1 + src/MissionManager/CorridorScanComplexItem.cc | 2 +- .../FixedWingLandingComplexItem.cc | 2 +- src/MissionManager/MissionSettingsItem.cc | 2 +- src/MissionManager/SimpleMissionItem.cc | 4 +-- .../StructureScanComplexItem.cc | 2 +- src/MissionManager/SurveyComplexItem.cc | 2 +- src/MissionManager/TakeoffMissionItem.cc | 2 +- src/MissionManager/VTOLLandingComplexItem.cc | 2 +- src/PlanView/CMakeLists.txt | 23 ------------- src/UI/CMakeLists.txt | 1 + src/UI/MainRootWindow.qml | 1 + src/UI/PlanView/CMakeLists.txt | 11 ++++++ src/{ => UI}/PlanView/CameraCalcCamera.qml | 0 src/{ => UI}/PlanView/CameraCalcGrid.qml | 0 src/{ => UI}/PlanView/CameraSection.qml | 0 src/{ => UI}/PlanView/CorridorScanEditor.qml | 0 .../PlanView/CorridorScanMapVisual.qml | 0 .../PlanView/FWLandingPatternEditor.qml | 0 .../PlanView/FWLandingPatternMapVisual.qml | 0 src/{ => UI}/PlanView/GeoFenceEditor.qml | 0 src/{ => UI}/PlanView/GeoFenceMapVisuals.qml | 0 src/{ => UI}/PlanView/MissionItemEditor.qml | 0 .../PlanView/MissionItemMapVisual.qml | 0 src/{ => UI}/PlanView/MissionItemStatus.qml | 0 .../PlanView/MissionSettingsEditor.qml | 0 src/{ => UI}/PlanView/PlanEditToolbar.qml | 0 .../PlanView/PlanToolBarIndicators.qml | 0 src/{ => UI}/PlanView/PlanView.qml | 0 .../PlanView/RallyPointEditorHeader.qml | 0 .../PlanView/RallyPointItemEditor.qml | 0 .../PlanView/RallyPointMapVisuals.qml | 0 src/{ => UI}/PlanView/SimpleItemEditor.qml | 0 src/{ => UI}/PlanView/SimpleItemMapVisual.qml | 0 src/{ => UI}/PlanView/StructureScanEditor.qml | 0 .../PlanView/StructureScanMapVisual.qml | 0 src/{ => UI}/PlanView/SurveyItemEditor.qml | 0 src/{ => UI}/PlanView/SurveyMapVisual.qml | 0 .../PlanView/TakeoffItemMapVisual.qml | 0 src/{ => UI}/PlanView/TerrainStatus.qml | 0 .../TransectStyleComplexItemEditor.qml | 0 .../TransectStyleComplexItemStats.qml | 0 .../TransectStyleComplexItemTabBar.qml | 0 .../TransectStyleComplexItemTerrainFollow.qml | 0 .../PlanView/TransectStyleMapVisuals.qml | 0 .../PlanView/VTOLLandingPatternEditor.qml | 0 .../PlanView/VTOLLandingPatternMapVisual.qml | 0 51 files changed, 25 insertions(+), 100 deletions(-) delete mode 100644 src/PlanView/CMakeLists.txt create mode 100644 src/UI/PlanView/CMakeLists.txt rename src/{ => UI}/PlanView/CameraCalcCamera.qml (100%) rename src/{ => UI}/PlanView/CameraCalcGrid.qml (100%) rename src/{ => UI}/PlanView/CameraSection.qml (100%) rename src/{ => UI}/PlanView/CorridorScanEditor.qml (100%) rename src/{ => UI}/PlanView/CorridorScanMapVisual.qml (100%) rename src/{ => UI}/PlanView/FWLandingPatternEditor.qml (100%) rename src/{ => UI}/PlanView/FWLandingPatternMapVisual.qml (100%) rename src/{ => UI}/PlanView/GeoFenceEditor.qml (100%) rename src/{ => UI}/PlanView/GeoFenceMapVisuals.qml (100%) rename src/{ => UI}/PlanView/MissionItemEditor.qml (100%) rename src/{ => UI}/PlanView/MissionItemMapVisual.qml (100%) rename src/{ => UI}/PlanView/MissionItemStatus.qml (100%) rename src/{ => UI}/PlanView/MissionSettingsEditor.qml (100%) rename src/{ => UI}/PlanView/PlanEditToolbar.qml (100%) rename src/{ => UI}/PlanView/PlanToolBarIndicators.qml (100%) rename src/{ => UI}/PlanView/PlanView.qml (100%) rename src/{ => UI}/PlanView/RallyPointEditorHeader.qml (100%) rename src/{ => UI}/PlanView/RallyPointItemEditor.qml (100%) rename src/{ => UI}/PlanView/RallyPointMapVisuals.qml (100%) rename src/{ => UI}/PlanView/SimpleItemEditor.qml (100%) rename src/{ => UI}/PlanView/SimpleItemMapVisual.qml (100%) rename src/{ => UI}/PlanView/StructureScanEditor.qml (100%) rename src/{ => UI}/PlanView/StructureScanMapVisual.qml (100%) rename src/{ => UI}/PlanView/SurveyItemEditor.qml (100%) rename src/{ => UI}/PlanView/SurveyMapVisual.qml (100%) rename src/{ => UI}/PlanView/TakeoffItemMapVisual.qml (100%) rename src/{ => UI}/PlanView/TerrainStatus.qml (100%) rename src/{ => UI}/PlanView/TransectStyleComplexItemEditor.qml (100%) rename src/{ => UI}/PlanView/TransectStyleComplexItemStats.qml (100%) rename src/{ => UI}/PlanView/TransectStyleComplexItemTabBar.qml (100%) rename src/{ => UI}/PlanView/TransectStyleComplexItemTerrainFollow.qml (100%) rename src/{ => UI}/PlanView/TransectStyleMapVisuals.qml (100%) rename src/{ => UI}/PlanView/VTOLLandingPatternEditor.qml (100%) rename src/{ => UI}/PlanView/VTOLLandingPatternMapVisual.qml (100%) diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc index 6648801180ca..46a0771c4e1a 100644 --- a/custom-example/qgroundcontrol.qrc +++ b/custom-example/qgroundcontrol.qrc @@ -26,14 +26,12 @@ ../src/QmlControls/HeightIndicator.qml ../src/QmlControls/QGCDynamicObjectManager.qml ../src/QmlControls/QGCOptionsComboBox.qml - ../src/PlanView/TransectStyleMapVisuals.qml ../src/FlightMap/MapItems/MapLineArrow.qml ../src/FlightMap/MapItems/SplitIndicator.qml ../src/UI/preferences/ADSBServerSettings.qml ../src/Comms/AirLink/AirLinkSettings.qml ../src/AnalyzeView/AnalyzeView.qml ../src/UI/preferences/BluetoothSettings.qml - ../src/PlanView/CorridorScanEditor.qml ../src/UI/preferences/RemoteIDSettings.qml ../src/AutoPilotPlugins/Common/ESP8266Component.qml ../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -44,7 +42,6 @@ ../src/FlightDisplay/FlightDisplayViewGStreamer.qml ../src/FlightDisplay/FlightDisplayViewQtMultimedia.qml ../src/UI/preferences/FlyViewSettings.qml - ../src/PlanView/FWLandingPatternEditor.qml ../src/UI/preferences/GeneralSettings.qml ../src/AnalyzeView/GeoTagPage.qml ../src/UI/preferences/HelpSettings.qml @@ -63,13 +60,10 @@ ../src/AnalyzeView/MAVLinkConsolePage.qml ../src/AnalyzeView/MAVLinkInspectorPage.qml ../src/UI/preferences/PX4LogTransferSettings.qml - ../src/PlanView/MissionSettingsEditor.qml ../src/AutoPilotPlugins/Common/MotorComponent.qml ../src/AutoPilotPlugins/PX4/ActuatorComponent.qml ../src/AutoPilotPlugins/PX4/ActuatorFact.qml ../src/AutoPilotPlugins/PX4/ActuatorSlider.qml - ../src/PlanView/PlanToolBarIndicators.qml - ../src/PlanView/PlanView.qml ../src/UI/preferences/PlanViewSettings.qml ../src/UI/toolbar/PlanViewToolBar.qml ../src/FlightDisplay/PreFlightCheckList.qml @@ -81,11 +75,7 @@ ../src/QmlControls/AltModeDialog.qml ../src/QmlControls/AxisMonitor.qml ../src/UI/toolbar/BatteryIndicator.qml - ../src/PlanView/CameraCalcCamera.qml - ../src/PlanView/CameraCalcGrid.qml - ../src/PlanView/CameraSection.qml ../src/QmlControls/ClickableColor.qml - ../src/PlanView/CorridorScanMapVisual.qml ../src/QmlControls/DeadMouseArea.qml ../src/QmlControls/DropButton.qml ../src/QmlControls/DropPanel.qml @@ -97,11 +87,8 @@ ../src/QmlControls/FileButton.qml ../src/UI/toolbar/FlightModeIndicator.qml ../src/QmlControls/FlightModeMenu.qml - ../src/PlanView/FWLandingPatternMapVisual.qml ../src/UI/toolbar/GPSIndicator.qml ../src/UI/toolbar/GPSIndicatorPage.qml - ../src/PlanView/GeoFenceEditor.qml - ../src/PlanView/GeoFenceMapVisuals.qml ../src/QmlControls/HorizontalFactValueGrid.qml ../src/QmlControls/IndicatorButton.qml ../src/QmlControls/LabelledButton.qml @@ -122,10 +109,7 @@ ../src/QmlControls/MAVLinkChart.qml ../src/QmlControls/MAVLinkMessageButton.qml ../src/QmlControls/MissionCommandDialog.qml - ../src/PlanView/MissionItemEditor.qml ../src/QmlControls/MissionItemIndexLabel.qml - ../src/PlanView/MissionItemMapVisual.qml - ../src/PlanView/MissionItemStatus.qml ../src/QmlControls/OfflineMapButton.qml ../src/QtLocationPlugin/QMLControl/OfflineMapEditor.qml ../src/UI/preferences/OfflineMapInfo.qml @@ -133,7 +117,6 @@ ../src/QmlControls/ParameterEditor.qml ../src/QmlControls/ParameterEditorDialog.qml ../src/QmlControls/PIDTuning.qml - ../src/PlanView/PlanEditToolbar.qml ../src/QmlControls/PreFlightCheckButton.qml ../src/QmlControls/PreFlightCheckGroup.qml ../src/QmlControls/PreFlightCheckModel.qml @@ -173,9 +156,6 @@ ../src/QmlControls/QGCToolBarButton.qml ../src/QmlControls/QGCToolInsets.qml ../src/QmlControls/QGroundControl/Controls/qmldir - ../src/PlanView/RallyPointEditorHeader.qml - ../src/PlanView/RallyPointItemEditor.qml - ../src/PlanView/RallyPointMapVisuals.qml ../src/QmlControls/RCChannelMonitor.qml ../src/QmlControls/RCToParamDialog.qml ../src/QmlControls/QGCRoundButton.qml @@ -183,23 +163,13 @@ ../src/QmlControls/SelectableControl.qml ../src/AutoPilotPlugins/Common/SetupPage.qml ../src/UI/toolbar/SignalStrength.qml - ../src/PlanView/SimpleItemMapVisual.qml ../src/QmlControls/SliderSwitch.qml - ../src/PlanView/StructureScanMapVisual.qml ../src/QmlControls/SubMenuButton.qml - ../src/PlanView/SurveyMapVisual.qml - ../src/PlanView/TerrainStatus.qml - ../src/PlanView/TakeoffItemMapVisual.qml ../src/QmlControls/ToolIndicatorPage.qml ../src/QmlControls/ToolStrip.qml ../src/QmlControls/ToolStripHoverButton.qml - ../src/PlanView/TransectStyleComplexItemEditor.qml - ../src/PlanView/TransectStyleComplexItemStats.qml - ../src/PlanView/TransectStyleComplexItemTabBar.qml - ../src/PlanView/TransectStyleComplexItemTerrainFollow.qml ../src/QmlControls/VehicleRotationCal.qml ../src/QmlControls/VehicleSummaryRow.qml - ../src/PlanView/VTOLLandingPatternMapVisual.qml ../src/FlightDisplay/FlightDisplayViewVideo.qml ../src/FlightDisplay/FlyView.qml ../src/FlightDisplay/FlyViewBottomRightRowLayout.qml @@ -268,9 +238,6 @@ ../src/VehicleSetup/SetupParameterEditor.qml ../src/VehicleSetup/SetupView.qml ../src/UI/preferences/SettingsPage.qml - ../src/PlanView/SimpleItemEditor.qml - ../src/PlanView/StructureScanEditor.qml - ../src/PlanView/SurveyItemEditor.qml ../src/AutoPilotPlugins/Common/SyslinkComponent.qml ../src/UI/preferences/TcpSettings.qml ../src/UI/preferences/TelemetrySettings.qml @@ -279,7 +246,6 @@ ../src/AnalyzeView/VibrationPage.qml ../src/UI/preferences/VideoSettings.qml ../src/FlightDisplay/VirtualJoystick.qml - ../src/PlanView/VTOLLandingPatternEditor.qml ../src/FlightDisplay/FlyViewInsetViewer.qml ../src/Viewer3D/Viewer3DQml/Viewer3D.qml ../src/QmlControls/Viewer3D/qmldir diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 9ab5307df1cd..b63bf7929dfa 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -26,14 +26,12 @@ src/QmlControls/HeightIndicator.qml src/QmlControls/QGCDynamicObjectManager.qml src/QmlControls/QGCOptionsComboBox.qml - src/PlanView/TransectStyleMapVisuals.qml src/FlightMap/MapItems/MapLineArrow.qml src/FlightMap/MapItems/SplitIndicator.qml src/UI/preferences/ADSBServerSettings.qml src/Comms/AirLink/AirLinkSettings.qml src/AnalyzeView/AnalyzeView.qml src/UI/preferences/BluetoothSettings.qml - src/PlanView/CorridorScanEditor.qml src/UI/preferences/RemoteIDSettings.qml src/AutoPilotPlugins/Common/ESP8266Component.qml src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml @@ -44,7 +42,6 @@ src/FlightDisplay/FlightDisplayViewGStreamer.qml src/FlightDisplay/FlightDisplayViewQtMultimedia.qml src/UI/preferences/FlyViewSettings.qml - src/PlanView/FWLandingPatternEditor.qml src/UI/preferences/GeneralSettings.qml src/AnalyzeView/GeoTagPage.qml src/UI/preferences/HelpSettings.qml @@ -62,12 +59,9 @@ src/AnalyzeView/MAVLinkConsolePage.qml src/AnalyzeView/MAVLinkInspectorPage.qml src/UI/preferences/PX4LogTransferSettings.qml - src/PlanView/MissionSettingsEditor.qml src/AutoPilotPlugins/PX4/ActuatorComponent.qml src/AutoPilotPlugins/PX4/ActuatorFact.qml src/AutoPilotPlugins/PX4/ActuatorSlider.qml - src/PlanView/PlanToolBarIndicators.qml - src/PlanView/PlanView.qml src/UI/preferences/PlanViewSettings.qml src/UI/toolbar/PlanViewToolBar.qml src/FlightDisplay/PreFlightCheckList.qml @@ -79,11 +73,7 @@ src/QmlControls/AltModeDialog.qml src/QmlControls/AxisMonitor.qml src/UI/toolbar/BatteryIndicator.qml - src/PlanView/CameraCalcCamera.qml - src/PlanView/CameraCalcGrid.qml - src/PlanView/CameraSection.qml src/QmlControls/ClickableColor.qml - src/PlanView/CorridorScanMapVisual.qml src/QmlControls/DeadMouseArea.qml src/QmlControls/DropButton.qml src/QmlControls/DropPanel.qml @@ -95,11 +85,8 @@ src/QmlControls/FileButton.qml src/UI/toolbar/FlightModeIndicator.qml src/QmlControls/FlightModeMenu.qml - src/PlanView/FWLandingPatternMapVisual.qml src/UI/toolbar/GPSIndicator.qml src/UI/toolbar/GPSIndicatorPage.qml - src/PlanView/GeoFenceEditor.qml - src/PlanView/GeoFenceMapVisuals.qml src/QmlControls/HorizontalFactValueGrid.qml src/QmlControls/IndicatorButton.qml src/QmlControls/LabelledButton.qml @@ -121,10 +108,7 @@ src/QmlControls/MAVLinkChart.qml src/QmlControls/MAVLinkMessageButton.qml src/QmlControls/MissionCommandDialog.qml - src/PlanView/MissionItemEditor.qml src/QmlControls/MissionItemIndexLabel.qml - src/PlanView/MissionItemMapVisual.qml - src/PlanView/MissionItemStatus.qml src/QmlControls/MvPanelPage.qml src/QmlControls/OfflineMapButton.qml src/QtLocationPlugin/QMLControl/OfflineMapEditor.qml @@ -133,7 +117,6 @@ src/QmlControls/ParameterEditor.qml src/QmlControls/ParameterEditorDialog.qml src/QmlControls/PIDTuning.qml - src/PlanView/PlanEditToolbar.qml src/QmlControls/PreFlightCheckButton.qml src/QmlControls/PreFlightCheckGroup.qml src/QmlControls/PreFlightCheckModel.qml @@ -175,9 +158,6 @@ src/QmlControls/QGCToolBarButton.qml src/QmlControls/QGCToolInsets.qml src/QmlControls/QGroundControl/Controls/qmldir - src/PlanView/RallyPointEditorHeader.qml - src/PlanView/RallyPointItemEditor.qml - src/PlanView/RallyPointMapVisuals.qml src/QmlControls/RCChannelMonitor.qml src/QmlControls/RCToParamDialog.qml src/QmlControls/QGCRoundButton.qml @@ -185,24 +165,14 @@ src/QmlControls/SelectableControl.qml src/AutoPilotPlugins/Common/SetupPage.qml src/UI/toolbar/SignalStrength.qml - src/PlanView/SimpleItemMapVisual.qml src/QmlControls/SliderSwitch.qml - src/PlanView/StructureScanMapVisual.qml src/QmlControls/SubMenuButton.qml - src/PlanView/SurveyMapVisual.qml - src/PlanView/TerrainStatus.qml - src/PlanView/TakeoffItemMapVisual.qml src/QmlControls/ToolIndicatorPage.qml src/QmlControls/ToolStrip.qml src/QmlControls/ToolStripHoverButton.qml - src/PlanView/TransectStyleComplexItemEditor.qml - src/PlanView/TransectStyleComplexItemStats.qml - src/PlanView/TransectStyleComplexItemTabBar.qml - src/PlanView/TransectStyleComplexItemTerrainFollow.qml src/QmlControls/ValueSlider.qml src/QmlControls/VehicleRotationCal.qml src/QmlControls/VehicleSummaryRow.qml - src/PlanView/VTOLLandingPatternMapVisual.qml src/FlightDisplay/CustomGuidedActionsController.qml src/FlightDisplay/FlightDisplayViewVideo.qml src/FlightDisplay/FlyView.qml @@ -276,9 +246,6 @@ src/VehicleSetup/SetupParameterEditor.qml src/VehicleSetup/SetupView.qml src/UI/preferences/SettingsPage.qml - src/PlanView/SimpleItemEditor.qml - src/PlanView/StructureScanEditor.qml - src/PlanView/SurveyItemEditor.qml src/AutoPilotPlugins/Common/SyslinkComponent.qml src/UI/preferences/TcpSettings.qml src/UI/preferences/TelemetrySettings.qml @@ -287,7 +254,6 @@ src/AnalyzeView/VibrationPage.qml src/UI/preferences/VideoSettings.qml src/FlightDisplay/VirtualJoystick.qml - src/PlanView/VTOLLandingPatternEditor.qml src/FlightDisplay/FlyViewInsetViewer.qml src/Viewer3D/Viewer3DQml/Viewer3D.qml src/QmlControls/Viewer3D/qmldir diff --git a/src/FlightDisplay/FlyViewMap.qml b/src/FlightDisplay/FlyViewMap.qml index 5aabb6db1018..917a5777dc1d 100644 --- a/src/FlightDisplay/FlyViewMap.qml +++ b/src/FlightDisplay/FlyViewMap.qml @@ -22,6 +22,7 @@ import QGroundControl.FlightMap import QGroundControl.Palette import QGroundControl.ScreenTools import QGroundControl.Vehicle +import QGroundControl.PlanView FlightMap { id: _root diff --git a/src/FlightMap/MapItems/PlanMapItems.qml b/src/FlightMap/MapItems/PlanMapItems.qml index 541ea349bee6..c004cdf9b5c0 100644 --- a/src/FlightMap/MapItems/PlanMapItems.qml +++ b/src/FlightMap/MapItems/PlanMapItems.qml @@ -14,6 +14,7 @@ import QtPositioning import QGroundControl import QGroundControl.Controls import QGroundControl.FlightMap +import QGroundControl.PlanView // Adds visual items associated with the Flight Plan to the map. // Currently only used by Fly View even though it's called PlanMapItems! diff --git a/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml b/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml index 6d94204d249d..72cb46e5eea8 100644 --- a/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml +++ b/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml @@ -20,6 +20,7 @@ import QGroundControl.Palette import QGroundControl.Controls import QGroundControl.FlightMap import QGroundControl.ShapeFileHelper +import QGroundControl.PlanView /// QGCMapPolygon map visuals Item { diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc index 3010beb671fd..11bb7800fa8a 100644 --- a/src/MissionManager/CorridorScanComplexItem.cc +++ b/src/MissionManager/CorridorScanComplexItem.cc @@ -27,7 +27,7 @@ CorridorScanComplexItem::CorridorScanComplexItem(PlanMasterController* masterCon , _metaDataMap (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/CorridorScan.SettingsGroup.json"), this)) , _corridorWidthFact (settingsGroup, _metaDataMap[corridorWidthName]) { - _editorQml = "qrc:/qml/CorridorScanEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/CorridorScanEditor.qml"; // We override the altitude to the mission default if (_cameraCalc.isManualCamera() || !_cameraCalc.valueSetIsDistance()->rawValue().toBool()) { diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc index 464adb679e8f..c06a0b0cc5a8 100644 --- a/src/MissionManager/FixedWingLandingComplexItem.cc +++ b/src/MissionManager/FixedWingLandingComplexItem.cc @@ -38,7 +38,7 @@ FixedWingLandingComplexItem::FixedWingLandingComplexItem(PlanMasterController* m , _stopTakingVideoFact (settingsGroup, _metaDataMap[stopTakingVideoName]) , _valueSetIsDistanceFact (settingsGroup, _metaDataMap[valueSetIsDistanceName]) { - _editorQml = "qrc:/qml/FWLandingPatternEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/FWLandingPatternEditor.qml"; _isIncomplete = false; _init(); diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc index 7ddbff3024c6..5a897d910d7b 100644 --- a/src/MissionManager/MissionSettingsItem.cc +++ b/src/MissionManager/MissionSettingsItem.cc @@ -28,7 +28,7 @@ MissionSettingsItem::MissionSettingsItem(PlanMasterController* masterController, , _speedSection (masterController) { _isIncomplete = false; - _editorQml = "qrc:/qml/MissionSettingsEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/MissionSettingsEditor.qml"; if (_metaDataMap.isEmpty()) { _metaDataMap = FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/MissionSettings.FactMetaData.json"), nullptr /* metaDataParent */); diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index b77f35f33e5b..f8d13163f40e 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -44,7 +44,7 @@ SimpleMissionItem::SimpleMissionItem(PlanMasterController* masterController, boo , _param6MetaData (FactMetaData::valueTypeDouble) , _param7MetaData (FactMetaData::valueTypeDouble) { - _editorQml = QStringLiteral("qrc:/qml/SimpleItemEditor.qml"); + _editorQml = QStringLiteral("qrc:/qml/QGroundControl/PlanView/SimpleItemEditor.qml"); _setupMetaData(); @@ -72,7 +72,7 @@ SimpleMissionItem::SimpleMissionItem(PlanMasterController* masterController, boo , _param6MetaData (FactMetaData::valueTypeDouble) , _param7MetaData (FactMetaData::valueTypeDouble) { - _editorQml = QStringLiteral("qrc:/qml/SimpleItemEditor.qml"); + _editorQml = QStringLiteral("qrc:/qml/QGroundControl/PlanView/SimpleItemEditor.qml"); struct MavFrame2AltMode_s { MAV_FRAME mavFrame; diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc index fc843abd4822..465cccec7b7d 100644 --- a/src/MissionManager/StructureScanComplexItem.cc +++ b/src/MissionManager/StructureScanComplexItem.cc @@ -40,7 +40,7 @@ StructureScanComplexItem::StructureScanComplexItem(PlanMasterController* masterC , _startFromTopFact (settingsGroup, _metaDataMap[startFromTopName]) , _entranceAltFact (settingsGroup, _metaDataMap[_entranceAltName]) { - _editorQml = "qrc:/qml/StructureScanEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/StructureScanEditor.qml"; _entranceAltFact.setRawValue(SettingsManager::instance()->appSettings()->defaultMissionItemAltitude()->rawValue()); diff --git a/src/MissionManager/SurveyComplexItem.cc b/src/MissionManager/SurveyComplexItem.cc index 5710dd02766d..af8299b59501 100644 --- a/src/MissionManager/SurveyComplexItem.cc +++ b/src/MissionManager/SurveyComplexItem.cc @@ -36,7 +36,7 @@ SurveyComplexItem::SurveyComplexItem(PlanMasterController* masterController, boo , _splitConcavePolygonsFact (settingsGroup, _metaDataMap[splitConcavePolygonsName]) , _entryPoint (EntryLocationTopLeft) { - _editorQml = "qrc:/qml/SurveyItemEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/SurveyItemEditor.qml"; if (_controllerVehicle && !(_controllerVehicle->fixedWing() || _controllerVehicle->vtol())) { // Only fixed wing flight paths support alternate transects diff --git a/src/MissionManager/TakeoffMissionItem.cc b/src/MissionManager/TakeoffMissionItem.cc index 4f2a38b60c1f..205ac9d172f0 100644 --- a/src/MissionManager/TakeoffMissionItem.cc +++ b/src/MissionManager/TakeoffMissionItem.cc @@ -46,7 +46,7 @@ TakeoffMissionItem::~TakeoffMissionItem() void TakeoffMissionItem::_init(bool forLoad) { - _editorQml = QStringLiteral("qrc:/qml/SimpleItemEditor.qml"); + _editorQml = QStringLiteral("qrc:/qml/QGroundControl/PlanView/SimpleItemEditor.qml"); connect(_settingsItem, &MissionSettingsItem::coordinateChanged, this, &TakeoffMissionItem::launchCoordinateChanged); diff --git a/src/MissionManager/VTOLLandingComplexItem.cc b/src/MissionManager/VTOLLandingComplexItem.cc index 8780d1f8afaf..b171db8487cd 100644 --- a/src/MissionManager/VTOLLandingComplexItem.cc +++ b/src/MissionManager/VTOLLandingComplexItem.cc @@ -39,7 +39,7 @@ VTOLLandingComplexItem::VTOLLandingComplexItem(PlanMasterController* masterContr , _stopTakingPhotosFact (settingsGroup, _metaDataMap[stopTakingPhotosName]) , _stopTakingVideoFact (settingsGroup, _metaDataMap[stopTakingVideoName]) { - _editorQml = "qrc:/qml/VTOLLandingPatternEditor.qml"; + _editorQml = "qrc:/qml/QGroundControl/PlanView/VTOLLandingPatternEditor.qml"; _isIncomplete = false; _init(); diff --git a/src/PlanView/CMakeLists.txt b/src/PlanView/CMakeLists.txt deleted file mode 100644 index 4867edbaa9de..000000000000 --- a/src/PlanView/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -find_package(Qt6 REQUIRED COMPONENTS Core Qml) - -qt_add_library(PlanView STATIC) - -file(GLOB QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) -qt_add_qml_module(PlanView - URI QGroundControl.PlanView - VERSION 1.0 - QML_FILES ${QML_SOURCES} - OUTPUT_TARGETS PlanView_targets - IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY} - IMPORTS - QtQuick - QtQuick.Controls - QtLocation - QtPositioning - - QGroundControl - QGroundControl.ScreenTools - QGroundControl.Palette - QGroundControl.Controls - QGroundControl.FlightMap -) diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt index 05e7ca24e13b..2a73410dcc52 100644 --- a/src/UI/CMakeLists.txt +++ b/src/UI/CMakeLists.txt @@ -1,5 +1,6 @@ project(UIplugin) +add_subdirectory(PlanView) add_subdirectory(ScreenTools) qt_add_qml_module(${PROJECT_NAME} diff --git a/src/UI/MainRootWindow.qml b/src/UI/MainRootWindow.qml index f3d2f90d3358..56e267632fab 100644 --- a/src/UI/MainRootWindow.qml +++ b/src/UI/MainRootWindow.qml @@ -20,6 +20,7 @@ import QGroundControl.FactControls import QGroundControl.ScreenTools import QGroundControl.FlightDisplay import QGroundControl.FlightMap +import QGroundControl.PlanView import QGroundControl.UTMSP diff --git a/src/UI/PlanView/CMakeLists.txt b/src/UI/PlanView/CMakeLists.txt new file mode 100644 index 000000000000..a4a3865b933b --- /dev/null +++ b/src/UI/PlanView/CMakeLists.txt @@ -0,0 +1,11 @@ +project(PlanViewplugin) + +file(GLOB_RECURSE MODULE_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) + +qt_add_qml_module(${PROJECT_NAME} + URI QGroundControl.PlanView + VERSION 1.0 + STATIC + RESOURCE_PREFIX /qml + QML_FILES ${MODULE_QML_FILES} +) diff --git a/src/PlanView/CameraCalcCamera.qml b/src/UI/PlanView/CameraCalcCamera.qml similarity index 100% rename from src/PlanView/CameraCalcCamera.qml rename to src/UI/PlanView/CameraCalcCamera.qml diff --git a/src/PlanView/CameraCalcGrid.qml b/src/UI/PlanView/CameraCalcGrid.qml similarity index 100% rename from src/PlanView/CameraCalcGrid.qml rename to src/UI/PlanView/CameraCalcGrid.qml diff --git a/src/PlanView/CameraSection.qml b/src/UI/PlanView/CameraSection.qml similarity index 100% rename from src/PlanView/CameraSection.qml rename to src/UI/PlanView/CameraSection.qml diff --git a/src/PlanView/CorridorScanEditor.qml b/src/UI/PlanView/CorridorScanEditor.qml similarity index 100% rename from src/PlanView/CorridorScanEditor.qml rename to src/UI/PlanView/CorridorScanEditor.qml diff --git a/src/PlanView/CorridorScanMapVisual.qml b/src/UI/PlanView/CorridorScanMapVisual.qml similarity index 100% rename from src/PlanView/CorridorScanMapVisual.qml rename to src/UI/PlanView/CorridorScanMapVisual.qml diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/UI/PlanView/FWLandingPatternEditor.qml similarity index 100% rename from src/PlanView/FWLandingPatternEditor.qml rename to src/UI/PlanView/FWLandingPatternEditor.qml diff --git a/src/PlanView/FWLandingPatternMapVisual.qml b/src/UI/PlanView/FWLandingPatternMapVisual.qml similarity index 100% rename from src/PlanView/FWLandingPatternMapVisual.qml rename to src/UI/PlanView/FWLandingPatternMapVisual.qml diff --git a/src/PlanView/GeoFenceEditor.qml b/src/UI/PlanView/GeoFenceEditor.qml similarity index 100% rename from src/PlanView/GeoFenceEditor.qml rename to src/UI/PlanView/GeoFenceEditor.qml diff --git a/src/PlanView/GeoFenceMapVisuals.qml b/src/UI/PlanView/GeoFenceMapVisuals.qml similarity index 100% rename from src/PlanView/GeoFenceMapVisuals.qml rename to src/UI/PlanView/GeoFenceMapVisuals.qml diff --git a/src/PlanView/MissionItemEditor.qml b/src/UI/PlanView/MissionItemEditor.qml similarity index 100% rename from src/PlanView/MissionItemEditor.qml rename to src/UI/PlanView/MissionItemEditor.qml diff --git a/src/PlanView/MissionItemMapVisual.qml b/src/UI/PlanView/MissionItemMapVisual.qml similarity index 100% rename from src/PlanView/MissionItemMapVisual.qml rename to src/UI/PlanView/MissionItemMapVisual.qml diff --git a/src/PlanView/MissionItemStatus.qml b/src/UI/PlanView/MissionItemStatus.qml similarity index 100% rename from src/PlanView/MissionItemStatus.qml rename to src/UI/PlanView/MissionItemStatus.qml diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/UI/PlanView/MissionSettingsEditor.qml similarity index 100% rename from src/PlanView/MissionSettingsEditor.qml rename to src/UI/PlanView/MissionSettingsEditor.qml diff --git a/src/PlanView/PlanEditToolbar.qml b/src/UI/PlanView/PlanEditToolbar.qml similarity index 100% rename from src/PlanView/PlanEditToolbar.qml rename to src/UI/PlanView/PlanEditToolbar.qml diff --git a/src/PlanView/PlanToolBarIndicators.qml b/src/UI/PlanView/PlanToolBarIndicators.qml similarity index 100% rename from src/PlanView/PlanToolBarIndicators.qml rename to src/UI/PlanView/PlanToolBarIndicators.qml diff --git a/src/PlanView/PlanView.qml b/src/UI/PlanView/PlanView.qml similarity index 100% rename from src/PlanView/PlanView.qml rename to src/UI/PlanView/PlanView.qml diff --git a/src/PlanView/RallyPointEditorHeader.qml b/src/UI/PlanView/RallyPointEditorHeader.qml similarity index 100% rename from src/PlanView/RallyPointEditorHeader.qml rename to src/UI/PlanView/RallyPointEditorHeader.qml diff --git a/src/PlanView/RallyPointItemEditor.qml b/src/UI/PlanView/RallyPointItemEditor.qml similarity index 100% rename from src/PlanView/RallyPointItemEditor.qml rename to src/UI/PlanView/RallyPointItemEditor.qml diff --git a/src/PlanView/RallyPointMapVisuals.qml b/src/UI/PlanView/RallyPointMapVisuals.qml similarity index 100% rename from src/PlanView/RallyPointMapVisuals.qml rename to src/UI/PlanView/RallyPointMapVisuals.qml diff --git a/src/PlanView/SimpleItemEditor.qml b/src/UI/PlanView/SimpleItemEditor.qml similarity index 100% rename from src/PlanView/SimpleItemEditor.qml rename to src/UI/PlanView/SimpleItemEditor.qml diff --git a/src/PlanView/SimpleItemMapVisual.qml b/src/UI/PlanView/SimpleItemMapVisual.qml similarity index 100% rename from src/PlanView/SimpleItemMapVisual.qml rename to src/UI/PlanView/SimpleItemMapVisual.qml diff --git a/src/PlanView/StructureScanEditor.qml b/src/UI/PlanView/StructureScanEditor.qml similarity index 100% rename from src/PlanView/StructureScanEditor.qml rename to src/UI/PlanView/StructureScanEditor.qml diff --git a/src/PlanView/StructureScanMapVisual.qml b/src/UI/PlanView/StructureScanMapVisual.qml similarity index 100% rename from src/PlanView/StructureScanMapVisual.qml rename to src/UI/PlanView/StructureScanMapVisual.qml diff --git a/src/PlanView/SurveyItemEditor.qml b/src/UI/PlanView/SurveyItemEditor.qml similarity index 100% rename from src/PlanView/SurveyItemEditor.qml rename to src/UI/PlanView/SurveyItemEditor.qml diff --git a/src/PlanView/SurveyMapVisual.qml b/src/UI/PlanView/SurveyMapVisual.qml similarity index 100% rename from src/PlanView/SurveyMapVisual.qml rename to src/UI/PlanView/SurveyMapVisual.qml diff --git a/src/PlanView/TakeoffItemMapVisual.qml b/src/UI/PlanView/TakeoffItemMapVisual.qml similarity index 100% rename from src/PlanView/TakeoffItemMapVisual.qml rename to src/UI/PlanView/TakeoffItemMapVisual.qml diff --git a/src/PlanView/TerrainStatus.qml b/src/UI/PlanView/TerrainStatus.qml similarity index 100% rename from src/PlanView/TerrainStatus.qml rename to src/UI/PlanView/TerrainStatus.qml diff --git a/src/PlanView/TransectStyleComplexItemEditor.qml b/src/UI/PlanView/TransectStyleComplexItemEditor.qml similarity index 100% rename from src/PlanView/TransectStyleComplexItemEditor.qml rename to src/UI/PlanView/TransectStyleComplexItemEditor.qml diff --git a/src/PlanView/TransectStyleComplexItemStats.qml b/src/UI/PlanView/TransectStyleComplexItemStats.qml similarity index 100% rename from src/PlanView/TransectStyleComplexItemStats.qml rename to src/UI/PlanView/TransectStyleComplexItemStats.qml diff --git a/src/PlanView/TransectStyleComplexItemTabBar.qml b/src/UI/PlanView/TransectStyleComplexItemTabBar.qml similarity index 100% rename from src/PlanView/TransectStyleComplexItemTabBar.qml rename to src/UI/PlanView/TransectStyleComplexItemTabBar.qml diff --git a/src/PlanView/TransectStyleComplexItemTerrainFollow.qml b/src/UI/PlanView/TransectStyleComplexItemTerrainFollow.qml similarity index 100% rename from src/PlanView/TransectStyleComplexItemTerrainFollow.qml rename to src/UI/PlanView/TransectStyleComplexItemTerrainFollow.qml diff --git a/src/PlanView/TransectStyleMapVisuals.qml b/src/UI/PlanView/TransectStyleMapVisuals.qml similarity index 100% rename from src/PlanView/TransectStyleMapVisuals.qml rename to src/UI/PlanView/TransectStyleMapVisuals.qml diff --git a/src/PlanView/VTOLLandingPatternEditor.qml b/src/UI/PlanView/VTOLLandingPatternEditor.qml similarity index 100% rename from src/PlanView/VTOLLandingPatternEditor.qml rename to src/UI/PlanView/VTOLLandingPatternEditor.qml diff --git a/src/PlanView/VTOLLandingPatternMapVisual.qml b/src/UI/PlanView/VTOLLandingPatternMapVisual.qml similarity index 100% rename from src/PlanView/VTOLLandingPatternMapVisual.qml rename to src/UI/PlanView/VTOLLandingPatternMapVisual.qml From 4878e93fcb4a3a9367cd76094f3254c8c6c8750d Mon Sep 17 00:00:00 2001 From: Sergii Lisovenko <2522054+s-lisovenko@users.noreply.github.com> Date: Sat, 1 Feb 2025 20:53:49 +0100 Subject: [PATCH 4/5] QML modules: Remove redundant Vehicle module --- src/QmlControls/QGroundControl/Vehicle/qmldir | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/QmlControls/QGroundControl/Vehicle/qmldir diff --git a/src/QmlControls/QGroundControl/Vehicle/qmldir b/src/QmlControls/QGroundControl/Vehicle/qmldir deleted file mode 100644 index 082da4bc1f3a..000000000000 --- a/src/QmlControls/QGroundControl/Vehicle/qmldir +++ /dev/null @@ -1 +0,0 @@ -Module QGroundControl.Vehicle From 1f5cf1b50701ecd9ae87c2a32d45b8f1fc8922f3 Mon Sep 17 00:00:00 2001 From: Sergii Lisovenko <2522054+s-lisovenko@users.noreply.github.com> Date: Sat, 1 Feb 2025 21:04:18 +0100 Subject: [PATCH 5/5] QML modules: Create Toolbar qml module --- custom-example/qgroundcontrol.qrc | 27 ------ .../FirmwarePlugin/CustomFirmwarePlugin.cc | 4 +- qgcimages.qrc | 82 +++++++++--------- qgroundcontrol.qrc | 27 ------ src/API/QGCCorePlugin.cc | 2 +- .../APM/APMBatteryIndicator.qml | 1 + src/FirmwarePlugin/APM/APMFirmwarePlugin.cc | 2 +- .../APM/APMFlightModeIndicator.qml | 1 + .../APM/ArduSubFirmwarePlugin.cc | 12 +-- src/FirmwarePlugin/FirmwarePlugin.cc | 16 ++-- .../PX4/PX4BatteryIndicator.qml | 1 + .../PX4/PX4FlightModeIndicator.qml | 1 + src/FlightDisplay/FlyView.qml | 1 + .../QGroundControl/Controls/qmldir | 27 ------ .../QGroundControl/FlightDisplay/qmldir | 2 - src/UI/CMakeLists.txt | 1 + src/UI/PlanView/PlanView.qml | 2 +- .../APMSupportForwardingIndicator.qml | 0 .../{toolbar => Toolbar}/ArmedIndicator.qml | 0 .../{toolbar => Toolbar}/BatteryIndicator.qml | 0 src/UI/Toolbar/CMakeLists.txt | 11 +++ .../FlightModeIndicator.qml | 0 .../FlightModeMenuIndicator.qml | 0 .../{toolbar => Toolbar}/FlyViewToolBar.qml | 0 .../FlyViewToolBarIndicators.qml | 0 src/UI/{toolbar => Toolbar}/GPSIndicator.qml | 0 .../{toolbar => Toolbar}/GPSIndicatorPage.qml | 0 .../{toolbar => Toolbar}/GimbalIndicator.qml | 0 .../Images/AirplaneIcon.svg | 0 .../{toolbar => Toolbar}/Images/Analyze.svg | 0 src/UI/{toolbar => Toolbar}/Images/Armed.svg | 0 .../{toolbar => Toolbar}/Images/Battery.svg | 0 .../Images/BatteryCritical.svg | 0 .../Images/BatteryEMERGENCY.svg | 0 .../Images/BatteryGreen.svg | 0 .../Images/BatteryOrange.svg | 0 .../Images/BatteryYellow.svg | 0 .../Images/BatteryYellowGreen.svg | 0 .../Images/CameraIcon.svg | 0 .../{toolbar => Toolbar}/Images/Connect.svg | 0 .../{toolbar => Toolbar}/Images/Disarmed.svg | 0 .../Images/Disconnect.svg | 0 src/UI/{toolbar => Toolbar}/Images/Gears.svg | 0 src/UI/{toolbar => Toolbar}/Images/Gps.svg | 0 .../{toolbar => Toolbar}/Images/Hamburger.svg | 0 .../{toolbar => Toolbar}/Images/Joystick.png | Bin .../{toolbar => Toolbar}/Images/Megaphone.svg | 0 .../Images/PaperPlane.svg | 0 src/UI/{toolbar => Toolbar}/Images/Plan.svg | 0 src/UI/{toolbar => Toolbar}/Images/Quad.svg | 0 src/UI/{toolbar => Toolbar}/Images/RC.svg | 0 src/UI/{toolbar => Toolbar}/Images/RTK.svg | 0 .../Images/RidEmergencyBackground.svg | 0 .../RidEmergencyBackgroundHighlight.svg | 0 .../Images/RidFlagBackgroundGreen.svg | 0 .../Images/RidFlagBackgroundRed.svg | 0 .../Images/RidIconGreen.svg | 0 .../Images/RidIconGrey.svg | 0 .../Images/RidIconRed.svg | 0 .../Images/RidIconYellow.svg | 0 .../{toolbar => Toolbar}/Images/Signal0.svg | 0 .../{toolbar => Toolbar}/Images/Signal100.svg | 0 .../{toolbar => Toolbar}/Images/Signal20.svg | 0 .../{toolbar => Toolbar}/Images/Signal40.svg | 0 .../{toolbar => Toolbar}/Images/Signal60.svg | 0 .../{toolbar => Toolbar}/Images/Signal80.svg | 0 .../{toolbar => Toolbar}/Images/TelemRSSI.svg | 0 .../Images/TrackingIcon.svg | 0 src/UI/{toolbar => Toolbar}/Images/Yield.svg | 0 src/UI/{toolbar => Toolbar}/Images/roi.svg | 0 .../JoystickIndicator.qml | 0 src/UI/{toolbar => Toolbar}/LinkIndicator.qml | 0 .../MainStatusIndicator.qml | 0 .../MainStatusIndicatorOfflinePage.qml | 0 .../{toolbar => Toolbar}/MessageIndicator.qml | 0 src/UI/{toolbar => Toolbar}/ModeIndicator.qml | 0 .../MultiVehicleSelector.qml | 0 .../PlanToolBarIndicators.qml | 0 .../{toolbar => Toolbar}/PlanViewToolBar.qml | 0 .../{toolbar => Toolbar}/RCRSSIIndicator.qml | 0 .../{toolbar => Toolbar}/RTKGPSIndicator.qml | 0 .../RemoteIDIndicator.qml | 0 .../RemoteIDIndicatorPage.qml | 0 .../{toolbar => Toolbar}/SignalStrength.qml | 0 .../TelemetryRSSIIndicator.qml | 0 .../VehicleGPSIndicator.qml | 0 86 files changed, 77 insertions(+), 143 deletions(-) rename src/UI/{toolbar => Toolbar}/APMSupportForwardingIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/ArmedIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/BatteryIndicator.qml (100%) create mode 100644 src/UI/Toolbar/CMakeLists.txt rename src/UI/{toolbar => Toolbar}/FlightModeIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/FlightModeMenuIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/FlyViewToolBar.qml (100%) rename src/UI/{toolbar => Toolbar}/FlyViewToolBarIndicators.qml (100%) rename src/UI/{toolbar => Toolbar}/GPSIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/GPSIndicatorPage.qml (100%) rename src/UI/{toolbar => Toolbar}/GimbalIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/Images/AirplaneIcon.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Analyze.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Armed.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Battery.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryCritical.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryEMERGENCY.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryGreen.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryOrange.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryYellow.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/BatteryYellowGreen.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/CameraIcon.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Connect.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Disarmed.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Disconnect.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Gears.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Gps.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Hamburger.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Joystick.png (100%) rename src/UI/{toolbar => Toolbar}/Images/Megaphone.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/PaperPlane.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Plan.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Quad.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RC.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RTK.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidEmergencyBackground.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidEmergencyBackgroundHighlight.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidFlagBackgroundGreen.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidFlagBackgroundRed.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidIconGreen.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidIconGrey.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidIconRed.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/RidIconYellow.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal0.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal100.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal20.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal40.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal60.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Signal80.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/TelemRSSI.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/TrackingIcon.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/Yield.svg (100%) rename src/UI/{toolbar => Toolbar}/Images/roi.svg (100%) rename src/UI/{toolbar => Toolbar}/JoystickIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/LinkIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/MainStatusIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/MainStatusIndicatorOfflinePage.qml (100%) rename src/UI/{toolbar => Toolbar}/MessageIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/ModeIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/MultiVehicleSelector.qml (100%) rename src/UI/{PlanView => Toolbar}/PlanToolBarIndicators.qml (100%) rename src/UI/{toolbar => Toolbar}/PlanViewToolBar.qml (100%) rename src/UI/{toolbar => Toolbar}/RCRSSIIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/RTKGPSIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/RemoteIDIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/RemoteIDIndicatorPage.qml (100%) rename src/UI/{toolbar => Toolbar}/SignalStrength.qml (100%) rename src/UI/{toolbar => Toolbar}/TelemetryRSSIIndicator.qml (100%) rename src/UI/{toolbar => Toolbar}/VehicleGPSIndicator.qml (100%) diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc index 46a0771c4e1a..0f0eff3a2dfd 100644 --- a/custom-example/qgroundcontrol.qrc +++ b/custom-example/qgroundcontrol.qrc @@ -1,19 +1,4 @@ - - ../src/UI/toolbar/ArmedIndicator.qml - ../src/UI/toolbar/RTKGPSIndicator.qml - ../src/UI/toolbar/VehicleGPSIndicator.qml - ../src/UI/toolbar/JoystickIndicator.qml - ../src/UI/toolbar/LinkIndicator.qml - ../src/UI/toolbar/MessageIndicator.qml - ../src/UI/toolbar/ModeIndicator.qml - ../src/UI/toolbar/MultiVehicleSelector.qml - ../src/UI/toolbar/RCRSSIIndicator.qml - ../src/UI/toolbar/RemoteIDIndicator.qml - ../src/UI/toolbar/TelemetryRSSIIndicator.qml - ../src/UI/toolbar/APMSupportForwardingIndicator.qml - ../src/UI/toolbar/GimbalIndicator.qml - ../src/FlightDisplay/DefaultChecklist.qml ../src/FlightDisplay/MultiRotorChecklist.qml @@ -65,7 +50,6 @@ ../src/AutoPilotPlugins/PX4/ActuatorFact.qml ../src/AutoPilotPlugins/PX4/ActuatorSlider.qml ../src/UI/preferences/PlanViewSettings.qml - ../src/UI/toolbar/PlanViewToolBar.qml ../src/FlightDisplay/PreFlightCheckList.qml ../src/VehicleSetup/OpticalFlowSensor.qml ../src/FlightMap/Widgets/VerticalCompassAttitude.qml @@ -74,7 +58,6 @@ ../src/QmlControls/AppMessages.qml ../src/QmlControls/AltModeDialog.qml ../src/QmlControls/AxisMonitor.qml - ../src/UI/toolbar/BatteryIndicator.qml ../src/QmlControls/ClickableColor.qml ../src/QmlControls/DeadMouseArea.qml ../src/QmlControls/DropButton.qml @@ -85,16 +68,12 @@ ../src/QmlControls/FactSliderPanel.qml ../src/FirstRunPromptDialogs/FirstRunPrompt.qml ../src/QmlControls/FileButton.qml - ../src/UI/toolbar/FlightModeIndicator.qml ../src/QmlControls/FlightModeMenu.qml - ../src/UI/toolbar/GPSIndicator.qml - ../src/UI/toolbar/GPSIndicatorPage.qml ../src/QmlControls/HorizontalFactValueGrid.qml ../src/QmlControls/IndicatorButton.qml ../src/QmlControls/LabelledButton.qml ../src/QmlControls/LabelledComboBox.qml ../src/QmlControls/LabelledLabel.qml - ../src/UI/toolbar/RemoteIDIndicatorPage.qml ../src/QmlControls/SettingsGroupLayout.qml ../src/QmlControls/InstrumentValueLabel.qml ../src/QmlControls/InstrumentValueValue.qml @@ -102,9 +81,6 @@ ../src/QmlControls/JoystickThumbPad.qml ../src/QmlControls/KMLOrSHPFileDialog.qml ../src/QmlControls/LogReplayStatusBar.qml - ../src/UI/toolbar/MainStatusIndicator.qml - ../src/UI/toolbar/FlightModeMenuIndicator.qml - ../src/UI/toolbar/MainStatusIndicatorOfflinePage.qml ../src/QmlControls/MainWindowSavedState.qml ../src/QmlControls/MAVLinkChart.qml ../src/QmlControls/MAVLinkMessageButton.qml @@ -162,7 +138,6 @@ ../src/QmlControls/SectionHeader.qml ../src/QmlControls/SelectableControl.qml ../src/AutoPilotPlugins/Common/SetupPage.qml - ../src/UI/toolbar/SignalStrength.qml ../src/QmlControls/SliderSwitch.qml ../src/QmlControls/SubMenuButton.qml ../src/QmlControls/ToolIndicatorPage.qml @@ -177,8 +152,6 @@ ../src/FlightDisplay/FlyViewMap.qml ../src/FlightDisplay/FlyViewMissionCompleteDialog.qml ../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml - ../src/UI/toolbar/FlyViewToolBar.qml - ../src/UI/toolbar/FlyViewToolBarIndicators.qml ../src/FlightDisplay/FlyViewToolStrip.qml ../src/FlightDisplay/FlyViewTopRightColumnLayout.qml ../src/FlightDisplay/FlyViewVideo.qml diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc index 3dfc1c2e86f6..36d6fa933376 100644 --- a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc +++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc @@ -41,7 +41,7 @@ const QVariantList& CustomFirmwarePlugin::toolIndicators(const Vehicle* vehicle) // any new toolbar indicators which are added upstream in our custom build. _toolIndicatorList = FirmwarePlugin::toolIndicators(vehicle); // Then specifically remove the RC RSSI indicator. - _toolIndicatorList.removeOne(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml"))); + _toolIndicatorList.removeOne(QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/RCRSSIIndicator.qml"))); } return _toolIndicatorList; } @@ -141,4 +141,4 @@ void CustomFirmwarePlugin::updateAvailableFlightModes(FlightModeList modeList) } } _updateModeMappings(modeList); -} \ No newline at end of file +} diff --git a/qgcimages.qrc b/qgcimages.qrc index 058de95147b9..3800e1bea427 100644 --- a/qgcimages.qrc +++ b/qgcimages.qrc @@ -47,11 +47,11 @@ src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg src/AutoPilotPlugins/Common/Images/Plane.svg src/FlightMap/Images/AlertAircraft.svg - src/UI/toolbar/Images/Analyze.svg + src/UI/Toolbar/Images/Analyze.svg src/FirmwarePlugin/APM/APMBrandImage.png src/FirmwarePlugin/APM/APMBrandImageSub.png src/AutoPilotPlugins/Common/Images/APMode.svg - src/UI/toolbar/Images/Armed.svg + src/UI/Toolbar/Images/Armed.svg src/QmlControls/arrow-down.png src/AutoPilotPlugins/Common/Images/ArrowCCW.svg src/AutoPilotPlugins/Common/Images/ArrowCW.svg @@ -60,18 +60,18 @@ src/FlightMap/Images/attitudeInstrument.svg src/FlightMap/Images/attitudePointer.svg src/FlightMap/Images/AwarenessAircraft.svg - src/UI/toolbar/Images/Battery.svg - src/UI/toolbar/Images/BatteryGreen.svg - src/UI/toolbar/Images/BatteryYellowGreen.svg - src/UI/toolbar/Images/BatteryYellow.svg - src/UI/toolbar/Images/BatteryOrange.svg - src/UI/toolbar/Images/BatteryCritical.svg - src/UI/toolbar/Images/BatteryEMERGENCY.svg + src/UI/Toolbar/Images/Battery.svg + src/UI/Toolbar/Images/BatteryGreen.svg + src/UI/Toolbar/Images/BatteryYellowGreen.svg + src/UI/Toolbar/Images/BatteryYellow.svg + src/UI/Toolbar/Images/BatteryOrange.svg + src/UI/Toolbar/Images/BatteryCritical.svg + src/UI/Toolbar/Images/BatteryEMERGENCY.svg resources/camera.svg src/Camera/images/camera_photo.svg src/Camera/images/camera_video.svg src/AutoPilotPlugins/Common/Images/CameraComponentIcon.png - src/UI/toolbar/Images/CameraIcon.svg + src/UI/Toolbar/Images/CameraIcon.svg src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg resources/check.svg src/QmlControls/checkbox-check.svg @@ -80,12 +80,12 @@ src/FlightMap/Images/compassDottedLine.svg src/FlightMap/Images/compassInstrumentArrow.svg src/FlightMap/Images/compassInstrumentDial.svg - src/UI/toolbar/Images/Connect.svg + src/UI/Toolbar/Images/Connect.svg src/FlightMap/Images/crossHair.svg src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg - src/UI/toolbar/Images/Disarmed.svg - src/UI/toolbar/Images/Disconnect.svg + src/UI/Toolbar/Images/Disarmed.svg + src/UI/Toolbar/Images/Disconnect.svg src/VehicleSetup/FirmwareUpgradeIcon.png src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png @@ -96,17 +96,17 @@ src/AutoPilotPlugins/APM/Images/simple5-frame.png src/AutoPilotPlugins/APM/Images/vectored-frame.png src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png - src/UI/toolbar/Images/Gears.svg + src/UI/Toolbar/Images/Gears.svg src/AutoPilotPlugins/PX4/Images/GeoFence.svg src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg src/AnalyzeView/GeoTagIcon.svg - src/UI/toolbar/Images/Gps.svg - src/UI/toolbar/Images/Hamburger.svg + src/UI/Toolbar/Images/Gps.svg + src/UI/Toolbar/Images/Hamburger.svg src/FlightMap/Images/Help.svg src/FlightMap/Images/HelpBlack.svg src/AutoPilotPlugins/PX4/Images/HITL.svg src/FlightMap/Images/Home.svg - src/UI/toolbar/Images/Joystick.png + src/UI/Toolbar/Images/Joystick.png src/AutoPilotPlugins/PX4/Images/LandMode.svg src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png @@ -127,12 +127,12 @@ src/FlightMap/Images/MapTypeBlack.svg src/AnalyzeView/MAVLinkConsoleIcon.svg src/AnalyzeView/MAVLinkInspector.svg - src/UI/toolbar/Images/Megaphone.svg + src/UI/Toolbar/Images/Megaphone.svg src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg src/AutoPilotPlugins/PX4/Images/no-logging-light.svg src/AutoPilotPlugins/PX4/Images/no-logging.svg src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg - src/UI/toolbar/Images/PaperPlane.svg + src/UI/Toolbar/Images/PaperPlane.svg resources/PatternCamera.png resources/PatternGrid.png resources/PatternPresets.png @@ -140,7 +140,7 @@ src/FlightMap/Images/PiP.svg src/FlightMap/Images/pipHide.svg src/FlightMap/Images/pipResize.svg - src/UI/toolbar/Images/Plan.svg + src/UI/Toolbar/Images/Plan.svg src/MissionManager/BlankPlanCreator.png src/MissionManager/CorridorScanPlanCreator.png src/MissionManager/StructureScanPlanCreator.png @@ -153,45 +153,45 @@ src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg src/AutoPilotPlugins/Common/Images/PowerComponentIcon.png src/FirmwarePlugin/PX4/PX4BrandImage.png - src/UI/toolbar/Images/Quad.svg + src/UI/Toolbar/Images/Quad.svg src/AutoPilotPlugins/Common/Images/RadioComponentIcon.png - src/UI/toolbar/Images/RidEmergencyBackgroundHighlight.svg - src/UI/toolbar/Images/RidEmergencyBackground.svg - src/UI/toolbar/Images/RidFlagBackgroundGreen.svg - src/UI/toolbar/Images/RidFlagBackgroundRed.svg - src/UI/toolbar/Images/RidIconGreen.svg - src/UI/toolbar/Images/RidIconGrey.svg - src/UI/toolbar/Images/RidIconRed.svg - src/UI/toolbar/Images/RidIconYellow.svg - src/UI/toolbar/Images/RC.svg + src/UI/Toolbar/Images/RidEmergencyBackgroundHighlight.svg + src/UI/Toolbar/Images/RidEmergencyBackground.svg + src/UI/Toolbar/Images/RidFlagBackgroundGreen.svg + src/UI/Toolbar/Images/RidFlagBackgroundRed.svg + src/UI/Toolbar/Images/RidIconGreen.svg + src/UI/Toolbar/Images/RidIconGrey.svg + src/UI/Toolbar/Images/RidIconRed.svg + src/UI/Toolbar/Images/RidIconYellow.svg + src/UI/Toolbar/Images/RC.svg src/AutoPilotPlugins/PX4/Images/RCLoss.svg src/AutoPilotPlugins/PX4/Images/RCLossLight.svg src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg - src/UI/toolbar/Images/roi.svg + src/UI/Toolbar/Images/roi.svg src/FlightMap/Images/rollDialWhite.svg src/FlightMap/Images/rollPointerWhite.svg - src/UI/toolbar/Images/RTK.svg + src/UI/Toolbar/Images/RTK.svg src/AutoPilotPlugins/Common/Images/SafetyComponentIcon.png src/FlightMap/Images/scale.png src/FlightMap/Images/scale_end.png src/FlightMap/Images/scale_endLight.png src/FlightMap/Images/scaleLight.png src/AutoPilotPlugins/Common/Images/SensorsComponentIcon.png - src/UI/toolbar/Images/Signal0.svg - src/UI/toolbar/Images/Signal100.svg - src/UI/toolbar/Images/Signal20.svg - src/UI/toolbar/Images/Signal40.svg - src/UI/toolbar/Images/Signal60.svg - src/UI/toolbar/Images/Signal80.svg + src/UI/Toolbar/Images/Signal0.svg + src/UI/Toolbar/Images/Signal100.svg + src/UI/Toolbar/Images/Signal20.svg + src/UI/Toolbar/Images/Signal40.svg + src/UI/Toolbar/Images/Signal60.svg + src/UI/Toolbar/Images/Signal80.svg src/AutoPilotPlugins/Common/Images/StationMode.svg src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png src/AutoPilotPlugins/APM/Images/ForwardingSupportIcon.svg src/AutoPilotPlugins/APM/Images/ForwardingSupportIconGreen.svg resources/CogWheels.png src/FlightMap/Images/sub.png - src/UI/toolbar/Images/TelemRSSI.svg - src/UI/toolbar/Images/TrackingIcon.svg + src/UI/Toolbar/Images/TelemRSSI.svg + src/UI/Toolbar/Images/TrackingIcon.svg src/AutoPilotPlugins/Common/Images/TuningComponentIcon.png src/FlightMap/Images/vehicleArrowOpaque.svg src/FlightMap/Images/vehicleArrowOutline.svg @@ -210,7 +210,7 @@ src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png src/AnalyzeView/VibrationPageIcon.png src/AutoPilotPlugins/Common/Images/wifi.svg - src/UI/toolbar/Images/Yield.svg + src/UI/Toolbar/Images/Yield.svg src/FlightMap/Images/ZoomMinus.svg src/FlightMap/Images/ZoomPlus.svg src/Viewer3D/Images/city_3d_map_icon.svg diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index b63bf7929dfa..6f1a5c24cc60 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -1,19 +1,4 @@ - - src/UI/toolbar/ArmedIndicator.qml - src/UI/toolbar/RTKGPSIndicator.qml - src/UI/toolbar/VehicleGPSIndicator.qml - src/UI/toolbar/JoystickIndicator.qml - src/UI/toolbar/LinkIndicator.qml - src/UI/toolbar/MessageIndicator.qml - src/UI/toolbar/ModeIndicator.qml - src/UI/toolbar/MultiVehicleSelector.qml - src/UI/toolbar/RCRSSIIndicator.qml - src/UI/toolbar/RemoteIDIndicator.qml - src/UI/toolbar/TelemetryRSSIIndicator.qml - src/UI/toolbar/APMSupportForwardingIndicator.qml - src/UI/toolbar/GimbalIndicator.qml - src/FlightDisplay/DefaultChecklist.qml src/FlightDisplay/MultiRotorChecklist.qml @@ -63,7 +48,6 @@ src/AutoPilotPlugins/PX4/ActuatorFact.qml src/AutoPilotPlugins/PX4/ActuatorSlider.qml src/UI/preferences/PlanViewSettings.qml - src/UI/toolbar/PlanViewToolBar.qml src/FlightDisplay/PreFlightCheckList.qml src/VehicleSetup/OpticalFlowSensor.qml src/FlightMap/Widgets/VerticalCompassAttitude.qml @@ -72,7 +56,6 @@ src/QmlControls/AppMessages.qml src/QmlControls/AltModeDialog.qml src/QmlControls/AxisMonitor.qml - src/UI/toolbar/BatteryIndicator.qml src/QmlControls/ClickableColor.qml src/QmlControls/DeadMouseArea.qml src/QmlControls/DropButton.qml @@ -83,17 +66,13 @@ src/QmlControls/FactSliderPanel.qml src/FirstRunPromptDialogs/FirstRunPrompt.qml src/QmlControls/FileButton.qml - src/UI/toolbar/FlightModeIndicator.qml src/QmlControls/FlightModeMenu.qml - src/UI/toolbar/GPSIndicator.qml - src/UI/toolbar/GPSIndicatorPage.qml src/QmlControls/HorizontalFactValueGrid.qml src/QmlControls/IndicatorButton.qml src/QmlControls/LabelledButton.qml src/QmlControls/LabelledComboBox.qml src/QmlControls/LabelledLabel.qml src/AutoPilotPlugins/Common/MotorComponent.qml - src/UI/toolbar/RemoteIDIndicatorPage.qml src/QmlControls/SettingsGroupLayout.qml src/QmlControls/InstrumentValueLabel.qml src/QmlControls/InstrumentValueValue.qml @@ -101,9 +80,6 @@ src/QmlControls/JoystickThumbPad.qml src/QmlControls/KMLOrSHPFileDialog.qml src/QmlControls/LogReplayStatusBar.qml - src/UI/toolbar/MainStatusIndicator.qml - src/UI/toolbar/FlightModeMenuIndicator.qml - src/UI/toolbar/MainStatusIndicatorOfflinePage.qml src/QmlControls/MainWindowSavedState.qml src/QmlControls/MAVLinkChart.qml src/QmlControls/MAVLinkMessageButton.qml @@ -164,7 +140,6 @@ src/QmlControls/SectionHeader.qml src/QmlControls/SelectableControl.qml src/AutoPilotPlugins/Common/SetupPage.qml - src/UI/toolbar/SignalStrength.qml src/QmlControls/SliderSwitch.qml src/QmlControls/SubMenuButton.qml src/QmlControls/ToolIndicatorPage.qml @@ -182,8 +157,6 @@ src/FlightDisplay/FlyViewMap.qml src/FlightDisplay/FlyViewMissionCompleteDialog.qml src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml - src/UI/toolbar/FlyViewToolBar.qml - src/UI/toolbar/FlyViewToolBarIndicators.qml src/FlightDisplay/FlyViewToolStrip.qml src/FlightDisplay/FlyViewToolStripActionList.qml src/FlightDisplay/FlyViewTopRightColumnLayout.qml diff --git a/src/API/QGCCorePlugin.cc b/src/API/QGCCorePlugin.cc index 15d20e72e869..9a92c04c02b5 100644 --- a/src/API/QGCCorePlugin.cc +++ b/src/API/QGCCorePlugin.cc @@ -286,7 +286,7 @@ const QVariantList &QGCCorePlugin::toolBarIndicators() { static const QVariantList toolBarIndicatorList = QVariantList( { - QVariant::fromValue(QUrl::fromUserInput(QStringLiteral("qrc:/toolbar/RTKGPSIndicator.qml"))), + QVariant::fromValue(QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/Toolbar/RTKGPSIndicator.qml"))), } ); diff --git a/src/FirmwarePlugin/APM/APMBatteryIndicator.qml b/src/FirmwarePlugin/APM/APMBatteryIndicator.qml index 718bec8c3bc3..af465d06775d 100644 --- a/src/FirmwarePlugin/APM/APMBatteryIndicator.qml +++ b/src/FirmwarePlugin/APM/APMBatteryIndicator.qml @@ -17,6 +17,7 @@ import QGroundControl.ScreenTools import QGroundControl.Palette import QGroundControl.FactSystem import QGroundControl.FactControls +import QGroundControl.Toolbar import MAVLink BatteryIndicator { diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc index 8e7b10f874c0..f953e8417d05 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc @@ -655,7 +655,7 @@ const QVariantList& APMFirmwarePlugin::toolIndicators(const Vehicle* vehicle) } // Then add the forwarding support indicator - _toolIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/APMSupportForwardingIndicator.qml"))); + _toolIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMSupportForwardingIndicator.qml"))); } return _toolIndicatorList; diff --git a/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml b/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml index 46a0fe5fb848..ca5774607994 100644 --- a/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml +++ b/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml @@ -18,6 +18,7 @@ import QGroundControl.ScreenTools import QGroundControl.Palette import QGroundControl.FactSystem import QGroundControl.FactControls +import QGroundControl.Toolbar FlightModeIndicator { waitForParameters: true diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc index b981fcd3401e..941104cf5f75 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc @@ -213,9 +213,9 @@ const QVariantList& ArduSubFirmwarePlugin::toolIndicators(const Vehicle* vehicle //-- Sub specific list of indicators (Enter your modified list here) if(_toolIndicators.size() == 0) { _toolIndicators = QVariantList({ - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/JoystickIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MessageIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/BatteryIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/JoystickIndicator.qml")), }); } return _toolIndicators; @@ -227,9 +227,9 @@ const QVariantList& ArduSubFirmwarePlugin::modeIndicators(const Vehicle* vehicle //-- Sub specific list of indicators (Enter your modified list here) if(_modeIndicators.size() == 0) { _modeIndicators = QVariantList({ - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ModeIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ArmedIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MultiVehicleSelector.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/ModeIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/ArmedIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")), }); } return _modeIndicators; diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc index ba826ff7f4a2..db8a20d8d91f 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.cc +++ b/src/FirmwarePlugin/FirmwarePlugin.cc @@ -310,13 +310,13 @@ const QVariantList& FirmwarePlugin::toolIndicators(const Vehicle*) if(_toolIndicatorList.size() == 0) { _toolIndicatorList = QVariantList({ QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/FlightModeIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/VehicleGPSIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MessageIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/VehicleGPSIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/TelemetryRSSIIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/RCRSSIIndicator.qml")), QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/BatteryIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RemoteIDIndicator.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GimbalIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/RemoteIDIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/GimbalIndicator.qml")), }); } return _toolIndicatorList; @@ -327,8 +327,8 @@ const QVariantList& FirmwarePlugin::modeIndicators(const Vehicle*) //-- Default list of indicators for all vehicles. if(_modeIndicatorList.size() == 0) { _modeIndicatorList = QVariantList({ - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MultiVehicleSelector.qml")), - QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/LinkIndicator.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")), + QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/LinkIndicator.qml")), }); } return _modeIndicatorList; diff --git a/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml b/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml index 4233541ba0f5..bbdd9534b45a 100644 --- a/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml +++ b/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml @@ -17,6 +17,7 @@ import QGroundControl.ScreenTools import QGroundControl.Palette import QGroundControl.FactSystem import QGroundControl.FactControls +import QGroundControl.Toolbar import MAVLink BatteryIndicator { diff --git a/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml b/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml index 13fae73fb29e..2746adceacab 100644 --- a/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml +++ b/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml @@ -18,6 +18,7 @@ import QGroundControl.ScreenTools import QGroundControl.Palette import QGroundControl.FactSystem import QGroundControl.FactControls +import QGroundControl.Toolbar FlightModeIndicator { waitForParameters: true diff --git a/src/FlightDisplay/FlyView.qml b/src/FlightDisplay/FlyView.qml index c92a377a08c2..fff2c6cdcb1b 100644 --- a/src/FlightDisplay/FlyView.qml +++ b/src/FlightDisplay/FlyView.qml @@ -26,6 +26,7 @@ import QGroundControl.FlightMap import QGroundControl.Palette import QGroundControl.ScreenTools import QGroundControl.Vehicle +import QGroundControl.Toolbar // 3D Viewer modules import Viewer3D diff --git a/src/QmlControls/QGroundControl/Controls/qmldir b/src/QmlControls/QGroundControl/Controls/qmldir index 1c366fe526fa..b1b919aebae5 100644 --- a/src/QmlControls/QGroundControl/Controls/qmldir +++ b/src/QmlControls/QGroundControl/Controls/qmldir @@ -6,10 +6,6 @@ APMSubMotorDisplay 1.0 APMSubMotorDisplay.qml AppMessages 1.0 AppMessages.qml AutotuneUI 1.0 AutotuneUI.qml AxisMonitor 1.0 AxisMonitor.qml -BatteryIndicator 1.0 BatteryIndicator.qml -CameraCalcCamera 1.0 CameraCalcCamera.qml -CameraCalcGrid 1.0 CameraCalcGrid.qml -CameraSection 1.0 CameraSection.qml ClickableColor 1.0 ClickableColor.qml DeadMouseArea 1.0 DeadMouseArea.qml DropButton 1.0 DropButton.qml @@ -20,13 +16,7 @@ FactSlider 1.0 FactSlider.qml FactSliderPanel 1.0 FactSliderPanel.qml FileButton 1.0 FileButton.qml FirstRunPrompt 1.0 FirstRunPrompt.qml -FlightModeIndicator 1.0 FlightModeIndicator.qml FlightModeMenu 1.0 FlightModeMenu.qml -FlightModeMenuIndicator 1.0 FlightModeMenuIndicator.qml -GeoFenceEditor 1.0 GeoFenceEditor.qml -GeoFenceMapVisuals 1.0 GeoFenceMapVisuals.qml -GPSIndicator 1.0 GPSIndicator.qml -GPSIndicatorPage 1.0 GPSIndicatorPage.qml HeightIndicator 1.0 HeightIndicator.qml HorizontalFactValueGrid 1.0 HorizontalFactValueGrid.qml IndicatorButton 1.0 IndicatorButton.qml @@ -39,16 +29,11 @@ LabelledButton 1.0 LabelledButton.qml LabelledComboBox 1.0 LabelledComboBox.qml LabelledLabel 1.0 LabelledLabel.qml LogReplayStatusBar 1.0 LogReplayStatusBar.qml -MainStatusIndicator 1.0 MainStatusIndicator.qml -MainStatusIndicatorOfflinePage 1.0 MainStatusIndicatorOfflinePage.qml MainWindowSavedState 1.0 MainWindowSavedState.qml MAVLinkChart 1.0 MAVLinkChart.qml MAVLinkMessageButton 1.0 MAVLinkMessageButton.qml MissionCommandDialog 1.0 MissionCommandDialog.qml -MissionItemEditor 1.0 MissionItemEditor.qml MissionItemIndexLabel 1.0 MissionItemIndexLabel.qml -MissionItemMapVisual 1.0 MissionItemMapVisual.qml -MissionItemStatus 1.0 MissionItemStatus.qml MotorComponent 1.0 MotorComponent.qml MvPanelPage 1.0 MvPanelPage.qml OfflineMapButton 1.0 OfflineMapButton.qml @@ -60,7 +45,6 @@ ParameterEditorDialog 1.0 ParameterEditorDialog.qml PIDTuning 1.0 PIDTuning.qml PipState 1.0 PipState.qml PipView 1.0 PipView.qml -PlanEditToolbar 1.0 PlanEditToolbar.qml PreFlightCheckButton 1.0 PreFlightCheckButton.qml PreFlightCheckGroup 1.0 PreFlightCheckGroup.qml PreFlightCheckList 1.0 PreFlightCheckList.qml @@ -99,30 +83,19 @@ QGCTabButton 1.0 QGCTabButton.qml QGCTextField 1.0 QGCTextField.qml QGCToolBarButton 1.0 QGCToolBarButton.qml QGCToolInsets 1.0 QGCToolInsets.qml -RallyPointEditorHeader 1.0 RallyPointEditorHeader.qml -RallyPointItemEditor 1.0 RallyPointItemEditor.qml -RallyPointMapVisuals 1.0 RallyPointMapVisuals.qml RCChannelMonitor 1.0 RCChannelMonitor.qml RCToParamDialog 1.0 RCToParamDialog.qml -RemoteIDIndicatorPage 1.0 RemoteIDIndicatorPage.qml SectionHeader 1.0 SectionHeader.qml SelectableControl 1.0 SelectableControl.qml SettingsGroupLayout 1.0 SettingsGroupLayout.qml SetupPage 1.0 SetupPage.qml -SignalStrength 1.0 SignalStrength.qml SimpleItemMapVisuals 1.0 SimpleItemMapVisuals.qml SliderSwitch 1.0 SliderSwitch.qml SubMenuButton 1.0 SubMenuButton.qml SurveyMapVisuals 1.0 SurveyMapVisuals.qml -TerrainStatus 1.0 TerrainStatus.qml ToolIndicatorPage 1.0 ToolIndicatorPage.qml ToolStrip 1.0 ToolStrip.qml ToolStripHoverButton 1.0 ToolStripHoverButton.qml -TransectStyleComplexItemEditor 1.0 TransectStyleComplexItemEditor.qml -TransectStyleComplexItemStats 1.0 TransectStyleComplexItemStats.qml -TransectStyleComplexItemTabBar 1.0 TransectStyleComplexItemTabBar.qml -TransectStyleComplexItemTerrainFollow 1.0 TransectStyleComplexItemTerrainFollow.qml -TransectStyleMapVisuals 1.0 TransectStyleMapVisuals.qml ValueSlider 1.0 ValueSlider.qml VehicleRotationCal 1.0 VehicleRotationCal.qml VehicleSummaryRow 1.0 VehicleSummaryRow.qml diff --git a/src/QmlControls/QGroundControl/FlightDisplay/qmldir b/src/QmlControls/QGroundControl/FlightDisplay/qmldir index f53eee9c86ea..87a264b32ff8 100644 --- a/src/QmlControls/QGroundControl/FlightDisplay/qmldir +++ b/src/QmlControls/QGroundControl/FlightDisplay/qmldir @@ -11,8 +11,6 @@ FlyViewInstrumentPanel 1.0 FlyViewInstrumentPanel.qml FlyViewMap 1.0 FlyViewMap.qml FlyViewMissionCompleteDialog 1.0 FlyViewMissionCompleteDialog.qml FlyViewPreFlightChecklistPopup 1.0 FlyViewPreFlightChecklistPopup.qml -FlyViewToolBar 1.0 FlyViewToolBar.qml -FlyViewToolBarIndicators 1.0 FlyViewToolBarIndicators.qml FlyViewToolStrip 1.0 FlyViewToolStrip.qml FlyViewToolStripActionList 1.0 FlyViewToolStripActionList.qml FlyViewTopRightColumnLayout 1.0 FlyViewTopRightColumnLayout.qml diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt index 2a73410dcc52..322d2c489bb1 100644 --- a/src/UI/CMakeLists.txt +++ b/src/UI/CMakeLists.txt @@ -2,6 +2,7 @@ project(UIplugin) add_subdirectory(PlanView) add_subdirectory(ScreenTools) +add_subdirectory(Toolbar) qt_add_qml_module(${PROJECT_NAME} URI QGroundControl diff --git a/src/UI/PlanView/PlanView.qml b/src/UI/PlanView/PlanView.qml index bc25e8317544..670257ab54bc 100644 --- a/src/UI/PlanView/PlanView.qml +++ b/src/UI/PlanView/PlanView.qml @@ -25,9 +25,9 @@ import QGroundControl.Palette import QGroundControl.Controllers import QGroundControl.ShapeFileHelper import QGroundControl.FlightDisplay +import QGroundControl.Toolbar import QGroundControl.UTMSP - Item { id: _root diff --git a/src/UI/toolbar/APMSupportForwardingIndicator.qml b/src/UI/Toolbar/APMSupportForwardingIndicator.qml similarity index 100% rename from src/UI/toolbar/APMSupportForwardingIndicator.qml rename to src/UI/Toolbar/APMSupportForwardingIndicator.qml diff --git a/src/UI/toolbar/ArmedIndicator.qml b/src/UI/Toolbar/ArmedIndicator.qml similarity index 100% rename from src/UI/toolbar/ArmedIndicator.qml rename to src/UI/Toolbar/ArmedIndicator.qml diff --git a/src/UI/toolbar/BatteryIndicator.qml b/src/UI/Toolbar/BatteryIndicator.qml similarity index 100% rename from src/UI/toolbar/BatteryIndicator.qml rename to src/UI/Toolbar/BatteryIndicator.qml diff --git a/src/UI/Toolbar/CMakeLists.txt b/src/UI/Toolbar/CMakeLists.txt new file mode 100644 index 000000000000..ff8b2454cd3f --- /dev/null +++ b/src/UI/Toolbar/CMakeLists.txt @@ -0,0 +1,11 @@ +project(Toolbarplugin) + +file(GLOB_RECURSE MODULE_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml) + +qt_add_qml_module(${PROJECT_NAME} + URI QGroundControl.Toolbar + VERSION 1.0 + STATIC + RESOURCE_PREFIX /qml + QML_FILES ${MODULE_QML_FILES} +) diff --git a/src/UI/toolbar/FlightModeIndicator.qml b/src/UI/Toolbar/FlightModeIndicator.qml similarity index 100% rename from src/UI/toolbar/FlightModeIndicator.qml rename to src/UI/Toolbar/FlightModeIndicator.qml diff --git a/src/UI/toolbar/FlightModeMenuIndicator.qml b/src/UI/Toolbar/FlightModeMenuIndicator.qml similarity index 100% rename from src/UI/toolbar/FlightModeMenuIndicator.qml rename to src/UI/Toolbar/FlightModeMenuIndicator.qml diff --git a/src/UI/toolbar/FlyViewToolBar.qml b/src/UI/Toolbar/FlyViewToolBar.qml similarity index 100% rename from src/UI/toolbar/FlyViewToolBar.qml rename to src/UI/Toolbar/FlyViewToolBar.qml diff --git a/src/UI/toolbar/FlyViewToolBarIndicators.qml b/src/UI/Toolbar/FlyViewToolBarIndicators.qml similarity index 100% rename from src/UI/toolbar/FlyViewToolBarIndicators.qml rename to src/UI/Toolbar/FlyViewToolBarIndicators.qml diff --git a/src/UI/toolbar/GPSIndicator.qml b/src/UI/Toolbar/GPSIndicator.qml similarity index 100% rename from src/UI/toolbar/GPSIndicator.qml rename to src/UI/Toolbar/GPSIndicator.qml diff --git a/src/UI/toolbar/GPSIndicatorPage.qml b/src/UI/Toolbar/GPSIndicatorPage.qml similarity index 100% rename from src/UI/toolbar/GPSIndicatorPage.qml rename to src/UI/Toolbar/GPSIndicatorPage.qml diff --git a/src/UI/toolbar/GimbalIndicator.qml b/src/UI/Toolbar/GimbalIndicator.qml similarity index 100% rename from src/UI/toolbar/GimbalIndicator.qml rename to src/UI/Toolbar/GimbalIndicator.qml diff --git a/src/UI/toolbar/Images/AirplaneIcon.svg b/src/UI/Toolbar/Images/AirplaneIcon.svg similarity index 100% rename from src/UI/toolbar/Images/AirplaneIcon.svg rename to src/UI/Toolbar/Images/AirplaneIcon.svg diff --git a/src/UI/toolbar/Images/Analyze.svg b/src/UI/Toolbar/Images/Analyze.svg similarity index 100% rename from src/UI/toolbar/Images/Analyze.svg rename to src/UI/Toolbar/Images/Analyze.svg diff --git a/src/UI/toolbar/Images/Armed.svg b/src/UI/Toolbar/Images/Armed.svg similarity index 100% rename from src/UI/toolbar/Images/Armed.svg rename to src/UI/Toolbar/Images/Armed.svg diff --git a/src/UI/toolbar/Images/Battery.svg b/src/UI/Toolbar/Images/Battery.svg similarity index 100% rename from src/UI/toolbar/Images/Battery.svg rename to src/UI/Toolbar/Images/Battery.svg diff --git a/src/UI/toolbar/Images/BatteryCritical.svg b/src/UI/Toolbar/Images/BatteryCritical.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryCritical.svg rename to src/UI/Toolbar/Images/BatteryCritical.svg diff --git a/src/UI/toolbar/Images/BatteryEMERGENCY.svg b/src/UI/Toolbar/Images/BatteryEMERGENCY.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryEMERGENCY.svg rename to src/UI/Toolbar/Images/BatteryEMERGENCY.svg diff --git a/src/UI/toolbar/Images/BatteryGreen.svg b/src/UI/Toolbar/Images/BatteryGreen.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryGreen.svg rename to src/UI/Toolbar/Images/BatteryGreen.svg diff --git a/src/UI/toolbar/Images/BatteryOrange.svg b/src/UI/Toolbar/Images/BatteryOrange.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryOrange.svg rename to src/UI/Toolbar/Images/BatteryOrange.svg diff --git a/src/UI/toolbar/Images/BatteryYellow.svg b/src/UI/Toolbar/Images/BatteryYellow.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryYellow.svg rename to src/UI/Toolbar/Images/BatteryYellow.svg diff --git a/src/UI/toolbar/Images/BatteryYellowGreen.svg b/src/UI/Toolbar/Images/BatteryYellowGreen.svg similarity index 100% rename from src/UI/toolbar/Images/BatteryYellowGreen.svg rename to src/UI/Toolbar/Images/BatteryYellowGreen.svg diff --git a/src/UI/toolbar/Images/CameraIcon.svg b/src/UI/Toolbar/Images/CameraIcon.svg similarity index 100% rename from src/UI/toolbar/Images/CameraIcon.svg rename to src/UI/Toolbar/Images/CameraIcon.svg diff --git a/src/UI/toolbar/Images/Connect.svg b/src/UI/Toolbar/Images/Connect.svg similarity index 100% rename from src/UI/toolbar/Images/Connect.svg rename to src/UI/Toolbar/Images/Connect.svg diff --git a/src/UI/toolbar/Images/Disarmed.svg b/src/UI/Toolbar/Images/Disarmed.svg similarity index 100% rename from src/UI/toolbar/Images/Disarmed.svg rename to src/UI/Toolbar/Images/Disarmed.svg diff --git a/src/UI/toolbar/Images/Disconnect.svg b/src/UI/Toolbar/Images/Disconnect.svg similarity index 100% rename from src/UI/toolbar/Images/Disconnect.svg rename to src/UI/Toolbar/Images/Disconnect.svg diff --git a/src/UI/toolbar/Images/Gears.svg b/src/UI/Toolbar/Images/Gears.svg similarity index 100% rename from src/UI/toolbar/Images/Gears.svg rename to src/UI/Toolbar/Images/Gears.svg diff --git a/src/UI/toolbar/Images/Gps.svg b/src/UI/Toolbar/Images/Gps.svg similarity index 100% rename from src/UI/toolbar/Images/Gps.svg rename to src/UI/Toolbar/Images/Gps.svg diff --git a/src/UI/toolbar/Images/Hamburger.svg b/src/UI/Toolbar/Images/Hamburger.svg similarity index 100% rename from src/UI/toolbar/Images/Hamburger.svg rename to src/UI/Toolbar/Images/Hamburger.svg diff --git a/src/UI/toolbar/Images/Joystick.png b/src/UI/Toolbar/Images/Joystick.png similarity index 100% rename from src/UI/toolbar/Images/Joystick.png rename to src/UI/Toolbar/Images/Joystick.png diff --git a/src/UI/toolbar/Images/Megaphone.svg b/src/UI/Toolbar/Images/Megaphone.svg similarity index 100% rename from src/UI/toolbar/Images/Megaphone.svg rename to src/UI/Toolbar/Images/Megaphone.svg diff --git a/src/UI/toolbar/Images/PaperPlane.svg b/src/UI/Toolbar/Images/PaperPlane.svg similarity index 100% rename from src/UI/toolbar/Images/PaperPlane.svg rename to src/UI/Toolbar/Images/PaperPlane.svg diff --git a/src/UI/toolbar/Images/Plan.svg b/src/UI/Toolbar/Images/Plan.svg similarity index 100% rename from src/UI/toolbar/Images/Plan.svg rename to src/UI/Toolbar/Images/Plan.svg diff --git a/src/UI/toolbar/Images/Quad.svg b/src/UI/Toolbar/Images/Quad.svg similarity index 100% rename from src/UI/toolbar/Images/Quad.svg rename to src/UI/Toolbar/Images/Quad.svg diff --git a/src/UI/toolbar/Images/RC.svg b/src/UI/Toolbar/Images/RC.svg similarity index 100% rename from src/UI/toolbar/Images/RC.svg rename to src/UI/Toolbar/Images/RC.svg diff --git a/src/UI/toolbar/Images/RTK.svg b/src/UI/Toolbar/Images/RTK.svg similarity index 100% rename from src/UI/toolbar/Images/RTK.svg rename to src/UI/Toolbar/Images/RTK.svg diff --git a/src/UI/toolbar/Images/RidEmergencyBackground.svg b/src/UI/Toolbar/Images/RidEmergencyBackground.svg similarity index 100% rename from src/UI/toolbar/Images/RidEmergencyBackground.svg rename to src/UI/Toolbar/Images/RidEmergencyBackground.svg diff --git a/src/UI/toolbar/Images/RidEmergencyBackgroundHighlight.svg b/src/UI/Toolbar/Images/RidEmergencyBackgroundHighlight.svg similarity index 100% rename from src/UI/toolbar/Images/RidEmergencyBackgroundHighlight.svg rename to src/UI/Toolbar/Images/RidEmergencyBackgroundHighlight.svg diff --git a/src/UI/toolbar/Images/RidFlagBackgroundGreen.svg b/src/UI/Toolbar/Images/RidFlagBackgroundGreen.svg similarity index 100% rename from src/UI/toolbar/Images/RidFlagBackgroundGreen.svg rename to src/UI/Toolbar/Images/RidFlagBackgroundGreen.svg diff --git a/src/UI/toolbar/Images/RidFlagBackgroundRed.svg b/src/UI/Toolbar/Images/RidFlagBackgroundRed.svg similarity index 100% rename from src/UI/toolbar/Images/RidFlagBackgroundRed.svg rename to src/UI/Toolbar/Images/RidFlagBackgroundRed.svg diff --git a/src/UI/toolbar/Images/RidIconGreen.svg b/src/UI/Toolbar/Images/RidIconGreen.svg similarity index 100% rename from src/UI/toolbar/Images/RidIconGreen.svg rename to src/UI/Toolbar/Images/RidIconGreen.svg diff --git a/src/UI/toolbar/Images/RidIconGrey.svg b/src/UI/Toolbar/Images/RidIconGrey.svg similarity index 100% rename from src/UI/toolbar/Images/RidIconGrey.svg rename to src/UI/Toolbar/Images/RidIconGrey.svg diff --git a/src/UI/toolbar/Images/RidIconRed.svg b/src/UI/Toolbar/Images/RidIconRed.svg similarity index 100% rename from src/UI/toolbar/Images/RidIconRed.svg rename to src/UI/Toolbar/Images/RidIconRed.svg diff --git a/src/UI/toolbar/Images/RidIconYellow.svg b/src/UI/Toolbar/Images/RidIconYellow.svg similarity index 100% rename from src/UI/toolbar/Images/RidIconYellow.svg rename to src/UI/Toolbar/Images/RidIconYellow.svg diff --git a/src/UI/toolbar/Images/Signal0.svg b/src/UI/Toolbar/Images/Signal0.svg similarity index 100% rename from src/UI/toolbar/Images/Signal0.svg rename to src/UI/Toolbar/Images/Signal0.svg diff --git a/src/UI/toolbar/Images/Signal100.svg b/src/UI/Toolbar/Images/Signal100.svg similarity index 100% rename from src/UI/toolbar/Images/Signal100.svg rename to src/UI/Toolbar/Images/Signal100.svg diff --git a/src/UI/toolbar/Images/Signal20.svg b/src/UI/Toolbar/Images/Signal20.svg similarity index 100% rename from src/UI/toolbar/Images/Signal20.svg rename to src/UI/Toolbar/Images/Signal20.svg diff --git a/src/UI/toolbar/Images/Signal40.svg b/src/UI/Toolbar/Images/Signal40.svg similarity index 100% rename from src/UI/toolbar/Images/Signal40.svg rename to src/UI/Toolbar/Images/Signal40.svg diff --git a/src/UI/toolbar/Images/Signal60.svg b/src/UI/Toolbar/Images/Signal60.svg similarity index 100% rename from src/UI/toolbar/Images/Signal60.svg rename to src/UI/Toolbar/Images/Signal60.svg diff --git a/src/UI/toolbar/Images/Signal80.svg b/src/UI/Toolbar/Images/Signal80.svg similarity index 100% rename from src/UI/toolbar/Images/Signal80.svg rename to src/UI/Toolbar/Images/Signal80.svg diff --git a/src/UI/toolbar/Images/TelemRSSI.svg b/src/UI/Toolbar/Images/TelemRSSI.svg similarity index 100% rename from src/UI/toolbar/Images/TelemRSSI.svg rename to src/UI/Toolbar/Images/TelemRSSI.svg diff --git a/src/UI/toolbar/Images/TrackingIcon.svg b/src/UI/Toolbar/Images/TrackingIcon.svg similarity index 100% rename from src/UI/toolbar/Images/TrackingIcon.svg rename to src/UI/Toolbar/Images/TrackingIcon.svg diff --git a/src/UI/toolbar/Images/Yield.svg b/src/UI/Toolbar/Images/Yield.svg similarity index 100% rename from src/UI/toolbar/Images/Yield.svg rename to src/UI/Toolbar/Images/Yield.svg diff --git a/src/UI/toolbar/Images/roi.svg b/src/UI/Toolbar/Images/roi.svg similarity index 100% rename from src/UI/toolbar/Images/roi.svg rename to src/UI/Toolbar/Images/roi.svg diff --git a/src/UI/toolbar/JoystickIndicator.qml b/src/UI/Toolbar/JoystickIndicator.qml similarity index 100% rename from src/UI/toolbar/JoystickIndicator.qml rename to src/UI/Toolbar/JoystickIndicator.qml diff --git a/src/UI/toolbar/LinkIndicator.qml b/src/UI/Toolbar/LinkIndicator.qml similarity index 100% rename from src/UI/toolbar/LinkIndicator.qml rename to src/UI/Toolbar/LinkIndicator.qml diff --git a/src/UI/toolbar/MainStatusIndicator.qml b/src/UI/Toolbar/MainStatusIndicator.qml similarity index 100% rename from src/UI/toolbar/MainStatusIndicator.qml rename to src/UI/Toolbar/MainStatusIndicator.qml diff --git a/src/UI/toolbar/MainStatusIndicatorOfflinePage.qml b/src/UI/Toolbar/MainStatusIndicatorOfflinePage.qml similarity index 100% rename from src/UI/toolbar/MainStatusIndicatorOfflinePage.qml rename to src/UI/Toolbar/MainStatusIndicatorOfflinePage.qml diff --git a/src/UI/toolbar/MessageIndicator.qml b/src/UI/Toolbar/MessageIndicator.qml similarity index 100% rename from src/UI/toolbar/MessageIndicator.qml rename to src/UI/Toolbar/MessageIndicator.qml diff --git a/src/UI/toolbar/ModeIndicator.qml b/src/UI/Toolbar/ModeIndicator.qml similarity index 100% rename from src/UI/toolbar/ModeIndicator.qml rename to src/UI/Toolbar/ModeIndicator.qml diff --git a/src/UI/toolbar/MultiVehicleSelector.qml b/src/UI/Toolbar/MultiVehicleSelector.qml similarity index 100% rename from src/UI/toolbar/MultiVehicleSelector.qml rename to src/UI/Toolbar/MultiVehicleSelector.qml diff --git a/src/UI/PlanView/PlanToolBarIndicators.qml b/src/UI/Toolbar/PlanToolBarIndicators.qml similarity index 100% rename from src/UI/PlanView/PlanToolBarIndicators.qml rename to src/UI/Toolbar/PlanToolBarIndicators.qml diff --git a/src/UI/toolbar/PlanViewToolBar.qml b/src/UI/Toolbar/PlanViewToolBar.qml similarity index 100% rename from src/UI/toolbar/PlanViewToolBar.qml rename to src/UI/Toolbar/PlanViewToolBar.qml diff --git a/src/UI/toolbar/RCRSSIIndicator.qml b/src/UI/Toolbar/RCRSSIIndicator.qml similarity index 100% rename from src/UI/toolbar/RCRSSIIndicator.qml rename to src/UI/Toolbar/RCRSSIIndicator.qml diff --git a/src/UI/toolbar/RTKGPSIndicator.qml b/src/UI/Toolbar/RTKGPSIndicator.qml similarity index 100% rename from src/UI/toolbar/RTKGPSIndicator.qml rename to src/UI/Toolbar/RTKGPSIndicator.qml diff --git a/src/UI/toolbar/RemoteIDIndicator.qml b/src/UI/Toolbar/RemoteIDIndicator.qml similarity index 100% rename from src/UI/toolbar/RemoteIDIndicator.qml rename to src/UI/Toolbar/RemoteIDIndicator.qml diff --git a/src/UI/toolbar/RemoteIDIndicatorPage.qml b/src/UI/Toolbar/RemoteIDIndicatorPage.qml similarity index 100% rename from src/UI/toolbar/RemoteIDIndicatorPage.qml rename to src/UI/Toolbar/RemoteIDIndicatorPage.qml diff --git a/src/UI/toolbar/SignalStrength.qml b/src/UI/Toolbar/SignalStrength.qml similarity index 100% rename from src/UI/toolbar/SignalStrength.qml rename to src/UI/Toolbar/SignalStrength.qml diff --git a/src/UI/toolbar/TelemetryRSSIIndicator.qml b/src/UI/Toolbar/TelemetryRSSIIndicator.qml similarity index 100% rename from src/UI/toolbar/TelemetryRSSIIndicator.qml rename to src/UI/Toolbar/TelemetryRSSIIndicator.qml diff --git a/src/UI/toolbar/VehicleGPSIndicator.qml b/src/UI/Toolbar/VehicleGPSIndicator.qml similarity index 100% rename from src/UI/toolbar/VehicleGPSIndicator.qml rename to src/UI/Toolbar/VehicleGPSIndicator.qml