Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ec4b5b31
Commit
ec4b5b31
authored
Jun 20, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moving image resources to their own QRC path.
parent
cc3cf383
Changes
22
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
124 additions
and
120 deletions
+124
-120
qgroundcontrol.qrc
qgroundcontrol.qrc
+64
-60
AirframeComponent.cc
src/AutoPilotPlugins/PX4/AirframeComponent.cc
+1
-1
AirframeComponentAirframes.cc
src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc
+10
-10
FlightModesComponent.cc
src/AutoPilotPlugins/PX4/FlightModesComponent.cc
+1
-1
PowerComponent.cc
src/AutoPilotPlugins/PX4/PowerComponent.cc
+1
-1
PowerComponent.qml
src/AutoPilotPlugins/PX4/PowerComponent.qml
+7
-7
RadioComponent.cc
src/AutoPilotPlugins/PX4/RadioComponent.cc
+1
-1
SafetyComponent.cc
src/AutoPilotPlugins/PX4/SafetyComponent.cc
+1
-1
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+5
-5
SensorsComponent.cc
src/AutoPilotPlugins/PX4/SensorsComponent.cc
+1
-1
SensorsComponent.qml
src/AutoPilotPlugins/PX4/SensorsComponent.qml
+6
-6
QGCButton.qml
src/QmlControls/QGCButton.qml
+1
-1
QGCComboBox.qml
src/QmlControls/QGCComboBox.qml
+1
-1
SubMenuButton.qml
src/QmlControls/SubMenuButton.qml
+1
-1
SetupView.qml
src/VehicleSetup/SetupView.qml
+2
-2
MapDisplay.qml
src/ui/mapdisplay/MapDisplay.qml
+5
-5
QGCAttitudeInstrument.qml
src/ui/qmlcommon/QGCAttitudeInstrument.qml
+4
-4
QGCAttitudeWidget.qml
src/ui/qmlcommon/QGCAttitudeWidget.qml
+3
-3
QGCCompass.qml
src/ui/qmlcommon/QGCCompass.qml
+2
-2
QGCCompassInstrument.qml
src/ui/qmlcommon/QGCCompassInstrument.qml
+2
-2
QGCMapBackground.qml
src/ui/qmlcommon/QGCMapBackground.qml
+3
-3
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+2
-2
No files found.
qgroundcontrol.qrc
View file @
ec4b5b31
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/AirframeComponent.cc
View file @
ec4b5b31
...
@@ -132,7 +132,7 @@ QString AirframeComponent::description(void) const
...
@@ -132,7 +132,7 @@ QString AirframeComponent::description(void) const
QString
AirframeComponent
::
iconResource
(
void
)
const
QString
AirframeComponent
::
iconResource
(
void
)
const
{
{
return
"AirframeComponentIcon.png"
;
return
"
/qmlimages/
AirframeComponentIcon.png"
;
}
}
bool
AirframeComponent
::
requiresSetup
(
void
)
const
bool
AirframeComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc
View file @
ec4b5b31
...
@@ -96,15 +96,15 @@ const AirframeComponentAirframes::AirframeInfo_t AirframeComponentAirframes::_rg
...
@@ -96,15 +96,15 @@ const AirframeComponentAirframes::AirframeInfo_t AirframeComponentAirframes::_rg
};
};
const
AirframeComponentAirframes
::
AirframeType_t
AirframeComponentAirframes
::
rgAirframeTypes
[]
=
{
const
AirframeComponentAirframes
::
AirframeType_t
AirframeComponentAirframes
::
rgAirframeTypes
[]
=
{
{
"Standard Airplane"
,
"qrc:/qml/AirframeStandardPlane.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoStandardPlane
},
{
"Standard Airplane"
,
"qrc:/qml
images
/AirframeStandardPlane.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoStandardPlane
},
{
"Flying Wing"
,
"qrc:/qml/AirframeFlyingWing.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoFlyingWing
},
{
"Flying Wing"
,
"qrc:/qml
images
/AirframeFlyingWing.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoFlyingWing
},
{
"QuadRotor X"
,
"qrc:/qml/AirframeQuadRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorX
},
{
"QuadRotor X"
,
"qrc:/qml
images
/AirframeQuadRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorX
},
{
"QuadRotor +"
,
"qrc:/qml/AirframeQuadRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorPlus
},
{
"QuadRotor +"
,
"qrc:/qml
images
/AirframeQuadRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorPlus
},
{
"HexaRotor X"
,
"qrc:/qml/AirframeHexaRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoHexaRotorX
},
{
"HexaRotor X"
,
"qrc:/qml
images
/AirframeHexaRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoHexaRotorX
},
{
"HexaRotor +"
,
"qrc:/qml/AirframeHexaRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoHexaRotorPlus
},
{
"HexaRotor +"
,
"qrc:/qml
images
/AirframeHexaRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoHexaRotorPlus
},
{
"OctoRotor X"
,
"qrc:/qml/AirframeOctoRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoOctoRotorX
},
{
"OctoRotor X"
,
"qrc:/qml
images
/AirframeOctoRotorX.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoOctoRotorX
},
{
"OctoRotor +"
,
"qrc:/qml/AirframeOctoRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoOctoRotorPlus
},
{
"OctoRotor +"
,
"qrc:/qml
images
/AirframeOctoRotorPlus.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoOctoRotorPlus
},
{
"QuadRotor H"
,
"qrc:/qml/AirframeQuadRotorH.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorH
},
{
"QuadRotor H"
,
"qrc:/qml
images
/AirframeQuadRotorH.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoQuadRotorH
},
{
"Simulation"
,
"qrc:/qml/AirframeSimulation.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoSimulation
},
{
"Simulation"
,
"qrc:/qml
images
/AirframeSimulation.png"
,
AirframeComponentAirframes
::
_rgAirframeInfoSimulation
},
{
NULL
,
NULL
,
NULL
}
{
NULL
,
NULL
,
NULL
}
};
};
src/AutoPilotPlugins/PX4/FlightModesComponent.cc
View file @
ec4b5b31
...
@@ -63,7 +63,7 @@ QString FlightModesComponent::description(void) const
...
@@ -63,7 +63,7 @@ QString FlightModesComponent::description(void) const
QString
FlightModesComponent
::
iconResource
(
void
)
const
QString
FlightModesComponent
::
iconResource
(
void
)
const
{
{
return
"FlightModesComponentIcon.png"
;
return
"
/qmlimages/
FlightModesComponentIcon.png"
;
}
}
bool
FlightModesComponent
::
requiresSetup
(
void
)
const
bool
FlightModesComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/PowerComponent.cc
View file @
ec4b5b31
...
@@ -46,7 +46,7 @@ QString PowerComponent::description(void) const
...
@@ -46,7 +46,7 @@ QString PowerComponent::description(void) const
QString
PowerComponent
::
iconResource
(
void
)
const
QString
PowerComponent
::
iconResource
(
void
)
const
{
{
return
"PowerComponentIcon.png"
;
return
"
/qmlimages/
PowerComponentIcon.png"
;
}
}
bool
PowerComponent
::
requiresSetup
(
void
)
const
bool
PowerComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @
ec4b5b31
...
@@ -54,13 +54,13 @@ QGCView {
...
@@ -54,13 +54,13 @@ QGCView {
function
getBatteryImage
()
function
getBatteryImage
()
{
{
switch
(
battNumCells
.
value
)
{
switch
(
battNumCells
.
value
)
{
case
1
:
return
"
/qml/PowerComponentBattery_01cell.svg
"
;
case
1
:
return
"
/qml
images
/PowerComponentBattery_01cell.svg
"
;
case
2
:
return
"
/qml/PowerComponentBattery_02cell.svg
"
case
2
:
return
"
/qml
images
/PowerComponentBattery_02cell.svg
"
case
3
:
return
"
/qml/PowerComponentBattery_03cell.svg
"
case
3
:
return
"
/qml
images
/PowerComponentBattery_03cell.svg
"
case
4
:
return
"
/qml/PowerComponentBattery_04cell.svg
"
case
4
:
return
"
/qml
images
/PowerComponentBattery_04cell.svg
"
case
5
:
return
"
/qml/PowerComponentBattery_05cell.svg
"
case
5
:
return
"
/qml
images
/PowerComponentBattery_05cell.svg
"
case
6
:
return
"
/qml/PowerComponentBattery_06cell.svg
"
case
6
:
return
"
/qml
images
/PowerComponentBattery_06cell.svg
"
default
:
return
"
/qml/PowerComponentBattery_01cell.svg
"
;
default
:
return
"
/qml
images
/PowerComponentBattery_01cell.svg
"
;
}
}
}
}
...
...
src/AutoPilotPlugins/PX4/RadioComponent.cc
View file @
ec4b5b31
...
@@ -48,7 +48,7 @@ QString RadioComponent::description(void) const
...
@@ -48,7 +48,7 @@ QString RadioComponent::description(void) const
QString
RadioComponent
::
iconResource
(
void
)
const
QString
RadioComponent
::
iconResource
(
void
)
const
{
{
return
"RadioComponentIcon.png"
;
return
"
/qmlimages/
RadioComponentIcon.png"
;
}
}
bool
RadioComponent
::
requiresSetup
(
void
)
const
bool
RadioComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/SafetyComponent.cc
View file @
ec4b5b31
...
@@ -46,7 +46,7 @@ QString SafetyComponent::description(void) const
...
@@ -46,7 +46,7 @@ QString SafetyComponent::description(void) const
QString
SafetyComponent
::
iconResource
(
void
)
const
QString
SafetyComponent
::
iconResource
(
void
)
const
{
{
return
"SafetyComponentIcon.png"
;
return
"
/qmlimages/
SafetyComponentIcon.png"
;
}
}
bool
SafetyComponent
::
requiresSetup
(
void
)
const
bool
SafetyComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
ec4b5b31
...
@@ -213,7 +213,7 @@ FactPanel {
...
@@ -213,7 +213,7 @@ FactPanel {
QGCColoredImage
{
QGCColoredImage
{
id
:
planeImage
id
:
planeImage
y
:
parent
.
height
-
planeWidth
-
40
y
:
parent
.
height
-
planeWidth
-
40
source
:
"
/qml/SafetyComponentPlane.png
"
source
:
"
/qml
images
/SafetyComponentPlane.png
"
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
width
:
planeWidth
width
:
planeWidth
height
:
planeWidth
height
:
planeWidth
...
@@ -226,7 +226,7 @@ FactPanel {
...
@@ -226,7 +226,7 @@ FactPanel {
y
:
parent
.
height
-
height
-
20
y
:
parent
.
height
-
height
-
20
width
:
80
width
:
80
height
:
parent
.
height
/
2
height
:
parent
.
height
/
2
source
:
"
/qml/SafetyComponentTree.svg
"
source
:
"
/qml
images
/SafetyComponentTree.svg
"
fillMode
:
Image
.
Stretch
fillMode
:
Image
.
Stretch
smooth
:
true
smooth
:
true
color
:
palette
.
windowShadeDark
color
:
palette
.
windowShadeDark
...
@@ -237,7 +237,7 @@ FactPanel {
...
@@ -237,7 +237,7 @@ FactPanel {
y
:
parent
.
height
-
height
y
:
parent
.
height
-
height
width
:
100
width
:
100
height
:
parent
.
height
*
.
75
height
:
parent
.
height
*
.
75
source
:
"
/qml/SafetyComponentTree.svg
"
source
:
"
/qml
images
/SafetyComponentTree.svg
"
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
smooth
:
true
smooth
:
true
color
:
palette
.
button
color
:
palette
.
button
...
@@ -246,7 +246,7 @@ FactPanel {
...
@@ -246,7 +246,7 @@ FactPanel {
QGCColoredImage
{
QGCColoredImage
{
x
:
parent
.
width
-
(
arrowWidth
/
2
)
-
1
x
:
parent
.
width
-
(
arrowWidth
/
2
)
-
1
y
:
parent
.
height
-
homeWidth
-
arrowToHomeSpacing
-
2
y
:
parent
.
height
-
homeWidth
-
arrowToHomeSpacing
-
2
source
:
"
/qml/SafetyComponentArrowDown.png
"
source
:
"
/qml
images
/SafetyComponentArrowDown.png
"
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
width
:
arrowWidth
width
:
arrowWidth
height
:
arrowWidth
height
:
arrowWidth
...
@@ -258,7 +258,7 @@ FactPanel {
...
@@ -258,7 +258,7 @@ FactPanel {
id
:
homeImage
id
:
homeImage
x
:
parent
.
width
-
(
homeWidth
/
2
)
x
:
parent
.
width
-
(
homeWidth
/
2
)
y
:
parent
.
height
-
homeWidth
y
:
parent
.
height
-
homeWidth
source
:
"
/qml/SafetyComponentHome.png
"
source
:
"
/qml
images
/SafetyComponentHome.png
"
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
width
:
homeWidth
width
:
homeWidth
height
:
homeWidth
height
:
homeWidth
...
...
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @
ec4b5b31
...
@@ -51,7 +51,7 @@ QString SensorsComponent::description(void) const
...
@@ -51,7 +51,7 @@ QString SensorsComponent::description(void) const
QString
SensorsComponent
::
iconResource
(
void
)
const
QString
SensorsComponent
::
iconResource
(
void
)
const
{
{
return
"SensorsComponentIcon.png"
;
return
"
/qmlimages/
SensorsComponentIcon.png"
;
}
}
bool
SensorsComponent
::
requiresSetup
(
void
)
const
bool
SensorsComponent
::
requiresSetup
(
void
)
const
...
...
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @
ec4b5b31
...
@@ -430,42 +430,42 @@ QGCView {
...
@@ -430,42 +430,42 @@ QGCView {
calValid
:
controller
.
orientationCalDownSideDone
calValid
:
controller
.
orientationCalDownSideDone
calInProgress
:
controller
.
orientationCalDownSideInProgress
calInProgress
:
controller
.
orientationCalDownSideInProgress
calInProgressText
:
controller
.
orientationCalDownSideRotate
?
"
Rotate
"
:
"
Hold Still
"
calInProgressText
:
controller
.
orientationCalDownSideRotate
?
"
Rotate
"
:
"
Hold Still
"
imageSource
:
controller
.
orientationCalDownSideRotate
?
"
qrc:///qml
/VehicleDownRotate.png
"
:
"
qrc:///qml
/VehicleDown.png
"
imageSource
:
controller
.
orientationCalDownSideRotate
?
"
qrc:///qml
images/VehicleDownRotate.png
"
:
"
qrc:///qmlimages
/VehicleDown.png
"
}
}
VehicleRotationCal
{
VehicleRotationCal
{
visible
:
controller
.
orientationCalUpsideDownSideVisible
visible
:
controller
.
orientationCalUpsideDownSideVisible
calValid
:
controller
.
orientationCalUpsideDownSideDone
calValid
:
controller
.
orientationCalUpsideDownSideDone
calInProgress
:
controller
.
orientationCalUpsideDownSideInProgress
calInProgress
:
controller
.
orientationCalUpsideDownSideInProgress
calInProgressText
:
"
Hold Still
"
calInProgressText
:
"
Hold Still
"
imageSource
:
"
qrc:///qml/VehicleUpsideDown.png
"
imageSource
:
"
qrc:///qml
images
/VehicleUpsideDown.png
"
}
}
VehicleRotationCal
{
VehicleRotationCal
{
visible
:
controller
.
orientationCalNoseDownSideVisible
visible
:
controller
.
orientationCalNoseDownSideVisible
calValid
:
controller
.
orientationCalNoseDownSideDone
calValid
:
controller
.
orientationCalNoseDownSideDone
calInProgress
:
controller
.
orientationCalNoseDownSideInProgress
calInProgress
:
controller
.
orientationCalNoseDownSideInProgress
calInProgressText
:
controller
.
orientationCalNoseDownSideRotate
?
"
Rotate
"
:
"
Hold Still
"
calInProgressText
:
controller
.
orientationCalNoseDownSideRotate
?
"
Rotate
"
:
"
Hold Still
"
imageSource
:
controller
.
orientationCalNoseDownSideRotate
?
"
qrc:///qml
/VehicleNoseDownRotate.png
"
:
"
qrc:///qml
/VehicleNoseDown.png
"
imageSource
:
controller
.
orientationCalNoseDownSideRotate
?
"
qrc:///qml
images/VehicleNoseDownRotate.png
"
:
"
qrc:///qmlimages
/VehicleNoseDown.png
"
}
}
VehicleRotationCal
{
VehicleRotationCal
{
visible
:
controller
.
orientationCalTailDownSideVisible
visible
:
controller
.
orientationCalTailDownSideVisible
calValid
:
controller
.
orientationCalTailDownSideDone
calValid
:
controller
.
orientationCalTailDownSideDone
calInProgress
:
controller
.
orientationCalTailDownSideInProgress
calInProgress
:
controller
.
orientationCalTailDownSideInProgress
calInProgressText
:
"
Hold Still
"
calInProgressText
:
"
Hold Still
"
imageSource
:
"
qrc:///qml/VehicleTailDown.png
"
imageSource
:
"
qrc:///qml
images
/VehicleTailDown.png
"
}
}
VehicleRotationCal
{
VehicleRotationCal
{
visible
:
controller
.
orientationCalLeftSideVisible
visible
:
controller
.
orientationCalLeftSideVisible
calValid
:
controller
.
orientationCalLeftSideDone
calValid
:
controller
.
orientationCalLeftSideDone
calInProgress
:
controller
.
orientationCalLeftSideInProgress
calInProgress
:
controller
.
orientationCalLeftSideInProgress
calInProgressText
:
controller
.
orientationCalLeftSideRotate
?
"
Rotate
"
:
"
Hold Still
"
calInProgressText
:
controller
.
orientationCalLeftSideRotate
?
"
Rotate
"
:
"
Hold Still
"
imageSource
:
controller
.
orientationCalLeftSideRotate
?
"
qrc:///qml
/VehicleLeftRotate.png
"
:
"
qrc:///qml
/VehicleLeft.png
"
imageSource
:
controller
.
orientationCalLeftSideRotate
?
"
qrc:///qml
images/VehicleLeftRotate.png
"
:
"
qrc:///qmlimages
/VehicleLeft.png
"
}
}
VehicleRotationCal
{
VehicleRotationCal
{
visible
:
controller
.
orientationCalRightSideVisible
visible
:
controller
.
orientationCalRightSideVisible
calValid
:
controller
.
orientationCalRightSideDone
calValid
:
controller
.
orientationCalRightSideDone
calInProgress
:
controller
.
orientationCalRightSideInProgress
calInProgress
:
controller
.
orientationCalRightSideInProgress
calInProgressText
:
"
Hold Still
"
calInProgressText
:
"
Hold Still
"
imageSource
:
"
qrc:///qml/VehicleRight.png
"
imageSource
:
"
qrc:///qml
images
/VehicleRight.png
"
}
}
}
}
}
}
...
...
src/QmlControls/QGCButton.qml
View file @
ec4b5b31
...
@@ -76,7 +76,7 @@ Button {
...
@@ -76,7 +76,7 @@ Button {
Image
{
Image
{
id
:
imageItem
id
:
imageItem
visible
:
control
.
menu
!==
null
visible
:
control
.
menu
!==
null
source
:
"
arrow-down.png
"
source
:
"
/qmlimages/
arrow-down.png
"
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
anchors.rightMargin
:
padding
.
right
anchors.rightMargin
:
padding
.
right
...
...
src/QmlControls/QGCComboBox.qml
View file @
ec4b5b31
...
@@ -30,7 +30,7 @@ ComboBox {
...
@@ -30,7 +30,7 @@ ComboBox {
Image
{
Image
{
id
:
imageItem
id
:
imageItem
visible
:
control
.
menu
!==
null
visible
:
control
.
menu
!==
null
source
:
"
arrow-down.png
"
source
:
"
/qmlimages/
arrow-down.png
"
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
anchors.rightMargin
:
dropDownButtonWidth
/
2
anchors.rightMargin
:
dropDownButtonWidth
/
2
...
...
src/QmlControls/SubMenuButton.qml
View file @
ec4b5b31
...
@@ -13,7 +13,7 @@ Button {
...
@@ -13,7 +13,7 @@ Button {
text
:
"
Button
"
text
:
"
Button
"
property
bool
setupComplete
:
true
property
bool
setupComplete
:
true
property
bool
setupIndicator
:
true
property
bool
setupIndicator
:
true
property
string
imageResource
:
"
subMenuButtonImage.png
"
property
string
imageResource
:
"
/qmlimages/
subMenuButtonImage.png
"
style
:
ButtonStyle
{
style
:
ButtonStyle
{
id
:
buttonStyle
id
:
buttonStyle
...
...
src/VehicleSetup/SetupView.qml
View file @
ec4b5b31
...
@@ -149,7 +149,7 @@ Rectangle {
...
@@ -149,7 +149,7 @@ Rectangle {
SubMenuButton
{
SubMenuButton
{
id
:
summaryButton
id
:
summaryButton
width
:
buttonWidth
width
:
buttonWidth
imageResource
:
"
VehicleSummaryIcon.png
"
imageResource
:
"
/qmlimages/
VehicleSummaryIcon.png
"
setupIndicator
:
false
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
exclusiveGroup
:
setupButtonGroup
text
:
"
SUMMARY
"
text
:
"
SUMMARY
"
...
@@ -160,7 +160,7 @@ Rectangle {
...
@@ -160,7 +160,7 @@ Rectangle {
SubMenuButton
{
SubMenuButton
{
id
:
firmwareButton
id
:
firmwareButton
width
:
buttonWidth
width
:
buttonWidth
imageResource
:
"
FirmwareUpgradeIcon.png
"
imageResource
:
"
/qmlimages/
FirmwareUpgradeIcon.png
"
setupIndicator
:
false
setupIndicator
:
false
exclusiveGroup
:
setupButtonGroup
exclusiveGroup
:
setupButtonGroup
visible
:
controller
.
showFirmware
visible
:
controller
.
showFirmware
...
...
src/ui/mapdisplay/MapDisplay.qml
View file @
ec4b5b31
...
@@ -82,7 +82,7 @@ Rectangle {
...
@@ -82,7 +82,7 @@ Rectangle {
Image
{
Image
{
id
:
buttomImg
id
:
buttomImg
anchors.fill
:
parent
anchors.fill
:
parent
source
:
showWaypointEditor
?
"
/qml
/buttonRight.svg
"
:
"
/qml
/buttonLeft.svg
"
source
:
showWaypointEditor
?
"
/qml
images/buttonRight.svg
"
:
"
/qmlimages
/buttonLeft.svg
"
mipmap
:
true
mipmap
:
true
smooth
:
true
smooth
:
true
antialiasing
:
true
antialiasing
:
true
...
@@ -144,25 +144,25 @@ Rectangle {
...
@@ -144,25 +144,25 @@ Rectangle {
QGCMapToolButton
{
QGCMapToolButton
{
width
:
50
width
:
50
height
:
50
height
:
50
imageSource
:
"
/qml/buttonHome.svg
"
imageSource
:
"
/qml
images
/buttonHome.svg
"
exclusiveGroup
:
mainActionGroup
exclusiveGroup
:
mainActionGroup
}
}
QGCMapToolButton
{
QGCMapToolButton
{
width
:
50
width
:
50
height
:
50
height
:
50
imageSource
:
"
/qml/buttonHome.svg
"
imageSource
:
"
/qml
images
/buttonHome.svg
"
exclusiveGroup
:
mainActionGroup
exclusiveGroup
:
mainActionGroup
}
}
QGCMapToolButton
{
QGCMapToolButton
{
width
:
50
width
:
50
height
:
50
height
:
50
imageSource
:
"
/qml/buttonHome.svg
"
imageSource
:
"
/qml
images
/buttonHome.svg
"
exclusiveGroup
:
mainActionGroup
exclusiveGroup
:
mainActionGroup
}
}
QGCMapToolButton
{
QGCMapToolButton
{
width
:
50
width
:
50
height
:
50
height
:
50
imageSource
:
"
/qml/buttonHome.svg
"
imageSource
:
"
/qml
images
/buttonHome.svg
"
exclusiveGroup
:
mainActionGroup
exclusiveGroup
:
mainActionGroup
}
}
}
}
...
...
src/ui/qmlcommon/QGCAttitudeInstrument.qml
View file @
ec4b5b31
...
@@ -51,7 +51,7 @@ QGCMovableItem {
...
@@ -51,7 +51,7 @@ QGCMovableItem {
//-- Pointer
//-- Pointer
Image
{
Image
{
id
:
pointer
id
:
pointer
source
:
"
/qml/attitudePointer.svg
"
source
:
"
/qml
images
/attitudePointer.svg
"
mipmap
:
true
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -60,7 +60,7 @@ QGCMovableItem {
...
@@ -60,7 +60,7 @@ QGCMovableItem {
//-- Instrument Dial
//-- Instrument Dial
Image
{
Image
{
id
:
instrumentDial
id
:
instrumentDial
source
:
"
/qml/attitudeDial.svg
"
source
:
"
/qml
images
/attitudeDial.svg
"
mipmap
:
true
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -86,7 +86,7 @@ QGCMovableItem {
...
@@ -86,7 +86,7 @@ QGCMovableItem {
Image
{
Image
{
id
:
crossHair
id
:
crossHair
anchors.centerIn
:
parent
anchors.centerIn
:
parent
source
:
"
/qml/crossHair.svg
"
source
:
"
/qml
images
/crossHair.svg
"
mipmap
:
true
mipmap
:
true
width
:
size
*
0.75
width
:
size
*
0.75
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
@@ -95,7 +95,7 @@ QGCMovableItem {
...
@@ -95,7 +95,7 @@ QGCMovableItem {
//-- Instrument Pannel
//-- Instrument Pannel
Image
{
Image
{
id
:
pannel
id
:
pannel
source
:
"
/qml/attitudeInstrument.svg
"
source
:
"
/qml
images
/attitudeInstrument.svg
"
mipmap
:
true
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
anchors.fill
:
parent
...
...
src/ui/qmlcommon/QGCAttitudeWidget.qml
View file @
ec4b5b31
...
@@ -39,7 +39,7 @@ Item {
...
@@ -39,7 +39,7 @@ Item {
Image
{
Image
{
id
:
rollDial
id
:
rollDial
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qml/rollDialWhite.svg
"
source
:
"
/qml
images
/rollDialWhite.svg
"
mipmap
:
true
mipmap
:
true
width
:
parent
.
width
width
:
parent
.
width
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
@@ -53,7 +53,7 @@ Item {
...
@@ -53,7 +53,7 @@ Item {
Image
{
Image
{
id
:
pointer
id
:
pointer
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qml/rollPointerWhite.svg
"
source
:
"
/qml
images
/rollPointerWhite.svg
"
mipmap
:
true
mipmap
:
true
width
:
rollDial
.
width
width
:
rollDial
.
width
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
@@ -62,7 +62,7 @@ Item {
...
@@ -62,7 +62,7 @@ Item {
Image
{
Image
{
id
:
crossHair
id
:
crossHair
anchors.centerIn
:
parent
anchors.centerIn
:
parent
source
:
"
/qml/crossHair.svg
"
source
:
"
/qml
images
/crossHair.svg
"
mipmap
:
true
mipmap
:
true
width
:
parent
.
width
width
:
parent
.
width
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
...
src/ui/qmlcommon/QGCCompass.qml
View file @
ec4b5b31
...
@@ -37,7 +37,7 @@ Item {
...
@@ -37,7 +37,7 @@ Item {
Image
{
Image
{
id
:
compass
id
:
compass
anchors.centerIn
:
parent
anchors.centerIn
:
parent
source
:
"
/qml/compass.svg
"
source
:
"
/qml
images
/compass.svg
"
mipmap
:
true
mipmap
:
true
width
:
root
.
width
width
:
root
.
width
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
@@ -51,7 +51,7 @@ Item {
...
@@ -51,7 +51,7 @@ Item {
id
:
pointer
id
:
pointer
anchors.bottom
:
compass
.
top
anchors.bottom
:
compass
.
top
anchors.horizontalCenter
:
root
.
horizontalCenter
anchors.horizontalCenter
:
root
.
horizontalCenter
source
:
"
/qml/compassNeedle.svg
"
source
:
"
/qml
images
/compassNeedle.svg
"
smooth
:
true
smooth
:
true
width
:
compass
.
width
*
0.1
width
:
compass
.
width
*
0.1
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
...
src/ui/qmlcommon/QGCCompassInstrument.qml
View file @
ec4b5b31
...
@@ -45,7 +45,7 @@ QGCMovableItem {
...
@@ -45,7 +45,7 @@ QGCMovableItem {
}
}
Image
{
Image
{
id
:
pointer
id
:
pointer
source
:
"
/qml/compassInstrumentAirplane.svg
"
source
:
"
/qml
images
/compassInstrumentAirplane.svg
"
mipmap
:
true
mipmap
:
true
width
:
size
*
0.75
width
:
size
*
0.75
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
...
@@ -58,7 +58,7 @@ QGCMovableItem {
...
@@ -58,7 +58,7 @@ QGCMovableItem {
}
}
Image
{
Image
{
id
:
compassDial
id
:
compassDial
source
:
"
/qml/compassInstrumentDial.svg
"
source
:
"
/qml
images
/compassInstrumentDial.svg
"
mipmap
:
true
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
anchors.fill
:
parent
...
...
src/ui/qmlcommon/QGCMapBackground.qml
View file @
ec4b5b31
...
@@ -336,19 +336,19 @@ Item {
...
@@ -336,19 +336,19 @@ Item {
}
}
Image
{
Image
{
id
:
scaleImageLeft
id
:
scaleImageLeft
source
:
"
/qml/scale_end.png
"
source
:
"
/qml
images
/scale_end.png
"
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
}
}
Image
{
Image
{
id
:
scaleImage
id
:
scaleImage
source
:
"
/qml/scale.png
"
source
:
"
/qml
images
/scale.png
"
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.left
:
scaleImageLeft
.
right
anchors.left
:
scaleImageLeft
.
right
}
}
Image
{
Image
{
id
:
scaleImageRight
id
:
scaleImageRight
source
:
"
/qml/scale_end.png
"
source
:
"
/qml
images
/scale_end.png
"
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.left
:
scaleImage
.
right
anchors.left
:
scaleImage
.
right
}
}
...
...
src/ui/toolbar/MainToolBar.qml
View file @
ec4b5b31
...
@@ -282,7 +282,7 @@ Rectangle {
...
@@ -282,7 +282,7 @@ Rectangle {
Image
{
Image
{
id
:
buttomImg
id
:
buttomImg
anchors.fill
:
parent
anchors.fill
:
parent
source
:
"
/qml/buttonMore.svg
"
source
:
"
/qml
images
/buttonMore.svg
"
mipmap
:
true
mipmap
:
true
smooth
:
true
smooth
:
true
antialiasing
:
true
antialiasing
:
true
...
@@ -349,7 +349,7 @@ Rectangle {
...
@@ -349,7 +349,7 @@ Rectangle {
Image
{
Image
{
id
:
dropDown
id
:
dropDown
source
:
"
QGroundControl/Control
s/arrow-down.png
"
source
:
"
/qmlimage
s/arrow-down.png
"
visible
:
(
messages
.
showTriangle
)
&&
(
MavManager
.
messageCount
>
0
)
visible
:
(
messages
.
showTriangle
)
&&
(
MavManager
.
messageCount
>
0
)
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment