From ec4b5b310ddabea218fd349c76cc60cd34ce082d Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Sat, 20 Jun 2015 13:03:32 -0400 Subject: [PATCH] Moving image resources to their own QRC path. --- qgroundcontrol.qrc | 124 +++++++++--------- src/AutoPilotPlugins/PX4/AirframeComponent.cc | 2 +- .../PX4/AirframeComponentAirframes.cc | 20 +-- .../PX4/FlightModesComponent.cc | 2 +- src/AutoPilotPlugins/PX4/PowerComponent.cc | 2 +- src/AutoPilotPlugins/PX4/PowerComponent.qml | 14 +- src/AutoPilotPlugins/PX4/RadioComponent.cc | 2 +- src/AutoPilotPlugins/PX4/SafetyComponent.cc | 2 +- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 10 +- src/AutoPilotPlugins/PX4/SensorsComponent.cc | 2 +- src/AutoPilotPlugins/PX4/SensorsComponent.qml | 12 +- src/QmlControls/QGCButton.qml | 2 +- src/QmlControls/QGCComboBox.qml | 2 +- src/QmlControls/SubMenuButton.qml | 2 +- src/VehicleSetup/SetupView.qml | 4 +- src/ui/mapdisplay/MapDisplay.qml | 10 +- src/ui/qmlcommon/QGCAttitudeInstrument.qml | 8 +- src/ui/qmlcommon/QGCAttitudeWidget.qml | 6 +- src/ui/qmlcommon/QGCCompass.qml | 4 +- src/ui/qmlcommon/QGCCompassInstrument.qml | 4 +- src/ui/qmlcommon/QGCMapBackground.qml | 6 +- src/ui/toolbar/MainToolBar.qml | 4 +- 22 files changed, 124 insertions(+), 120 deletions(-) diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 13c465a06..3af6b3731 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -4,6 +4,70 @@ src/FactSystem/FactSystemTest.qml + + src/AutoPilotPlugins/PX4/Images/SafetyComponentTree.svg + src/AutoPilotPlugins/PX4/Images/SafetyComponentHome.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentArrowDown.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentPlane.png + + src/AutoPilotPlugins/PX4/Images/VehicleDown.png + src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png + src/AutoPilotPlugins/PX4/Images/VehicleLeft.png + src/AutoPilotPlugins/PX4/Images/VehicleRight.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png + src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png + + src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png + + src/AutoPilotPlugins/PX4/Images/AirframeStandardPlane.png + src/AutoPilotPlugins/PX4/Images/AirframeFlyingWing.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorH.png + src/AutoPilotPlugins/PX4/Images/AirframeSimulation.png + + src/QmlControls/arrow-down.png + resources/CogWheels.png + src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png + src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png + src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png + src/AutoPilotPlugins/PX4/Images/AirframeComponentIcon.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png + src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png + src/VehicleSetup/FirmwareUpgradeIcon.png + src/VehicleSetup/VehicleSummaryIcon.png + + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg + + src/ui/qmlcommon/attitudeDial.svg + src/ui/qmlcommon/attitudeInstrument.svg + src/ui/qmlcommon/attitudePointer.svg + src/ui/qmlcommon/buttonHome.svg + src/ui/qmlcommon/buttonLeft.svg + src/ui/qmlcommon/buttonMore.svg + src/ui/qmlcommon/buttonRight.svg + src/ui/qmlcommon/compass.svg + src/ui/qmlcommon/compassInstrumentAirplane.svg + src/ui/qmlcommon/compassInstrumentDial.svg + src/ui/qmlcommon/compassNeedle.svg + src/ui/qmlcommon/crossHair.svg + src/ui/qmlcommon/rollDialWhite.svg + src/ui/qmlcommon/rollPointerWhite.svg + src/ui/qmlcommon/scale.png + src/ui/qmlcommon/scale_end.png + + src/test.qml src/QmlControls/QmlTest.qml @@ -30,7 +94,6 @@ src/QmlControls/IndicatorButton.qml src/QmlControls/VehicleRotationCal.qml src/QmlControls/VehicleSummaryRow.qml - src/QmlControls/arrow-down.png src/ViewWidgets/ViewWidget.qml src/QmlControls/QGCView.qml @@ -62,51 +125,9 @@ src/AutoPilotPlugins/PX4/RadioComponentSummary.qml src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml - src/AutoPilotPlugins/PX4/Images/SafetyComponentTree.svg - src/AutoPilotPlugins/PX4/Images/SafetyComponentHome.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentArrowDown.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentPlane.png - - src/AutoPilotPlugins/PX4/Images/VehicleDown.png - src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png - src/AutoPilotPlugins/PX4/Images/VehicleLeft.png - src/AutoPilotPlugins/PX4/Images/VehicleRight.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png - src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png - - src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png src/AutoPilotPlugins/PX4/AirframeComponent.qml - src/AutoPilotPlugins/PX4/Images/AirframeStandardPlane.png - src/AutoPilotPlugins/PX4/Images/AirframeFlyingWing.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorH.png - src/AutoPilotPlugins/PX4/Images/AirframeSimulation.png - - resources/CogWheels.png - src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png - src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png - src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png - src/AutoPilotPlugins/PX4/Images/AirframeComponentIcon.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png - src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png - src/VehicleSetup/FirmwareUpgradeIcon.png - src/VehicleSetup/VehicleSummaryIcon.png - - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg src/ui/toolbar/MainToolBar.qml src/ui/flightdisplay/FlightDisplay.qml @@ -130,23 +151,6 @@ src/ui/qmlcommon/qmldir src/ui/qmlcommon/QGCWaypoint.qml - - src/ui/qmlcommon/attitudeDial.svg - src/ui/qmlcommon/attitudeInstrument.svg - src/ui/qmlcommon/attitudePointer.svg - src/ui/qmlcommon/buttonHome.svg - src/ui/qmlcommon/buttonLeft.svg - src/ui/qmlcommon/buttonMore.svg - src/ui/qmlcommon/buttonRight.svg - src/ui/qmlcommon/compass.svg - src/ui/qmlcommon/compassInstrumentAirplane.svg - src/ui/qmlcommon/compassInstrumentDial.svg - src/ui/qmlcommon/compassNeedle.svg - src/ui/qmlcommon/crossHair.svg - src/ui/qmlcommon/rollDialWhite.svg - src/ui/qmlcommon/rollPointerWhite.svg - src/ui/qmlcommon/scale.png - src/ui/qmlcommon/scale_end.png diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.cc b/src/AutoPilotPlugins/PX4/AirframeComponent.cc index dbda69dbd..f24e4fce1 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.cc +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.cc @@ -132,7 +132,7 @@ QString AirframeComponent::description(void) const QString AirframeComponent::iconResource(void) const { - return "AirframeComponentIcon.png"; + return "/qmlimages/AirframeComponentIcon.png"; } bool AirframeComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc b/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc index 46cf2368b..1126103e4 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc +++ b/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc @@ -96,15 +96,15 @@ const AirframeComponentAirframes::AirframeInfo_t AirframeComponentAirframes::_rg }; const AirframeComponentAirframes::AirframeType_t AirframeComponentAirframes::rgAirframeTypes[] = { - { "Standard Airplane", "qrc:/qml/AirframeStandardPlane.png", AirframeComponentAirframes::_rgAirframeInfoStandardPlane }, - { "Flying Wing", "qrc:/qml/AirframeFlyingWing.png", AirframeComponentAirframes::_rgAirframeInfoFlyingWing }, - { "QuadRotor X", "qrc:/qml/AirframeQuadRotorX.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorX }, - { "QuadRotor +", "qrc:/qml/AirframeQuadRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorPlus }, - { "HexaRotor X", "qrc:/qml/AirframeHexaRotorX.png", AirframeComponentAirframes::_rgAirframeInfoHexaRotorX }, - { "HexaRotor +", "qrc:/qml/AirframeHexaRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoHexaRotorPlus }, - { "OctoRotor X", "qrc:/qml/AirframeOctoRotorX.png", AirframeComponentAirframes::_rgAirframeInfoOctoRotorX }, - { "OctoRotor +", "qrc:/qml/AirframeOctoRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoOctoRotorPlus }, - { "QuadRotor H", "qrc:/qml/AirframeQuadRotorH.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorH }, - { "Simulation", "qrc:/qml/AirframeSimulation.png", AirframeComponentAirframes::_rgAirframeInfoSimulation }, + { "Standard Airplane", "qrc:/qmlimages/AirframeStandardPlane.png", AirframeComponentAirframes::_rgAirframeInfoStandardPlane }, + { "Flying Wing", "qrc:/qmlimages/AirframeFlyingWing.png", AirframeComponentAirframes::_rgAirframeInfoFlyingWing }, + { "QuadRotor X", "qrc:/qmlimages/AirframeQuadRotorX.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorX }, + { "QuadRotor +", "qrc:/qmlimages/AirframeQuadRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorPlus }, + { "HexaRotor X", "qrc:/qmlimages/AirframeHexaRotorX.png", AirframeComponentAirframes::_rgAirframeInfoHexaRotorX }, + { "HexaRotor +", "qrc:/qmlimages/AirframeHexaRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoHexaRotorPlus }, + { "OctoRotor X", "qrc:/qmlimages/AirframeOctoRotorX.png", AirframeComponentAirframes::_rgAirframeInfoOctoRotorX }, + { "OctoRotor +", "qrc:/qmlimages/AirframeOctoRotorPlus.png", AirframeComponentAirframes::_rgAirframeInfoOctoRotorPlus }, + { "QuadRotor H", "qrc:/qmlimages/AirframeQuadRotorH.png", AirframeComponentAirframes::_rgAirframeInfoQuadRotorH }, + { "Simulation", "qrc:/qmlimages/AirframeSimulation.png", AirframeComponentAirframes::_rgAirframeInfoSimulation }, { NULL, NULL, NULL } }; diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc index 02f6893cc..2e6193b85 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc +++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc @@ -63,7 +63,7 @@ QString FlightModesComponent::description(void) const QString FlightModesComponent::iconResource(void) const { - return "FlightModesComponentIcon.png"; + return "/qmlimages/FlightModesComponentIcon.png"; } bool FlightModesComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.cc b/src/AutoPilotPlugins/PX4/PowerComponent.cc index 093e67c61..c0883eba8 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.cc +++ b/src/AutoPilotPlugins/PX4/PowerComponent.cc @@ -46,7 +46,7 @@ QString PowerComponent::description(void) const QString PowerComponent::iconResource(void) const { - return "PowerComponentIcon.png"; + return "/qmlimages/PowerComponentIcon.png"; } bool PowerComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 12f127937..eccbc406e 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -54,13 +54,13 @@ QGCView { function getBatteryImage() { switch(battNumCells.value) { - case 1: return "/qml/PowerComponentBattery_01cell.svg"; - case 2: return "/qml/PowerComponentBattery_02cell.svg" - case 3: return "/qml/PowerComponentBattery_03cell.svg" - case 4: return "/qml/PowerComponentBattery_04cell.svg" - case 5: return "/qml/PowerComponentBattery_05cell.svg" - case 6: return "/qml/PowerComponentBattery_06cell.svg" - default: return "/qml/PowerComponentBattery_01cell.svg"; + case 1: return "/qmlimages/PowerComponentBattery_01cell.svg"; + case 2: return "/qmlimages/PowerComponentBattery_02cell.svg" + case 3: return "/qmlimages/PowerComponentBattery_03cell.svg" + case 4: return "/qmlimages/PowerComponentBattery_04cell.svg" + case 5: return "/qmlimages/PowerComponentBattery_05cell.svg" + case 6: return "/qmlimages/PowerComponentBattery_06cell.svg" + default: return "/qmlimages/PowerComponentBattery_01cell.svg"; } } diff --git a/src/AutoPilotPlugins/PX4/RadioComponent.cc b/src/AutoPilotPlugins/PX4/RadioComponent.cc index a45346b81..6d553d57f 100644 --- a/src/AutoPilotPlugins/PX4/RadioComponent.cc +++ b/src/AutoPilotPlugins/PX4/RadioComponent.cc @@ -48,7 +48,7 @@ QString RadioComponent::description(void) const QString RadioComponent::iconResource(void) const { - return "RadioComponentIcon.png"; + return "/qmlimages/RadioComponentIcon.png"; } bool RadioComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.cc b/src/AutoPilotPlugins/PX4/SafetyComponent.cc index d0e06df3c..e7b5da65e 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.cc +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.cc @@ -46,7 +46,7 @@ QString SafetyComponent::description(void) const QString SafetyComponent::iconResource(void) const { - return "SafetyComponentIcon.png"; + return "/qmlimages/SafetyComponentIcon.png"; } bool SafetyComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 01d10f215..b0d70c797 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -213,7 +213,7 @@ FactPanel { QGCColoredImage { id: planeImage y: parent.height - planeWidth - 40 - source: "/qml/SafetyComponentPlane.png" + source: "/qmlimages/SafetyComponentPlane.png" fillMode: Image.PreserveAspectFit width: planeWidth height: planeWidth @@ -226,7 +226,7 @@ FactPanel { y: parent.height - height - 20 width: 80 height: parent.height / 2 - source: "/qml/SafetyComponentTree.svg" + source: "/qmlimages/SafetyComponentTree.svg" fillMode: Image.Stretch smooth: true color: palette.windowShadeDark @@ -237,7 +237,7 @@ FactPanel { y: parent.height - height width: 100 height: parent.height * .75 - source: "/qml/SafetyComponentTree.svg" + source: "/qmlimages/SafetyComponentTree.svg" fillMode: Image.PreserveAspectFit smooth: true color: palette.button @@ -246,7 +246,7 @@ FactPanel { QGCColoredImage { x: parent.width - (arrowWidth/2) - 1 y: parent.height - homeWidth - arrowToHomeSpacing - 2 - source: "/qml/SafetyComponentArrowDown.png" + source: "/qmlimages/SafetyComponentArrowDown.png" fillMode: Image.PreserveAspectFit width: arrowWidth height: arrowWidth @@ -258,7 +258,7 @@ FactPanel { id: homeImage x: parent.width - (homeWidth / 2) y: parent.height - homeWidth - source: "/qml/SafetyComponentHome.png" + source: "/qmlimages/SafetyComponentHome.png" fillMode: Image.PreserveAspectFit width: homeWidth height: homeWidth diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.cc b/src/AutoPilotPlugins/PX4/SensorsComponent.cc index d7e4b7a83..560c47246 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.cc +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.cc @@ -51,7 +51,7 @@ QString SensorsComponent::description(void) const QString SensorsComponent::iconResource(void) const { - return "SensorsComponentIcon.png"; + return "/qmlimages/SensorsComponentIcon.png"; } bool SensorsComponent::requiresSetup(void) const diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml index 3b3dccac1..ce6525dd8 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml @@ -430,42 +430,42 @@ QGCView { calValid: controller.orientationCalDownSideDone calInProgress: controller.orientationCalDownSideInProgress calInProgressText: controller.orientationCalDownSideRotate ? "Rotate" : "Hold Still" - imageSource: controller.orientationCalDownSideRotate ? "qrc:///qml/VehicleDownRotate.png" : "qrc:///qml/VehicleDown.png" + imageSource: controller.orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png" } VehicleRotationCal { visible: controller.orientationCalUpsideDownSideVisible calValid: controller.orientationCalUpsideDownSideDone calInProgress: controller.orientationCalUpsideDownSideInProgress calInProgressText: "Hold Still" - imageSource: "qrc:///qml/VehicleUpsideDown.png" + imageSource: "qrc:///qmlimages/VehicleUpsideDown.png" } VehicleRotationCal { visible: controller.orientationCalNoseDownSideVisible calValid: controller.orientationCalNoseDownSideDone calInProgress: controller.orientationCalNoseDownSideInProgress calInProgressText: controller.orientationCalNoseDownSideRotate ? "Rotate" : "Hold Still" - imageSource: controller.orientationCalNoseDownSideRotate ? "qrc:///qml/VehicleNoseDownRotate.png" : "qrc:///qml/VehicleNoseDown.png" + imageSource: controller.orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png" } VehicleRotationCal { visible: controller.orientationCalTailDownSideVisible calValid: controller.orientationCalTailDownSideDone calInProgress: controller.orientationCalTailDownSideInProgress calInProgressText: "Hold Still" - imageSource: "qrc:///qml/VehicleTailDown.png" + imageSource: "qrc:///qmlimages/VehicleTailDown.png" } VehicleRotationCal { visible: controller.orientationCalLeftSideVisible calValid: controller.orientationCalLeftSideDone calInProgress: controller.orientationCalLeftSideInProgress calInProgressText: controller.orientationCalLeftSideRotate ? "Rotate" : "Hold Still" - imageSource: controller.orientationCalLeftSideRotate ? "qrc:///qml/VehicleLeftRotate.png" : "qrc:///qml/VehicleLeft.png" + imageSource: controller.orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png" } VehicleRotationCal { visible: controller.orientationCalRightSideVisible calValid: controller.orientationCalRightSideDone calInProgress: controller.orientationCalRightSideInProgress calInProgressText: "Hold Still" - imageSource: "qrc:///qml/VehicleRight.png" + imageSource: "qrc:///qmlimages/VehicleRight.png" } } } diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 02ba38d37..8143a0ac7 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -76,7 +76,7 @@ Button { Image { id: imageItem visible: control.menu !== null - source: "arrow-down.png" + source: "/qmlimages/arrow-down.png" anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: padding.right diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml index e9849ec65..4afb64f13 100644 --- a/src/QmlControls/QGCComboBox.qml +++ b/src/QmlControls/QGCComboBox.qml @@ -30,7 +30,7 @@ ComboBox { Image { id: imageItem visible: control.menu !== null - source: "arrow-down.png" + source: "/qmlimages/arrow-down.png" anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: dropDownButtonWidth / 2 diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml index 97e2a4762..24697e93d 100644 --- a/src/QmlControls/SubMenuButton.qml +++ b/src/QmlControls/SubMenuButton.qml @@ -13,7 +13,7 @@ Button { text: "Button" property bool setupComplete: true property bool setupIndicator: true - property string imageResource: "subMenuButtonImage.png" + property string imageResource: "/qmlimages/subMenuButtonImage.png" style: ButtonStyle { id: buttonStyle diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml index 6f45b679a..d0d3b852f 100644 --- a/src/VehicleSetup/SetupView.qml +++ b/src/VehicleSetup/SetupView.qml @@ -149,7 +149,7 @@ Rectangle { SubMenuButton { id: summaryButton width: buttonWidth - imageResource: "VehicleSummaryIcon.png" + imageResource: "/qmlimages/VehicleSummaryIcon.png" setupIndicator: false exclusiveGroup: setupButtonGroup text: "SUMMARY" @@ -160,7 +160,7 @@ Rectangle { SubMenuButton { id: firmwareButton width: buttonWidth - imageResource: "FirmwareUpgradeIcon.png" + imageResource: "/qmlimages/FirmwareUpgradeIcon.png" setupIndicator: false exclusiveGroup: setupButtonGroup visible: controller.showFirmware diff --git a/src/ui/mapdisplay/MapDisplay.qml b/src/ui/mapdisplay/MapDisplay.qml index 9cf57920d..a60ebb8c6 100644 --- a/src/ui/mapdisplay/MapDisplay.qml +++ b/src/ui/mapdisplay/MapDisplay.qml @@ -82,7 +82,7 @@ Rectangle { Image { id: buttomImg anchors.fill: parent - source: showWaypointEditor ? "/qml/buttonRight.svg" : "/qml/buttonLeft.svg" + source: showWaypointEditor ? "/qmlimages/buttonRight.svg" : "/qmlimages/buttonLeft.svg" mipmap: true smooth: true antialiasing: true @@ -144,25 +144,25 @@ Rectangle { QGCMapToolButton { width: 50 height: 50 - imageSource: "/qml/buttonHome.svg" + imageSource: "/qmlimages/buttonHome.svg" exclusiveGroup: mainActionGroup } QGCMapToolButton { width: 50 height: 50 - imageSource: "/qml/buttonHome.svg" + imageSource: "/qmlimages/buttonHome.svg" exclusiveGroup: mainActionGroup } QGCMapToolButton { width: 50 height: 50 - imageSource: "/qml/buttonHome.svg" + imageSource: "/qmlimages/buttonHome.svg" exclusiveGroup: mainActionGroup } QGCMapToolButton { width: 50 height: 50 - imageSource: "/qml/buttonHome.svg" + imageSource: "/qmlimages/buttonHome.svg" exclusiveGroup: mainActionGroup } } diff --git a/src/ui/qmlcommon/QGCAttitudeInstrument.qml b/src/ui/qmlcommon/QGCAttitudeInstrument.qml index d27e67649..df060bc4a 100644 --- a/src/ui/qmlcommon/QGCAttitudeInstrument.qml +++ b/src/ui/qmlcommon/QGCAttitudeInstrument.qml @@ -51,7 +51,7 @@ QGCMovableItem { //-- Pointer Image { id: pointer - source: "/qml/attitudePointer.svg" + source: "/qmlimages/attitudePointer.svg" mipmap: true fillMode: Image.PreserveAspectFit anchors.fill: parent @@ -60,7 +60,7 @@ QGCMovableItem { //-- Instrument Dial Image { id: instrumentDial - source: "/qml/attitudeDial.svg" + source: "/qmlimages/attitudeDial.svg" mipmap: true fillMode: Image.PreserveAspectFit anchors.fill: parent @@ -86,7 +86,7 @@ QGCMovableItem { Image { id: crossHair anchors.centerIn: parent - source: "/qml/crossHair.svg" + source: "/qmlimages/crossHair.svg" mipmap: true width: size * 0.75 fillMode: Image.PreserveAspectFit @@ -95,7 +95,7 @@ QGCMovableItem { //-- Instrument Pannel Image { id: pannel - source: "/qml/attitudeInstrument.svg" + source: "/qmlimages/attitudeInstrument.svg" mipmap: true fillMode: Image.PreserveAspectFit anchors.fill: parent diff --git a/src/ui/qmlcommon/QGCAttitudeWidget.qml b/src/ui/qmlcommon/QGCAttitudeWidget.qml index 2c9817dc4..40e806222 100644 --- a/src/ui/qmlcommon/QGCAttitudeWidget.qml +++ b/src/ui/qmlcommon/QGCAttitudeWidget.qml @@ -39,7 +39,7 @@ Item { Image { id: rollDial anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} - source: "/qml/rollDialWhite.svg" + source: "/qmlimages/rollDialWhite.svg" mipmap: true width: parent.width fillMode: Image.PreserveAspectFit @@ -53,7 +53,7 @@ Item { Image { id: pointer anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} - source: "/qml/rollPointerWhite.svg" + source: "/qmlimages/rollPointerWhite.svg" mipmap: true width: rollDial.width fillMode: Image.PreserveAspectFit @@ -62,7 +62,7 @@ Item { Image { id: crossHair anchors.centerIn: parent - source: "/qml/crossHair.svg" + source: "/qmlimages/crossHair.svg" mipmap: true width: parent.width fillMode: Image.PreserveAspectFit diff --git a/src/ui/qmlcommon/QGCCompass.qml b/src/ui/qmlcommon/QGCCompass.qml index 5ce4d1932..6ef47efc3 100644 --- a/src/ui/qmlcommon/QGCCompass.qml +++ b/src/ui/qmlcommon/QGCCompass.qml @@ -37,7 +37,7 @@ Item { Image { id: compass anchors.centerIn: parent - source: "/qml/compass.svg" + source: "/qmlimages/compass.svg" mipmap: true width: root.width fillMode: Image.PreserveAspectFit @@ -51,7 +51,7 @@ Item { id: pointer anchors.bottom: compass.top anchors.horizontalCenter: root.horizontalCenter - source: "/qml/compassNeedle.svg" + source: "/qmlimages/compassNeedle.svg" smooth: true width: compass.width * 0.1 fillMode: Image.PreserveAspectFit diff --git a/src/ui/qmlcommon/QGCCompassInstrument.qml b/src/ui/qmlcommon/QGCCompassInstrument.qml index 0a4c97373..106149a59 100644 --- a/src/ui/qmlcommon/QGCCompassInstrument.qml +++ b/src/ui/qmlcommon/QGCCompassInstrument.qml @@ -45,7 +45,7 @@ QGCMovableItem { } Image { id: pointer - source: "/qml/compassInstrumentAirplane.svg" + source: "/qmlimages/compassInstrumentAirplane.svg" mipmap: true width: size * 0.75 fillMode: Image.PreserveAspectFit @@ -58,7 +58,7 @@ QGCMovableItem { } Image { id: compassDial - source: "/qml/compassInstrumentDial.svg" + source: "/qmlimages/compassInstrumentDial.svg" mipmap: true fillMode: Image.PreserveAspectFit anchors.fill: parent diff --git a/src/ui/qmlcommon/QGCMapBackground.qml b/src/ui/qmlcommon/QGCMapBackground.qml index bb731fb4e..4b0eac7f8 100644 --- a/src/ui/qmlcommon/QGCMapBackground.qml +++ b/src/ui/qmlcommon/QGCMapBackground.qml @@ -336,19 +336,19 @@ Item { } Image { id: scaleImageLeft - source: "/qml/scale_end.png" + source: "/qmlimages/scale_end.png" anchors.bottom: parent.bottom anchors.left: parent.left } Image { id: scaleImage - source: "/qml/scale.png" + source: "/qmlimages/scale.png" anchors.bottom: parent.bottom anchors.left: scaleImageLeft.right } Image { id: scaleImageRight - source: "/qml/scale_end.png" + source: "/qmlimages/scale_end.png" anchors.bottom: parent.bottom anchors.left: scaleImage.right } diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 5acd18f91..d5796018e 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -282,7 +282,7 @@ Rectangle { Image { id: buttomImg anchors.fill: parent - source: "/qml/buttonMore.svg" + source: "/qmlimages/buttonMore.svg" mipmap: true smooth: true antialiasing: true @@ -349,7 +349,7 @@ Rectangle { Image { id: dropDown - source: "QGroundControl/Controls/arrow-down.png" + source: "/qmlimages/arrow-down.png" visible: (messages.showTriangle) && (MavManager.messageCount > 0) anchors.bottom: parent.bottom anchors.right: parent.right -- 2.22.0