zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Moving to point size fonts. 

Android done.
QGC4.4
dogmaphobic 9 years ago
parent
3f55f678d0
commit
e1d73b08c3
67 changed files with 301 additions and 356 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AutoPilotPlugins/APM/APMAirframeComponent.qml
  2. 6
      src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
  3. 2
      src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
  4. 2
      src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
  5. 2
      src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
  6. 2
      src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
  7. 2
      src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
  8. 2
      src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
  9. 8
      src/AutoPilotPlugins/APM/APMSensorsComponent.qml
  10. 2
      src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
  11. 46
      src/AutoPilotPlugins/Common/ESP8266Component.qml
  12. 2
      src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
  13. 13
      src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
  14. 4
      src/AutoPilotPlugins/PX4/CameraComponent.qml
  15. 2
      src/AutoPilotPlugins/PX4/CameraComponentSummary.qml
  16. 2
      src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
  17. 2
      src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
  18. 2
      src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
  19. 2
      src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
  20. 4
      src/AutoPilotPlugins/PX4/SafetyComponent.qml
  21. 2
      src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
  22. 2
      src/AutoPilotPlugins/PX4/SensorsComponent.qml
  23. 2
      src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
  24. 6
      src/FlightDisplay/FlightDisplayViewVideo.qml
  25. 29
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  26. 12
      src/FlightMap/FlightMap.qml
  27. 2
      src/FlightMap/Widgets/QGCAttitudeHUD.qml
  28. 6
      src/FlightMap/Widgets/QGCCompassWidget.qml
  29. 6
      src/FlightMap/Widgets/QGCInstrumentWidget.qml
  30. 10
      src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
  31. 6
      src/FlightMap/Widgets/QGCPitchIndicator.qml
  32. 20
      src/FlightMap/Widgets/QGCSlider.qml
  33. 8
      src/FlightMap/Widgets/ValuesWidget.qml
  34. 8
      src/MissionEditor/MissionItemStatus.qml
  35. 2
      src/MissionEditor/SimpleItemEditor.qml
  36. 2
      src/QmlControls/DropButton.qml
  37. 2
      src/QmlControls/MissionCommandDialog.qml
  38. 4
      src/QmlControls/MissionItemIndexLabel.qml
  39. 2
      src/QmlControls/ParameterEditor.qml
  40. 18
      src/QmlControls/QGCButton.qml
  41. 2
      src/QmlControls/QGCCheckBox.qml
  42. 10
      src/QmlControls/QGCComboBox.qml
  43. 2
      src/QmlControls/QGCLabel.qml
  44. 4
      src/QmlControls/QGCMovableItem.qml
  45. 10
      src/QmlControls/QGCPipable.qml
  46. 2
      src/QmlControls/QGCRadioButton.qml
  47. 15
      src/QmlControls/QGCTextField.qml
  48. 2
      src/QmlControls/RoundButton.qml
  49. 84
      src/QmlControls/ScreenTools.qml
  50. 19
      src/QmlControls/ScreenToolsController.cc
  51. 65
      src/QmlControls/ScreenToolsController.h
  52. 2
      src/QmlControls/SubMenuButton.qml
  53. 2
      src/QmlControls/VehicleRotationCal.qml
  54. 87
      src/QtLocationPlugin/QMLControl/OfflineMap.qml
  55. 4
      src/VehicleSetup/FirmwareUpgrade.qml
  56. 2
      src/VehicleSetup/JoystickConfig.qml
  57. 8
      src/VehicleSetup/SetupView.qml
  58. 4
      src/VehicleSetup/VehicleSummary.qml
  59. 8
      src/ui/MainWindowInner.qml
  60. 11
      src/ui/MainWindowLeftPanel.qml
  61. 2
      src/ui/preferences/DebugWindow.qml
  62. 2
      src/ui/preferences/GeneralSettings.qml
  63. 4
      src/ui/preferences/LinkSettings.qml
  64. 2
      src/ui/preferences/MavlinkSettings.qml
  65. 2
      src/ui/toolbar/MainToolBar.qml
  66. 18
      src/ui/toolbar/MainToolBarIndicators.qml
  67. 26
      src/ui/uas/UASQuickViewTextItem.cc

2
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
Unescape View File

@ -119,7 +119,7 @@ QGCView { @@ -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
}

6
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
Unescape View File

