Move SUPPORTED_* to qfield.h now that we have one, add supported file…

… extensions
opengisch · Feb 9, 2025 · fd61f19 · fd61f19 · qfield-fairy · Feb 9, 2025
1 parent 0f1ea05
commit fd61f19
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/core/localfilesmodel.cpp b/src/core/localfilesmodel.cpp
@@ -16,8 +16,8 @@
 
 #include "localfilesmodel.h"
 #include "platformutilities.h"
+#include "qfield.h"
 #include "qfieldcloudutils.h"
-#include "qgismobileapp.h"
 #include "webdavconnection.h"
 
 #include <QDir>
@@ -289,7 +289,7 @@ void LocalFilesModel::reloadModel()
           {
             datasets << Item( ItemMetaType::Dataset, ItemType::RasterDataset, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
           }
-          else if ( suffix == QStringLiteral( "log" ) || suffix == QStringLiteral( "txt" ) )
+          else if ( SUPPORTED_FILE_EXTENSIONS.contains( suffix ) )
           {
             files << Item( ItemMetaType::File, ItemType::OtherFile, fi.completeBaseName(), suffix, fi.absoluteFilePath(), fi.size() );
           }

diff --git a/src/core/localfilesmodel.h b/src/core/localfilesmodel.h
@@ -18,8 +18,6 @@
 
 #include <QAbstractListModel>
 
-#define SUPPORTED_DATASET_THUMBNAIL QStringList( { QStringLiteral( "zip" ), QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ) } )
-
 /**
  * \ingroup core
  */

diff --git a/src/core/platforms/platformutilities.cpp b/src/core/platforms/platformutilities.cpp
@@ -22,7 +22,6 @@
 #include "projectsource.h"
 #include "qfield.h"
 #include "qfieldcloudconnection.h"
-#include "qgismobileapp.h"
 #include "qgsmessagelog.h"
 #include "resourcesource.h"
 #include "stringutils.h"

diff --git a/src/core/qfield.h.in b/src/core/qfield.h.in
@@ -61,4 +61,10 @@ namespace qfield
 #define WITH_SENTRY @WITH_SENTRY@
 #define QGIS_PREFIX_PATH "@QGIS_PREFIX_PATH@"
 
+#define SUPPORTED_PROJECT_EXTENSIONS QStringList( { QStringLiteral( "qgs" ), QStringLiteral( "qgz" ) } )
+#define SUPPORTED_VECTOR_EXTENSIONS QStringList( { QStringLiteral( "gpkg" ), QStringLiteral( "shp" ), QStringLiteral( "kml" ), QStringLiteral( "kmz" ), QStringLiteral( "geojson" ), QStringLiteral( "json" ), QStringLiteral( "pdf" ), QStringLiteral( "gpx" ), QStringLiteral( "gml" ), QStringLiteral( "mif" ), QStringLiteral( "fgb" ), QStringLiteral( "db" ), QStringLiteral( "sqlite" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ), QStringLiteral( "rar" ) } )
+#define SUPPORTED_RASTER_EXTENSIONS QStringList( { QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "gpkg" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ) } )
+#define SUPPORTED_FILE_EXTENSIONS QStringList( { QStringLiteral( "log" ), QStringLiteral( "txt" ), QStringLiteral( "mp4" ), QStringLiteral( "m4a" ), QStringLiteral( "ogg" ), QStringLiteral( "mp3" ) } )
+#define SUPPORTED_DATASET_THUMBNAIL QStringList( { QStringLiteral( "zip" ), QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ) } )
+
 #endif // QFIELD_H
diff --git a/src/core/qgismobileapp.h b/src/core/qgismobileapp.h
@@ -60,10 +60,6 @@ class QgsPrintLayout;
 
 #define REGISTER_SINGLETON( uri, _class, name ) qmlRegisterSingletonType<_class>( uri, 1, 0, name, []( QQmlEngine *engine, QJSEngine *scriptEngine ) -> QObject * { Q_UNUSED(engine); Q_UNUSED(scriptEngine); return new _class(); } )
 
-#define SUPPORTED_PROJECT_EXTENSIONS QStringList( { QStringLiteral( "qgs" ), QStringLiteral( "qgz" ) } )
-#define SUPPORTED_VECTOR_EXTENSIONS QStringList( { QStringLiteral( "gpkg" ), QStringLiteral( "shp" ), QStringLiteral( "kml" ), QStringLiteral( "kmz" ), QStringLiteral( "geojson" ), QStringLiteral( "json" ), QStringLiteral( "pdf" ), QStringLiteral( "gpx" ), QStringLiteral( "gml" ), QStringLiteral( "mif" ), QStringLiteral( "fgb" ), QStringLiteral( "db" ), QStringLiteral( "sqlite" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ), QStringLiteral( "rar" ) } )
-#define SUPPORTED_RASTER_EXTENSIONS QStringList( { QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "gpkg" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ), QStringLiteral( "mbtiles" ), QStringLiteral( "vrt" ), QStringLiteral( "zip" ), QStringLiteral( "7z" ) } )
-
 /**
  * \defgroup core
  * \brief QField C++ classes

diff --git a/src/core/recentprojectlistmodel.cpp b/src/core/recentprojectlistmodel.cpp
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 #include "platformutilities.h"
+#include "qfield.h"
 #include "qfieldcloudutils.h"
-#include "qgismobileapp.h"
 #include "recentprojectlistmodel.h"
 
 #include <QDir>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,8 +18,6 @@ @@
     #include <QAbstractListModel>
-    #define SUPPORTED_DATASET_THUMBNAIL QStringList( { QStringLiteral( "zip" ), QStringLiteral( "tif" ), QStringLiteral( "tiff" ), QStringLiteral( "pdf" ), QStringLiteral( "jpg" ), QStringLiteral( "jpeg" ), QStringLiteral( "png" ), QStringLiteral( "jp2" ), QStringLiteral( "webp" ) } )
     /**
      * \ingroup core
      */
@@ Expand Down @@