Skip to content

QML modules with cmake #12380

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

QML modules with cmake #12380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7280e3c
QML modules: Made FactcControls as separate qml module
s-lisovenko Feb 1, 2025
8638f51
QML modules: Create ScreenTools qml module + create UI qml module
s-lisovenko Feb 1, 2025
e410e08
QML modules: Made PlanView as separate qml module
s-lisovenko Feb 1, 2025
4878e93
QML modules: Remove redundant Vehicle module
s-lisovenko Feb 1, 2025
1f5cf1b
QML modules: Create Toolbar qml module
s-lisovenko Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions custom-example/qgroundcontrol.qrc
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -141,4 +141,4 @@ void CustomFirmwarePlugin::updateAvailableFlightModes(FlightModeList modeList)
}
}
_updateModeMappings(modeList);
}
}
82 changes: 41 additions & 41 deletions qgcimages.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<file alias="AirframeSimulation.svg">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="AirframeStandardPlane.svg">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="AlertAircraft.svg">src/FlightMap/Images/AlertAircraft.svg</file>
<file alias="Analyze.svg">src/UI/toolbar/Images/Analyze.svg</file>
<file alias="Analyze.svg">src/UI/Toolbar/Images/Analyze.svg</file>
<file alias="APM/BrandImage">src/FirmwarePlugin/APM/APMBrandImage.png</file>
<file alias="APM/BrandImageSub">src/FirmwarePlugin/APM/APMBrandImageSub.png</file>
<file alias="APMode.svg">src/AutoPilotPlugins/Common/Images/APMode.svg</file>
<file alias="Armed.svg">src/UI/toolbar/Images/Armed.svg</file>
<file alias="Armed.svg">src/UI/Toolbar/Images/Armed.svg</file>
<file alias="arrow-down.png">src/QmlControls/arrow-down.png</file>
<file alias="ArrowCCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCCW.svg</file>
<file alias="ArrowCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCW.svg</file>
Expand All @@ -60,18 +60,18 @@
<file alias="attitudeInstrument.svg">src/FlightMap/Images/attitudeInstrument.svg</file>
<file alias="attitudePointer.svg">src/FlightMap/Images/attitudePointer.svg</file>
<file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
<file alias="Battery.svg">src/UI/toolbar/Images/Battery.svg</file>
<file alias="BatteryGreen.svg">src/UI/toolbar/Images/BatteryGreen.svg</file>
<file alias="BatteryYellowGreen.svg">src/UI/toolbar/Images/BatteryYellowGreen.svg</file>
<file alias="BatteryYellow.svg">src/UI/toolbar/Images/BatteryYellow.svg</file>
<file alias="BatteryOrange.svg">src/UI/toolbar/Images/BatteryOrange.svg</file>
<file alias="BatteryCritical.svg">src/UI/toolbar/Images/BatteryCritical.svg</file>
<file alias="BatteryEMERGENCY.svg">src/UI/toolbar/Images/BatteryEMERGENCY.svg</file>
<file alias="Battery.svg">src/UI/Toolbar/Images/Battery.svg</file>
<file alias="BatteryGreen.svg">src/UI/Toolbar/Images/BatteryGreen.svg</file>
<file alias="BatteryYellowGreen.svg">src/UI/Toolbar/Images/BatteryYellowGreen.svg</file>
<file alias="BatteryYellow.svg">src/UI/Toolbar/Images/BatteryYellow.svg</file>
<file alias="BatteryOrange.svg">src/UI/Toolbar/Images/BatteryOrange.svg</file>
<file alias="BatteryCritical.svg">src/UI/Toolbar/Images/BatteryCritical.svg</file>
<file alias="BatteryEMERGENCY.svg">src/UI/Toolbar/Images/BatteryEMERGENCY.svg</file>
<file alias="camera.svg">resources/camera.svg</file>
<file alias="camera_photo.svg">src/Camera/images/camera_photo.svg</file>
<file alias="camera_video.svg">src/Camera/images/camera_video.svg</file>
<file alias="CameraComponentIcon.png">src/AutoPilotPlugins/Common/Images/CameraComponentIcon.png</file>
<file alias="CameraIcon.svg">src/UI/toolbar/Images/CameraIcon.svg</file>
<file alias="CameraIcon.svg">src/UI/Toolbar/Images/CameraIcon.svg</file>
<file alias="CameraTrigger.svg">src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg</file>
<file alias="check.svg">resources/check.svg</file>
<file alias="checkbox-check.svg">src/QmlControls/checkbox-check.svg</file>
Expand All @@ -80,12 +80,12 @@
<file alias="compassDottedLine.svg">src/FlightMap/Images/compassDottedLine.svg</file>
<file alias="compassInstrumentArrow.svg">src/FlightMap/Images/compassInstrumentArrow.svg</file>
<file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
<file alias="Connect.svg">src/UI/toolbar/Images/Connect.svg</file>
<file alias="Connect.svg">src/UI/Toolbar/Images/Connect.svg</file>
<file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
<file alias="DatalinkLoss.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg</file>
<file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
<file alias="Disarmed.svg">src/UI/toolbar/Images/Disarmed.svg</file>
<file alias="Disconnect.svg">src/UI/toolbar/Images/Disconnect.svg</file>
<file alias="Disarmed.svg">src/UI/Toolbar/Images/Disarmed.svg</file>
<file alias="Disconnect.svg">src/UI/Toolbar/Images/Disconnect.svg</file>
<file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="FollowComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
<file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
Expand All @@ -96,17 +96,17 @@
<file alias="Frames/SimpleROV-5.png">src/AutoPilotPlugins/APM/Images/simple5-frame.png</file>
<file alias="Frames/Vectored.png">src/AutoPilotPlugins/APM/Images/vectored-frame.png</file>
<file alias="Frames/Vectored6DOF.png">src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png</file>
<file alias="Gears.svg">src/UI/toolbar/Images/Gears.svg</file>
<file alias="Gears.svg">src/UI/Toolbar/Images/Gears.svg</file>
<file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
<file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
<file alias="GeoTagIcon.svg">src/AnalyzeView/GeoTagIcon.svg</file>
<file alias="Gps.svg">src/UI/toolbar/Images/Gps.svg</file>
<file alias="Hamburger.svg">src/UI/toolbar/Images/Hamburger.svg</file>
<file alias="Gps.svg">src/UI/Toolbar/Images/Gps.svg</file>
<file alias="Hamburger.svg">src/UI/Toolbar/Images/Hamburger.svg</file>
<file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
<file alias="HelpBlack.svg">src/FlightMap/Images/HelpBlack.svg</file>
<file alias="HITL.svg">src/AutoPilotPlugins/PX4/Images/HITL.svg</file>
<file alias="Home.svg">src/FlightMap/Images/Home.svg</file>
<file alias="Joystick.png">src/UI/toolbar/Images/Joystick.png</file>
<file alias="Joystick.png">src/UI/Toolbar/Images/Joystick.png</file>
<file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
<file alias="LandModeCopter.svg">src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg</file>
<file alias="LightsComponentIcon.png">src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png</file>
Expand All @@ -127,20 +127,20 @@
<file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
<file alias="MAVLinkConsoleIcon.svg">src/AnalyzeView/MAVLinkConsoleIcon.svg</file>
<file alias="MAVLinkInspector.svg">src/AnalyzeView/MAVLinkInspector.svg</file>
<file alias="Megaphone.svg">src/UI/toolbar/Images/Megaphone.svg</file>
<file alias="Megaphone.svg">src/UI/Toolbar/Images/Megaphone.svg</file>
<file alias="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
<file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
<file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
<file alias="ObjectAvoidance.svg">src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg</file>
<file alias="PaperPlane.svg">src/UI/toolbar/Images/PaperPlane.svg</file>
<file alias="PaperPlane.svg">src/UI/Toolbar/Images/PaperPlane.svg</file>
<file alias="PatternCamera.png">resources/PatternCamera.png</file>
<file alias="PatternGrid.png">resources/PatternGrid.png</file>
<file alias="PatternPresets.png">resources/PatternPresets.png</file>
<file alias="PatternTerrain.png">resources/PatternTerrain.png</file>
<file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
<file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
<file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file>
<file alias="Plan.svg">src/UI/toolbar/Images/Plan.svg</file>
<file alias="Plan.svg">src/UI/Toolbar/Images/Plan.svg</file>
<file alias="PlanCreator/BlankPlanCreator.png">src/MissionManager/BlankPlanCreator.png</file>
<file alias="PlanCreator/CorridorScanPlanCreator.png">src/MissionManager/CorridorScanPlanCreator.png</file>
<file alias="PlanCreator/StructureScanPlanCreator.png">src/MissionManager/StructureScanPlanCreator.png</file>
Expand All @@ -153,45 +153,45 @@
<file alias="PowerComponentBattery_06cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg</file>
<file alias="PowerComponentIcon.png">src/AutoPilotPlugins/Common/Images/PowerComponentIcon.png</file>
<file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
<file alias="Quad.svg">src/UI/toolbar/Images/Quad.svg</file>
<file alias="Quad.svg">src/UI/Toolbar/Images/Quad.svg</file>
<file alias="RadioComponentIcon.png">src/AutoPilotPlugins/Common/Images/RadioComponentIcon.png</file>
<file alias="RidEmergencyBackgroundHighlight.svg">src/UI/toolbar/Images/RidEmergencyBackgroundHighlight.svg</file>
<file alias="RidEmergencyBackground.svg">src/UI/toolbar/Images/RidEmergencyBackground.svg</file>
<file alias="RidFlagBackgroundGreen.svg">src/UI/toolbar/Images/RidFlagBackgroundGreen.svg</file>
<file alias="RidFlagBackgroundRed.svg">src/UI/toolbar/Images/RidFlagBackgroundRed.svg</file>
<file alias="RidIconGreen.svg">src/UI/toolbar/Images/RidIconGreen.svg</file>
<file alias="RidIconGrey.svg">src/UI/toolbar/Images/RidIconGrey.svg</file>
<file alias="RidIconRed.svg">src/UI/toolbar/Images/RidIconRed.svg</file>
<file alias="RidIconYellow.svg">src/UI/toolbar/Images/RidIconYellow.svg</file>
<file alias="RC.svg">src/UI/toolbar/Images/RC.svg</file>
<file alias="RidEmergencyBackgroundHighlight.svg">src/UI/Toolbar/Images/RidEmergencyBackgroundHighlight.svg</file>
<file alias="RidEmergencyBackground.svg">src/UI/Toolbar/Images/RidEmergencyBackground.svg</file>
<file alias="RidFlagBackgroundGreen.svg">src/UI/Toolbar/Images/RidFlagBackgroundGreen.svg</file>
<file alias="RidFlagBackgroundRed.svg">src/UI/Toolbar/Images/RidFlagBackgroundRed.svg</file>
<file alias="RidIconGreen.svg">src/UI/Toolbar/Images/RidIconGreen.svg</file>
<file alias="RidIconGrey.svg">src/UI/Toolbar/Images/RidIconGrey.svg</file>
<file alias="RidIconRed.svg">src/UI/Toolbar/Images/RidIconRed.svg</file>
<file alias="RidIconYellow.svg">src/UI/Toolbar/Images/RidIconYellow.svg</file>
<file alias="RC.svg">src/UI/Toolbar/Images/RC.svg</file>
<file alias="RCLoss.svg">src/AutoPilotPlugins/PX4/Images/RCLoss.svg</file>
<file alias="RCLossLight.svg">src/AutoPilotPlugins/PX4/Images/RCLossLight.svg</file>
<file alias="ReturnToHomeAltitude.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg</file>
<file alias="ReturnToHomeAltitudeCopter.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg</file>
<file alias="roi.svg">src/UI/toolbar/Images/roi.svg</file>
<file alias="roi.svg">src/UI/Toolbar/Images/roi.svg</file>
<file alias="rollDialWhite.svg">src/FlightMap/Images/rollDialWhite.svg</file>
<file alias="rollPointerWhite.svg">src/FlightMap/Images/rollPointerWhite.svg</file>
<file alias="RTK.svg">src/UI/toolbar/Images/RTK.svg</file>
<file alias="RTK.svg">src/UI/Toolbar/Images/RTK.svg</file>
<file alias="SafetyComponentIcon.png">src/AutoPilotPlugins/Common/Images/SafetyComponentIcon.png</file>
<file alias="scale.png">src/FlightMap/Images/scale.png</file>
<file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
<file alias="scale_endLight.png">src/FlightMap/Images/scale_endLight.png</file>
<file alias="scaleLight.png">src/FlightMap/Images/scaleLight.png</file>
<file alias="SensorsComponentIcon.png">src/AutoPilotPlugins/Common/Images/SensorsComponentIcon.png</file>
<file alias="Signal0.svg">src/UI/toolbar/Images/Signal0.svg</file>
<file alias="Signal100.svg">src/UI/toolbar/Images/Signal100.svg</file>
<file alias="Signal20.svg">src/UI/toolbar/Images/Signal20.svg</file>
<file alias="Signal40.svg">src/UI/toolbar/Images/Signal40.svg</file>
<file alias="Signal60.svg">src/UI/toolbar/Images/Signal60.svg</file>
<file alias="Signal80.svg">src/UI/toolbar/Images/Signal80.svg</file>
<file alias="Signal0.svg">src/UI/Toolbar/Images/Signal0.svg</file>
<file alias="Signal100.svg">src/UI/Toolbar/Images/Signal100.svg</file>
<file alias="Signal20.svg">src/UI/Toolbar/Images/Signal20.svg</file>
<file alias="Signal40.svg">src/UI/Toolbar/Images/Signal40.svg</file>
<file alias="Signal60.svg">src/UI/Toolbar/Images/Signal60.svg</file>
<file alias="Signal80.svg">src/UI/Toolbar/Images/Signal80.svg</file>
<file alias="StationMode.svg">src/AutoPilotPlugins/Common/Images/StationMode.svg</file>
<file alias="SubFrameComponentIcon.png">src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png</file>
<file alias="ForwardingSupportIcon.svg">src/AutoPilotPlugins/APM/Images/ForwardingSupportIcon.svg</file>
<file alias="ForwardingSupportIconGreen.svg">src/AutoPilotPlugins/APM/Images/ForwardingSupportIconGreen.svg</file>
<file alias="subMenuButtonImage.png">resources/CogWheels.png</file>
<file alias="subVehicleArrowOpaque.png">src/FlightMap/Images/sub.png</file>
<file alias="TelemRSSI.svg">src/UI/toolbar/Images/TelemRSSI.svg</file>
<file alias="TrackingIcon.svg">src/UI/toolbar/Images/TrackingIcon.svg</file>
<file alias="TelemRSSI.svg">src/UI/Toolbar/Images/TelemRSSI.svg</file>
<file alias="TrackingIcon.svg">src/UI/Toolbar/Images/TrackingIcon.svg</file>
<file alias="TuningComponentIcon.png">src/AutoPilotPlugins/Common/Images/TuningComponentIcon.png</file>
<file alias="vehicleArrowOpaque.svg">src/FlightMap/Images/vehicleArrowOpaque.svg</file>
<file alias="vehicleArrowOutline.svg">src/FlightMap/Images/vehicleArrowOutline.svg</file>
Expand All @@ -210,7 +210,7 @@
<file alias="VehicleUpsideDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png</file>
<file alias="VibrationPageIcon">src/AnalyzeView/VibrationPageIcon.png</file>
<file alias="wifi.svg">src/AutoPilotPlugins/Common/Images/wifi.svg</file>
<file alias="Yield.svg">src/UI/toolbar/Images/Yield.svg</file>
<file alias="Yield.svg">src/UI/Toolbar/Images/Yield.svg</file>
<file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
<file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
<file alias="Viewer3D/City3DMapIcon.svg">src/Viewer3D/Images/city_3d_map_icon.svg</file>
Expand Down
Loading
Loading