Add a core settings registry value for GPSBabel path

qgis · Aug 2, 2021 · 5ecd73d · 5ecd73d
1 parent 41d98c8
commit 5ecd73d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/resources/qgis_global_settings.ini b/resources/qgis_global_settings.ini
@@ -237,6 +237,9 @@ enable_problem_resolution=false
 # Default for GPS leap seconds correction as of 2019-06-19
 leapSecondsCorrection=18
 
+# Path to (or command name for) the GPSBabel executable file
+gpsbabelPath=gpsbabel
+
 # [proxy]
 # # URL list for which proxy configuration doesn't apply. In the case of these URLs, the default system proxy configuration
 # # is applied

diff --git a/src/analysis/processing/qgsalgorithmgpsbabeltools.cpp b/src/analysis/processing/qgsalgorithmgpsbabeltools.cpp
@@ -20,6 +20,7 @@
 #include "qgsrunprocess.h"
 #include "qgsproviderutils.h"
 #include "qgssettings.h"
+#include "qgssettingsregistrycore.h"
 
 ///@cond PRIVATE
 
@@ -96,9 +97,7 @@ QVariantMap QgsConvertGpxFeatureTypeAlgorithm::processAlgorithm( const QVariantM
 
   const ConversionType convertType = static_cast< ConversionType >( parameterAsEnum( parameters, QStringLiteral( "CONVERSION" ), context ) );
 
-  // TODO -- fix the settings path when the rest of the GPS tools plugin is migrated
-  QgsSettings settings;
-  QString babelPath = settings.value( QStringLiteral( "Plugin-GPS/gpsbabelpath" ), QString() ).toString();
+  QString babelPath = QgsSettingsRegistryCore::settingsGpsBabelPath.value();
   if ( babelPath.isEmpty() )
     babelPath = QStringLiteral( "gpsbabel" );
 

diff --git a/src/core/settings/qgssettingsregistrycore.h b/src/core/settings/qgssettingsregistrycore.h
@@ -172,6 +172,9 @@ class CORE_EXPORT QgsSettingsRegistryCore : public QgsSettingsRegistry
 
     //! Settings entry digitizing tracing max feature count
     static const inline QgsSettingsEntryInteger settingsDigitizingTracingMaxFeatureCount = QgsSettingsEntryInteger( QStringLiteral( "/qgis/digitizing/tracing_max_feature_count" ), QgsSettings::NoSection, 10000 );
+
+    //! Settings entry path to GPSBabel executable.
+    static const inline QgsSettingsEntryString settingsGpsBabelPath = QgsSettingsEntryString( QStringLiteral( "gpsbabelPath" ), QgsSettings::Gps, QStringLiteral( "gpsbabel" ) );
 #endif
 
 };