Skip to content

Q
qgroundcontrol
Commit ec4b5b31 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Moving image resources to their own QRC path.

parent cc3cf383
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 120 deletions
qgroundcontrol.qrc
View file @ ec4b5b31
This diff is collapsed.
src/AutoPilotPlugins/PX4/AirframeComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc
View file @ ec4b5b31
......@@ -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 }
};
src/AutoPilotPlugins/PX4/FlightModesComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/PowerComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ ec4b5b31
......@@ -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";
}
}
......
src/AutoPilotPlugins/PX4/RadioComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/SafetyComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @ ec4b5b31
......@@ -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
......
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @ ec4b5b31
......@@ -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"
}
}
}
......
src/QmlControls/QGCButton.qml
View file @ ec4b5b31
......@@ -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
......
src/QmlControls/QGCComboBox.qml
View file @ ec4b5b31
......@@ -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
......
src/QmlControls/SubMenuButton.qml
View file @ ec4b5b31
......@@ -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
......
src/VehicleSetup/SetupView.qml
View file @ ec4b5b31
......@@ -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
......
src/ui/mapdisplay/MapDisplay.qml
View file @ ec4b5b31
......@@ -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
}
}
......
src/ui/qmlcommon/QGCAttitudeInstrument.qml
View file @ ec4b5b31
......@@ -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
......
src/ui/qmlcommon/QGCAttitudeWidget.qml
View file @ ec4b5b31
......@@ -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
......
src/ui/qmlcommon/QGCCompass.qml
View file @ ec4b5b31
......@@ -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
......
src/ui/qmlcommon/QGCCompassInstrument.qml
View file @ ec4b5b31
......@@ -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
......
src/ui/qmlcommon/QGCMapBackground.qml
View file @ ec4b5b31
......@@ -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
}
......
src/ui/toolbar/MainToolBar.qml
View file @ ec4b5b31
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment