Skip to content

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

Done

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