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
e2c65e4e
Commit
e2c65e4e
authored
8 years ago
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Done
parent
32471f91
master
dev1
merge_branch_alt
original
phil
rc1
No related merge requests found
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
233 additions
and
323 deletions
+233
-323
APMSafetyComponentCopter.qml
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
+1
-0
ESP8266Component.qml
src/AutoPilotPlugins/Common/ESP8266Component.qml
+1
-0
CameraComponent.qml
src/AutoPilotPlugins/PX4/CameraComponent.qml
+1
-0
PowerComponent.qml
src/AutoPilotPlugins/PX4/PowerComponent.qml
+1
-0
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+7
-1
FlightDisplayViewVideo.qml
src/FlightDisplay/FlightDisplayViewVideo.qml
+1
-1
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+1
-1
VehicleMapItem.qml
src/FlightMap/MapItems/VehicleMapItem.qml
+9
-9
QGCAttitudeHUD.qml
src/FlightMap/Widgets/QGCAttitudeHUD.qml
+16
-13
QGCAttitudeWidget.qml
src/FlightMap/Widgets/QGCAttitudeWidget.qml
+19
-16
QGCCompassWidget.qml
src/FlightMap/Widgets/QGCCompassWidget.qml
+2
-0
QGCInstrumentWidget.qml
src/FlightMap/Widgets/QGCInstrumentWidget.qml
+1
-1
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+0
-1
DropButton.qml
src/QmlControls/DropButton.qml
+1
-2
MissionItemEditor.qml
src/QmlControls/MissionItemEditor.qml
+1
-0
OfflineMapButton.qml
src/QmlControls/OfflineMapButton.qml
+1
-0
QGCPipable.qml
src/QmlControls/QGCPipable.qml
+2
-0
QGCToolBarButton.qml
src/QmlControls/QGCToolBarButton.qml
+2
-1
RoundButton.qml
src/QmlControls/RoundButton.qml
+8
-7
ScreenTools.qml
src/QmlControls/ScreenTools.qml
+12
-11
SliderSwitch.qml
src/QmlControls/SliderSwitch.qml
+1
-0
SubMenuButton.qml
src/QmlControls/SubMenuButton.qml
+1
-1
OfflineMap.qml
src/QtLocationPlugin/QMLControl/OfflineMap.qml
+0
-1
VehicleSummary.qml
src/VehicleSetup/VehicleSummary.qml
+1
-1
MainWindowInner.qml
src/ui/MainWindowInner.qml
+5
-2
MainWindowLeftPanel.qml
src/ui/MainWindowLeftPanel.qml
+11
-9
DebugWindow.qml
src/ui/preferences/DebugWindow.qml
+91
-5
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+1
-88
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+30
-148
SignalStrength.qml
src/ui/toolbar/SignalStrength.qml
+5
-4
No files found.
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
View file @
e2c65e4e
...
...
@@ -361,6 +361,7 @@ QGCView {
anchors.top
:
parent
.
top
height
:
ScreenTools
.
defaultFontPixelWidth
*
20
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
visible
:
false
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/Common/ESP8266Component.qml
View file @
e2c65e4e
...
...
@@ -146,6 +146,7 @@ QGCView {
color
:
palette
.
text
width
:
ScreenTools
.
defaultFontPixelWidth
*
12
height
:
width
*
1.45
sourceSize.height
:
width
*
1.45
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
wifiMode
?
(
wifiMode
.
value
===
0
?
"
/qmlimages/APMode.svg
"
:
"
/qmlimages/StationMode.svg
"
)
:
"
/qmlimages/APMode.svg
"
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/CameraComponent.qml
View file @
e2c65e4e
...
...
@@ -147,6 +147,7 @@ QGCView {
color
:
palette
.
text
height
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
"
/qmlimages/CameraTrigger.svg
"
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @
e2c65e4e
...
...
@@ -201,6 +201,7 @@ QGCView {
x
:
voltageCol
.
firstColumnWidth
+
textEditWidth
+
(
ScreenTools
.
defaultFontPixelWidth
*
3
)
width
:
height
*
0.75
height
:
voltageCol
.
height
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
smooth
:
true
color
:
palette
.
text
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
e2c65e4e
...
...
@@ -89,6 +89,7 @@ QGCView {
Image
{
height
:
ScreenTools
.
defaultFontPixelWidth
*
6
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
"
/qmlimages/LowBatteryLight.svg
"
:
"
/qmlimages/LowBattery.svg
"
...
...
@@ -160,6 +161,7 @@ QGCView {
Image
{
height
:
ScreenTools
.
defaultFontPixelWidth
*
6
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
"
/qmlimages/RCLossLight.svg
"
:
"
/qmlimages/RCLoss.svg
"
...
...
@@ -217,6 +219,7 @@ QGCView {
Image
{
height
:
ScreenTools
.
defaultFontPixelWidth
*
6
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
"
/qmlimages/DatalinkLossLight.svg
"
:
"
/qmlimages/DatalinkLoss.svg
"
...
...
@@ -274,6 +277,7 @@ QGCView {
Image
{
height
:
ScreenTools
.
defaultFontPixelWidth
*
8
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
?
"
/qmlimages/GeoFenceLight.svg
"
:
"
/qmlimages/GeoFence.svg
"
...
...
@@ -357,6 +361,7 @@ QGCView {
color
:
palette
.
text
height
:
ScreenTools
.
defaultFontPixelWidth
*
10
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
controller
.
fixedWing
?
"
/qmlimages/ReturnToHomeAltitude.svg
"
:
"
/qmlimages/ReturnToHomeAltitudeCopter.svg
"
...
...
@@ -469,8 +474,9 @@ QGCView {
}
QGCColoredImage
{
color
:
palette
.
text
height
:
ScreenTools
.
defaultFontPixelWidth
*
1
0
height
:
ScreenTools
.
defaultFontPixelWidth
*
1
3
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
sourceSize.width
:
width
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
source
:
controller
.
fixedWing
?
"
/qmlimages/LandMode.svg
"
:
"
/qmlimages/LandModeCopter.svg
"
...
...
This diff is collapsed.
Click to expand it.
src/FlightDisplay/FlightDisplayViewVideo.qml
View file @
e2c65e4e
...
...
@@ -45,7 +45,7 @@ Item {
text
:
qsTr
(
"
NO VIDEO
"
)
font.family
:
ScreenTools
.
demiboldFontFamily
color
:
"
white
"
font.pointSize
:
_mainIsMap
?
12
*
ScreenTools
.
fontHRatio
:
20
*
ScreenTools
.
fontHRatio
font.pointSize
:
_mainIsMap
?
ScreenTools
.
smallFontPointSize
:
ScreenTools
.
largeFontPointSize
anchors.centerIn
:
parent
}
}
...
...
This diff is collapsed.
Click to expand it.
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
e2c65e4e
...
...
@@ -123,7 +123,7 @@ Item {
anchors.top
:
parent
.
top
anchors.right
:
altitudeSlider
.
visible
?
altitudeSlider
.
left
:
parent
.
right
visible
:
QGroundControl
.
virtualTabletJoystick
width
:
getGadgetWidth
()
width
:
ScreenTools
.
isTinyScreen
?
getGadgetWidth
()
*
2
:
getGadgetWidth
()
active
:
_activeVehicle
!=
null
heading
:
_heading
rollAngle
:
_roll
...
...
This diff is collapsed.
Click to expand it.
src/FlightMap/MapItems/VehicleMapItem.qml
View file @
e2c65e4e
...
...
@@ -42,16 +42,16 @@ MapQuickItem {
visible
:
vehicle
&&
vehicle
.
coordinateValid
sourceItem
:
Image
{
id
:
vehicleIcon
source
:
isSatellite
?
"
/qmlimages/airplaneOpaque.svg
"
:
"
/qmlimages/airplaneOutline.svg
"
mipmap
:
true
width
:
size
fillMode
:
Image
.
PreserveAspectFit
id
:
vehicleIcon
source
:
isSatellite
?
"
/qmlimages/airplaneOpaque.svg
"
:
"
/qmlimages/airplaneOutline.svg
"
mipmap
:
true
width
:
size
sourceSize.width
:
size
fillMode
:
Image
.
PreserveAspectFit
transform
:
Rotation
{
origin.x
:
vehicleIcon
.
width
/
2
origin.y
:
vehicleIcon
.
height
/
2
angle
:
vehicle
?
vehicle
.
heading
.
value
:
0
origin.x
:
vehicleIcon
.
width
/
2
origin.y
:
vehicleIcon
.
height
/
2
angle
:
vehicle
?
vehicle
.
heading
.
value
:
0
}
}
}
This diff is collapsed.
Click to expand it.
src/FlightMap/Widgets/QGCAttitudeHUD.qml
View file @
e2c65e4e
...
...
@@ -48,25 +48,27 @@ Item {
Image
{
id
:
rollDial
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qmlimages/rollDialWhite.svg
"
mipmap
:
true
width
:
parent
.
width
fillMode
:
Image
.
PreserveAspectFit
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qmlimages/rollDialWhite.svg
"
mipmap
:
true
width
:
parent
.
width
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
transform
:
Rotation
{
origin.x
:
rollDial
.
width
/
2
origin.y
:
rollDial
.
height
angle
:
-
_rollAngle
origin.x
:
rollDial
.
width
/
2
origin.y
:
rollDial
.
height
angle
:
-
_rollAngle
}
}
Image
{
id
:
pointer
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qmlimages/rollPointerWhite.svg
"
mipmap
:
true
width
:
rollDial
.
width
fillMode
:
Image
.
PreserveAspectFit
anchors
{
bottom
:
root
.
verticalCenter
;
horizontalCenter
:
parent
.
horizontalCenter
}
source
:
"
/qmlimages/rollPointerWhite.svg
"
mipmap
:
true
width
:
rollDial
.
width
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
}
Image
{
...
...
@@ -75,6 +77,7 @@ Item {
source
:
"
/qmlimages/crossHair.svg
"
mipmap
:
true
width
:
parent
.
width
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
}
...
...
This diff is collapsed.
Click to expand it.
src/FlightMap/Widgets/QGCAttitudeWidget.qml
View file @
e2c65e4e
...
...
@@ -58,31 +58,33 @@ Item {
//----------------------------------------------------
//-- Artificial Horizon
QGCArtificialHorizon
{
rollAngle
:
_rollAngle
pitchAngle
:
_pitchAngle
anchors.fill
:
parent
rollAngle
:
_rollAngle
pitchAngle
:
_pitchAngle
anchors.fill
:
parent
}
//----------------------------------------------------
//-- Pointer
Image
{
id
:
pointer
source
:
"
/qmlimages/attitudePointer.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
id
:
pointer
source
:
"
/qmlimages/attitudePointer.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
sourceSize.height
:
parent
.
height
}
//----------------------------------------------------
//-- Instrument Dial
Image
{
id
:
instrumentDial
source
:
"
/qmlimages/attitudeDial.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
id
:
instrumentDial
source
:
"
/qmlimages/attitudeDial.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
sourceSize.height
:
parent
.
height
transform
:
Rotation
{
origin.x
:
root
.
width
/
2
origin.y
:
root
.
height
/
2
angle
:
-
_rollAngle
origin.x
:
root
.
width
/
2
origin.y
:
root
.
height
/
2
angle
:
-
_rollAngle
}
}
//----------------------------------------------------
...
...
@@ -104,6 +106,7 @@ Item {
source
:
"
/qmlimages/crossHair.svg
"
mipmap
:
true
width
:
size
*
0.75
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
}
}
...
...
This diff is collapsed.
Click to expand it.
src/FlightMap/Widgets/QGCCompassWidget.qml
View file @
e2c65e4e
...
...
@@ -64,6 +64,7 @@ Item {
source
:
"
/qmlimages/compassInstrumentAirplane.svg
"
mipmap
:
true
width
:
size
*
0.75
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
anchors.centerIn
:
parent
transform
:
Rotation
{
...
...
@@ -79,6 +80,7 @@ Item {
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
sourceSize.height
:
parent
.
height
}
Rectangle
{
...
...
This diff is collapsed.
Click to expand it.
src/FlightMap/Widgets/QGCInstrumentWidget.qml
View file @
e2c65e4e
...
...
@@ -108,8 +108,8 @@ Item {
mipmap
:
true
opacity
:
0.5
width
:
attitudeWidget
.
width
*
0.15
sourceSize.width
:
width
fillMode
:
Image
.
PreserveAspectFit
MouseArea
{
anchors.fill
:
parent
hoverEnabled
:
true
...
...
This diff is collapsed.
Click to expand it.
src/MissionEditor/MissionEditor.qml
View file @
e2c65e4e
...
...
@@ -698,7 +698,6 @@ QGCView {
buttonImage
:
"
/qmlimages/ZoomMinus.svg
"
z
:
QGroundControl
.
zOrderWidgets
lightBorders
:
_lightWidgetBorders
onClicked
:
{
if
(
editorMap
)
editorMap
.
zoomLevel
-=
0.5
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/DropButton.qml
View file @
e2c65e4e
...
...
@@ -11,7 +11,7 @@ Item {
signal
clicked
()
property
alias
buttonImage
:
roundButton
.
buttonImage
property
alias
rotateImage
:
roundButton
.
rotateImage
property
real
radius
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
property
real
radius
:
ScreenTools
.
defaultFontPixelHeight
*
1.
2
5
property
int
dropDirection
:
dropDown
property
alias
dropDownComponent
:
dropDownLoader
.
sourceComponent
property
real
viewportMargins
:
0
...
...
@@ -160,7 +160,6 @@ Item {
RoundButton
{
id
:
roundButton
radius
:
parent
.
width
/
2
onClicked
:
{
_root
.
clicked
()
}
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/MissionItemEditor.qml
View file @
e2c65e4e
...
...
@@ -62,6 +62,7 @@ Rectangle {
anchors.verticalCenter
:
commandPicker
.
verticalCenter
width
:
commandPicker
.
height
height
:
commandPicker
.
height
sourceSize.height
:
height
source
:
"
qrc:/qmlimages/Hamburger.svg
"
visible
:
missionItem
.
isCurrentItem
&&
missionItem
.
sequenceNumber
!=
0
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/OfflineMapButton.qml
View file @
e2c65e4e
...
...
@@ -60,6 +60,7 @@ Rectangle
QGCColoredImage
{
width
:
sizeLabel
.
height
*
0.8
height
:
sizeLabel
.
height
*
0.8
sourceSize.height
:
height
source
:
"
/res/buttonRight.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/QGCPipable.qml
View file @
e2c65e4e
...
...
@@ -57,6 +57,7 @@ Item {
visible
:
!
isHidden
height
:
ScreenTools
.
defaultFontPixelHeight
*
2.5
width
:
ScreenTools
.
defaultFontPixelHeight
*
2.5
sourceSize.height
:
height
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -78,6 +79,7 @@ Item {
Image
{
width
:
parent
.
width
*
0.75
height
:
parent
.
height
*
0.75
sourceSize.height
:
height
source
:
"
/res/buttonRight.svg
"
mipmap
:
true
fillMode
:
Image
.
PreserveAspectFit
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/QGCToolBarButton.qml
View file @
e2c65e4e
...
...
@@ -55,6 +55,7 @@ Item {
anchors.bottomMargin
:
_topBottomMargins
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
sourceSize.height
:
parent
.
height
fillMode
:
Image
.
PreserveAspectFit
color
:
checked
?
qgcPal
.
buttonHighlight
:
qgcPal
.
buttonText
}
...
...
@@ -63,7 +64,7 @@ Item {
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
height
:
_topBottomMargins
/
3
height
:
_topBottomMargins
*
0.25
color
:
qgcPal
.
buttonHighlight
visible
:
checked
}
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/RoundButton.qml
View file @
e2c65e4e
...
...
@@ -10,7 +10,7 @@ Item {
signal
clicked
()
property
alias
buttonImage
:
button
.
source
property
real
radius
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
property
real
radius
:
ScreenTools
.
defaultFontPixelHeight
*
1.
2
5
property
bool
rotateImage
:
false
property
bool
lightBorders
:
true
...
...
@@ -45,12 +45,13 @@ Item {
color
:
checked
?
qgcPal
.
buttonHighlight
:
qgcPal
.
button
QGCColoredImage
{
id
:
button
anchors.fill
:
parent
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
smooth
:
true
color
:
checked
?
qgcPal
.
buttonHighlightText
:
qgcPal
.
buttonText
id
:
button
anchors.fill
:
parent
sourceSize.height
:
parent
.
height
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
smooth
:
true
color
:
checked
?
qgcPal
.
buttonHighlightText
:
qgcPal
.
buttonText
RotationAnimation
on
rotation
{
id
:
imageRotation
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/ScreenTools.qml
View file @
e2c65e4e
...
...
@@ -13,20 +13,18 @@ Item {
property
real
availableHeight
:
0
property
real
defaultFontPointSize
:
1
property
real
defaultFontPixelHeight
:
1
property
real
defaultFontPixelWidth
:
1
property
real
smallFontPointSize
:
1
property
real
mediumFontPointSize
:
1
property
real
largeFontPointSize
:
1
//-- These are computed at runtime
property
real
defaultFontPointSize
:
10
property
real
defaultFontPixelHeight
:
10
property
real
defaultFontPixelWidth
:
10
property
real
smallFontPointSize
:
10
property
real
mediumFontPointSize
:
10
property
real
largeFontPointSize
:
10
readonly
property
real
smallFontPointRatio
:
0.75
readonly
property
real
mediumFontPointRatio
:
1.25
readonly
property
real
largeFontPointRatio
:
1.5
// Font scaling based on system font
readonly
property
real
fontHRatio
:
_textMeasure
.
fontHeight
/
_defaultFont
.
fontHeight
property
bool
isAndroid
:
ScreenToolsController
.
isAndroid
property
bool
isiOS
:
ScreenToolsController
.
isiOS
property
bool
isMobile
:
ScreenToolsController
.
isMobile
...
...
@@ -68,9 +66,12 @@ Item {
return
14
;
}
}
else
{
//--
Linux and Mac OS we use a slightly smaller font
if
(
ScreenToolsController
.
isMacOS
||
ScreenToolsController
.
isLinux
)
//--
Mac OS
if
(
ScreenToolsController
.
isMacOS
)
return
_defaultFont
.
font
.
pointSize
-
1
//-- Linux
if
(
ScreenToolsController
.
isLinux
)
return
_defaultFont
.
font
.
pointSize
-
3.25
else
return
_defaultFont
.
font
.
pointSize
}
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/SliderSwitch.qml
View file @
e2c65e4e
...
...
@@ -43,6 +43,7 @@ Rectangle {
anchors.centerIn
:
parent
width
:
parent
.
width
*
0.8
height
:
parent
.
height
*
0.8
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
smooth
:
false
mipmap
:
false
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/SubMenuButton.qml
View file @
e2c65e4e
...
...
@@ -14,7 +14,7 @@ Button {
text
:
"
Button
"
///< Pass in your own button text
checkable
:
true
implicitHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2.5
implicitHeight
:
ScreenTools
.
isTinyScreen
?
ScreenTools
.
defaultFontPixelHeight
*
3.5
:
ScreenTools
.
defaultFontPixelHeight
*
2.5
style
:
ButtonStyle
{
id
:
buttonStyle
...
...
This diff is collapsed.
Click to expand it.
src/QtLocationPlugin/QMLControl/OfflineMap.qml
View file @
e2c65e4e
...
...
@@ -267,7 +267,6 @@ Rectangle {
center
:
QGroundControl
.
defaultMapPosition
visible
:
false
gesture.flickDeceleration
:
3000
gesture.activeGestures
:
MapGestureArea
.
ZoomGesture
|
MapGestureArea
.
PanGesture
|
MapGestureArea
.
FlickGesture
plugin
:
Plugin
{
name
:
"
QGroundControl
"
}
Rectangle
{
...
...
This diff is collapsed.
Click to expand it.
src/VehicleSetup/VehicleSummary.qml
View file @
e2c65e4e
...
...
@@ -39,7 +39,7 @@ Rectangle {
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
color
:
qgcPal
.
window
property
real
_minSummaryW
:
ScreenTools
.
defaultFontPixelWidth
*
36
property
real
_minSummaryW
:
ScreenTools
.
isTinyScreen
?
ScreenTools
.
defaultFontPixelWidth
*
28
:
ScreenTools
.
defaultFontPixelWidth
*
36
property
real
_summaryBoxWidth
:
_minSummaryW
property
real
_summaryBoxSpace
:
ScreenTools
.
defaultFontPixelWidth
*
2
...
...
This diff is collapsed.
Click to expand it.
src/ui/MainWindowInner.qml
View file @
e2c65e4e
...
...
@@ -45,7 +45,7 @@ Item {
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
true
}
property
real
tbHeight
:
ScreenTools
.
isMobile
?
(
ScreenTools
.
isTinyScreen
?
(
mainWindow
.
width
*
0.0666
)
:
(
mainWindow
.
width
*
0.05
))
:
ScreenTools
.
defaultFontPixelHeight
*
4
property
real
tbHeight
:
ScreenTools
.
isMobile
?
(
ScreenTools
.
isTinyScreen
?
(
mainWindow
.
width
*
0.0666
)
:
(
mainWindow
.
width
*
0.05
))
:
ScreenTools
.
defaultFontPixelHeight
*
3
property
int
tbCellHeight
:
tbHeight
*
0.75
property
real
tbSpacing
:
ScreenTools
.
isMobile
?
width
*
0.00824
:
9.54
property
real
tbButtonWidth
:
tbCellHeight
*
1.35
...
...
@@ -383,6 +383,7 @@ Item {
anchors.right
:
parent
.
right
width
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
height
:
width
sourceSize.height
:
height
source
:
"
/res/XDelete.svg
"
fillMode
:
Image
.
PreserveAspectFit
mipmap
:
true
...
...
@@ -418,7 +419,7 @@ Item {
}
width
:
mainWindow
.
width
*
0.55
height
:
ScreenTools
.
defaultFontPixelHeight
*
ScreenTools
.
fontHRatio
*
6
height
:
ScreenTools
.
defaultFontPixelHeight
*
6
color
:
qgcPal
.
window
visible
:
false
radius
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
...
...
@@ -467,6 +468,7 @@ Item {
anchors.right
:
parent
.
right
width
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
height
:
width
sourceSize.height
:
height
source
:
"
/res/XDelete.svg
"
fillMode
:
Image
.
PreserveAspectFit
color
:
qgcPal
.
warningText
...
...
@@ -485,6 +487,7 @@ Item {
anchors.right
:
parent
.
right
width
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
height
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
sourceSize.height
:
height
source
:
"
/res/ArrowDown.svg
"
fillMode
:
Image
.
PreserveAspectFit
visible
:
criticalMessageText
.
lineCount
>
5
...
...
This diff is collapsed.
Click to expand it.
src/ui/MainWindowLeftPanel.qml
View file @
e2c65e4e
...
...
@@ -41,8 +41,9 @@ Item {
property
alias
animateHideDialog
:
__animateHideDialog
readonly
property
int
__animationDuration
:
100
readonly
property
real
__closeButtonSize
:
ScreenTools
.
defaultFontPixelHeight
*
2
readonly
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
/
2
readonly
property
real
__closeButtonSize
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
readonly
property
real
_margins
:
ScreenTools
.
defaultFontPixelHeight
*
0.5
readonly
property
real
_buttonHeight
:
ScreenTools
.
isTinyScreen
?
ScreenTools
.
defaultFontPixelHeight
*
3
:
ScreenTools
.
defaultFontPixelHeight
*
2
QGCPalette
{
id
:
qgcPal
}
...
...
@@ -163,7 +164,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
General
"
)
...
...
@@ -177,7 +178,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Comm Links
"
)
...
...
@@ -191,7 +192,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Offline Maps
"
)
...
...
@@ -205,7 +206,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
MavLink
"
)
...
...
@@ -219,7 +220,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Console
"
)
...
...
@@ -233,7 +234,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Mock Link
"
)
...
...
@@ -248,7 +249,7 @@ Item {
}
QGCButton
{
height
:
ScreenTools
.
defaultFontPixelHeight
*
2
height
:
_buttonHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
text
:
qsTr
(
"
Debug
"
)
...
...
@@ -316,6 +317,7 @@ Item {
color
:
qgcPal
.
text
width
:
parent
.
width
*
0.75
height
:
parent
.
height
*
0.75
sourceSize.height
:
height
anchors.centerIn
:
parent
}
MouseArea
{
...
...
This diff is collapsed.
Click to expand it.
src/ui/preferences/DebugWindow.qml
View file @
e2c65e4e
...
...
@@ -54,7 +54,7 @@ QGCView {
anchors.margins
:
20
anchors.top
:
parent
.
top
anchors.left
:
parent
.
left
columns
:
2
columns
:
3
Text
{
text
:
qsTr
(
"
Qt Platform:
"
)
color
:
qgcPal
.
text
...
...
@@ -65,6 +65,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 10
"
)
color
:
qgcPal
.
text
font.pointSize
:
10
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Default font width:
"
)
color
:
qgcPal
.
text
...
...
@@ -75,6 +81,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 10.5
"
)
color
:
qgcPal
.
text
font.pointSize
:
10.5
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Default font height:
"
)
color
:
qgcPal
.
text
...
...
@@ -85,6 +97,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 11
"
)
color
:
qgcPal
.
text
font.pointSize
:
11
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Default font pixel size:
"
)
color
:
qgcPal
.
text
...
...
@@ -95,6 +113,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 11.5
"
)
color
:
qgcPal
.
text
font.pointSize
:
11.5
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Default font point size:
"
)
color
:
qgcPal
.
text
...
...
@@ -105,6 +129,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 12
"
)
color
:
qgcPal
.
text
font.pointSize
:
12
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
QML Screen Desktop:
"
)
color
:
qgcPal
.
text
...
...
@@ -115,6 +145,12 @@ QGCView {
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 12.5
"
)
color
:
qgcPal
.
text
font.pointSize
:
12.5
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
QML Screen Size:
"
)
color
:
qgcPal
.
text
...
...
@@ -126,23 +162,73 @@ QGCView {
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
QML Pixel Density:
"
)
text
:
qsTr
(
"
Font Point Size 13
"
)
color
:
qgcPal
.
text
font.pointSize
:
13
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
Screen
.
pixelDensity
text
:
qsTr
(
"
QML Pixel Density:
"
)
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
QML Pixel Ratio:
"
)
text
:
Screen
.
pixelDensity
.
toFixed
(
4
)
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
Screen
.
devicePixelRatio
text
:
qsTr
(
"
Font Point Size 13.5
"
)
color
:
qgcPal
.
text
font.pointSize
:
13.5
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
QML Pixel Ratio:
"
)
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
Screen
.
devicePixelRatio
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 14
"
)
color
:
qgcPal
.
text
font.pointSize
:
14
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Default Point:
"
)
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
ScreenTools
.
defaultFontPointSize
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 14.5
"
)
color
:
qgcPal
.
text
font.pointSize
:
14.5
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Computed Font Height:
"
)
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
ScreenTools
.
defaultFontPixelHeight
color
:
qgcPal
.
text
font.family
:
ScreenTools
.
normalFontFamily
}
Text
{
text
:
qsTr
(
"
Font Point Size 15
"
)
color
:
qgcPal
.
text
font.pointSize
:
15
font.family
:
ScreenTools
.
normalFontFamily
}
}
...
...
This diff is collapsed.
Click to expand it.
src/ui/toolbar/MainToolBar.qml
View file @
e2c65e4e
...
...
@@ -51,93 +51,6 @@ Rectangle {
property
bool
isBackgroundDark
:
true
property
bool
opaqueBackground
:
false
/*
Dev System (Mac OS)
qml: Main Window Width: 1008
qml: Toolbar height: 51.2
qml: Default font: 12.8
qml: Font (.75): 9.600000000000001
qml: Font (.85): 10.88
qml: Font 1.5): 19.200000000000003
qml: Default Font Width: 8.328125
qml: Default Font Height: 12.8
qml: --
qml: Real Font Height: 16
qml: fontHRatio: 1
qml: --
qml: cellHeight: 38
qml: tbFontSmall: 10
qml: tbFontNormal: 12
qml: tbFontLarge: 18
qml: tbSpacing: 9.54
Nexus 9
qml: Main Window Width: 2048
qml: Toolbar height: 90.9312
qml: Default font: 38
qml: Font (.75): 28.5
qml: Font (.85): 32.3
qml: Font 1.5): 57
qml: Default Font Width: 20.0625
qml: Default Font Height: 38
qml: --
qml: Real Font Height: 38
qml: fontHRatio: 2.375
qml: --
qml: cellHeight: 68
qml: tbFontSmall: 23.75
qml: tbFontNormal: 28.5
qml: tbFontLarge: 42.75
qml: tbSpacing: 16.87552
Nexus 7
qml: Main Window Width: 1920
qml: Toolbar height: 85.248
qml: Default font: 38
qml: Font (.75): 28.5
qml: Font (.85): 32.3
qml: Font 1.5): 57
qml: Default Font Width: 20.140625
qml: Default Font Height: 38
qml: --
qml: Real Font Height: 38
qml: fontHRatio: 2.375
qml: --
qml: cellHeight: 63
qml: tbFontSmall: 23.75
qml: tbFontNormal: 28.5
qml: tbFontLarge: 42.75
qml: tbSpacing: 15.820800000000002
Nexus 4
qml: Main Window Width: 1196
qml: Toolbar height: 79.65360000000001
qml: Default font: 38
qml: Font (.75): 28.5
qml: Font (.85): 32.3
qml: Font 1.5): 57
qml: Default Font Width: 20.140625
qml: Default Font Height: 38
qml: --
qml: Real Font Height: 38
qml: fontHRatio: 2.375
qml: --
qml: cellHeight: 59
qml: tbFontSmall: 23.75
qml: tbFontNormal: 28.5
qml: tbFontLarge: 42.75
qml: tbSpacing: 9.85504
*/
readonly
property
real
tbFontSmall
:
8
*
ScreenTools
.
fontHRatio
readonly
property
real
tbFontNormal
:
12
*
ScreenTools
.
fontHRatio
readonly
property
real
tbFontLarge
:
18
*
ScreenTools
.
fontHRatio
readonly
property
var
colorGreen
:
"
#05f068
"
readonly
property
var
colorOrange
:
"
#f0ab06
"
readonly
property
var
colorRed
:
"
#fc4638
"
...
...
@@ -503,7 +416,7 @@ Rectangle {
QGCLabel
{
id
:
connectionLost
text
:
qsTr
(
"
COMMUNICATION LOST
"
)
font.pointSize
:
tbFontLarg
e
font.pointSize
:
ScreenTools
.
largeFontPointSiz
e
font.family
:
ScreenTools
.
demiboldFontFamily
color
:
colorRed
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
...
...
This diff is collapsed.
Click to expand it.
src/ui/toolbar/MainToolBarIndicators.qml
View file @
e2c65e4e
...
...
@@ -37,6 +37,7 @@ Row {
QGCPalette
{
id
:
qgcPal
}
//-------------------------------------------------------------------------
function
getSatStrength
(
hdop
)
{
if
(
hdop
<=
1.0
)
return
100
...
...
@@ -49,6 +50,7 @@ Row {
return
0
}
//-------------------------------------------------------------------------
function
getMessageColor
()
{
if
(
activeVehicle
)
{
if
(
activeVehicle
.
messageTypeNone
)
...
...
@@ -67,6 +69,7 @@ Row {
return
"
white
"
;
}
//-------------------------------------------------------------------------
function
getBatteryVoltageText
()
{
if
(
activeVehicle
.
battery
.
voltage
.
value
>=
0
)
{
return
activeVehicle
.
battery
.
voltage
.
valueString
+
activeVehicle
.
battery
.
voltage
.
units
...
...
@@ -74,6 +77,7 @@ Row {
return
'
N/A
'
;
}
//-------------------------------------------------------------------------
function
getBatteryPercentageText
()
{
if
(
activeVehicle
)
{
if
(
activeVehicle
.
battery
.
percentRemaining
.
value
>
98.9
)
{
...
...
@@ -97,29 +101,26 @@ Row {
height
:
mainWindow
.
tbCellHeight
visible
:
activeVehicle
&&
activeVehicle
.
messageCount
anchors.verticalCenter
:
parent
.
verticalCenter
Item
{
id
:
criticalMessage
anchors.fill
:
parent
visible
:
activeVehicle
&&
activeVehicle
.
messageCount
>
0
&&
isMessageImportant
Image
{
source
:
"
/qmlimages/Yield.svg
"
height
:
mainWindow
.
tbCellHeight
*
0.75
fillMode
:
Image
.
PreserveAspectFit
cache
:
false
visible
:
isMessageImportant
source
:
"
/qmlimages/Yield.svg
"
height
:
mainWindow
.
tbCellHeight
*
0.75
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
cache
:
false
visible
:
isMessageImportant
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
SequentialAnimation
{
id
:
loopAnimation
loops
:
Animation
.
Infinite
NumberAnimation
{
target
:
criticalMessage
;
property
:
"
opacity
"
;
duration
:
1000
;
from
:
0.25
;
to
:
1
}
NumberAnimation
{
target
:
criticalMessage
;
property
:
"
opacity
"
;
duration
:
1000
;
from
:
1
;
to
:
0.25
}
}
onVisibleChanged
:
{
if
(
messages
.
visible
)
{
loopAnimation
.
start
()
...
...
@@ -128,23 +129,21 @@ Row {
}
}
}
Item
{
anchors.fill
:
parent
visible
:
!
criticalMessage
.
visible
QGCColoredImage
{
id
:
messageIcon
source
:
"
/qmlimages/Megaphone.svg
"
height
:
mainWindow
.
tbCellHeight
*
0.5
width
:
height
sourceSize.height
:
height
fillMode
:
Image
.
PreserveAspectFit
color
:
getMessageColor
()
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -160,38 +159,35 @@ Row {
width
:
gpsRow
.
width
*
1.1
height
:
mainWindow
.
tbCellHeight
Row
{
id
:
gpsRow
height
:
parent
.
height
id
:
gpsRow
height
:
parent
.
height
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCColoredImage
{
id
:
gpsIcon
source
:
"
/qmlimages/Gps.svg
"
fillMode
:
Image
.
PreserveAspectFit
width
:
mainWindow
.
tbCellHeight
*
0.65
height
:
mainWindow
.
tbCellHeight
*
0.5
sourceSize.height
:
height
opacity
:
(
activeVehicle
&&
activeVehicle
.
gps
.
count
.
value
>=
0
)
?
1
:
0.5
color
:
qgcPal
.
buttonText
anchors.verticalCenter
:
parent
.
verticalCenter
}
SignalStrength
{
size
:
mainWindow
.
tbCellHeight
*
0.5
percent
:
activeVehicle
?
getSatStrength
(
activeVehicle
.
gps
.
hdop
.
value
)
:
""
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
QGCLabel
{
anchors.top
:
parent
.
top
//anchors.leftMargin: gpsIcon.width
//anchors.left: parent.left
anchors.right
:
gpsRow
.
right
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.horizontalCenter
:
parent
.
horizontalCenter
visible
:
activeVehicle
&&
!
isNaN
(
activeVehicle
.
gps
.
hdop
.
value
)
font.pointSize
:
tbFontSmall
font.pointSize
:
ScreenTools
.
smallFontPointSize
color
:
qgcPal
.
buttonText
text
:
activeVehicle
?
activeVehicle
.
gps
.
hdop
.
value
.
toFixed
(
0
)
:
""
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -207,28 +203,26 @@ Row {
id
:
rcRssi
width
:
rssiRow
.
width
*
1.1
height
:
mainWindow
.
tbCellHeight
Row
{
id
:
rssiRow
height
:
parent
.
height
id
:
rssiRow
height
:
parent
.
height
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCColoredImage
{
width
:
mainWindow
.
tbCellHeight
*
0.65
height
:
mainWindow
.
tbCellHeight
*
0.5
height
:
width
sourceSize.height
:
height
source
:
"
/qmlimages/RC.svg
"
fillMode
:
Image
.
PreserveAspectFit
opacity
:
activeVehicle
?
(
activeVehicle
.
rcRSSI
<
1
?
0.5
:
1
)
:
0.5
color
:
qgcPal
.
buttonText
anchors.verticalCenter
:
parent
.
verticalCenter
}
SignalStrength
{
size
:
mainWindow
.
tbCellHeight
*
0.5
percent
:
activeVehicle
?
activeVehicle
.
rcRSSI
:
0
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -245,17 +239,16 @@ Row {
width
:
telemIcon
.
width
height
:
mainWindow
.
tbCellHeight
visible
:
_controller
.
telemetryLRSSI
<
0
QGCColoredImage
{
id
:
telemIcon
height
:
parent
.
height
*
0.5
sourceSize.height
:
height
width
:
height
*
1.5
source
:
"
/qmlimages/TelemRSSI.svg
"
fillMode
:
Image
.
PreserveAspectFit
color
:
qgcPal
.
buttonText
anchors.verticalCenter
:
parent
.
verticalCenter
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -272,28 +265,26 @@ Row {
width
:
battRow
.
width
*
1.1
height
:
mainWindow
.
tbCellHeight
opacity
:
(
activeVehicle
&&
activeVehicle
.
battery
.
voltage
.
value
>=
0
)
?
1
:
0.5
Row
{
id
:
battRow
height
:
mainWindow
.
tbCellHeight
anchors.horizontalCenter
:
parent
.
horizontalCenter
QGCColoredImage
{
height
:
mainWindow
.
tbCellHeight
*
0.65
width
:
height
sourceSize.width
:
width
source
:
"
/qmlimages/Battery.svg
"
fillMode
:
Image
.
PreserveAspectFit
color
:
qgcPal
.
buttonT
ext
color
:
qgcPal
.
t
ext
anchors.verticalCenter
:
parent
.
verticalCenter
}
QGCLabel
{
text
:
getBatteryPercentageText
()
font.pointSize
:
tbFontLarg
e
font.pointSize
:
ScreenTools
.
mediumFontPointSiz
e
color
:
getBatteryColor
()
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
@@ -375,7 +366,7 @@ Row {
QGCLabel
{
text
:
activeVehicle
?
activeVehicle
.
flightMode
:
qsTr
(
"
N/A
"
,
"
No data to display
"
)
font.pointSize
:
tbFontLarg
e
font.pointSize
:
ScreenTools
.
mediumFontPointSiz
e
color
:
qgcPal
.
buttonText
anchors.verticalCenter
:
parent
.
verticalCenter
}
...
...
@@ -430,115 +421,6 @@ Row {
}
}
}
/*
property var colorOrangeText: (qgcPal.globalTheme === QGCPalette.Light) ? "#b75711" : "#ea8225"
property var colorRedText: (qgcPal.globalTheme === QGCPalette.Light) ? "#ee1112" : "#ef2526"
property var colorGreenText: (qgcPal.globalTheme === QGCPalette.Light) ? "#046b1b" : "#00d930"
property var colorWhiteText: (qgcPal.globalTheme === QGCPalette.Light) ? "#343333" : "#f0f0f0"
function getRSSIColor(value) {
if(value < 10)
return colorRed;
if(value < 50)
return colorOrange;
return colorGreen;
}
Rectangle {
id: rssiRC
width: getProportionalDimmension(55)
height: mainWindow.tbCellHeight
visible: _controller.remoteRSSI <= 100
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(_controller.remoteRSSI);
border.color: "#00000000"
border.width: 0
Image {
source: "qrc:/res/AntennaRC";
width: mainWindow.tbCellHeight * 0.7
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: getProportionalDimmension(6)
mipmap: true
smooth: true
}
QGCLabel {
text: _controller.remoteRSSI
anchors.right: parent.right
anchors.rightMargin: getProportionalDimmension(6)
anchors.verticalCenter: parent.verticalCenter
horizontalAlignment: Text.AlignRight
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
}
Rectangle {
id: rssiTelemetry
width: getProportionalDimmension(80)
height: mainWindow.tbCellHeight
visible: (_controller.telemetryRRSSI > 0) && (_controller.telemetryLRSSI > 0)
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(Math.min(_controller.telemetryRRSSI,_controller.telemetryLRSSI));
border.color: "#00000000"
border.width: 0
Image {
source: "qrc:/res/AntennaT";
width: mainWindow.tbCellHeight * 0.7
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: getProportionalDimmension(6)
mipmap: true
smooth: true
}
Column {
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: getProportionalDimmension(6)
Row {
anchors.right: parent.right
QGCLabel {
text: 'R '
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
QGCLabel {
text: _controller.telemetryRRSSI + 'dBm'
width: getProportionalDimmension(30)
horizontalAlignment: Text.AlignRight
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
}
Row {
anchors.right: parent.right
QGCLabel {
text: 'L '
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
QGCLabel {
text: _controller.telemetryLRSSI + 'dBm'
width: getProportionalDimmension(30)
horizontalAlignment: Text.AlignRight
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
}
}
}
*/
}
// Row
}
This diff is collapsed.
Click to expand it.
src/ui/toolbar/SignalStrength.qml
View file @
e2c65e4e
...
...
@@ -57,9 +57,10 @@ Item {
}
QGCColoredImage
{
source
:
getIcon
()
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
color
:
qgcPal
.
buttonText
source
:
getIcon
()
fillMode
:
Image
.
PreserveAspectFit
anchors.fill
:
parent
color
:
qgcPal
.
buttonText
sourceSize.height
:
size
}
}
This diff is collapsed.
Click to expand it.
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