Merge pull request #2854 from dogmaphobic/flickableInOfflineMaps

Flickable in Offline Maps

src/QtLocationPlugin/QGCMapTileSet.cpp

@@ -29,13 +29,13 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
-#include <math.h>
-#include <QSettings>
-
 #include "QGCMapEngine.h"
 #include "QGCMapTileSet.h"
 #include "QGCMapEngineManager.h"
 
+#include <QSettings>
+#include <math.h>
+
 QGC_LOGGING_CATEGORY(QGCCachedTileSetLog, "QGCCachedTileSetLog")
 
 #define TILE_BATCH_SIZE      256

src/QtLocationPlugin/QGCMapUrlEngine.cpp

@@ -27,6 +27,8 @@ This file is part of the QGROUNDCONTROL project
  *  Original work: The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
  */
 
+#include "QGCMapEngine.h"
+
 #include <QRegExp>
 #include <QNetworkReply>
 #include <QEventLoop>
@@ -34,8 +36,6 @@ This file is part of the QGROUNDCONTROL project
 #include <QString>
 #include <QByteArray>
 
-#include "QGCMapEngine.h"
-
 //-----------------------------------------------------------------------------
 UrlFactory::UrlFactory()
     : _timeout(5 * 1000)

src/QtLocationPlugin/QGCTileCacheWorker.cpp

@@ -29,6 +29,9 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
+#include "QGCMapEngine.h"
+#include "QGCMapTileSet.h"
+
 #include <QVariant>
 #include <QtSql/QSqlQuery>
 #include <QSqlError>
@@ -39,9 +42,6 @@ This file is part of the QGROUNDCONTROL project
 
 #include "time.h"
 
-#include "QGCMapEngine.h"
-#include "QGCMapTileSet.h"
-
 const char* kDefaultSet = "Default Tile Set";
 const QString kSession  = QLatin1String("QGeoTileWorkerSession");
 

src/QtLocationPlugin/QGeoCodeReplyQGC.cpp

@@ -44,6 +44,8 @@
 **
 ****************************************************************************/
 
+#include "QGeoCodeReplyQGC.h"
+
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
@@ -54,8 +56,6 @@
 #include <QSet>
 #include <QDebug>
 
-#include "QGeoCodeReplyQGC.h"
-
 enum QGeoCodeTypeGoogle {
     GeoCodeTypeUnknown,
     StreetAddress, // indicates a precise street address.

src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp

@@ -44,6 +44,9 @@
 **
 ****************************************************************************/
 
+#include "QGeoCodingManagerEngineQGC.h"
+#include "QGeoCodeReplyQGC.h"
+
 #include <QtCore/QVariantMap>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
@@ -55,10 +58,6 @@
 #include <QtPositioning/QGeoAddress>
 #include <QtPositioning/QGeoShape>
 #include <QtPositioning/QGeoRectangle>
-#include <QDebug>
-
-#include "QGeoCodingManagerEngineQGC.h"
-#include "QGeoCodeReplyQGC.h"
 
 static QString addressToQuery(const QGeoAddress &address)
 {

src/QtLocationPlugin/QGeoMapReplyQGC.cpp

@@ -44,13 +44,13 @@
 **
 ****************************************************************************/
 
+#include "QGCMapEngine.h"
+#include "QGeoMapReplyQGC.h"
+
 #include <QtLocation/private/qgeotilespec_p.h>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QFile>
 
-#include "QGCMapEngine.h"
-#include "QGeoMapReplyQGC.h"
-
 //-----------------------------------------------------------------------------
 QGeoTiledMapReplyQGC::QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager, const QNetworkRequest &request, const QGeoTileSpec &spec, QObject *parent)
     : QGeoTiledMapReply(spec, parent)

src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp

@@ -44,13 +44,12 @@
 **
 ****************************************************************************/
 
-#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
-
-#include "qdebug.h"
 #include "QGeoServiceProviderPluginQGC.h"
 #include "QGeoTiledMappingManagerEngineQGC.h"
 #include "QGeoCodingManagerEngineQGC.h"
 
+#include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
+
 Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata();
 Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance();
 

src/QtLocationPlugin/QGeoTileFetcherQGC.cpp

@@ -44,14 +44,14 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QLocale>
-#include <QtNetwork/QNetworkRequest>
-#include <QtLocation/private/qgeotilespec_p.h>
-
 #include "QGCMapEngine.h"
 #include "QGeoTileFetcherQGC.h"
 #include "QGeoMapReplyQGC.h"
 
+#include <QtCore/QLocale>
+#include <QtNetwork/QNetworkRequest>
+#include <QtLocation/private/qgeotilespec_p.h>
+
 //-----------------------------------------------------------------------------
 QGeoTileFetcherQGC::QGeoTileFetcherQGC(QGeoTiledMappingManagerEngine *parent)
     : QGeoTileFetcher(parent)

src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp

@@ -44,6 +44,10 @@
 **
 ****************************************************************************/
 
+#include "QGCMapEngine.h"
+#include "QGeoTiledMappingManagerEngineQGC.h"
+#include "QGeoTileFetcherQGC.h"
+
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 #if QT_VERSION < 0x050500
@@ -54,10 +58,6 @@
 #include <QDir>
 #include <QStandardPaths>
 
-#include "QGCMapEngine.h"
-#include "QGeoTiledMappingManagerEngineQGC.h"
-#include "QGeoTileFetcherQGC.h"
-
 #if QT_VERSION >= 0x050500
 //-----------------------------------------------------------------------------
 QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent)

src/QtLocationPlugin/QMLControl/OfflineMap.qml

@@ -611,8 +611,14 @@ Rectangle {
         anchors.bottom:     parent.bottom
         anchors.margins:    ScreenTools.defaultFontPixelWidth
         visible:            false
-
+        QGCFlickable {
+            id:                 infoScroll
+            anchors.fill:       parent
+            contentHeight:      infoColumn.height
+            flickableDirection: Flickable.VerticalFlick
+            clip:               true
             Column {
+                id:             infoColumn
                 width:          parent.width
                 spacing:        ScreenTools.defaultFontPixelHeight
                 Item {
@@ -779,6 +785,7 @@ Rectangle {
                 }
             }
         }
+    }
     Rectangle {
         id:                 _optionsView
         color:              __qgcPal.windowShade
@@ -794,7 +801,14 @@ Rectangle {
                 maxCacheMemSize.text = QGroundControl.mapEngineManager.maxMemCache
             }
         }
+        QGCFlickable {
+            id:                 optionsScroll
+            anchors.fill:       parent
+            contentHeight:      optionsColumn.height
+            flickableDirection: Flickable.VerticalFlick
+            clip:               true
             Column {
+                id:             optionsColumn
                 width:          parent.width
                 spacing:        ScreenTools.defaultFontPixelHeight
                 Item {
@@ -906,4 +920,5 @@ Rectangle {
                 }
             }
         }
+    }
 }

src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

@@ -29,11 +29,9 @@
 #include "QGCMapTileSet.h"
 #include "QGCMapUrlEngine.h"
 
-#include <stdio.h>
-
-#include <QQmlEngine>
 #include <QSettings>
 #include <QStorageInfo>
+#include <stdio.h>
 
 QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog")