Merge pull request #3247 from dogmaphobic/offlineMap

Offline map

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

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

src/QmlControls/QGCTextField.qml

@@ -31,6 +31,7 @@ TextField {
     }
 
     style: TextFieldStyle {
+        font.pixelSize: ScreenTools.defaultFontPixelSize
         background: Item {
             id: backgroundItem
 

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

src/QtLocationPlugin/QGCMapEngine.cpp

@@ -266,7 +266,7 @@ QGCTileSet
 QGCMapEngine::getTileCount(int zoom, double topleftLon, double topleftLat, double bottomRightLon, double bottomRightLat, UrlFactory::MapType mapType)
 {
     if(zoom <  1) zoom = 1;
-    if(zoom > 18) zoom = 18;
+    if(zoom > MAX_MAP_ZOOM) zoom = MAX_MAP_ZOOM;
     QGCTileSet set;
     set.tileX0 = long2tileX(topleftLon,     zoom);
     set.tileY0 = lat2tileY(topleftLat,      zoom);

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"
@@ -282,6 +283,7 @@ Item {
 
     //-- Main Setting Display Area
     Rectangle {
+        id:             settingDisplayArea
         anchors.left:   __verticalSeparator.right
         width:          mainWindow.width - __leftMenu.width - __verticalSeparator.width
         height:         parent.height - toolBar.height - __topSeparator.height