Fix the module name

Update the CI configurations to fetch the Qt serialport module
Code cleanup
2025-04-20 12:19:11 +02:00 · 2023-02-01 22:57:41 +01:00 · 2023-02-01 22:54:59 +01:00 · 2023-02-01 22:49:03 +01:00 · 2023-02-01 22:41:57 +01:00 · 2023-02-01 22:36:41 +01:00
10 changed files with 53 additions and 16 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 11.12.{build}
+version: 12.0.{build}

 configuration:
  - Release
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -37,7 +37,7 @@ jobs:
          version: '6.4.0'
          target: 'android'
          arch: 'android_armv7'
-          modules: qtpositioning qt5compat
+          modules: qtpositioning qt5compat qtserialport
      - name: Install Android OpenSSL
        run:  git clone https://github.com/KDAB/android_openssl.git
      - name: Create localization
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -15,7 +15,7 @@ jobs:
      - name: Install dependencies
        run: |
          sudo apt-get update
-          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 11.12
+VERSION = 12.0

 QT += core \
    gui \
@ -14,7 +14,8 @@ QT += core \
    widgets \
    printsupport \
    positioning \
-    svg
+    svg \
+    serialport
 greaterThan(QT_MAJOR_VERSION, 5) {
    QT += openglwidgets \
          core5compat
@ -263,6 +264,7 @@ SOURCES += src/main.cpp \
    src/GUI/motioninfoitem.cpp \
    src/GUI/navigationwidget.cpp \
    src/GUI/pluginparameters.cpp \
+    src/GUI/settings.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
--- a/pkg/windows/gpxsee64.nsi
+++ b/pkg/windows/gpxsee64.nsi
@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "11.12"
+!define VERSION "12.0"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@ -2641,8 +2641,8 @@ void GUI::writeSettings()
 		settings.setValue(DEM_USERNAME_SETTING, _options.demUsername);
 	if (_options.demPassword != DEM_PASSWORD_DEFAULT)
 		settings.setValue(DEM_PASSWORD_SETTING, _options.demPassword);
-	// the plugins order is random so always store the value
-	settings.setValue(POSITION_PLUGIN_SETTING, _options.plugin);
+	if (_options.plugin != POSITION_PLUGIN_DEFAULT)
+		settings.setValue(POSITION_PLUGIN_SETTING, _options.plugin);
 	index = 0;
 	for (QMap<QString, QVariantMap>::const_iterator it
 	  = _options.pluginParams.constBegin();
--- a/src/GUI/markerinfoitem.h
+++ b/src/GUI/markerinfoitem.h
@ -2,6 +2,7 @@
 #define MARKERINFOITEM_H

 #include <QGraphicsItem>
+#include <QFont>
 #include "format.h"

 class Coordinates;
--- a/src/GUI/settings.cpp
+++ b/src/GUI/settings.cpp
@ -0,0 +1,21 @@
+#include <QGeoPositionInfoSource>
+#include "settings.h"
+
+static QString defaultPlugin()
+{
+	QString source;
+
+	QGeoPositionInfoSource *ps = QGeoPositionInfoSource::createDefaultSource(0);
+	if (ps) {
+		source = ps->sourceName();
+		delete ps;
+	}
+
+	return source;
+}
+
+const QString &Settings::positionPlugin()
+{
+	static QString plugin(defaultPlugin());
+	return plugin;
+}
--- a/src/GUI/settings.h
+++ b/src/GUI/settings.h
@ -1,14 +1,21 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H

-#include <QtGlobal>
+#include <QLocale>
+#include <QDir>
+#include <QPageLayout>
+#include <QPageSize>
 #include "common/config.h"
+#include "common/util.h"
+#include "data/graph.h"
+#include "format.h"
+#include "units.h"
+#include "timetype.h"
+#include "markerinfoitem.h"
+

 #define IMPERIAL_UNITS() \
 	(QLocale::system().measurementSystem() == QLocale::ImperialSystem)
-#define POSITION_PLUGIN() \
-	(QGeoPositionInfoSource::availableSources().isEmpty() \
-	  ? "" : QGeoPositionInfoSource::availableSources().first())
 #define CURRENT_PATH(filename) \
 	QDir::current().filePath(filename)

@ -214,7 +221,7 @@
 #define DEM_PASSWORD_SETTING              "demPassword"
 #define DEM_PASSWORD_DEFAULT              ""
 #define POSITION_PLUGIN_SETTING           "positionPlugin"
-#define POSITION_PLUGIN_DEFAULT           POSITION_PLUGIN()
+#define POSITION_PLUGIN_DEFAULT           Settings::positionPlugin()
 #define POSITION_PLUGIN_PARAMS_PREFIX     "pluginParameters"
 #define POSITION_PLUGIN_PARAMS_PLUGIN     "plugin"
 #define POSITION_PLUGIN_PARAMS_PARAM      "parameters"
@ -255,10 +262,15 @@
 #define HIDPI_MAP_SETTING                 "HiDPIMap"
 #define HIDPI_MAP_DEFAULT                 true
 #define DATA_PATH_SETTING                 "dataPath"
-#define DATA_PATH_DEFAULT                 QString()
+#define DATA_PATH_DEFAULT                 ""
 #define MAPS_PATH_SETTING                 "mapsPath"
-#define MAPS_PATH_DEFAULT                 QString()
+#define MAPS_PATH_DEFAULT                 ""
 #define POI_PATH_SETTING                  "poiPath"
-#define POI_PATH_DEFAULT                  QString()
+#define POI_PATH_DEFAULT                  ""
+
+namespace Settings
+{
+    const QString &positionPlugin();
+}

 #endif // SETTINGS_H
--- a/src/data/graph.h
+++ b/src/data/graph.h
@ -3,6 +3,7 @@

 #include <QList>
 #include <QVector>
+#include <QColor>
 #include <QDebug>
 #include <cmath>
Author	SHA1	Message	Date
Martin Tůma	3b6e6c03a7	Fix the module name	2023-02-01 22:57:41 +01:00
Martin Tůma	a1a6fade92	Update the CI configurations to fetch the Qt serialport module	2023-02-01 22:54:59 +01:00
Martin Tůma	c001235e91	Code cleanup	2023-02-01 22:49:03 +01:00
Martin Tůma	c01b9da10c	Version++ As we require the serialport Qt plugin now, increase the major number.	2023-02-01 22:41:57 +01:00
Martin Tůma	e4d42453a0	Require the serialport Qt module The serialport module is a dependency of the nmea positioning plugin. Without being explicitly specified, the Qt deploy tools skip the nmea positioning plugin when creating the application package.	2023-02-01 22:36:41 +01:00
Martin Tůma	d6d316676c	Properly use the default positioning plugin as the default option	2023-02-01 22:26:36 +01:00