Merge branch 'master' of github.com:Akaflieg-Freiburg/enroute

CMakeLists.txt

@@ -5,6 +5,7 @@
 cmake_minimum_required(VERSION 3.13)
 include(ExternalProject)
 include(GNUInstallDirs)
+option(BUILD_DOC "Build documentation" OFF)
 
 
 #
@@ -41,7 +42,11 @@ if( ANDROID )
 endif()
 
 # Create target collecting all documentation
-add_custom_target(doc)
+if ( BUILD_DOC )
+    add_custom_target(fulldoc ALL)
+else()
+    add_custom_target(fulldoc)
+endif()
 
 # Subdirectories
 add_subdirectory(3rdParty)

src/CMakeLists.txt

@@ -207,17 +207,18 @@ endif()
 # Generate unix executable
 #
 if (NOT ANDROID)
-    # Configure Doxyfile
-    configure_file(Doxyfile.in Doxyfile)
-
     # Add executable and libraries
     add_executable(${PROJECT_NAME} ${SOURCES})
     target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Positioning Qt5::Quick Qt5::Sql Qt5::Svg qhttpengine)
 
     # Install
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-    # Generate documentation
-    add_custom_target(enroute_doc COMMAND doxygen)
-    add_dependencies(doc enroute_doc)
+    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})    
 endif()
+
+
+#
+# Generate documentation
+#
+configure_file(Doxyfile.in Doxyfile)
+add_custom_target(enroute_doc COMMAND doxygen)
+add_dependencies(fulldoc enroute_doc)

src/MapManager.cpp

@@ -95,6 +95,17 @@ bool MapManager::geoMapUpdatesAvailable() const
 }
 
 
+QString MapManager::geoMapUpdateSize() const
+{
+    qint64 downloadSize = 0;
+    foreach(auto geoMapPtr, _geoMaps)
+        if (geoMapPtr->updatable())
+            downloadSize += geoMapPtr->remoteFileSize();
+
+    return QLocale::system().formattedDataSize(downloadSize, 1, QLocale::DataSizeSIFormat);
+}
+
+
 QMap<QString, Downloadable*> MapManager::aviationMaps() const
 {
     QMap<QString, Downloadable *> result;

src/MapManager.h

@@ -85,6 +85,12 @@ class MapManager : public QObject
   /*! \brief Getter function for the property with the same name */
   bool geoMapUpdatesAvailable() const;
 
+  /*! \brief Gives an estimate for the download size, as a localized string */
+  Q_PROPERTY(QString geoMapUpdateSize READ geoMapUpdateSize NOTIFY geoMapUpdatesAvailableChanged)
+
+  /*! \brief Getter function for the property with the same name */
+  QString geoMapUpdateSize() const;
+
   /*! \brief List of available aviation maps
 
     This method return a QMap that contains pointers to all known aviation maps

src/qml/dialogs/UpdateMapDialog.qml

@@ -25,7 +25,7 @@ LongTextDialog {
     id: mud
 
     title: qsTr("Map updates available")
-    text: qsTr("<p>One or several of your installed maps can be updated. You might wish to update now if you have a fast and inexpensive internet connection.</p>")
+    text: qsTr(`<p>One or several of your installed maps can be updated. The estimated download size is ${mapManager.geoMapUpdateSize}.</p>`)
 
     footer: DialogButtonBox {
         ToolButton {