root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-31 09:05:14 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' into android-latest

Browse Source
This commit is contained in:
Martin Tůma 2025-01-25 11:31:08 +01:00
commit fc196543a1
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/linux/gpxsee.appdata.xml
View File

@ -112,5 +112,6 @@
<mimetype>application/vnd.iho.s57-catalogue</mimetype>
<mimetype>application/vnd.gpsdump.wpt</mimetype>
<mimetype>application/vnd.gpstuner.gmi</mimetype>
<mimetype>x-scheme-handler/geo</mimetype>
</mimetypes>
</component>

2
pkg/linux/gpxsee.desktop
View File

@ -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

29
src/GUI/gui.cpp
View File

@ -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);