From b31e202519dfea4897354f7dea6255548a7ef2f5 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Wed, 20 Apr 2016 22:15:46 -0400 Subject: [PATCH] Wrapping up iOS --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- src/QmlControls/QGCButton.qml | 2 +- src/QmlControls/QGCTextField.qml | 1 + src/QmlControls/ScreenToolsController.cc | 2 +- src/QtLocationPlugin/QMLControl/OfflineMap.qml | 16 ++++++++-------- src/ui/MainWindowLeftPanel.qml | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 1e61d1fd3..0c71e760d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml index 81e25a00e..cdbfbc6bb 100644 --- a/src/QmlControls/QGCButton.qml +++ b/src/QmlControls/QGCButton.qml @@ -60,7 +60,7 @@ Button { background: Item { property bool down: control.pressed || (control.checkable && control.checked) implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) - implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 3 * 0.75 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) + implicitHeight: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 2.5 : Math.max(25, Math.round(TextSingleton.implicitHeight * 1.2)) Rectangle { anchors.fill: parent diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 9c639c20f..e8902a322 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -31,6 +31,7 @@ TextField { } style: TextFieldStyle { + font.pixelSize: ScreenTools.defaultFontPixelSize background: Item { id: backgroundItem diff --git a/src/QmlControls/ScreenToolsController.cc b/src/QmlControls/ScreenToolsController.cc index 9717284d7..c226cd6f8 100644 --- a/src/QmlControls/ScreenToolsController.cc +++ b/src/QmlControls/ScreenToolsController.cc @@ -31,7 +31,7 @@ const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; #elif __android__ const double ScreenToolsController::_defaultFontPixelSizeRatio = 1.0; #elif __ios__ -const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; +const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.6; #else const double ScreenToolsController::_defaultFontPixelSizeRatio = 0.8; #endif diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index b15add361..beb3e60e3 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -579,27 +579,27 @@ Rectangle { Label { text: qsTr("Tile Count") color: "black" - width: ScreenTools.defaultFontPixelWidth * 12 + width: ScreenTools.defaultFontPixelWidth * 8 font.pixelSize: ScreenTools.smallFontPixelSize horizontalAlignment: Text.AlignHCenter } Label { text: QGroundControl.mapEngineManager.tileCountStr color: "black" - width: ScreenTools.defaultFontPixelWidth * 12 + width: ScreenTools.defaultFontPixelWidth * 8 horizontalAlignment: Text.AlignHCenter } Label { text: qsTr("Set Size (Est)") color: "black" - width: ScreenTools.defaultFontPixelWidth * 12 + width: ScreenTools.defaultFontPixelWidth * 8 font.pixelSize: ScreenTools.smallFontPixelSize horizontalAlignment: Text.AlignHCenter } Label { text: QGroundControl.mapEngineManager.tileSizeStr color: "black" - width: ScreenTools.defaultFontPixelWidth * 12 + width: ScreenTools.defaultFontPixelWidth * 8 horizontalAlignment: Text.AlignHCenter } } @@ -618,7 +618,7 @@ Rectangle { } QGCTextField { id: setName - width: ScreenTools.defaultFontPixelWidth * 24 + width: ScreenTools.defaultFontPixelWidth * 20 anchors.verticalCenter: parent.verticalCenter } } @@ -633,7 +633,7 @@ Rectangle { QGCTextField { id: setDescription text: qsTr("Description") - width: ScreenTools.defaultFontPixelWidth * 24 + width: ScreenTools.defaultFontPixelWidth * 20 anchors.verticalCenter: parent.verticalCenter } } @@ -647,7 +647,7 @@ Rectangle { } QGCComboBox { id: mapCombo - width: ScreenTools.defaultFontPixelWidth * 24 + width: ScreenTools.defaultFontPixelWidth * 20 model: QGroundControl.mapEngineManager.mapList onActivated: { mapType = textAt(index) @@ -668,7 +668,7 @@ Rectangle { } Item { height: 1 - width: ScreenTools.defaultFontPixelWidth * 1.5 + width: ScreenTools.defaultFontPixelWidth } Column { anchors.verticalCenter: parent.verticalCenter diff --git a/src/ui/MainWindowLeftPanel.qml b/src/ui/MainWindowLeftPanel.qml index a16421747..a6a3121fc 100644 --- a/src/ui/MainWindowLeftPanel.qml +++ b/src/ui/MainWindowLeftPanel.qml @@ -193,6 +193,7 @@ Item { anchors.right: parent.right text: qsTr("Offline Maps") exclusiveGroup: panelActionGroup + visible: !ScreenTools.isTinyScreen onClicked: { if(__rightPanel.source != "OfflineMap.qml") { __rightPanel.source = "OfflineMap.qml" -- 2.22.0