lisonwu/qgroundcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some SVG rendering throughout the application

Browse Source 
Certain SVG icons, such as the QGroundControl logo displayed in the
top-left corner of the Fly View and other places, were being rendered
with a very blurry appearance. The root cause of this issue is a quirk
in Qt (QTBUG-59732 and others), where resource aliases that do not
explicitly include the ".svg" extension are rendered using
QPixmapIconEngine, which is intended for bitmap images, instead of the
appropriate QSvgIconEngine.

To resolve this, the following changes have been made:
- Added the ".svg" extension to the resource aliases of all SVG icons
that didn't have it.
- Updated all references to these resources throughout the application.
This commit is contained in:
Rubén Pérez Alonso
2024-12-05 13:43:19 +01:00
committed by Don Gagne
parent 75ec0ac29e
commit 2703ab2245
17 changed files with 133 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom-example/custom.qrc
+1 -1
View File
@@ -33,7 +33,7 @@
<file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">res/CustomFlyViewOverlay.qml</file>
</qresource>
<qresource prefix="/res">
<file alias="QGCLogoFull">res/QGCLogoFull.svg</file>
<file alias="QGCLogoFull.svg">res/QGCLogoFull.svg</file>
<file alias="qgroundcontrol.ico">res/icons/custom_qgroundcontrol.ico</file>
</qresource>
</RCC>
custom-example/qgcimages.qrc
+48 -48
View File
@@ -1,51 +1,51 @@
<RCC>
<qresource prefix="/qmlimages">
<file alias="adsbVehicle.svg">../src/FlightMap/Images/adsbVehicle.svg</file>
<file alias="Airframe/AirframeSimulation">../src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="Airframe/AirframeUnknown">../src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
<file alias="Airframe/Airship">../src/AutoPilotPlugins/Common/Images/Airship.svg</file>
<file alias="Airframe/Autogyro">../src/AutoPilotPlugins/Common/Images/Autogyro.svg</file>
<file alias="Airframe/Boat">../src/AutoPilotPlugins/Common/Images/Boat.svg</file>
<file alias="Airframe/FlyingWing">../src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="Airframe/Helicopter">../src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
<file alias="Airframe/HelicopterCoaxial">../src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
<file alias="Airframe/HexaRotorPlus">../src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="Airframe/HexaRotorX">../src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="Airframe/OctoRotorPlus">../src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="Airframe/OctoRotorPlusCoaxial">../src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
<file alias="Airframe/OctoRotorX">../src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="Airframe/OctoRotorXCoaxial">../src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
<file alias="Airframe/Plane">../src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="Airframe/PlaneATail">../src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
<file alias="Airframe/PlaneVTail">../src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
<file alias="Airframe/QuadRotorATail">../src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
<file alias="Airframe/QuadRotorH">../src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="Airframe/QuadRotorPlus">../src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="Airframe/QuadRotorVTail">../src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
<file alias="Airframe/QuadRotorWide">../src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
<file alias="Airframe/QuadRotorX">../src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="Airframe/Rover">../src/AutoPilotPlugins/Common/Images/Rover.svg</file>
<file alias="Airframe/Vectored6DofUUV">../src/AutoPilotPlugins/Common/Images/Vectored6DofUUV.svg</file>
<file alias="Airframe/VTOLDuoRotorTailSitter">../src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
<file alias="Airframe/VTOLPlane">../src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
<file alias="Airframe/VTOLPlaneOcto">../src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg</file>
<file alias="Airframe/VTOLQuadRotorTailSitter">../src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
<file alias="Airframe/VTOLTiltRotor">../src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
<file alias="Airframe/Y6A">../src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
<file alias="Airframe/Y6B">../src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
<file alias="Airframe/YMinus">../src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
<file alias="Airframe/YPlus">../src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
<file alias="Airframe/AirframeSimulation.svg">../src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="Airframe/AirframeUnknown.svg">../src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
<file alias="Airframe/Airship.svg">../src/AutoPilotPlugins/Common/Images/Airship.svg</file>
<file alias="Airframe/Autogyro.svg">../src/AutoPilotPlugins/Common/Images/Autogyro.svg</file>
<file alias="Airframe/Boat.svg">../src/AutoPilotPlugins/Common/Images/Boat.svg</file>
<file alias="Airframe/FlyingWing.svg">../src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="Airframe/Helicopter.svg">../src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
<file alias="Airframe/HelicopterCoaxial.svg">../src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
<file alias="Airframe/HexaRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="Airframe/HexaRotorX.svg">../src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="Airframe/OctoRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="Airframe/OctoRotorPlusCoaxial.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
<file alias="Airframe/OctoRotorX.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="Airframe/OctoRotorXCoaxial.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
<file alias="Airframe/Plane.svg">../src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="Airframe/PlaneATail.svg">../src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
<file alias="Airframe/PlaneVTail.svg">../src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
<file alias="Airframe/QuadRotorATail.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
<file alias="Airframe/QuadRotorH.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="Airframe/QuadRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="Airframe/QuadRotorVTail.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
<file alias="Airframe/QuadRotorWide.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
<file alias="Airframe/QuadRotorX.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="Airframe/Rover.svg">../src/AutoPilotPlugins/Common/Images/Rover.svg</file>
<file alias="Airframe/Vectored6DofUUV.svg">../src/AutoPilotPlugins/Common/Images/Vectored6DofUUV.svg</file>
<file alias="Airframe/VTOLDuoRotorTailSitter.svg">../src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
<file alias="Airframe/VTOLPlane.svg">../src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
<file alias="Airframe/VTOLPlaneOcto.svg">../src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg</file>
<file alias="Airframe/VTOLQuadRotorTailSitter.svg">../src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
<file alias="Airframe/VTOLTiltRotor.svg">../src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
<file alias="Airframe/Y6A.svg">../src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
<file alias="Airframe/Y6B.svg">../src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
<file alias="Airframe/YMinus.svg">../src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
<file alias="Airframe/YPlus.svg">../src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
<file alias="AirframeComponentIcon.png">../src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png</file>
<file alias="AirframeFlyingWing.png">../src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="AirframeHexaRotorPlus.png">../src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="AirframeHexaRotorX.png">../src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="AirframeOctoRotorPlus.png">../src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="AirframeOctoRotorX.png">../src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="AirframeQuadRotorH.png">../src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="AirframeQuadRotorPlus.png">../src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="AirframeQuadRotorX.png">../src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="AirframeSimulation.png">../src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="AirframeStandardPlane.png">../src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="AirframeFlyingWing.svg">../src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="AirframeHexaRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="AirframeHexaRotorX.svg">../src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="AirframeOctoRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="AirframeOctoRotorX.svg">../src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="AirframeQuadRotorH.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="AirframeQuadRotorPlus.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="AirframeQuadRotorX.svg">../src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<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="APM/BrandImage">../src/FirmwarePlugin/APM/APMBrandImage.png</file>
@@ -99,7 +99,7 @@
<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">../src/AnalyzeView/GeoTagIcon.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="Help.svg">../src/FlightMap/Images/Help.svg</file>
@@ -110,7 +110,7 @@
<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>
<file alias="LogDownloadIcon">../src/AnalyzeView/LogDownloadIcon.svg</file>
<file alias="LogDownloadIcon.svg">../src/AnalyzeView/LogDownloadIcon.svg</file>
<file alias="LowBattery.svg">../src/AutoPilotPlugins/PX4/Images/LowBattery.svg</file>
<file alias="LowBatteryLight.svg">../src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg</file>
<file alias="MapAddMission.svg">../src/FlightMap/Images/MapAddMission.svg</file>
@@ -125,8 +125,8 @@
<file alias="MapSyncChanged.svg">../src/FlightMap/Images/MapSyncChanged.svg</file>
<file alias="MapType.svg">../src/FlightMap/Images/MapType.svg</file>
<file alias="MapTypeBlack.svg">../src/FlightMap/Images/MapTypeBlack.svg</file>
<file alias="MAVLinkConsoleIcon">../src/AnalyzeView/MAVLinkConsoleIcon.svg</file>
<file alias="MAVLinkInspector">../src/AnalyzeView/MAVLinkInspector.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="MotorComponentIcon.svg">../src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
<file alias="no-logging-light.svg">../src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
custom-example/qgcresources.exclusion
+1 -1
View File
@@ -1,3 +1,3 @@
<file alias="QGCLogoFull">resources/QGCLogoFull.svg</file>
<file alias="QGCLogoFull.svg">resources/QGCLogoFull.svg</file>
<file alias="qgroundcontrol.ico">resources/icons/qgroundcontrol.ico</file>
custom-example/qgcresources.qrc
+9 -9
View File
@@ -7,8 +7,8 @@
</qresource>
<qresource prefix="/res">
<file alias="action.svg">../resources/action.svg</file>
<file alias="AntennaRC">../resources/Antenna_RC.svg</file>
<file alias="AntennaT">../resources/Antenna_T.svg</file>
<file alias="AntennaRC.svg">../resources/Antenna_RC.svg</file>
<file alias="AntennaT.svg">../resources/Antenna_T.svg</file>
<file alias="ArrowDown.svg">../resources/ArrowDown.svg</file>
<file alias="ArrowRight.svg">../resources/ArrowRight.svg</file>
<file alias="buttonLeft.svg">../resources/buttonLeft.svg</file>
@@ -35,15 +35,15 @@
<file alias="Pause.svg">../resources/Pause.svg</file>
<file alias="pause-mission.svg">../resources/pause-mission.svg</file>
<file alias="pencil.svg">../resources/pencil.svg</file>
<file alias="Play">../resources/Play.svg</file>
<file alias="PowerButton">../resources/PowerButton.svg</file>
<file alias="QGCLogoBlack">../resources/QGCLogoBlack.svg</file>
<file alias="QGCLogoWhite">../resources/QGCLogoWhite.svg</file>
<file alias="QGCLogoArrow">../resources/QGCLogoArrow.svg</file>
<file alias="QGroundControlConnect">../resources/QGroundControlConnect.svg</file>
<file alias="Play.svg">../resources/Play.svg</file>
<file alias="PowerButton.svg">../resources/PowerButton.svg</file>
<file alias="QGCLogoBlack.svg">../resources/QGCLogoBlack.svg</file>
<file alias="QGCLogoWhite.svg">../resources/QGCLogoWhite.svg</file>
<file alias="QGCLogoArrow.svg">../resources/QGCLogoArrow.svg</file>
<file alias="QGroundControlConnect.svg">../resources/QGroundControlConnect.svg</file>
<file alias="rtl.svg">../resources/rtl.svg</file>
<file alias="SplashScreen">../resources/SplashScreen.png</file>
<file alias="Stop">../resources/Stop.svg</file>
<file alias="Stop.svg">../resources/Stop.svg</file>
<file alias="takeoff.svg">../resources/takeoff.svg</file>
<file alias="terrain.svg">../resources/terrain.svg</file>
<file alias="TrashDelete.svg">../resources/TrashDelete.svg</file>
custom-example/qgroundcontrol.qrc
+1
View File
@@ -405,6 +405,7 @@
<file alias="Vehicle/SetpointFact.json">../src/Vehicle/FactGroups/SetpointFact.json</file>
<file alias="Vehicle/LocalPositionFact.json">../src/Vehicle/FactGroups/LocalPositionFact.json</file>
<file alias="Vehicle/LocalPositionSetpointFact.json">../src/Vehicle/FactGroups/LocalPositionFact.json</file>
<file alias="Vehicle/RPMFact.json">../src/Vehicle/FactGroups/RPMFact.json</file>
<file alias="Vehicle/SubmarineFact.json">../src/Vehicle/FactGroups/SubmarineFact.json</file>
<file alias="Vehicle/TemperatureFact.json">../src/Vehicle/FactGroups/TemperatureFact.json</file>
<file alias="Vehicle/TerrainFactGroup.json">../src/Vehicle/FactGroups/TerrainFactGroup.json</file>
custom-example/res/Custom/Widgets/CustomIconButton.qml
+1 -1
View File
@@ -49,7 +49,7 @@ Button {
mipmap: true
antialiasing: true
fillMode: Image.PreserveAspectFit
source: qgcPal.globalTheme === QGCPalette.Light ? "/res/QGCLogoBlack" : "/res/QGCLogoWhite"
source: qgcPal.globalTheme === QGCPalette.Light ? "/res/QGCLogoBlack.svg" : "/res/QGCLogoWhite.svg"
sourceSize.height: height
anchors.left: _edge.right
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
qgcimages.qrc
+48 -48
View File
@@ -1,51 +1,51 @@
<RCC>
<qresource prefix="/qmlimages">
<file alias="adsbVehicle.svg">src/FlightMap/Images/adsbVehicle.svg</file>
<file alias="Airframe/AirframeSimulation">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="Airframe/AirframeUnknown">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
<file alias="Airframe/Airship">src/AutoPilotPlugins/Common/Images/Airship.svg</file>
<file alias="Airframe/Autogyro">src/AutoPilotPlugins/Common/Images/Autogyro.svg</file>
<file alias="Airframe/Boat">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
<file alias="Airframe/FlyingWing">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="Airframe/Helicopter">src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
<file alias="Airframe/HelicopterCoaxial">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
<file alias="Airframe/HexaRotorPlus">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="Airframe/HexaRotorX">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="Airframe/OctoRotorPlus">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="Airframe/OctoRotorPlusCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
<file alias="Airframe/OctoRotorX">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="Airframe/OctoRotorXCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
<file alias="Airframe/Plane">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="Airframe/PlaneATail">src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
<file alias="Airframe/PlaneVTail">src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
<file alias="Airframe/QuadRotorATail">src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
<file alias="Airframe/QuadRotorH">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="Airframe/QuadRotorPlus">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="Airframe/QuadRotorVTail">src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
<file alias="Airframe/QuadRotorWide">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
<file alias="Airframe/QuadRotorX">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="Airframe/Rover">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
<file alias="Airframe/Vectored6DofUUV">src/AutoPilotPlugins/Common/Images/Vectored6DofUUV.svg</file>
<file alias="Airframe/VTOLDuoRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
<file alias="Airframe/VTOLPlane">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
<file alias="Airframe/VTOLPlaneOcto">src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg</file>
<file alias="Airframe/VTOLQuadRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
<file alias="Airframe/VTOLTiltRotor">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
<file alias="Airframe/Y6A">src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
<file alias="Airframe/Y6B">src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
<file alias="Airframe/YMinus">src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
<file alias="Airframe/YPlus">src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
<file alias="Airframe/AirframeSimulation.svg">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="Airframe/AirframeUnknown.svg">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
<file alias="Airframe/Airship.svg">src/AutoPilotPlugins/Common/Images/Airship.svg</file>
<file alias="Airframe/Autogyro.svg">src/AutoPilotPlugins/Common/Images/Autogyro.svg</file>
<file alias="Airframe/Boat.svg">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
<file alias="Airframe/FlyingWing.svg">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="Airframe/Helicopter.svg">src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
<file alias="Airframe/HelicopterCoaxial.svg">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
<file alias="Airframe/HexaRotorPlus.svg">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="Airframe/HexaRotorX.svg">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="Airframe/OctoRotorPlus.svg">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="Airframe/OctoRotorPlusCoaxial.svg">src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
<file alias="Airframe/OctoRotorX.svg">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="Airframe/OctoRotorXCoaxial.svg">src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
<file alias="Airframe/Plane.svg">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="Airframe/PlaneATail.svg">src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
<file alias="Airframe/PlaneVTail.svg">src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
<file alias="Airframe/QuadRotorATail.svg">src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
<file alias="Airframe/QuadRotorH.svg">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="Airframe/QuadRotorPlus.svg">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="Airframe/QuadRotorVTail.svg">src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
<file alias="Airframe/QuadRotorWide.svg">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
<file alias="Airframe/QuadRotorX.svg">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="Airframe/Rover.svg">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
<file alias="Airframe/Vectored6DofUUV.svg">src/AutoPilotPlugins/Common/Images/Vectored6DofUUV.svg</file>
<file alias="Airframe/VTOLDuoRotorTailSitter.svg">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
<file alias="Airframe/VTOLPlane.svg">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
<file alias="Airframe/VTOLPlaneOcto.svg">src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg</file>
<file alias="Airframe/VTOLQuadRotorTailSitter.svg">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
<file alias="Airframe/VTOLTiltRotor.svg">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
<file alias="Airframe/Y6A.svg">src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
<file alias="Airframe/Y6B.svg">src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
<file alias="Airframe/YMinus.svg">src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
<file alias="Airframe/YPlus.svg">src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
<file alias="AirframeComponentIcon.png">src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png</file>
<file alias="AirframeFlyingWing.png">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="AirframeHexaRotorPlus.png">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="AirframeHexaRotorX.png">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="AirframeOctoRotorPlus.png">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="AirframeOctoRotorX.png">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="AirframeQuadRotorH.png">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="AirframeQuadRotorPlus.png">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="AirframeQuadRotorX.png">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="AirframeSimulation.png">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="AirframeStandardPlane.png">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="AirframeFlyingWing.svg">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="AirframeHexaRotorPlus.svg">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="AirframeHexaRotorX.svg">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="AirframeOctoRotorPlus.svg">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="AirframeOctoRotorX.svg">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="AirframeQuadRotorH.svg">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
<file alias="AirframeQuadRotorPlus.svg">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="AirframeQuadRotorX.svg">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<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="APM/BrandImage">src/FirmwarePlugin/APM/APMBrandImage.png</file>
@@ -99,7 +99,7 @@
<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">src/AnalyzeView/GeoTagIcon.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="Help.svg">src/FlightMap/Images/Help.svg</file>
@@ -110,7 +110,7 @@
<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>
<file alias="LogDownloadIcon">src/AnalyzeView/LogDownloadIcon.svg</file>
<file alias="LogDownloadIcon.svg">src/AnalyzeView/LogDownloadIcon.svg</file>
<file alias="LowBattery.svg">src/AutoPilotPlugins/PX4/Images/LowBattery.svg</file>
<file alias="LowBatteryLight.svg">src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg</file>
<file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
@@ -125,8 +125,8 @@
<file alias="MapSyncChanged.svg">src/FlightMap/Images/MapSyncChanged.svg</file>
<file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
<file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
<file alias="MAVLinkConsoleIcon">src/AnalyzeView/MAVLinkConsoleIcon.svg</file>
<file alias="MAVLinkInspector">src/AnalyzeView/MAVLinkInspector.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="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
<file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
qgcresources.qrc
+11 -11
View File
@@ -7,8 +7,8 @@
</qresource>
<qresource prefix="/res">
<file alias="action.svg">resources/action.svg</file>
<file alias="AntennaRC">resources/Antenna_RC.svg</file>
<file alias="AntennaT">resources/Antenna_T.svg</file>
<file alias="AntennaRC.svg">resources/Antenna_RC.svg</file>
<file alias="AntennaT.svg">resources/Antenna_T.svg</file>
<file alias="ArrowDown.svg">resources/ArrowDown.svg</file>
<file alias="ArrowRight.svg">resources/ArrowRight.svg</file>
<file alias="buttonLeft.svg">resources/buttonLeft.svg</file>
@@ -18,7 +18,7 @@
<file alias="counter-clockwise-arrow.svg">resources/counter-clockwise-arrow.svg</file>
<file alias="chevron-down.svg">resources/chevron-down.svg</file>
<file alias="chevron-up.svg">resources/chevron-up.svg</file>
<file alias="DropArrow.svg">resources/DropArrow.svg</file>
<file alias="DropArrow.svg">resources/DropArrow.svg</file>
<file alias="gear-black.svg">resources/gear-black.svg</file>
<file alias="gear-white.svg">resources/gear-white.svg</file>
<file alias="helicoptericon.svg">resources/helicoptericon.svg</file>
@@ -35,16 +35,16 @@
<file alias="Pause.svg">resources/Pause.svg</file>
<file alias="pause-mission.svg">resources/pause-mission.svg</file>
<file alias="pencil.svg">resources/pencil.svg</file>
<file alias="Play">resources/Play.svg</file>
<file alias="PowerButton">resources/PowerButton.svg</file>
<file alias="QGCLogoBlack">resources/QGCLogoBlack.svg</file>
<file alias="QGCLogoFull">resources/QGCLogoFull.svg</file>
<file alias="QGCLogoWhite">resources/QGCLogoWhite.svg</file>
<file alias="QGCLogoArrow">resources/QGCLogoArrow.svg</file>
<file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
<file alias="Play.svg">resources/Play.svg</file>
<file alias="PowerButton.svg">resources/PowerButton.svg</file>
<file alias="QGCLogoBlack.svg">resources/QGCLogoBlack.svg</file>
<file alias="QGCLogoFull.svg">resources/QGCLogoFull.svg</file>
<file alias="QGCLogoWhite.svg">resources/QGCLogoWhite.svg</file>
<file alias="QGCLogoArrow.svg">resources/QGCLogoArrow.svg</file>
<file alias="QGroundControlConnect.svg">resources/QGroundControlConnect.svg</file>
<file alias="rtl.svg">resources/rtl.svg</file>
<file alias="SplashScreen">resources/SplashScreen.png</file>
<file alias="Stop">resources/Stop.svg</file>
<file alias="Stop.svg">resources/Stop.svg</file>
<file alias="takeoff.svg">resources/takeoff.svg</file>
<file alias="terrain.svg">resources/terrain.svg</file>
<file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
src/API/QGCCorePlugin.cc
+4 -4
View File
@@ -134,13 +134,13 @@ void QGCCorePlugin::registerQmlTypes()
QVariantList &QGCCorePlugin::analyzePages()
{
if (_p->analyzeList.isEmpty()) {
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("Log Download"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/LogDownloadPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/LogDownloadIcon")))));
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("Log Download"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/LogDownloadPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/LogDownloadIcon.svg")))));
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("GeoTag Images"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/GeoTagPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/GeoTagIcon")))));
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("GeoTag Images"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/GeoTagPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/GeoTagIcon.svg")))));
#endif
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("MAVLink Console"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/MAVLinkConsolePage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/MAVLinkConsoleIcon")))));
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("MAVLink Console"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/MAVLinkConsolePage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/MAVLinkConsoleIcon.svg")))));
#ifndef QGC_DISABLE_MAVLINK_INSPECTOR
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("MAVLink Inspector"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/MAVLinkInspectorPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/MAVLinkInspector")))));
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("MAVLink Inspector"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/MAVLinkInspectorPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/MAVLinkInspector.svg")))));
#endif
_p->analyzeList.append(QVariant::fromValue(new QmlComponentInfo(tr("Vibration"), QUrl::fromUserInput(QStringLiteral("qrc:/qml/VibrationPage.qml")), QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/VibrationPageIcon")))));
}
src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+1 -1
View File
@@ -296,7 +296,7 @@ APMFrameClass::APMFrameClass(const QString& name, bool copter, int frameClass, F
}
}
if (_imageResourceDefault.isEmpty()) {
_imageResourceDefault = QStringLiteral("/qmlimages/Airframe/AirframeUnknown");
_imageResourceDefault = QStringLiteral("/qmlimages/Airframe/AirframeUnknown.svg");
}
// Filter the enums
src/AutoPilotPlugins/APM/APMFollowComponent.qml
+1 -1
View File
@@ -350,7 +350,7 @@ SetupPage {
Image {
id: gcsIcon
anchors.centerIn: parent
source: "/res/QGCLogoArrow"
source: "/res/QGCLogoArrow.svg"
mipmap: true
antialiasing: true
fillMode: Image.PreserveAspectFit
src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc
+2 -2
View File
@@ -24,7 +24,7 @@ QMap<QString, AirframeComponentAirframes::AirframeType_t*>& AirframeComponentAir
// Standard planes
AirframeType_t *standardPlane = new AirframeType_t;
standardPlane->name = "Standard Airplane";
standardPlane->imageResource = "qrc:/qmlimages/AirframeStandardPlane.png";
standardPlane->imageResource = "qrc:/qmlimages/AirframeStandardPlane.svg";
AirframeInfo_t *easystar = new AirframeInfo_t;
easystar->name = "Multiplex Easystar 1/2";
easystar->autostartId = 2100;
@@ -56,7 +56,7 @@ void AirframeComponentAirframes::insert(QString& group, QString& image, QString&
}
if (g->imageResource.isEmpty()) {
g->imageResource = QString("qrc:/qmlimages/Airframe/AirframeUnknown");
g->imageResource = QString("qrc:/qmlimages/Airframe/AirframeUnknown.svg");
}
rgAirframeTypes.insert(group, g);
src/FlightMap/FlightMap.qml
+1 -1
View File
@@ -175,7 +175,7 @@ Map {
sourceItem: Image {
id: mapItemImage
source: isNaN(gcsHeading) ? "/res/QGCLogoFull" : "/res/QGCLogoArrow"
source: isNaN(gcsHeading) ? "/res/QGCLogoFull.svg" : "/res/QGCLogoArrow.svg"
mipmap: true
antialiasing: true
fillMode: Image.PreserveAspectFit
src/UI/MainRootWindow.qml
+1 -1
View File
@@ -338,7 +338,7 @@ ApplicationWindow {
height: toolSelectDialog._toolButtonHeight
Layout.fillWidth: true
text: qsTr("Application Settings")
imageResource: "/res/QGCLogoFull"
imageResource: "/res/QGCLogoFull.svg"
imageColor: "transparent"
visible: !QGroundControl.corePlugin.options.combineSettingsAndSetup
onClicked: {
src/UI/SettingsPagesModel.qml
+1 -1
View File
@@ -16,7 +16,7 @@ ListModel {
ListElement {
name: qsTr("General")
url: "/qml/GeneralSettings.qml"
iconUrl: "qrc:/res/QGCLogoWhite"
iconUrl: "qrc:/res/QGCLogoWhite.svg"
pageVisible: function() { return true }
}
src/UI/toolbar/FlyViewToolBar.qml
+1 -1
View File
@@ -66,7 +66,7 @@ Rectangle {
QGCToolBarButton {
id: currentButton
Layout.preferredHeight: viewButtonRow.height
icon.source: "/res/QGCLogoFull"
icon.source: "/res/QGCLogoFull.svg"
logo: true
onClicked: mainWindow.showToolSelectDialog()
}
src/UI/toolbar/PlanViewToolBar.qml
+1 -1
View File
@@ -52,7 +52,7 @@ Rectangle {
QGCToolBarButton {
id: currentButton
Layout.preferredHeight: viewButtonRow.height
icon.source: "/res/QGCLogoFull"
icon.source: "/res/QGCLogoFull.svg"
logo: true
onClicked: mainWindow.showToolSelectDialog()
}