Merge pull request #1466 from Karry/client-setting

Make client setting Qt independent
Framstag · Jul 19, 2023 · 1091ff4 · 1091ff4
2 parents 605ed74 + f959c5a
commit 1091ff4
Show file tree

Hide file tree

Showing 70 changed files with 1,628 additions and 1,188 deletions.
diff --git a/Demos/meson.build b/Demos/meson.build
@@ -125,7 +125,7 @@ if buildClientQt
                                    'src/QtDemoApp.cpp'],
                                   demoMocs,
                                   cpp_args: ['-fPIC'],
-                                  include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientqtIncDir, demoIncDir],
+                                  include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientIncDir, osmscoutclientqtIncDir, demoIncDir],
                                   dependencies: [mathDep, openmpDep, qtClientDep],
                                   link_with: [osmscout, osmscoutmap, osmscoutmapqt, osmscoutclientqt],
                                   override_options : ['unity=off'], # generated code for qt resources use static variables with the same name
@@ -145,7 +145,7 @@ if buildClientQt
                                  '../OSMScout2/src/Theme.cpp'],
                                 [demoMocs, navDemoMocs],
                                 cpp_args: ['-fPIC'],
-                                include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientqtIncDir, osmscoutgpxIncDir, demoIncDir, include_directories('../OSMScout2/src')],
+                                include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientIncDir, osmscoutclientqtIncDir, osmscoutgpxIncDir, demoIncDir, include_directories('../OSMScout2/src')],
                                 dependencies: [mathDep, openmpDep, qtClientDep],
                                 link_with: [osmscout, osmscoutmap, osmscoutmapqt, osmscoutclientqt, osmscoutgpx],
                                 override_options : ['unity=off'], # generated code for qt resources use static variables with the same name
@@ -164,7 +164,7 @@ if buildClientQt
                                    '../OSMScout2/src/Theme.cpp'],
                                   [demoMocs, routingParamsDemoMocs],
                                   cpp_args: ['-fPIC'],
-                                  include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientqtIncDir, demoIncDir, include_directories('../OSMScout2/src')],
+                                  include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapqtIncDir, osmscoutclientIncDir, osmscoutclientqtIncDir, demoIncDir, include_directories('../OSMScout2/src')],
                                   dependencies: [mathDep, openmpDep, qtClientDep],
                                   link_with: [osmscout, osmscoutmap, osmscoutmapqt, osmscoutclientqt],
                                   override_options : ['unity=off'], # generated code for qt resources use static variables with the same name

diff --git a/OSMScout2/meson.build b/OSMScout2/meson.build
@@ -19,8 +19,8 @@ OSMScout2 = executable('OSMScout2',
                      osmscout2Src,
                      osmscout2Mocs,
                      cpp_args: ['-fPIC'],
-                     include_directories: [osmscout2IncDir, osmscoutgpxIncDir, osmscoutclientqtIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir],
+                     include_directories: [osmscout2IncDir, osmscoutgpxIncDir, osmscoutclientqtIncDir, osmscoutclientIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir],
                      dependencies: [mathDep, openmpDep, qtClientDep],
-                     link_with: [osmscoutgpx, osmscoutclientqt, osmscoutmapqt, osmscoutmap, osmscout],
+                     link_with: [osmscoutgpx, osmscoutclientqt, osmscoutclient, osmscoutmapqt, osmscoutmap, osmscout],
                      install: true)
 
diff --git a/OSMScout2/resources/voice-providers.json b/OSMScout2/resources/voice-providers.json
@@ -1,7 +1,7 @@
 [
   {
     "uri": "https://osmscout.karry.cz/voices",
-    "listUri": "https://osmscout.karry.cz/voices/list.json?locale=%3",
+    "listUri": "https://osmscout.karry.cz/voices/list.json?locale=%1",
     "name": "karry.cz"
   }
 ]
diff --git a/StyleEditor/meson.build b/StyleEditor/meson.build
@@ -23,7 +23,7 @@ OSMScout2 = executable('StyleEditor',
                      styleeditorSrc,
                      styleeditorMocs,
                      cpp_args: ['-fPIC'],
-                     include_directories: [styleeditorIncDir, osmscoutclientqtIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir],
+                     include_directories: [styleeditorIncDir, osmscoutclientqtIncDir, osmscoutclientIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir],
                      dependencies: [mathDep, openmpDep, qtClientDep],
-                     link_with: [osmscoutclientqt, osmscoutmapqt, osmscoutmap, osmscout],
+                     link_with: [osmscoutclientqt, osmscoutclient, osmscoutmapqt, osmscoutmap, osmscout],
                      install: true)