@ -20,11 +20,9 @@ FactPanel { @@ -20,11 +20,9 @@ FactPanel {
property Fact sysIdFact: controller.getParameterFact(-1, "FRAME")
Column {
anchors.fill: parent
anchors.margins: 8
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
id: nameRow;
labelText: qsTr("Frame Type:")

2
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
Unescape View File

@ -24,7 +24,7 @@ FactPanel { @@ -24,7 +24,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
visible: _mountTypeExists

2
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
Unescape View File

@ -23,7 +23,7 @@ FactPanel { @@ -23,7 +23,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Flight Mode 1:")

2
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
Unescape View File

@ -42,7 +42,7 @@ FactPanel { @@ -42,7 +42,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Battery monitor:")

2
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
Unescape View File

@ -21,7 +21,7 @@ FactPanel { @@ -21,7 +21,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Roll:")

2
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
Unescape View File

@ -85,7 +85,7 @@ FactPanel { @@ -85,7 +85,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Arming Checks:")

2
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
Unescape View File

@ -24,7 +24,7 @@ FactPanel { @@ -24,7 +24,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Throttle failsafe:")

8
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
Unescape View File

@ -64,8 +64,8 @@ QGCView { @@ -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 { @@ -269,7 +269,7 @@ QGCView {
Column {
QGCLabel {
font.pixelSize: sideBarH1PointSize
font.pointSize: sideBarH1PointSize
text: qsTr("Set Orientations")
}
@ -459,7 +459,7 @@ QGCView { @@ -459,7 +459,7 @@ QGCView {
anchors.left: orientationCalArea.left
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Flow {

2
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
Unescape View File

@ -46,7 +46,7 @@ FactPanel { @@ -46,7 +46,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Compass 1:")

46
src/AutoPilotPlugins/Common/ESP8266Component.qml
Unescape View File

@ -41,11 +41,11 @@ QGCView { @@ -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
@ -319,12 +319,12 @@ QGCView { @@ -319,12 +319,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 +332,13 @@ QGCView { @@ -332,13 +332,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 +346,12 @@ QGCView { @@ -346,12 +346,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 +361,84 @@ QGCView { @@ -361,84 +361,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
}
}
}

2
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
Unescape View File

@ -29,7 +29,7 @@ FactPanel { @@ -29,7 +29,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Firmware Version:")
valueText: esp8266.version

13
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
Unescape View File

@ -8,9 +8,10 @@ import QGroundControl.Controllers 1.0 @@ -8,9 +8,10 @@ import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
id: panel
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
AirframeComponentController { id: controller; factPanel: panel }
@ -21,19 +22,15 @@ FactPanel { @@ -21,19 +22,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")

4
src/AutoPilotPlugins/PX4/CameraComponent.qml
Unescape View File

@ -45,8 +45,8 @@ QGCView { @@ -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

2
src/AutoPilotPlugins/PX4/CameraComponentSummary.qml
Unescape View File

@ -22,7 +22,7 @@ FactPanel { @@ -22,7 +22,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Trigger mode:")

2
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
Unescape View File

@ -22,7 +22,7 @@ FactPanel { @@ -22,7 +22,7 @@ FactPanel {
Loader {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
sourceComponent: _simpleMode ? simple : advanced
}

2
src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml
Unescape View File

@ -201,7 +201,7 @@ Item { @@ -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
}

2
src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
Unescape View File

@ -24,7 +24,7 @@ FactPanel { @@ -24,7 +24,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Roll:")

2
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
Unescape View File

@ -47,7 +47,7 @@ FactPanel { @@ -47,7 +47,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Battery Full:")

4
src/AutoPilotPlugins/PX4/SafetyComponent.qml
Unescape View File

@ -44,8 +44,8 @@ QGCView { @@ -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")

2
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
Unescape View File

@ -24,7 +24,7 @@ FactPanel { @@ -24,7 +24,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("RTL min alt:")

2
src/AutoPilotPlugins/PX4/SensorsComponent.qml
Unescape View File

@ -409,7 +409,7 @@ QGCView { @@ -409,7 +409,7 @@ QGCView {
anchors.left: orientationCalArea.left
width: parent.width
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Flow {

2
src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
Unescape View File

@ -25,7 +25,7 @@ FactPanel { @@ -25,7 +25,7 @@ FactPanel {
Column {
anchors.fill: parent
anchors.margins: 8
anchors.margins: ScreenTools.defaultFontPixelWidth
VehicleSummaryRow {
labelText: qsTr("Compass:")

6
src/FlightDisplay/FlightDisplayViewVideo.qml
Unescape View File

@ -45,7 +45,7 @@ Item { @@ -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 ? 12 * ScreenTools.fontHRatio : 20 * ScreenTools.fontHRatio
anchors.centerIn: parent
}
}
@ -61,8 +61,8 @@ Item { @@ -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
}

29
src/FlightDisplay/FlightDisplayViewWidgets.qml
Unescape View File

@ -51,8 +51,6 @@ Item { @@ -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 { @@ -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 { @@ -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 : ""
}
}
@ -247,12 +245,11 @@ Item { @@ -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 { @@ -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 { @@ -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 { @@ -328,7 +324,6 @@ Item {
id: guidedModeHideTimer
interval: 7000
running: true
onTriggered: {
if (ScreenTools.isShortScreen) {
_guidedModeBar.state = "Hidden"
@ -360,9 +355,9 @@ Item { @@ -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 { @@ -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 { @@ -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

12
src/FlightMap/FlightMap.qml
Unescape View File

@ -175,9 +175,9 @@ Map { @@ -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 { @@ -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 { @@ -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

2
src/FlightMap/Widgets/QGCAttitudeHUD.qml
Unescape View File

@ -85,6 +85,6 @@ Item { @@ -85,6 +85,6 @@ Item {
pitchAngle: _pitchAngle
rollAngle: _rollAngle
color: Qt.rgba(0,0,0,0)
size: ScreenTools.defaultFontPixelSize * (10)
size: ScreenTools.defaultFontPixelHeight * (10)
}
}

6
src/FlightMap/Widgets/QGCCompassWidget.qml
Unescape View File

@ -40,9 +40,9 @@ Item { @@ -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
@ -91,7 +91,7 @@ Item { @@ -91,7 +91,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
}

6
src/FlightMap/Widgets/QGCInstrumentWidget.qml
Unescape View File

@ -54,15 +54,15 @@ Item { @@ -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 }

10
src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
Unescape View File

@ -50,13 +50,13 @@ Rectangle { @@ -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 {

6
src/FlightMap/Widgets/QGCPitchIndicator.qml
Unescape View File

@ -40,7 +40,7 @@ Rectangle { @@ -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 { @@ -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 { @@ -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)

20
src/FlightMap/Widgets/QGCSlider.qml
Unescape View File

@ -52,15 +52,15 @@ Item { @@ -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 { @@ -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 { @@ -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)

8
src/FlightMap/Widgets/ValuesWidget.qml
Unescape View File

@ -79,7 +79,6 @@ QGCFlickable { @@ -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 { @@ -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 { @@ -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 { @@ -126,7 +124,7 @@ QGCFlickable {
QGCLabel {
width: parent.width
horizontalAlignment: Text.AlignHCenter
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize * 0.75
fontSizeMode: Text.HorizontalFit
color: textColor
text: fact.shortDescription
@ -141,7 +139,7 @@ QGCFlickable { @@ -141,7 +139,7 @@ QGCFlickable {
QGCLabel {
width: parent.width
horizontalAlignment: Text.AlignHCenter
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize * 0.75
fontSizeMode: Text.HorizontalFit
color: textColor
text: fact.units

8
src/MissionEditor/MissionItemStatus.qml
Unescape View File

@ -98,18 +98,18 @@ Rectangle { @@ -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 { @@ -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)
}
*/

2
src/MissionEditor/SimpleItemEditor.qml
Unescape View File

@ -40,7 +40,7 @@ Rectangle { @@ -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 ?

2
src/QmlControls/DropButton.qml
Unescape View File

@ -11,7 +11,7 @@ Item { @@ -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.5
property int dropDirection: dropDown
property alias dropDownComponent: dropDownLoader.sourceComponent
property real viewportMargins: 0

2
src/QmlControls/MissionCommandDialog.qml
Unescape View File

@ -77,7 +77,7 @@ QGCViewDialog { @@ -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

4
src/QmlControls/MissionItemIndexLabel.qml
Unescape View File

@ -19,7 +19,7 @@ Rectangle { @@ -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 { @@ -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
}
}

2
src/QmlControls/ParameterEditor.qml
Unescape View File

@ -43,7 +43,7 @@ QGCView { @@ -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

18
src/QmlControls/QGCButton.qml
Unescape View File

@ -50,8 +50,8 @@ Button { @@ -50,8 +50,8 @@ Button {
style: ButtonStyle {
/*! The padding between the background and the label components. */
padding {
top: 4
left: 4
top: 4
left: 4
right: control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 4
bottom: 4
}
@ -59,14 +59,8 @@ Button { @@ -59,14 +59,8 @@ Button {
/*! 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(TextSingleton.implicitHeight * 4.5)
implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
Rectangle {
anchors.fill: parent
@ -90,7 +84,7 @@ Button { @@ -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 { @@ -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 ?

2
src/QmlControls/QGCCheckBox.qml
Unescape View File

@ -29,7 +29,7 @@ CheckBox { @@ -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

10
src/QmlControls/QGCComboBox.qml
Unescape View File

@ -12,20 +12,14 @@ ComboBox { @@ -12,20 +12,14 @@ ComboBox {
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))
}
implicitHeight: Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2))
Rectangle {
anchors.fill: parent

2
src/QmlControls/QGCLabel.qml
Unescape View File

@ -10,7 +10,7 @@ Text { @@ -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

4
src/QmlControls/QGCMovableItem.qml
Unescape View File

@ -9,8 +9,8 @@ import QGroundControl.ScreenTools 1.0 @@ -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 {

10
src/QmlControls/QGCPipable.qml
Unescape View File

@ -55,8 +55,8 @@ Item { @@ -55,8 +55,8 @@ 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
MouseArea {
anchors.fill: parent
onClicked: {
@ -70,9 +70,9 @@ Item { @@ -70,9 +70,9 @@ 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 {

2
src/QmlControls/QGCRadioButton.qml
Unescape View File

@ -28,7 +28,7 @@ RadioButton { @@ -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

15
src/QmlControls/QGCTextField.qml
Unescape View File

@ -19,15 +19,8 @@ TextField { @@ -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(TextSingleton.implicitHeight * 1.2))
Label {
id: unitsLabelWidthGenerator
@ -39,7 +32,7 @@ TextField { @@ -39,7 +32,7 @@ TextField {
}
style: TextFieldStyle {
font.pixelSize: ScreenTools.defaultFontPixelSize
font.pointSize: ScreenTools.defaultFontPointSize
background: Item {
id: backgroundItem
@ -68,7 +61,7 @@ TextField { @@ -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

2
src/QmlControls/RoundButton.qml
Unescape View File

@ -10,7 +10,7 @@ Item { @@ -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.5
property bool rotateImage: false
property bool lightBorders: true

84
src/QmlControls/ScreenTools.qml
Unescape View File

@ -7,36 +7,31 @@ import QtQuick.Window 2.2 @@ -7,36 +7,31 @@ 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 defaultFontPointSize: 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
property real smallFontPointSize: 1
property real mediumFontPointSize: 1
property real largeFontPointSize: 1
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
readonly property real smallFontPointRatio: 0.75
readonly property real mediumFontPointRatio: 1.25
readonly property real largeFontPointRatio: 1.5
// 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)
// Font scaling based on system font
readonly property real fontHRatio: _textMeasure.fontHeight / _defaultFont.fontHeight
property bool isAndroid: ScreenToolsController.isAndroid
property bool isiOS: ScreenToolsController.isiOS
property bool isMobile: ScreenToolsController.isMobile
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"
@ -51,31 +46,44 @@ Item { @@ -51,31 +46,44 @@ Item {
}
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 {
//-- Linux and Mac OS we use a slightly smaller font
if(ScreenToolsController.isMacOS || ScreenToolsController.isLinux)
return _defaultFont.font.pointSize - 1
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
}
}
}

19
src/QmlControls/ScreenToolsController.cc
Unescape View File

@ -22,27 +22,12 @@ @@ -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()
{
}

65
src/QmlControls/ScreenToolsController.h
Unescape View File

@ -28,16 +28,11 @@ @@ -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: @@ -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: @@ -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

2
src/QmlControls/SubMenuButton.qml
Unescape View File

@ -14,7 +14,7 @@ Button { @@ -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.defaultFontPixelHeight * 2.5
style: ButtonStyle {
id: buttonStyle

2
src/QmlControls/VehicleRotationCal.qml
Unescape View File

@ -69,7 +69,7 @@ Rectangle { @@ -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"))
}
}

87
src/QtLocationPlugin/QMLControl/OfflineMap.qml
Unescape View File

@ -54,8 +54,8 @@ Rectangle { @@ -54,8 +54,8 @@ Rectangle {
property string savedMapType: ""
property real _newSetMiddleLabel: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 10 : ScreenTools.defaultFontPixelWidth * 14
property real _newSetMiddleField: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 18 : ScreenTools.defaultFontPixelWidth * 20
property real _netSetSliderWidth: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 12 : ScreenTools.defaultFontPixelWidth * 14
property real _newSetMiddleField: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 16 : ScreenTools.defaultFontPixelWidth * 20
property real _netSetSliderWidth: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelWidth * 8 : ScreenTools.defaultFontPixelWidth * 14
property real oldlon0: 0
property real oldlon1: 0
@ -244,14 +244,14 @@ Rectangle { @@ -244,14 +244,14 @@ Rectangle {
QGCLabel {
id: labelTitle
text: qsTr("Offline Maps")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
anchors.verticalCenter: parent.verticalCenter
}
QGCCheckBox {
id: showTilePreview
text: qsTr("Show tile min/max zoom level preview")
checked: false
visible: _mapView.visible
visible: _mapView.visible && !ScreenTools.isTinyScreen
anchors.verticalCenter: parent.verticalCenter
}
}
@ -334,7 +334,7 @@ Rectangle { @@ -334,7 +334,7 @@ Rectangle {
text: qsTr("Add new set")
anchors.left: parent.left
anchors.right: parent.right
height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2
height: ScreenTools.defaultFontPixelHeight * 2
onClicked: {
_offlineMapRoot._currentSelection = null
showMap()
@ -348,7 +348,7 @@ Rectangle { @@ -348,7 +348,7 @@ Rectangle {
complete: object.complete
anchors.left: parent.left
anchors.right: parent.right
height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 4 : ScreenTools.defaultFontPixelHeight * 2
height: ScreenTools.defaultFontPixelHeight * 2
onClicked: {
_offlineMapRoot._currentSelection = object
showInfo()
@ -381,6 +381,7 @@ Rectangle { @@ -381,6 +381,7 @@ Rectangle {
Item {
width: parent.width
anchors.top: parent.top
visible: showTilePreview.checked
Rectangle {
width: ScreenTools.defaultFontPixelHeight * 16
height: ScreenTools.defaultFontPixelHeight * 9
@ -388,7 +389,6 @@ Rectangle { @@ -388,7 +389,6 @@ Rectangle {
anchors.left: parent.left
anchors.margins: ScreenTools.defaultFontPixelHeight
color: "black"
visible: showTilePreview.checked
Map {
id: _mapMin
anchors.fill: parent
@ -407,7 +407,6 @@ Rectangle { @@ -407,7 +407,6 @@ Rectangle {
anchors.right: parent.right
anchors.margins: ScreenTools.defaultFontPixelHeight
color: "black"
visible: showTilePreview.checked
Map {
id: _mapMax
anchors.fill: parent
@ -437,37 +436,37 @@ Rectangle { @@ -437,37 +436,37 @@ Rectangle {
anchors.centerIn: parent
spacing: ScreenTools.defaultFontPixelWidth * 0.5
Rectangle {
height: _zoomRow.height + ScreenTools.defaultFontPixelHeight * 1.5
width: _zoomRow.width + ScreenTools.defaultFontPixelWidth
color: "#98aca4"
border.color: "black"
border.width: 2
height: _zoomRow.height + ScreenTools.defaultFontPixelHeight * 1.5
width: _zoomRow.width + ScreenTools.defaultFontPixelWidth
color: "#98aca4"
border.color: "black"
border.width: 2
radius: ScreenTools.defaultFontPixelWidth * 0.5
anchors.verticalCenter: parent.verticalCenter
Row {
id: _zoomRow
id: _zoomRow
anchors.centerIn: parent
Column {
spacing: ScreenTools.defaultFontPixelHeight * 0.5
spacing: ScreenTools.defaultFontPixelHeight * 0.5
anchors.verticalCenter: parent.verticalCenter
Row {
spacing: ScreenTools.defaultFontPixelWidth * 0.5
spacing: ScreenTools.defaultFontPixelWidth * 0.5
Column {
anchors.verticalCenter: parent.verticalCenter
Label {
text: qsTr("Min")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 5
font.pixelSize: ScreenTools.smallFontPixelSize
width: ScreenTools.defaultFontPixelWidth * 4
font.pointSize: ScreenTools.smallFontPointSize
horizontalAlignment: Text.AlignHCenter
font.family: ScreenTools.normalFontFamily
}
Label {
text: qsTr("Zoom")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 5
width: ScreenTools.defaultFontPixelWidth * 4
font.family: ScreenTools.normalFontFamily
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
horizontalAlignment: Text.AlignHCenter
}
}
@ -482,7 +481,7 @@ Rectangle { @@ -482,7 +481,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
style: SliderStyle {
groove: Rectangle {
implicitWidth: ScreenTools.defaultFontPixelWidth * 14
implicitWidth: _netSetSliderWidth
implicitHeight: 4
color: "gray"
radius: 4
@ -492,13 +491,14 @@ Rectangle { @@ -492,13 +491,14 @@ Rectangle {
color: control.pressed ? "white" : "lightgray"
border.color: "gray"
border.width: 2
implicitWidth: ScreenTools.isAndroid ? 60 : 30
implicitHeight: ScreenTools.isAndroid ? 60 : 30
implicitWidth: ScreenTools.defaultFontPixelWidth * 3
implicitHeight: ScreenTools.defaultFontPixelWidth * 3
radius: 10
Label {
text: _slider0.value
anchors.centerIn: parent
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.smallFontPointSize
}
}
}
@ -524,16 +524,16 @@ Rectangle { @@ -524,16 +524,16 @@ Rectangle {
Label {
text: qsTr("Max")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 5
font.pixelSize: ScreenTools.smallFontPixelSize
width: ScreenTools.defaultFontPixelWidth * 4
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.normalFontFamily
horizontalAlignment: Text.AlignHCenter
}
Label {
text: qsTr("Zoom")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 5
font.pixelSize: ScreenTools.smallFontPixelSize
width: ScreenTools.defaultFontPixelWidth * 4
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.normalFontFamily
horizontalAlignment: Text.AlignHCenter
}
@ -549,7 +549,7 @@ Rectangle { @@ -549,7 +549,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
style: SliderStyle {
groove: Rectangle {
implicitWidth: ScreenTools.defaultFontPixelWidth * 14
implicitWidth: _netSetSliderWidth
implicitHeight: 4
color: "gray"
radius: 4
@ -559,13 +559,14 @@ Rectangle { @@ -559,13 +559,14 @@ Rectangle {
color: control.pressed ? "white" : "lightgray"
border.color: "gray"
border.width: 2
implicitWidth: ScreenTools.isAndroid ? 60 : 30
implicitHeight: ScreenTools.isAndroid ? 60 : 30
implicitWidth: ScreenTools.defaultFontPixelWidth * 3
implicitHeight: ScreenTools.defaultFontPixelWidth * 3
radius: 10
Label {
text: _slider1.value
font.family: ScreenTools.normalFontFamily
anchors.centerIn: parent
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.smallFontPointSize
}
}
}
@ -590,7 +591,7 @@ Rectangle { @@ -590,7 +591,7 @@ Rectangle {
text: qsTr("Tile Count")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 12
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.normalFontFamily
horizontalAlignment: Text.AlignHCenter
}
@ -599,13 +600,14 @@ Rectangle { @@ -599,13 +600,14 @@ Rectangle {
color: "black"
width: ScreenTools.defaultFontPixelWidth * 12
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.defaultFontPointSize
horizontalAlignment: Text.AlignHCenter
}
Label {
text: qsTr("Set Size (Est)")
color: "black"
width: ScreenTools.defaultFontPixelWidth * 12
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.normalFontFamily
horizontalAlignment: Text.AlignHCenter
}
@ -614,6 +616,7 @@ Rectangle { @@ -614,6 +616,7 @@ Rectangle {
color: "black"
width: ScreenTools.defaultFontPixelWidth * 12
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.defaultFontPointSize
horizontalAlignment: Text.AlignHCenter
}
}
@ -690,7 +693,7 @@ Rectangle { @@ -690,7 +693,7 @@ Rectangle {
QGCButton {
text: qsTr("Download")
enabled: setName.text.length > 0
width: ScreenTools.defaultFontPixelWidth * 12
width: ScreenTools.defaultFontPixelWidth * 10
onClicked: {
if(QGroundControl.mapEngineManager.findName(setName.text)) {
duplicateName.visible = true
@ -707,7 +710,7 @@ Rectangle { @@ -707,7 +710,7 @@ Rectangle {
}
QGCButton {
text: qsTr("Cancel")
width: ScreenTools.defaultFontPixelWidth * 12
width: ScreenTools.defaultFontPixelWidth * 10
onClicked: {
showList()
}
@ -760,7 +763,7 @@ Rectangle { @@ -760,7 +763,7 @@ Rectangle {
spacing: ScreenTools.defaultFontPixelHeight * 0.5
QGCLabel {
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.name : ""
font.pixelSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPixelSize : ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPointSize : ScreenTools.largeFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
@ -918,7 +921,7 @@ Rectangle { @@ -918,7 +921,7 @@ Rectangle {
QGCLabel {
id: nameLabel
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.name : ""
font.pixelSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPixelSize : ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPointSize : ScreenTools.largeFontPointSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
@ -968,10 +971,6 @@ Rectangle { @@ -968,10 +971,6 @@ Rectangle {
}
}
}
Item {
height: ScreenTools.defaultFontPixelHeight * 0.5
width: 1
}
Row {
anchors.horizontalCenter: parent.horizontalCenter
spacing: ScreenTools.defaultFontPixelWidth
@ -1051,7 +1050,7 @@ Rectangle { @@ -1051,7 +1050,7 @@ Rectangle {
QGCLabel {
id: optionsLabel
text: qsTr("Offline Map Options")
font.pixelSize: ScreenTools.largeFontPixelSize
font.pointSize: ScreenTools.largeFontPointSize
anchors.centerIn: parent
}
}
@ -1094,7 +1093,7 @@ Rectangle { @@ -1094,7 +1093,7 @@ Rectangle {
QGCLabel {
anchors.centerIn: parent
text: qsTr("Memory cache changes require a restart to take effect.")
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.85
font.pointSize: ScreenTools.defaultFontPointSize * 0.85
}
}
Rectangle {
@ -1119,7 +1118,7 @@ Rectangle { @@ -1119,7 +1118,7 @@ Rectangle {
QGCLabel {
anchors.centerIn: parent
text: qsTr("With an access token, you can use MapBox Maps.")
font.pixelSize: ScreenTools.defaultFontPixelSize * 0.85
font.pointSize: ScreenTools.defaultFontPointSize * 0.85
}
}
}

4
src/VehicleSetup/FirmwareUpgrade.qml
Unescape View File

@ -341,7 +341,7 @@ QGCView { @@ -341,7 +341,7 @@ QGCView {
QGCLabel {
id: titleLabel
text: title
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
ProgressBar {
@ -359,7 +359,7 @@ QGCView { @@ -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

2
src/VehicleSetup/JoystickConfig.qml
Unescape View File

@ -149,7 +149,7 @@ QGCView { @@ -149,7 +149,7 @@ QGCView {
QGCLabel {
id: header
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: qsTr("JOYSTICK")
}

8
src/VehicleSetup/SetupView.qml
Unescape View File

@ -151,7 +151,7 @@ Rectangle { @@ -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 { @@ -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 { @@ -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 { @@ -211,7 +211,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
text: _messagePanelText
}
}

4
src/VehicleSetup/VehicleSummary.qml
Unescape View File

@ -113,7 +113,7 @@ Rectangle { @@ -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 { @@ -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 {

8
src/ui/MainWindowInner.qml
Unescape View File

@ -45,7 +45,7 @@ Item { @@ -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 * 4
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 { @@ -373,6 +373,7 @@ Item {
textFormat: TextEdit.RichText
color: "white"
font.family: ScreenTools.normalFontFamily
font.pointSize: ScreenTools.defaultFontPointSize
}
}
//-- Dismiss System Message
@ -380,7 +381,7 @@ Item { @@ -380,7 +381,7 @@ 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
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
@ -451,6 +452,7 @@ Item { @@ -451,6 +452,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,7 +465,7 @@ Item { @@ -463,7 +465,7 @@ 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
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit

11
src/ui/MainWindowLeftPanel.qml
Unescape View File

@ -155,7 +155,7 @@ Item { @@ -155,7 +155,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 +163,7 @@ Item { @@ -163,6 +163,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("General")
@ -176,6 +177,7 @@ Item { @@ -176,6 +177,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Comm Links")
@ -189,6 +191,7 @@ Item { @@ -189,6 +191,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Offline Maps")
@ -202,6 +205,7 @@ Item { @@ -202,6 +205,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("MavLink")
@ -215,6 +219,7 @@ Item { @@ -215,6 +219,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Console")
@ -228,6 +233,7 @@ Item { @@ -228,6 +233,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Mock Link")
@ -242,6 +248,7 @@ Item { @@ -242,6 +248,7 @@ Item {
}
QGCButton {
height: ScreenTools.defaultFontPixelHeight * 2
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Debug")
@ -301,7 +308,7 @@ Item { @@ -301,7 +308,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

2
src/ui/preferences/DebugWindow.qml
Unescape View File

@ -91,7 +91,7 @@ QGCView { @@ -91,7 +91,7 @@ QGCView {
font.family: ScreenTools.normalFontFamily
}
Text {
text: _textMeasure.font.pixelSize
text: _textMeasure.font.pointSize
color: qgcPal.text
font.family: ScreenTools.normalFontFamily
}

2
src/ui/preferences/GeneralSettings.qml
Unescape View File

@ -59,7 +59,7 @@ Rectangle { @@ -59,7 +59,7 @@ Rectangle {
QGCLabel {
text: qsTr("General Settings")
font.pixelSize: ScreenTools.mediumFontPixelSize
font.pointSize: ScreenTools.mediumFontPointSize
}
Rectangle {
height: 1

4
src/ui/preferences/LinkSettings.qml
Unescape View File

@ -74,7 +74,7 @@ Rectangle { @@ -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 { @@ -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

2
src/ui/preferences/MavlinkSettings.qml
Unescape View File

@ -55,7 +55,7 @@ Rectangle { @@ -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

2
src/ui/toolbar/MainToolBar.qml
Unescape View File

@ -503,7 +503,7 @@ Rectangle { @@ -503,7 +503,7 @@ Rectangle {
QGCLabel {
id: connectionLost
text: qsTr("COMMUNICATION LOST")
font.pixelSize: tbFontLarge
font.pointSize: tbFontLarge
font.family: ScreenTools.demiboldFontFamily
color: colorRed
anchors.rightMargin: ScreenTools.defaultFontPixelWidth

18
src/ui/toolbar/MainToolBarIndicators.qml
Unescape View File

@ -187,7 +187,7 @@ Row { @@ -187,7 +187,7 @@ Row {
//anchors.left: parent.left
anchors.right: gpsRow.right
visible: activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
font.pixelSize: tbFontSmall
font.pointSize: tbFontSmall
color: qgcPal.buttonText
text: activeVehicle ? activeVehicle.gps.hdop.value.toFixed(0) : ""
}
@ -288,7 +288,7 @@ Row { @@ -288,7 +288,7 @@ Row {
QGCLabel {
text: getBatteryPercentageText()
font.pixelSize: tbFontLarge
font.pointSize: tbFontLarge
color: getBatteryColor()
anchors.verticalCenter: parent.verticalCenter
}
@ -309,7 +309,7 @@ Row { @@ -309,7 +309,7 @@ Row {
//-- Vehicle Selector
QGCButton {
id: vehicleSelectorButton
width: ScreenTools.defaultFontPixelSize * 8
width: ScreenTools.defaultFontPixelHeight * 8
text: "Vehicle " + (activeVehicle ? activeVehicle.id : "None")
visible: QGroundControl.multiVehicleManager.vehicles.count > 1
anchors.verticalCenter: parent.verticalCenter
@ -375,7 +375,7 @@ Row { @@ -375,7 +375,7 @@ Row {
QGCLabel {
text: activeVehicle ? activeVehicle.flightMode : qsTr("N/A", "No data to display")
font.pixelSize: tbFontLarge
font.pointSize: tbFontLarge
color: qgcPal.buttonText
anchors.verticalCenter: parent.verticalCenter
}
@ -470,7 +470,7 @@ Row { @@ -470,7 +470,7 @@ Row {
anchors.rightMargin: getProportionalDimmension(6)
anchors.verticalCenter: parent.verticalCenter
horizontalAlignment: Text.AlignRight
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
@ -503,7 +503,7 @@ Row { @@ -503,7 +503,7 @@ Row {
anchors.right: parent.right
QGCLabel {
text: 'R '
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
@ -511,7 +511,7 @@ Row { @@ -511,7 +511,7 @@ Row {
text: _controller.telemetryRRSSI + 'dBm'
width: getProportionalDimmension(30)
horizontalAlignment: Text.AlignRight
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
@ -520,7 +520,7 @@ Row { @@ -520,7 +520,7 @@ Row {
anchors.right: parent.right
QGCLabel {
text: 'L '
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}
@ -528,7 +528,7 @@ Row { @@ -528,7 +528,7 @@ Row {
text: _controller.telemetryLRSSI + 'dBm'
width: getProportionalDimmension(30)
horizontalAlignment: Text.AlignRight
font.pixelSize: ScreenTools.smallFontPixelSize
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.demiboldFontFamily
color: colorWhite
}

26
src/ui/uas/UASQuickViewTextItem.cc
Unescape View File

@ -73,7 +73,7 @@ int UASQuickViewTextItem::minValuePixelSize() @@ -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() @@ -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) @@ -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) @@ -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();

Write Preview
Loading…
Cancel
Save