From 319cdbf8380b0372f33010cd5c4a54e01bfd8193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Thu, 23 Jan 2025 00:54:23 +0100
Subject: [PATCH] Added support for file scheme URIs
---
pkg/linux/gpxsee.desktop | 2 +-
src/GUI/gui.cpp | 29 ++++++++++++++++++++---------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/pkg/linux/gpxsee.desktop b/pkg/linux/gpxsee.desktop
index 31300673..7354be78 100644
--- a/pkg/linux/gpxsee.desktop
+++ b/pkg/linux/gpxsee.desktop
@@ -11,7 +11,7 @@ Comment[ru]=Программа для просмотра и анализа GPS
Comment[sv]=GPS-loggfilsläsare och analysator
Comment[tr]=GPS günlük dosyası görüntüleyici ve analizcisi
Comment[uk]=Переглядач та аналізатор GPS логів
-Exec=gpxsee %F
+Exec=gpxsee %U
Icon=gpxsee
Terminal=false
Type=Application
diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp
index 627a0484..b237016b 100644
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@@ -1069,6 +1069,8 @@ void GUI::openDir()
bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
{
+ QString path;
+
QUrl url(fileName);
if (url.scheme() == "geo") {
if (loadURL(url, showError)) {
@@ -1077,20 +1079,23 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
return true;
} else if (showError)
return false;
- }
+ } else if (url.isLocalFile())
+ path = url.toLocalFile();
+ else
+ path = fileName;
- QFileInfo fi(fileName);
- QString canonicalFileName(fi.canonicalFilePath());
+ QFileInfo fi(path);
+ QString canonicalPath(fi.canonicalFilePath());
- if (_files.contains(canonicalFileName))
+ if (_files.contains(canonicalPath))
return true;
- if (!loadFile(fileName, tryUnknown, showError))
+ if (!loadFile(path, tryUnknown, showError))
return false;
- _files.append(canonicalFileName);
+ _files.append(canonicalPath);
#ifndef Q_OS_ANDROID
- _browser->setCurrent(fileName);
+ _browser->setCurrent(path);
#endif // Q_OS_ANDROID
_fileActionGroup->setEnabled(true);
// Explicitly enable the reload action as it may be disabled by loadMapDir()
@@ -1103,7 +1108,7 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
if (_files.count() > 1)
_mapView->showExtendedInfo(true);
#ifndef Q_OS_ANDROID
- updateRecentFiles(canonicalFileName);
+ updateRecentFiles(canonicalPath);
#endif // Q_OS_ANDROID
return true;
@@ -1890,7 +1895,13 @@ bool GUI::loadMapNode(const TreeNode<Map*> &node, MapAction *&action,
bool GUI::loadMap(const QString &fileName, MapAction *&action, int &showError)
{
- TreeNode<Map*> maps(MapList::loadMaps(fileName, _mapView->inputProjection()));
+ QString path;
+ QUrl url(fileName);
+
+ path = url.isLocalFile() ? url.toLocalFile() : fileName;
+
+
+ TreeNode<Map*> maps(MapList::loadMaps(path, _mapView->inputProjection()));
QList<QAction*> existingActions(_mapsActionGroup->actions());
return loadMapNode(maps, action, existingActions, showError);