diff --git a/StyleEditor/src/MainWindow.h b/StyleEditor/src/MainWindow.h
@@ -22,7 +22,8 @@
 
 #include <QQmlApplicationEngine>
 
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/Settings.h>
+
 #include <osmscoutclientqt/MapWidget.h>
 
 class MainWindow : public QQmlApplicationEngine

diff --git a/StyleEditor/src/SettingsDialog.h b/StyleEditor/src/SettingsDialog.h
@@ -28,7 +28,7 @@
 #include <QStandardItemModel>
 #include <QTableView>*/
 
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/Settings.h>
 
 class SettingsDialog : public QQuickView
 {

diff --git a/StyleEditor/src/StyleEditor.cpp b/StyleEditor/src/StyleEditor.cpp
@@ -25,7 +25,7 @@
 #include <QApplication>
 
 // OSMScout library
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/Settings.h>
 #include <osmscoutclientqt/OSMScoutQt.h>
 
 // Main Window

diff --git a/Tests/meson.build b/Tests/meson.build
@@ -599,7 +599,7 @@ if buildClientQt
     ClientQtThreading = executable('ClientQtThreading',
                  'src/ClientQtThreading.cpp',
                  threadingMocs,
-                 include_directories: [testIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir, osmscoutclientqtIncDir],
+                 include_directories: [testIncDir, osmscoutmapqtIncDir, osmscoutclientIncDir, osmscoutmapIncDir, osmscoutIncDir, osmscoutclientqtIncDir],
                  dependencies: [mathDep, threadDep, openmpDep, qtClientDep],
                  link_with: [osmscoutmapqt, osmscoutmap, osmscout, osmscoutclientqt],
                  install: true,
@@ -612,7 +612,7 @@ if buildClientQt
     QtFileDownloader = executable('QtFileDownloader',
                  'src/QtFileDownloader.cpp',
                  testMocs,
-                 include_directories: [testIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir, osmscoutclientqtIncDir],
+                 include_directories: [testIncDir, osmscoutmapqtIncDir, osmscoutmapIncDir, osmscoutIncDir, osmscoutclientIncDir, osmscoutclientqtIncDir],
                  dependencies: [mathDep, threadDep, openmpDep, qtClientDep],
                  link_with: [osmscoutmapqt, osmscoutmap, osmscout, osmscoutclientqt],
                  install: true,

diff --git a/Tests/src/HeaderCheck.cpp b/Tests/src/HeaderCheck.cpp
@@ -135,6 +135,12 @@ static const std::set<std::string> allowedDependencies{
     "osmscout.navigation => osmscout.routing",
     "osmscout.navigation => osmscout", // Fix this
 
+    "osmscoutclient => osmscoutclient.json",
+    "osmscoutclient => osmscout.async",
+    "osmscoutclient => osmscout.io",
+    "osmscoutclient => osmscout.routing",
+    "osmscoutclient => osmscout.util",
+
     "osmscoutclientqt => osmscout.system",
     "osmscoutclientqt => osmscout.async",
     "osmscoutclientqt => osmscout.log",
@@ -150,6 +156,8 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutclientqt => osmscout",
     "osmscoutclientqt => osmscoutmap",
     "osmscoutclientqt => osmscoutmapqt",
+    "osmscoutclientqt => osmscoutclient",
+    "osmscoutclientqt => osmscoutclient.json",
     "osmscoutclientqt => osmscoutclientqt.private",
 
     "osmscoutgpx => osmscout.system",

diff --git a/libosmscout-client-qt/CMakeLists.txt b/libosmscout-client-qt/CMakeLists.txt
@@ -15,17 +15,14 @@ set(HEADER_FILES
     include/osmscoutclientqt/LocationEntry.h
     include/osmscoutclientqt/LocationInfoModel.h
     include/osmscoutclientqt/MapWidget.h
-    include/osmscoutclientqt/OnlineTileProvider.h
     include/osmscoutclientqt/OnlineTileProviderModel.h
     include/osmscoutclientqt/OpeningHoursModel.h
     include/osmscoutclientqt/OsmTileDownloader.h
     include/osmscoutclientqt/OSMTile.h
     include/osmscoutclientqt/RoutingModel.h
     include/osmscoutclientqt/Router.h
     include/osmscoutclientqt/SearchLocationModel.h
-    include/osmscoutclientqt/Settings.h
     include/osmscoutclientqt/TileCache.h
-    include/osmscoutclientqt/MapProvider.h
     include/osmscoutclientqt/AvailableMapsModel.h
     include/osmscoutclientqt/PersistentCookieJar.h
     include/osmscoutclientqt/MapManager.h
@@ -51,15 +48,16 @@ set(HEADER_FILES
     include/osmscoutclientqt/NavigationModel.h
     include/osmscoutclientqt/VehiclePosition.h
     include/osmscoutclientqt/QmlRoutingProfile.h
+    include/osmscoutclientqt/QmlSettings.h
     include/osmscoutclientqt/QtRouteData.h
+    include/osmscoutclientqt/QtSettingsStorage.h
     include/osmscoutclientqt/RouteStep.h
     include/osmscoutclientqt/NearPOIModel.h
     include/osmscoutclientqt/POILookupModule.h
     include/osmscoutclientqt/InstalledMapsModel.h
     include/osmscoutclientqt/Voice.h
     include/osmscoutclientqt/VoiceManager.h
     include/osmscoutclientqt/AvailableVoicesModel.h
-    include/osmscoutclientqt/VoiceProvider.h
     include/osmscoutclientqt/InstalledVoicesModel.h
 )
 
@@ -75,17 +73,14 @@ set(SOURCE_FILES
     src/osmscoutclientqt/LocationEntry.cpp
     src/osmscoutclientqt/LocationInfoModel.cpp
     src/osmscoutclientqt/MapWidget.cpp
-    src/osmscoutclientqt/OnlineTileProvider.cpp
     src/osmscoutclientqt/OnlineTileProviderModel.cpp
     src/osmscoutclientqt/OpeningHoursModel.cpp
     src/osmscoutclientqt/OSMTile.cpp
     src/osmscoutclientqt/OsmTileDownloader.cpp
     src/osmscoutclientqt/RoutingModel.cpp
     src/osmscoutclientqt/Router.cpp
     src/osmscoutclientqt/SearchLocationModel.cpp
-    src/osmscoutclientqt/Settings.cpp
     src/osmscoutclientqt/TileCache.cpp
-    src/osmscoutclientqt/MapProvider.cpp
     src/osmscoutclientqt/AvailableMapsModel.cpp
     src/osmscoutclientqt/MapManager.cpp
     src/osmscoutclientqt/MapDownloadsModel.cpp
@@ -111,14 +106,15 @@ set(SOURCE_FILES
     src/osmscoutclientqt/VehiclePosition.cpp
     src/osmscoutclientqt/RouteStep.cpp
     src/osmscoutclientqt/QmlRoutingProfile.cpp
+    src/osmscoutclientqt/QmlSettings.cpp
     src/osmscoutclientqt/QtRouteData.cpp
+    src/osmscoutclientqt/QtSettingsStorage.cpp
     src/osmscoutclientqt/NearPOIModel.cpp
     src/osmscoutclientqt/POILookupModule.cpp
     src/osmscoutclientqt/InstalledMapsModel.cpp
     src/osmscoutclientqt/Voice.cpp
     src/osmscoutclientqt/VoiceManager.cpp
     src/osmscoutclientqt/AvailableVoicesModel.cpp
-    src/osmscoutclientqt/VoiceProvider.cpp
     src/osmscoutclientqt/InstalledVoicesModel.cpp
 )
 

diff --git a/libosmscout-client-qt/include/meson.build b/libosmscout-client-qt/include/meson.build
@@ -12,23 +12,22 @@ osmscoutclientqtHeader = [
             'osmscoutclientqt/RouteDescriptionBuilder.h',
             'osmscoutclientqt/RouteStep.h',
             'osmscoutclientqt/QmlRoutingProfile.h',
+            'osmscoutclientqt/QmlSettings.h',
             'osmscoutclientqt/QtRouteData.h',
+            'osmscoutclientqt/QtSettingsStorage.h',
             'osmscoutclientqt/NavigationModule.h',
             'osmscoutclientqt/NavigationModel.h',
             'osmscoutclientqt/VehiclePosition.h',
             'osmscoutclientqt/InputHandler.h',
-            'osmscoutclientqt/OnlineTileProvider.h',
             'osmscoutclientqt/OnlineTileProviderModel.h',
             'osmscoutclientqt/OpeningHoursModel.h',
             'osmscoutclientqt/SearchLocationModel.h',
-            'osmscoutclientqt/Settings.h',
             'osmscoutclientqt/MapWidget.h',
             'osmscoutclientqt/LocationEntry.h',
             'osmscoutclientqt/LocationInfoModel.h',
             'osmscoutclientqt/OsmTileDownloader.h',
             'osmscoutclientqt/OSMTile.h',
             'osmscoutclientqt/TileCache.h',
-            'osmscoutclientqt/MapProvider.h',
             'osmscoutclientqt/AvailableMapsModel.h',
             'osmscoutclientqt/FileDownloader.h',
             'osmscoutclientqt/IconAnimation.h',
@@ -57,7 +56,6 @@ osmscoutclientqtHeader = [
             'osmscoutclientqt/Voice.h',
             'osmscoutclientqt/VoiceManager.h',
             'osmscoutclientqt/AvailableVoicesModel.h',
-            'osmscoutclientqt/VoiceProvider.h',
             'osmscoutclientqt/InstalledVoicesModel.h',
           ]
 

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/AvailableMapsModel.h b/libosmscout-client-qt/include/osmscoutclientqt/AvailableMapsModel.h
@@ -25,8 +25,10 @@
 #include <QNetworkDiskCache>
 #include <QNetworkReply>
 
-#include <osmscoutclientqt/MapProvider.h>
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/MapProvider.h>
+#include <osmscoutclient/Settings.h>
+
+#include <osmscoutclientqt/ClientQtImportExport.h>
 
 namespace osmscout {
 

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/AvailableVoicesModel.h b/libosmscout-client-qt/include/osmscoutclientqt/AvailableVoicesModel.h
@@ -20,12 +20,13 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-#include <osmscoutclientqt/VoiceProvider.h>
+#include <osmscoutclientqt/ClientQtImportExport.h>
+
+#include <osmscoutclient/VoiceProvider.h>
+
 #include <osmscoutclientqt/VoiceManager.h>
 #include <osmscoutclientqt/Voice.h>
 
-#include <osmscoutclientqt/ClientQtImportExport.h>
-
 #include <QAbstractListModel>
 #include <QNetworkDiskCache>
 #include <QNetworkAccessManager>

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/DBThread.h b/libosmscout-client-qt/include/osmscoutclientqt/DBThread.h
@@ -36,7 +36,8 @@
 #include <osmscoutmap/MapService.h>
 #include <osmscoutmapqt/MapPainterQt.h>
 
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/Settings.h>
+
 #include <osmscoutclientqt/TileCache.h>
 #include <osmscoutclientqt/OsmTileDownloader.h>
 #include <osmscoutclientqt/MapManager.h>
@@ -116,6 +117,8 @@ class OSMSCOUT_CLIENT_QT_API DBThread : public QObject
   void databaseLoadFinished(osmscout::GeoBox boundingBox);
   void styleErrorsChanged();
 
+  void mapDpiSignal(double);
+
 public slots:
   void ToggleDaylight();
   void onMapDPIChange(double dpi);
@@ -162,6 +165,12 @@ public slots:
 
   std::vector<std::string>           customPoiTypes;
 
+  Slot<double> mapDpiSlot{
+    [this](const double &d) {
+      mapDpiSignal(d);
+    }
+  };
+
 protected:
 
   /**

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/InstalledVoicesModel.h b/libosmscout-client-qt/include/osmscoutclientqt/InstalledVoicesModel.h
@@ -19,9 +19,11 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
+
+#include <osmscoutclient/Settings.h>
+
 #include <osmscoutclientqt/VoiceManager.h>
 #include <osmscoutclientqt/Voice.h>
-#include <osmscoutclientqt/Settings.h>
 #include <osmscoutclientqt/ClientQtImportExport.h>
 
 #include <QAbstractListModel>
@@ -44,6 +46,11 @@ namespace osmscout {
 class OSMSCOUT_CLIENT_QT_API InstalledVoicesModel : public QAbstractListModel {
   Q_OBJECT
 
+private:
+  Slot<std::string> voiceDirSlot{
+    [this](const std::string &dir){ onVoiceChanged(QString::fromStdString(dir)); }
+  };
+
 signals:
   void voiceChanged(const QString);
 

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/MapDownloadsModel.h b/libosmscout-client-qt/include/osmscoutclientqt/MapDownloadsModel.h
@@ -20,18 +20,17 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
+#include <osmscoutclientqt/ClientQtImportExport.h>
+
+#include <osmscoutclientqt/MapManager.h>
+#include <osmscoutclientqt/DBThread.h>
+
 #include <QObject>
 #include <QStringList>
 #include <QList>
 #include <QDir>
 #include <QTimer>
 
-#include <osmscoutclientqt/ClientQtImportExport.h>
-
-#include <osmscoutclientqt/MapProvider.h>
-#include <osmscoutclientqt/MapManager.h>
-#include <osmscoutclientqt/DBThread.h>
-
 namespace osmscout {
 
 /**

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/MapManager.h b/libosmscout-client-qt/include/osmscoutclientqt/MapManager.h
@@ -20,19 +20,19 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-#include <QObject>
-#include <QStringList>
-#include <QList>
-#include <QDir>
-#include <QTimer>
-
 #include <osmscoutclientqt/ClientQtImportExport.h>
 
-#include <osmscoutclientqt/MapProvider.h>
-#include <osmscoutclientqt/Settings.h>
+#include <osmscoutclient/MapProvider.h>
+#include <osmscoutclient/Settings.h>
+
 #include <osmscoutclientqt/AvailableMapsModel.h>
 #include <osmscoutclientqt/FileDownloader.h>
 
+#include <QObject>
+#include <QStringList>
+#include <QList>
+#include <QDir>
+#include <QTimer>
 #include <QtGlobal>
 #include <QStorageInfo>