Skip to content

Q
qgroundcontrol
Commit 779d9702 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Merge pull request #3333 from dogmaphobic/pointSizeFont 

UI Layout Reorg
parents 3f55f678 e2c65e4e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 515 additions and 679 deletions
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
View file @ 779d9702
......@@ -119,7 +119,7 @@ QGCView {
anchors.left: parent.left
anchors.right: applyButton.right
text: qsTr("Please select your airframe type")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
wrapMode: Text.WordWrap
}
......
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @ 779d9702
......@@ -20,11 +20,8 @@ FactPanel {
property Fact sysIdFact: controller.getParameterFact(-1, "FRAME")
Column {
anchors.fill: parent
anchors.margins: 8
anchors.fill: parent
VehicleSummaryRow {
id: nameRow;
labelText: qsTr("Frame Type:")
......
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
View file @ 779d9702
......@@ -24,7 +24,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
visible: _mountTypeExists
......
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
View file @ 779d9702
......@@ -23,7 +23,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Flight Mode 1:")
......
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @ 779d9702
......@@ -42,7 +42,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Battery monitor:")
......
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
View file @ 779d9702
......@@ -21,7 +21,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Roll:")
......
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
View file @ 779d9702
......@@ -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
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @ 779d9702
......@@ -85,7 +85,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Arming Checks:")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
View file @ 779d9702
......@@ -24,7 +24,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Throttle failsafe:")
......
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
View file @ 779d9702
......@@ -64,8 +64,8 @@ QGCView {
readonly property string _badCompassCalText: "The calibration for Compass %1 appears to be poor. " +
"Check the compass position within your vehicle and re-do the calibration."
readonly property int sideBarH1PointSize: ScreenTools.mediumFontPixelSize
readonly property int mainTextH1PointSize: ScreenTools.mediumFontPixelSize // Seems to be unused
readonly property int sideBarH1PointSize: ScreenTools.mediumFontPointSize
readonly property int mainTextH1PointSize: ScreenTools.mediumFontPointSize // Seems to be unused
readonly property int rotationColumnWidth: 250
......@@ -269,7 +269,7 @@ QGCView {
Column {
QGCLabel {
font.pixelSize: sideBarH1PointSize
font.pointSize: sideBarH1PointSize
text: qsTr("Set Orientations")
}
......@@ -459,7 +459,7 @@ QGCView {
anchors.left: orientationCalArea.left
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Flow {
......
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file @ 779d9702
......@@ -46,7 +46,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Compass 1:")
......
src/AutoPilotPlugins/Common/ESP8266Component.qml
View file @ 779d9702
......@@ -41,11 +41,11 @@ QGCView {
QGCPalette { id: palette; colorGroupEnabled: panel.enabled }
property real _margins: ScreenTools.defaultFontPixelHeight
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 22
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 20
property real _labelWidth: ScreenTools.defaultFontPixelWidth * 12
property real _statusWidth: ScreenTools.defaultFontPixelWidth * 8
property real _smallFont: ScreenTools.smallFontPixelSize
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 18
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16
property real _labelWidth: ScreenTools.defaultFontPixelWidth * 10
property real _statusWidth: ScreenTools.defaultFontPixelWidth * 6
property real _smallFont: ScreenTools.smallFontPointSize
readonly property string dialogTitle: qsTr("controller WiFi Bridge")
property int stStatus: XMLHttpRequest.UNSENT
......@@ -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"
......@@ -319,12 +320,12 @@ QGCView {
spacing: _margins
QGCLabel {
text: qsTr("Messages Received")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
id: vpackets
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _statusWidth
horizontalAlignment: Text.AlignRight
}
......@@ -332,13 +333,13 @@ QGCView {
Row {
spacing: _margins
QGCLabel {
font.pixelSize: _smallFont
font.pointSize: _smallFont
text: qsTr("Messages Received")
width: _labelWidth
}
QGCLabel {
id: gpackets
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _statusWidth
horizontalAlignment: Text.AlignRight
}
......@@ -346,12 +347,12 @@ QGCView {
Row {
spacing: _margins
QGCLabel {
font.pixelSize: _smallFont
font.pointSize: _smallFont
text: qsTr("Messages Received")
width: _labelWidth
}
QGCLabel {
font.pixelSize: _smallFont
font.pointSize: _smallFont
text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesReceived) : 0
width: _statusWidth
horizontalAlignment: Text.AlignRight
......@@ -361,84 +362,84 @@ QGCView {
spacing: _margins
QGCLabel {
text: qsTr("Messages Lost")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
id: vlost
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
Row {
spacing: _margins
QGCLabel {
text: qsTr("Messages Lost")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
id: glost
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
Row {
spacing: _margins
QGCLabel {
text: qsTr("Messages Lost")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesLost) : 0
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
Row {
spacing: _margins
QGCLabel {
text: qsTr("Messages Sent")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
id: vsent
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
Row {
spacing: _margins
QGCLabel {
text: qsTr("Messages Sent")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
id: gsent
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
Row {
spacing: _margins
QGCLabel {
text: qsTr("Messages Sent")
font.pixelSize: _smallFont
font.pointSize: _smallFont
width: _labelWidth
}
QGCLabel {
text: controller.vehicle ? thisThingHasNoNumberLocaleSupport(controller.vehicle.messagesSent) : 0
width: _statusWidth
horizontalAlignment: Text.AlignRight
font.pixelSize: _smallFont
font.pointSize: _smallFont
}
}
}
......
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
View file @ 779d9702
......@@ -29,7 +29,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Firmware Version:")
valueText: esp8266.version
......
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
View file @ 779d9702
......@@ -8,9 +8,9 @@ import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
AirframeComponentController { id: controller; factPanel: panel }
......@@ -21,19 +21,15 @@ FactPanel {
property bool autoStartSet: sysAutoStartFact ? (sysAutoStartFact.value !== 0) : false
Column {
anchors.fill: parent
anchors.margins: 8
anchors.fill: parent
VehicleSummaryRow {
labelText: qsTr("System ID:")
valueText: sysIdFact ? sysIdFact.valueString : ""
}
VehicleSummaryRow {
labelText: qsTr("Airframe type:")
valueText: autoStartSet ? controller.currentAirframeType : qsTr("Setup required")
}
VehicleSummaryRow {
labelText: qsTr("Vehicle:")
valueText: autoStartSet ? controller.currentVehicleName : qsTr("Setup required")
......
src/AutoPilotPlugins/PX4/CameraComponent.qml
View file @ 779d9702
......@@ -45,8 +45,8 @@ QGCView {
QGCPalette { id: palette; colorGroupEnabled: enabled }
property real _margins: ScreenTools.defaultFontPixelHeight
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 20
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 20
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 16
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16
property Fact _camTriggerMode: controller.getParameterFact(-1, "TRIG_MODE")
property Fact _camTriggerPol: controller.getParameterFact(-1, "TRIG_POLARITY", false) // Don't bitch about missing as these only exist if trigger mode is enabled
......@@ -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"
......
src/AutoPilotPlugins/PX4/CameraComponentSummary.qml
View file @ 779d9702
......@@ -22,7 +22,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Trigger mode:")
......
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
View file @ 779d9702
......@@ -22,7 +22,6 @@ FactPanel {
Loader {
anchors.fill: parent
anchors.margins: 8
sourceComponent: _simpleMode ? simple : advanced
}
......
src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
View file @ 779d9702
......@@ -201,7 +201,7 @@ Item {
anchors.left: parent.left
anchors.right: buttonColumn.left
text: topHelpText
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
wrapMode: Text.WordWrap
}
......
src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
View file @ 779d9702
......@@ -24,7 +24,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Roll:")
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ 779d9702
......@@ -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
......
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
View file @ 779d9702
......@@ -47,7 +47,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Battery Full:")
......
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 779d9702
......@@ -44,8 +44,8 @@ QGCView {
QGCPalette { id: palette; colorGroupEnabled: enabled }
property real _margins: ScreenTools.defaultFontPixelHeight
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 24
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 18
property real _middleRowWidth: ScreenTools.defaultFontPixelWidth * 20
property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 14
property Fact _fenceAction: controller.getParameterFact(-1, "GF_ACTION")
property Fact _fenceRadius: controller.getParameterFact(-1, "GF_MAX_HOR_DIST")
......@@ -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 * 10
height: ScreenTools.defaultFontPixelWidth * 13
width: ScreenTools.defaultFontPixelWidth * 20
sourceSize.width: width
mipmap: true
fillMode: Image.PreserveAspectFit
source: controller.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg"
......
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
View file @ 779d9702
......@@ -24,7 +24,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("RTL min alt:")
......
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @ 779d9702
......@@ -409,7 +409,7 @@ QGCView {
anchors.left: orientationCalArea.left
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Flow {
......
src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
View file @ 779d9702
......@@ -27,7 +27,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Compass 0:")
......
src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
View file @ 779d9702
......@@ -25,7 +25,6 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: qsTr("Compass:")
......
src/FlightDisplay/FlightDisplayViewVideo.qml
View file @ 779d9702
......@@ -45,7 +45,7 @@ Item {
text: qsTr("NO VIDEO")
font.family: ScreenTools.demiboldFontFamily
color: "white"
font.pixelSize: _mainIsMap ? 12 * ScreenTools.fontHRatio : 20 * ScreenTools.fontHRatio
font.pointSize: _mainIsMap ? ScreenTools.smallFontPointSize : ScreenTools.largeFontPointSize
anchors.centerIn: parent
}
}
......@@ -61,8 +61,8 @@ Item {
visible: !_mainIsMap
rollAngle: _roll
pitchAngle: _pitch
width: ScreenTools.defaultFontPixelSize * (30)
height: ScreenTools.defaultFontPixelSize * (30)
width: ScreenTools.defaultFontPixelHeight * (30)
height: ScreenTools.defaultFontPixelHeight * (30)
active: QGroundControl.multiVehicleManager.activeVehicleAvailable
z: QGroundControl.zOrderWidgets
}
......
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ 779d9702
......@@ -51,8 +51,6 @@ Item {
function getGadgetWidth() {
if(ScreenTools.isMobile) {
if(ScreenTools.isTinyScreen)
return mainWindow.width * 0.2
return mainWindow.width * 0.15
}
var w = mainWindow.width * 0.15
......@@ -74,7 +72,7 @@ Item {
visible: _activeVehicle && !_activeVehicle.coordinateValid && _mainIsMap
z: QGroundControl.zOrderTopMost
color: mapPal.text
font.pixelSize: ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.largeFontPointSize
text: qsTr("No GPS Lock for Vehicle")
}
......@@ -83,7 +81,7 @@ Item {
visible: _activeVehicle && !_activeVehicle.coordinateValid
z: QGroundControl.zOrderTopMost
color: mapPal.text
font.pixelSize: ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.largeFontPointSize
text: _activeVehicle ? _activeVehicle.prearmError : ""
}
}
......@@ -125,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
......@@ -247,12 +245,11 @@ Item {
//-- Zoom Map In
RoundButton {
id: mapZoomPlus
visible: _mainIsMap && !ScreenTools.isTinyScreen
visible: _mainIsMap
buttonImage: "/qmlimages/ZoomPlus.svg"
exclusiveGroup: _dropButtonsExclusiveGroup
z: QGroundControl.zOrderWidgets
lightBorders: _lightWidgetBorders
onClicked: {
if(_flightMap)
_flightMap.zoomLevel += 0.5
......@@ -263,12 +260,11 @@ Item {
//-- Zoom Map Out
RoundButton {
id: mapZoomMinus
visible: _mainIsMap && !ScreenTools.isTinyScreen
visible: _mainIsMap
buttonImage: "/qmlimages/ZoomMinus.svg"
exclusiveGroup: _dropButtonsExclusiveGroup
z: QGroundControl.zOrderWidgets
lightBorders: _lightWidgetBorders
onClicked: {
if(_flightMap)
_flightMap.zoomLevel -= 0.5
......@@ -283,7 +279,7 @@ Item {
anchors.margins: _barMargin
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
width: guidedModeColumn.width + (_margins * 2)
width: guidedModeColumn.width + (_margins * 2)
height: guidedModeColumn.height + (_margins * 2)
radius: _margins
color: _lightWidgetBorders ? qgcPal.mapWidgetBorderLight : qgcPal.mapWidgetBorderDark
......@@ -328,7 +324,6 @@ Item {
id: guidedModeHideTimer
interval: 7000
running: true
onTriggered: {
if (ScreenTools.isShortScreen) {
_guidedModeBar.state = "Hidden"
......@@ -360,9 +355,9 @@ Item {
_activeVehicle.guidedModeLand()
break;
case confirmTakeoff:
var altitude = altitudeSlider.getValue()
if (!isNaN(altitude)) {
_activeVehicle.guidedModeTakeoff(altitude)
var altitude1 = altitudeSlider.getValue()
if (!isNaN(altitude1)) {
_activeVehicle.guidedModeTakeoff(altitude1)
}
break;
case confirmArm:
......@@ -375,9 +370,9 @@ Item {
_activeVehicle.emergencyStop()
break;
case confirmChangeAlt:
var altitude = altitudeSlider.getValue()
if (!isNaN(altitude)) {
_activeVehicle.guidedModeChangeAltitude(altitude)
var altitude2 = altitudeSlider.getValue()
if (!isNaN(altitude2)) {
_activeVehicle.guidedModeChangeAltitude(altitude2)
}
break;
case confirmGoTo:
......@@ -432,7 +427,7 @@ Item {
guidedModeConfirm.confirmText = qsTr("move vehicle")
break;
case confirmRetask:
_guidedModeBar.confirmText = qsTr("active waypoint change")
_guidedModeBar.confirmText = qsTr("active waypoint change")
break;
}
guidedModeBar.visible = false
......
src/FlightMap/FlightMap.qml
View file @ 779d9702
......@@ -175,9 +175,9 @@ Map {
width: scaleImageLeft.width + scaleImage.width + scaleImageRight.width
anchors {
bottom: parent.bottom
bottomMargin: ScreenTools.defaultFontPixelSize * (0.66)
bottomMargin: ScreenTools.defaultFontPixelHeight * (0.66)
right: parent.right
rightMargin: ScreenTools.defaultFontPixelSize * (0.33)
rightMargin: ScreenTools.defaultFontPixelHeight * (0.33)
}
Image {
id: scaleImageLeft
......@@ -204,7 +204,7 @@ Map {
horizontalAlignment: Text.AlignHCenter
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.bottomMargin: ScreenTools.defaultFontPixelSize * (0.83)
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * (0.83)
text: "0 m"
}
Component.onCompleted: {
......@@ -300,9 +300,9 @@ Map {
z: 1000
anchors {
bottom: parent.bottom;
bottomMargin: ScreenTools.defaultFontPixelSize * (1.25)
rightMargin: ScreenTools.defaultFontPixelSize * (1.66)
leftMargin: ScreenTools.defaultFontPixelSize * (1.66)
bottomMargin: ScreenTools.defaultFontPixelHeight * (1.25)
rightMargin: ScreenTools.defaultFontPixelHeight * (1.66)
leftMargin: ScreenTools.defaultFontPixelHeight * (1.66)
left: parent.left
}
width: parent.width - anchors.rightMargin - anchors.leftMargin
......
src/FlightMap/MapItems/VehicleMapItem.qml
View file @ 779d9702
......@@ -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
}
}
}
src/FlightMap/Widgets/QGCAttitudeHUD.qml
View file @ 779d9702
......@@ -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
}
......@@ -85,6 +88,6 @@ Item {
pitchAngle: _pitchAngle
rollAngle: _rollAngle
color: Qt.rgba(0,0,0,0)
size: ScreenTools.defaultFontPixelSize * (10)
size: ScreenTools.defaultFontPixelHeight * (10)
}
}
src/FlightMap/Widgets/QGCAttitudeWidget.qml
View file @ 779d9702
......@@ -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
}
}
......
src/FlightMap/Widgets/QGCCompassWidget.qml
View file @ 779d9702
......@@ -40,9 +40,9 @@ Item {
property real heading: 0
property real size: _defaultSize
property real _defaultSize: ScreenTools.defaultFontPixelSize * (10)
property real _defaultSize: ScreenTools.defaultFontPixelHeight * (10)
property real _sizeRatio: ScreenTools.isTinyScreen ? (size / _defaultSize) * 0.5 : size / _defaultSize
property int _fontSize: ScreenTools.defaultFontPixelSize * _sizeRatio
property int _fontSize: ScreenTools.defaultFontPointSize * _sizeRatio
width: size
height: size
......@@ -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 {
......@@ -91,7 +93,7 @@ Item {
QGCLabel {
text: active ? heading.toFixed(0) : qsTr("OFF")
font.family: active ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily
font.pixelSize: _fontSize < 1 ? 1 : _fontSize;
font.pointSize: _fontSize < 8 ? 8 : _fontSize;
color: "white"
anchors.centerIn: parent
}
......
src/FlightMap/Widgets/QGCInstrumentWidget.qml
View file @ 779d9702
......@@ -54,15 +54,15 @@ Item {
property Fact groundSpeedFact: _emptyFact
property Fact airSpeedFact: _emptyFact
property real _defaultSize: ScreenTools.defaultFontPixelSize * (9)
property real _defaultSize: ScreenTools.defaultFontPixelHeight * (9)
property color _backgroundColor: qgcPal.window
property real _spacing: ScreenTools.defaultFontPixelSize * 0.33
property real _spacing: ScreenTools.defaultFontPixelHeight * 0.33
property real _topBottomMargin: (size * 0.05) / 2
property real _availableValueHeight: maxHeight - (attitudeWidget.height + _spacer1.height + _spacer2.height + (_spacing * 4)) - (_showCompass ? compass.height : 0)
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
readonly property bool _showCompass: !ScreenTools.isShortScreen
readonly property bool _showCompass: true // !ScreenTools.isShortScreen
QGCPalette { id: qgcPal }
......@@ -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
......
src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
View file @ 779d9702
......@@ -50,13 +50,13 @@ Rectangle {
property real _innerRadius: (width - (_topBottomMargin * 3)) / 4
property real _outerRadius: _innerRadius + _topBottomMargin
property real _defaultSize: ScreenTools.defaultFontPixelSize * (9)
property real _defaultSize: ScreenTools.defaultFontPixelHeight * (9)
property real _sizeRatio: ScreenTools.isTinyScreen ? (size / _defaultSize) * 0.5 : size / _defaultSize
property real _bigFontSize: ScreenTools.defaultFontPixelSize * 2.5 * _sizeRatio
property real _normalFontSize:ScreenTools.defaultFontPixelSize * 1.5 * _sizeRatio
property real _labelFontSize: ScreenTools.defaultFontPixelSize * 0.75 * _sizeRatio
property real _spacing: ScreenTools.defaultFontPixelSize * 0.33
property real _bigFontSize: ScreenTools.defaultFontPointSize * 2.5 * _sizeRatio
property real _normalFontSize:ScreenTools.defaultFontPointSize * 1.5 * _sizeRatio
property real _labelFontSize: ScreenTools.defaultFontPointSize * 0.75 * _sizeRatio
property real _spacing: ScreenTools.defaultFontPixelHeight * 0.33
property real _topBottomMargin: (size * 0.05) / 2
QGCAttitudeWidget {
......
src/FlightMap/Widgets/QGCPitchIndicator.qml
View file @ 779d9702
......@@ -40,7 +40,7 @@ Rectangle {
property real _reticleSlot: _reticleSpacing + _reticleHeight
property real _longDash: size * 0.40
property real _shortDash: size * 0.25
property real _fontSize: ScreenTools.defaultFontPixelSize * (size / _defaultSize)
property real _fontSize: ScreenTools.defaultFontPointSize * (size / _defaultSize)
property real _defaultSize: ScreenTools.isAndroid ? 300 : 100
......@@ -72,7 +72,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
smooth: true
font.family: ScreenTools.demiboldFontFamily
font.pixelSize: _fontSize < 1 ? 1 : _fontSize;
font.pointSize: _fontSize < 1 ? 1 : _fontSize;
text: _pitch
color: "white"
visible: (_pitch != 0) && ((_pitch % 10) === 0)
......@@ -83,7 +83,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
smooth: true
font.family: ScreenTools.demiboldFontFamily
font.pixelSize: _fontSize < 1 ? 1 : _fontSize;
font.pointSize: _fontSize < 1 ? 1 : _fontSize;
text: _pitch
color: "white"
visible: (_pitch != 0) && ((_pitch % 10) === 0)
......
src/FlightMap/Widgets/QGCSlider.qml
View file @ 779d9702
......@@ -52,15 +52,15 @@ Item {
Rectangle {
anchors.fill: parent
radius: ScreenTools.defaultFontPixelSize * (0.5)
radius: ScreenTools.defaultFontPixelHeight * (0.5)
color: Qt.rgba(0,0,0,0.65);
}
Rectangle {
anchors.left: parent.left
anchors.leftMargin: ScreenTools.defaultFontPixelSize * (0.33)
radius: ScreenTools.defaultFontPixelSize * (0.33)
height: ScreenTools.defaultFontPixelSize * (0.33)
anchors.leftMargin: ScreenTools.defaultFontPixelHeight * (0.33)
radius: ScreenTools.defaultFontPixelHeight * (0.33)
height: ScreenTools.defaultFontPixelHeight * (0.33)
width: handle.x - x
color: "#69bb17"
anchors.verticalCenter: parent.verticalCenter
......@@ -69,21 +69,21 @@ Item {
Rectangle {
id: labelRect
width: label.width
height: label.height + ScreenTools.defaultFontPixelSize * (0.33)
radius: ScreenTools.defaultFontPixelSize * (0.33)
height: label.height + ScreenTools.defaultFontPixelHeight * (0.33)
radius: ScreenTools.defaultFontPixelHeight * (0.33)
smooth: true
color: Qt.rgba(1,1,1,0.75);
border.width: ScreenTools.defaultFontPixelSize * (0.083)
border.width: ScreenTools.defaultFontPixelHeight * (0.083)
border.color: Qt.rgba(0,0,0,0.45);
anchors.bottom: handle.top
anchors.bottomMargin: ScreenTools.defaultFontPixelSize * (0.33)
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * (0.33)
visible: mouseRegion.pressed
x: Math.max(Math.min(handle.x + (handle.width - width ) / 2, slider.width - width), 0)
QGCLabel{
id: label
color: "black"
text: slider.value.toFixed(2)
width: font.pixelSize * 3.5
width: font.pointSize * 3.5
anchors.horizontalCenter: labelRect.horizontalCenter
horizontalAlignment: Text.AlignHCenter
anchors.verticalCenter: labelRect.verticalCenter
......@@ -93,7 +93,7 @@ Item {
Rectangle {
id: handle;
smooth: true
width: ScreenTools.defaultFontPixelSize * (2.16);
width: ScreenTools.defaultFontPixelHeight * (2.16);
y: (slider.height - height) / 2;
x: (slider.value - slider.minimum) * slider.length / (slider.maximum - slider.minimum)
......
src/FlightMap/Widgets/ValuesWidget.qml
View file @ 779d9702
......@@ -79,7 +79,6 @@ QGCFlickable {
model: _activeVehicle ? controller.largeValues : 0
Column {
id: valueColumn
width: _largeColumn.width
property Fact fact: _activeVehicle.getFact(modelData.replace("Vehicle.", ""))
......@@ -95,7 +94,7 @@ QGCFlickable {
QGCLabel {
width: parent.width
horizontalAlignment: Text.AlignHCenter
font.pixelSize: ScreenTools.largeFontPixelSize * (largeValue ? 1.3 : 1.0)
font.pointSize: ScreenTools.mediumFontPointSize * (largeValue ? 1.3 : 1.0)
font.family: largeValue ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily
fontSizeMode: Text.HorizontalFit
color: textColor
......@@ -117,7 +116,6 @@ QGCFlickable {
model: _activeVehicle ? controller.smallValues : 0
Column {
id: valueColumn
width: (_root.width / 2) - (_margins / 2) - 0.1
clip: true
......@@ -126,7 +124,7 @@ QGCFlickable {
QGCLabel {
width: parent.width
horizontalAlignment: Text.AlignHCenter
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.isTinyScreen ? ScreenTools.smallFontPointSize * 0.75 : ScreenTools.smallFontPointSize
fontSizeMode: Text.HorizontalFit
color: textColor
text: fact.shortDescription
......@@ -141,7 +139,7 @@ QGCFlickable {
QGCLabel {
width: parent.width
horizontalAlignment: Text.AlignHCenter
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.isTinyScreen ? ScreenTools.smallFontPointSize * 0.75 : ScreenTools.smallFontPointSize
fontSizeMode: Text.HorizontalFit
color: textColor
text: fact.units
......@@ -247,20 +245,20 @@ QGCFlickable {
}
QGCCheckBox {
id: _addCheckBox
text: factGroup.getFact(modelData).shortDescription
checked: _largeCheckBox.checked || listContains(controller.smallValues, propertyName)
onClicked: updateValues()
id: _addCheckBox
text: factGroup.getFact(modelData).shortDescription
checked: listContains(controller.smallValues, propertyName) || _largeCheckBox.checked
onClicked: updateValues()
Layout.fillWidth: true
Layout.minimumWidth: ScreenTools.defaultFontPixelWidth * 20
}
QGCCheckBox {
id: _largeCheckBox
text: qsTr("Large")
checked: listContains(controller.largeValues, propertyName)
enabled: _addCheckBox.checked
onClicked: updateValues()
id: _largeCheckBox
text: qsTr("Large")
checked: listContains(controller.largeValues, propertyName)
enabled: _addCheckBox.checked
onClicked: updateValues()
}
}
}
......@@ -269,12 +267,10 @@ QGCFlickable {
Repeater {
model: factGroup ? factGroup.factGroupNames : 0
Loader {
sourceComponent: factGroupList
property var factGroup: _root ? _root.parent.factGroup.getFactGroup(modelData) : undefined
property string factGroupName: _root ? _root.parent.factGroupName + "." + modelData : undefined
property string factGroupName: _root ? _root.parent.factGroupName + "." + modelData : ""
}
}
}
......
src/MissionEditor/MissionEditor.qml
View file @ 779d9702
......@@ -698,7 +698,6 @@ QGCView {
buttonImage: "/qmlimages/ZoomMinus.svg"
z: QGroundControl.zOrderWidgets
lightBorders: _lightWidgetBorders
onClicked: {
if(editorMap)
editorMap.zoomLevel -= 0.5
......
src/MissionEditor/MissionItemStatus.qml
View file @ 779d9702
......@@ -98,18 +98,18 @@ Rectangle {
id: graphRow
anchors.top: parent.top
anchors.bottom: parent.bottom
spacing: ScreenTools.smallFontPixelWidth
spacing: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio
Repeater {
model: missionItems
Item {
height: graphRow.height
width: ScreenTools.smallFontPixelWidth * 2
width: ScreenTools.defaultFontPixelWidth * ScreenTools.smallFontPointRatio * 2
visible: object.specifiesCoordinate && !object.isStandaloneCoordinate
property real availableHeight: height - ScreenTools.smallFontPixelHeight - indicator.height
property real availableHeight: height - (ScreenTools.defaultFontPixelHeight * ScreenTools.smallFontPointRatio) - indicator.height
property bool graphAbsolute: true
......@@ -128,7 +128,7 @@ Rectangle {
QGCLabel {
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
text: (object.relativeAltitude ? "" : "=") + object.coordinate.altitude.toFixed(0)
}
*/
......
src/MissionEditor/SimpleItemEditor.qml
View file @ 779d9702
......@@ -40,7 +40,7 @@ Rectangle {
QGCLabel {
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.smallFontPixelHeight
font.pointSize: ScreenTools.smallFontPointSize
text: missionItem.sequenceNumber == 0 ?
qsTr("Planned home position.") :
(missionItem.rawEdit ?
......
src/QmlControls/DropButton.qml
View file @ 779d9702
......@@ -11,7 +11,7 @@ Item {
signal clicked()
property alias buttonImage: roundButton.buttonImage
property alias rotateImage: roundButton.rotateImage
property real radius: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5
property real radius: ScreenTools.defaultFontPixelHeight * 1.25
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()
}
......
src/QmlControls/MissionCommandDialog.qml
View file @ 779d9702
......@@ -77,7 +77,7 @@ QGCViewDialog {
delegate: Rectangle {
width: parent.width
height: commandColumn.height + ScreenTools.defaultFontPixelSize
height: commandColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.button
property var mavCmdInfo: object
......
src/QmlControls/MissionItemEditor.qml
View file @ 779d9702
......@@ -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
......
src/QmlControls/MissionItemIndexLabel.qml
View file @ 779d9702
......@@ -19,7 +19,7 @@ Rectangle {
border.color: "white"
color: isCurrentItem ? "green" : qgcPal.mapButtonHighlight
property real _width: small ? ScreenTools.smallFontPixelSize * 1.5 : ScreenTools.mediumFontPixelSize * 1.5
property real _width: small ? ScreenTools.smallFontPointSize * 1.5 : ScreenTools.mediumFontPointSize * 1.5
QGCPalette { id: qgcPal }
......@@ -35,6 +35,6 @@ Rectangle {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: "white"
font.pixelSize: small ? ScreenTools.smallFontPixelSize : ScreenTools.mediumFontPixelSize
font.pointSize: small ? ScreenTools.smallFontPointSize : ScreenTools.mediumFontPointSize
}
}
src/QmlControls/OfflineMapButton.qml
View file @ 779d9702
......@@ -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
......
src/QmlControls/ParameterEditor.qml
View file @ 779d9702
......@@ -43,7 +43,7 @@ QGCView {
QGCPalette { id: __qgcPal; colorGroupEnabled: true }
property Fact _editorDialogFact: Fact { }
property int _rowHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2
property int _rowHeight: ScreenTools.defaultFontPixelHeight * 2
property int _rowWidth: 10 // Dynamic adjusted at runtime
property bool _searchFilter: false ///< true: showing results of search
property var _searchResults ///< List of parameter names from search results
......
src/QmlControls/QGCButton.qml
View file @ 779d9702
......@@ -12,7 +12,7 @@ Button {
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _showHighlight: (pressed | hovered | checked) && !__forceHoverOff
property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light
property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
// This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can
// move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn
......@@ -43,30 +43,24 @@ Button {
repeat: true
onTriggered: {
__forceHoverOff = (__lastGlobalMouseX != ScreenTools.mouseX() || __lastGlobalMouseY != ScreenTools.mouseY());
__forceHoverOff = (__lastGlobalMouseX !== ScreenTools.mouseX() || __lastGlobalMouseY !== ScreenTools.mouseY());
}
}
style: ButtonStyle {
/*! The padding between the background and the label components. */
padding {
top: 4
left: 4
right: control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 4
top: 4
left: 4
right: control.menu !== null ? Math.round(ScreenTools.defaultFontPixelHeight * 0.5) : 4
bottom: 4
}
/*! This defines the background of the button. */
background: Item {
property bool down: control.pressed || (control.checkable && control.checked)
implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
implicitHeight: {
if(ScreenTools.isTinyScreen)
return ScreenTools.defaultFontPixelHeight * 3.5
if(ScreenTools.isMobile)
return ScreenTools.defaultFontPixelHeight * 2.5
return Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
}
implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5)
implicitHeight: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Rectangle {
anchors.fill: parent
......@@ -90,7 +84,7 @@ Button {
/*! This defines the label of the button. */
label: Item {
implicitWidth: row.implicitWidth
implicitWidth: row.implicitWidth
implicitHeight: row.implicitHeight
baselineOffset: row.y + text.y + text.baselineOffset
......@@ -108,7 +102,7 @@ Button {
id: text
antialiasing: true
text: control.text
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
anchors.verticalCenter: parent.verticalCenter
color: _showHighlight ?
......
src/QmlControls/QGCCheckBox.qml
View file @ 779d9702
......@@ -29,7 +29,7 @@ CheckBox {
id: text
text: control.text
antialiasing: true
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
color: control.__qgcPal.text
anchors.verticalCenter: parent.verticalCenter
......
src/QmlControls/QGCComboBox.qml
View file @ 779d9702
......@@ -9,23 +9,17 @@ import QGroundControl.ScreenTools 1.0
ComboBox {
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _showHighlight: pressed | hovered
property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light
property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light
style: ComboBoxStyle {
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
textColor: _showHighlight ?
control._qgcPal.buttonHighlightText :
control._qgcPal.buttonText
background: Item {
implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
implicitHeight: {
if(ScreenTools.isTinyScreen)
return ScreenTools.defaultFontPixelHeight * 3.5
if(ScreenTools.isMobile)
return ScreenTools.defaultFontPixelHeight * 2.5
return Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
}
implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5)
implicitHeight: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Rectangle {
anchors.fill: parent
......
src/QmlControls/QGCLabel.qml
View file @ 779d9702
......@@ -10,7 +10,7 @@ Text {
property bool enabled: true
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
color: __qgcPal.text
antialiasing: true
......
src/QmlControls/QGCMovableItem.qml
View file @ 779d9702
......@@ -9,8 +9,8 @@ import QGroundControl.ScreenTools 1.0
Item {
id: root
property bool allowDragging: true
property real minimumWidth: ScreenTools.defaultFontPixelSize * (5)
property real minimumHeight: ScreenTools.defaultFontPixelSize * (5)
property real minimumWidth: ScreenTools.defaultFontPixelHeight * (5)
property real minimumHeight: ScreenTools.defaultFontPixelHeight * (5)
property alias tForm: tform
signal resetRequested()
transform: Scale {
......
src/QmlControls/QGCPipable.qml
View file @ 779d9702
......@@ -55,8 +55,9 @@ Item {
anchors.left: parent.left
anchors.bottom: parent.bottom
visible: !isHidden
height: ScreenTools.defaultFontPixelSize * 2.5
width: ScreenTools.defaultFontPixelSize * 2.5
height: ScreenTools.defaultFontPixelHeight * 2.5
width: ScreenTools.defaultFontPixelHeight * 2.5
sourceSize.height: height
MouseArea {
anchors.fill: parent
onClicked: {
......@@ -70,14 +71,15 @@ Item {
id: openPIP
anchors.left : parent.left
anchors.bottom: parent.bottom
height: ScreenTools.defaultFontPixelSize * 2
width: ScreenTools.defaultFontPixelSize * 2
radius: ScreenTools.defaultFontPixelSize / 3
height: ScreenTools.defaultFontPixelHeight * 2
width: ScreenTools.defaultFontPixelHeight * 2
radius: ScreenTools.defaultFontPixelHeight / 3
visible: isHidden
color: isDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
Image {
width: parent.width * 0.75
height: parent.height * 0.75
sourceSize.height: height
source: "/res/buttonRight.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
......
src/QmlControls/QGCRadioButton.qml
View file @ 779d9702
......@@ -28,7 +28,7 @@ RadioButton {
Text {
id: text
text: control.text
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
antialiasing: true
color: control.__qgcPal.text
......
src/QmlControls/QGCTextField.qml
View file @ 779d9702
......@@ -19,15 +19,8 @@ TextField {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
textColor: __qgcPal.textFieldText
height: {
if(ScreenTools.isTinyScreen)
return ScreenTools.defaultFontPixelHeight * 3.5
if(ScreenTools.isMobile)
return ScreenTools.defaultFontPixelHeight * 2.5
return implicitHeight
}
textColor: __qgcPal.textFieldText
height: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Label {
id: unitsLabelWidthGenerator
......@@ -39,7 +32,7 @@ TextField {
}
style: TextFieldStyle {
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
background: Item {
id: backgroundItem
......@@ -68,7 +61,7 @@ TextField {
width: unitsLabelWidthGenerator.width
text: control.unitsLabel
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
antialiasing: true
......
src/QmlControls/QGCToolBarButton.qml
View file @ 779d9702
......@@ -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
}
......
src/QmlControls/RoundButton.qml
View file @ 779d9702
......@@ -10,7 +10,7 @@ Item {
signal clicked()
property alias buttonImage: button.source
property real radius: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5
property real radius: ScreenTools.defaultFontPixelHeight * 1.25
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
......
src/QmlControls/ScreenTools.qml
View file @ 779d9702
......@@ -7,36 +7,29 @@ import QtQuick.Window 2.2
import QGroundControl.ScreenToolsController 1.0
Item {
id: _screenTools
signal repaintRequested
property real availableHeight: 0
property real defaultFontPixelSize: 1
property real defaultFontPixelHeight: 1
property real defaultFontPixelWidth: 1
property real smallFontPixelSize: 1
property real smallFontPixelHeight: 1
property real smallFontPixelWidth: 1
property real mediumFontPixelSize: 1
property real largeFontPixelSize: 1
// To proportionally scale fonts
readonly property real _defaultFontHeight: 16
readonly property real fontHRatio: isTinyScreen ? (_textMeasure.contentHeight / _defaultFontHeight) * 0.75 : (_textMeasure.contentHeight / _defaultFontHeight)
readonly property real realFontHeight: _textMeasure.contentHeight
readonly property real realFontWidth : _textMeasure.contentWidth
//-- 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
// On OSX ElCapitan with Qt 5.4.0 any font pixel size above 19 shows garbage test. No idea why at this point.
// Will remove Math.min when problem is figure out.
// readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19)
// readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, ScreenToolsController.isMobile ? 10000 : 19)
readonly property real smallFontPointRatio: 0.75
readonly property real mediumFontPointRatio: 1.25
readonly property real largeFontPointRatio: 1.5
property bool isAndroid: ScreenToolsController.isAndroid
property bool isiOS: ScreenToolsController.isiOS
property bool isMobile: ScreenToolsController.isMobile
property bool isDebug: ScreenToolsController.isDebug
property bool isTinyScreen: (Screen.width / Screen.pixelDensity) < 120 // 120mm
property bool isTinyScreen: (Screen.width / Screen.pixelDensity) < 120 // 120mm
property bool isShortScreen: ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example
readonly property string normalFontFamily: "opensans"
......@@ -50,32 +43,48 @@ Item {
return ScreenToolsController.mouseY()
}
Text {
id: _defaultFont
text: "X"
property real fontHeight: contentHeight
}
Text {
id: _textMeasure
text: "X"
font.family: normalFontFamily
property real fontWidth: contentWidth * (ScreenToolsController.testHighDPI ? 2 : 1)
property real fontHeight: contentHeight * (ScreenToolsController.testHighDPI ? 2 : 1)
Component.onCompleted: {
var fudgeFactor = 1.0
// Small Android Devices (Large Scaling Error)
if(ScreenToolsController.isAndroid && (Screen.width / Screen.pixelDensity) < 120) {
fudgeFactor = 0.6
// Nexus 7 type
} else if(ScreenToolsController.isAndroid && (Screen.height / Screen.width) < 0.6) {
fudgeFactor = 0.75
// iPhones
} else if (ScreenToolsController.isiOS && (Screen.width / Screen.pixelDensity) < 120) {
fudgeFactor = 0.75
font.pointSize: {
if(ScreenToolsController.isMobile) {
// Small Devices
if((Screen.width / Screen.pixelDensity) < 120) {
return 11;
// iOS
} else if(ScreenToolsController.isiOS) {
return 13;
// Android
} else {
return 14;
}
} else {
//-- 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
}
defaultFontPixelSize = _textMeasure.fontHeight * ScreenToolsController.defaultFontPixelSizeRatio * fudgeFactor
defaultFontPixelHeight = defaultFontPixelSize * fudgeFactor
defaultFontPixelWidth = _textMeasure.fontWidth * ScreenToolsController.defaultFontPixelSizeRatio * fudgeFactor
smallFontPixelSize = defaultFontPixelSize * ScreenToolsController.smallFontPixelSizeRatio * fudgeFactor
smallFontPixelHeight = smallFontPixelSize * fudgeFactor
smallFontPixelWidth = defaultFontPixelWidth * ScreenToolsController.smallFontPixelSizeRatio * fudgeFactor
mediumFontPixelSize = defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio * fudgeFactor
largeFontPixelSize = defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio * fudgeFactor
}
property real fontWidth: contentWidth
property real fontHeight: contentHeight
Component.onCompleted: {
defaultFontPointSize = _textMeasure.font.pointSize
defaultFontPixelHeight = _textMeasure.fontHeight
defaultFontPixelWidth = _textMeasure.fontWidth
smallFontPointSize = defaultFontPointSize * _screenTools.smallFontPointRatio
mediumFontPointSize = defaultFontPointSize * _screenTools.mediumFontPointRatio
largeFontPointSize = defaultFontPointSize * _screenTools.largeFontPointRatio
}
}
}
src/QmlControls/ScreenToolsController.cc
View file @ 779d9702
......@@ -22,27 +22,12 @@
======================================================================*/
/// @file
/// @author Gus Grubba <mavlink@grubba.com>
/// @author Gus Grubba <mavlink@grubba.com>
#include "ScreenToolsController.h"
#include <QScreen>
#ifdef Q_OS_WIN
const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0;
#elif __android__
const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0;
#elif __ios__
const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8;
#elif defined Q_OS_LINUX
const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8;
#else
const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8;
#endif
const double ScreenToolsController::_smallFontPixelSizeRatio = 0.75;
const double ScreenToolsController::_mediumFontPixelSizeRatio = 1.22;
const double ScreenToolsController::_largeFontPixelSizeRatio = 1.66;
ScreenToolsController::ScreenToolsController()
{
}
src/QmlControls/ScreenToolsController.h
View file @ 779d9702
......@@ -28,16 +28,11 @@
#define ScreenToolsController_H
#include "QGCApplication.h"
#include <QQuickItem>
#include <QCursor>
/*!
@brief Screen helper tools for QML widgets
To use its functions, you need to import the module with the following line:
@code
@endcode
*/
/// This Qml control is used to return screen parameters
......@@ -52,58 +47,43 @@ public:
Q_PROPERTY(bool isMobile READ isMobile CONSTANT)
Q_PROPERTY(bool testHighDPI READ testHighDPI CONSTANT)
Q_PROPERTY(bool isDebug READ isDebug CONSTANT)
//! Used to trigger a \c Canvas element repaint.
/*!
There is a bug as of Qt 5.4 where a Canvas element defined within a QQuickWidget does not receive
repaint events. QGC's main window will emit these signals when a \c Canvas element needs to be
repainted.
If you use a \c Canvas element inside some QML widget, you can use this code to handle repaint:
@code
import QGroundControl.ScreenToolsController 1.0
...
Canvas {
id: myCanvas
height: 40
width: 40
Connections {
target: ScreenToolsController
onRepaintRequestedChanged: {
myCanvas.requestPaint();
}
}
onPaint: {
var context = getContext("2d");
...
}
}
@endcode
*/
Q_PROPERTY(bool isMacOS READ isMacOS CONSTANT)
Q_PROPERTY(bool isLinux READ isLinux CONSTANT)
// Returns current mouse position
Q_INVOKABLE int mouseX(void) { return QCursor::pos().x(); }
Q_INVOKABLE int mouseY(void) { return QCursor::pos().y(); }
// Used to adjust default font size on an OS basis
Q_PROPERTY(double defaultFontPixelSizeRatio MEMBER _defaultFontPixelSizeRatio CONSTANT)
// Used to calculate font sizes based on default font size
Q_PROPERTY(double smallFontPixelSizeRatio MEMBER _smallFontPixelSizeRatio CONSTANT)
Q_PROPERTY(double mediumFontPixelSizeRatio MEMBER _mediumFontPixelSizeRatio CONSTANT)
Q_PROPERTY(double largeFontPixelSizeRatio MEMBER _largeFontPixelSizeRatio CONSTANT)
#if defined (__android__)
bool isAndroid () { return true; }
bool isiOS () { return false; }
bool isMobile () { return true; }
bool isLinux () { return false; }
bool isMacOS () { return false; }
#elif defined(__ios__)
bool isAndroid () { return false; }
bool isiOS () { return true; }
bool isMobile () { return true; }
bool isLinux () { return false; }
bool isMacOS () { return false; }
#elif defined(__macos__)
bool isAndroid () { return false; }
bool isiOS () { return false; }
bool isMobile () { return qgcApp()->fakeMobile(); }
bool isLinux () { return false; }
bool isMacOS () { return true; }
#elif defined(Q_OS_LINUX)
bool isAndroid () { return false; }
bool isiOS () { return false; }
bool isMobile () { return qgcApp()->fakeMobile(); }
bool isLinux () { return true; }
bool isMacOS () { return false; }
#else
bool isAndroid () { return false; }
bool isiOS () { return false; }
bool isMobile () { return qgcApp()->fakeMobile(); }
bool isLinux () { return false; }
bool isMacOS () { return false; }
#endif
#ifdef QT_DEBUG
......@@ -114,11 +94,6 @@ public:
bool testHighDPI () { return false; }
#endif
private:
static const double _defaultFontPixelSizeRatio;
static const double _smallFontPixelSizeRatio;
static const double _mediumFontPixelSizeRatio;
static const double _largeFontPixelSizeRatio;
};
#endif
src/QmlControls/SliderSwitch.qml
View file @ 779d9702
......@@ -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
......
src/QmlControls/SubMenuButton.qml
View file @ 779d9702
......@@ -14,7 +14,7 @@ Button {
text: "Button" ///< Pass in your own button text
checkable: true
implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 5 : ScreenTools.defaultFontPixelHeight * 2.5
implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 3.5 : ScreenTools.defaultFontPixelHeight * 2.5
style: ButtonStyle {
id: buttonStyle
......
src/QmlControls/VehicleRotationCal.qml
View file @ 779d9702
......@@ -69,7 +69,7 @@ Rectangle {
height: parent.height
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignBottom
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: calInProgress ? calInProgressText : (calValid ? qsTr("Completed") : qsTr("Incomplete"))
}
}
......
src/VehicleSetup/FirmwareUpgrade.qml
View file @ 779d9702
......@@ -341,7 +341,7 @@ QGCView {
QGCLabel {
id: titleLabel
text: title
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
ProgressBar {
......@@ -359,7 +359,7 @@ QGCView {
width: parent.width
readOnly: true
frameVisible: false
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
textFormat: TextEdit.RichText
text: welcomeText
......
src/VehicleSetup/JoystickConfig.qml
View file @ 779d9702
......@@ -149,7 +149,7 @@ QGCView {
QGCLabel {
id: header
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: qsTr("JOYSTICK")
}
......
src/VehicleSetup/SetupView.qml
View file @ 779d9702
......@@ -151,7 +151,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: "QGroundControl does not currently support setup of your vehicle type. " +
"If your vehicle is already configured you can still Fly."
......@@ -172,7 +172,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.largeFontPointSize
text: "Connect vehicle to your device and QGroundControl will automatically detect it." +
(ScreenTools.isMobile ? "" : " Click Firmware on the left to upgrade your vehicle.")
......@@ -192,7 +192,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: "You are currently connected to a vehicle, but that vehicle did not return back the full parameter list. " +
"Because of this the full set of vehicle setup options are not available."
......@@ -211,7 +211,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: _messagePanelText
}
}
......
src/VehicleSetup/VehicleSummary.qml
View file @ 779d9702
......@@ -39,7 +39,7 @@ Rectangle {
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
color: qgcPal.window
property real _minSummaryW: ScreenTools.defaultFontPixelWidth * 42
property real _minSummaryW: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 28 : ScreenTools.defaultFontPixelWidth * 36
property real _summaryBoxWidth: _minSummaryW
property real _summaryBoxSpace: ScreenTools.defaultFontPixelWidth * 2
......@@ -113,7 +113,7 @@ Rectangle {
// Outer summary item rectangle
Rectangle {
width: _summaryBoxWidth
height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 20 : ScreenTools.defaultFontPixelHeight * 13
height: ScreenTools.defaultFontPixelHeight * 13
color: qgcPal.windowShade
visible: modelData.summaryQmlSource.toString() !== ""
border.width: 1
......@@ -122,7 +122,7 @@ Rectangle {
border.color = Qt.rgba(border.color.r, border.color.g, border.color.b, 0.1)
}
readonly property real titleHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2
readonly property real titleHeight: ScreenTools.defaultFontPixelHeight * 2
// Title bar
QGCButton {
......@@ -151,8 +151,9 @@ Rectangle {
anchors.top: titleBar.bottom
width: parent.width
Loader {
anchors.fill: parent
source: modelData.summaryQmlSource
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
source: modelData.summaryQmlSource
}
}
}
......
src/ui/MainWindowInner.qml
View file @ 779d9702
......@@ -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.defaultFontPixelSize * 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
......@@ -373,6 +373,7 @@ Item {
textFormat: TextEdit.RichText
color: "white"
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.defaultFontPointSize
}
}
//-- Dismiss System Message
......@@ -380,8 +381,9 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.top: parent.top
anchors.right: parent.right
width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
sourceSize.height: height
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
mipmap: true
......@@ -417,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
......@@ -451,6 +453,7 @@ Item {
anchors.left: parent.left
readOnly: true
textFormat: TextEdit.RichText
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.demiboldFontFamily
wrapMode: TextEdit.WordWrap
color: qgcPal.warningText
......@@ -463,8 +466,9 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.top: parent.top
anchors.right: parent.right
width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 2.5 : ScreenTools.defaultFontPixelHeight * 1.5
width: ScreenTools.defaultFontPixelHeight * 1.5
height: width
sourceSize.height: height
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.warningText
......@@ -483,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
......
src/ui/MainWindowLeftPanel.qml
View file @ 779d9702
......@@ -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 }
......@@ -155,7 +156,7 @@ Item {
anchors.right: parent.right
anchors.topMargin: _margins
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
spacing: ScreenTools.defaultFontPixelHeight * 0.5
QGCLabel {
text: qsTr("Preferences")
......@@ -163,6 +164,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("General")
......@@ -176,6 +178,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Comm Links")
......@@ -189,6 +192,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Offline Maps")
......@@ -202,6 +206,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("MavLink")
......@@ -215,6 +220,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Console")
......@@ -228,6 +234,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Mock Link")
......@@ -242,6 +249,7 @@ Item {
}
QGCButton {
height: _buttonHeight
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Debug")
......@@ -301,7 +309,7 @@ Item {
height: __closeButtonSize
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: ScreenTools.defaultFontPixelSize * 0.5
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
QGCColoredImage {
source: "/res/XDelete.svg"
mipmap: true
......@@ -309,6 +317,7 @@ Item {
color: qgcPal.text
width: parent.width * 0.75
height: parent.height * 0.75
sourceSize.height: height
anchors.centerIn: parent
}
MouseArea {
......
src/ui/preferences/DebugWindow.qml
View file @ 779d9702
......@@ -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,16 +97,28 @@ 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
font.family: ScreenTools.normalFontFamily
}
Text {
text: _textMeasure.font.pixelSize
text: _textMeasure.font.pointSize
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
}
}
......
src/ui/preferences/GeneralSettings.qml
View file @ 779d9702
......@@ -59,7 +59,7 @@ Rectangle {
QGCLabel {
text: qsTr("General Settings")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
......
src/ui/preferences/LinkSettings.qml
View file @ 779d9702
......@@ -74,7 +74,7 @@ Rectangle {
spacing: ScreenTools.defaultFontPixelHeight / 2
QGCLabel {
text: qsTr("Comm Link Settings")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
......@@ -214,7 +214,7 @@ Rectangle {
spacing: ScreenTools.defaultFontPixelHeight / 2
QGCLabel {
text: linkConfig ? qsTr("Edit Link Configuration Settings (WIP)") : qsTr("Create New Link Configuration (WIP)")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
......
src/ui/preferences/MavlinkSettings.qml
View file @ 779d9702
......@@ -55,7 +55,7 @@ Rectangle {
anchors.top: parent.top
QGCLabel {
text: qsTr("MavLink Settings")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1
......
src/ui/toolbar/MainToolBar.qml
View file @ 779d9702
......@@ -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.pixelSize: tbFontLarge
font.pointSize: ScreenTools.largeFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorRed
anchors.rightMargin: ScreenTools.defaultFontPixelWidth
......
src/ui/toolbar/MainToolBarIndicators.qml
View file @ 779d9702
This diff is collapsed.
src/ui/toolbar/SignalStrength.qml
View file @ 779d9702
......@@ -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
}
}
src/ui/uas/UASQuickViewTextItem.cc
View file @ 779d9702
......@@ -73,7 +73,7 @@ int UASQuickViewTextItem::minValuePixelSize()
QFont valuefont = valueLabel->font();
QFont titlefont = titleLabel->font();
valuefont.setPixelSize(this->height());
titlefont.setPixelSize(valuefont.pixelSize() * 0.75);
titlefont.setPixelSize(valuefont.pointSize() * 0.75);
//spacerItem->setGeometry(QRect(0,0,20,this->height()/10.0));
QFontMetrics metrics(valuefont);
......@@ -91,27 +91,27 @@ int UASQuickViewTextItem::minValuePixelSize()
fit = true;
else
{
if (valuefont.pixelSize() - 1 <= 6)
if (valuefont.pointSize() - 1 <= 6)
{
fit = true;
valuefont.setPixelSize(6);
}
else
{
valuefont.setPixelSize(valuefont.pixelSize() - 1);
valuefont.setPixelSize(valuefont.pointSize() - 1);
}
//titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
//qDebug() << "Point size:" << valuefont.pixelSize() << valueLabel->width() << valueLabel->height();
//titlefont.setPixelSize(valuefont.pointSize() / 2.0);
//qDebug() << "Point size:" << valuefont.pointSize() << valueLabel->width() << valueLabel->height();
}
}
return valuefont.pixelSize();
return valuefont.pointSize();
}
void UASQuickViewTextItem::setValuePixelSize(int size)
{
QFont valuefont = valueLabel->font();
QFont titlefont = titleLabel->font();
valuefont.setPixelSize(size);
titlefont.setPixelSize(valuefont.pixelSize() * 0.75);
titlefont.setPixelSize(valuefont.pointSize() * 0.75);
valueLabel->setFont(valuefont);
titleLabel->setFont(titlefont);
update();
......@@ -126,7 +126,7 @@ void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
QFont valuefont = valueLabel->font();
QFont titlefont = titleLabel->font();
valuefont.setPixelSize(this->height());
titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
titlefont.setPixelSize(valuefont.pointSize() / 2.0);
//spacerItem->setGeometry(QRect(0,0,20,this->height()/10.0));
QFontMetrics metrics(valuefont);
......@@ -144,20 +144,20 @@ void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
fit = true;
else
{
if (valuefont.pixelSize()-5 <= 0)
if (valuefont.pointSize()-5 <= 0)
{
fit = true;
valuefont.setPixelSize(5);
}
else
{
valuefont.setPixelSize(valuefont.pixelSize() - 5);
valuefont.setPixelSize(valuefont.pointSize() - 5);
}
//titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
//qDebug() << "Point size:" << valuefont.pixelSize() << valueLabel->width() << valueLabel->height();
//titlefont.setPixelSize(valuefont.pointSize() / 2.0);
//qDebug() << "Point size:" << valuefont.pointSize() << valueLabel->width() << valueLabel->height();
}
}
titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
titlefont.setPixelSize(valuefont.pointSize() / 2.0);
valueLabel->setFont(valuefont);
titleLabel->setFont(titlefont);
update();
......
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