1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-22 18:20:49 +01:00

Compare commits

..

No commits in common. "03ee575aacdcb915692ca01eb35fea31787b27df" and "9d60d1c9fcd3dad2c75ca0688c6607234f6d0063" have entirely different histories.

4 changed files with 10 additions and 28 deletions

View File

@ -41,12 +41,6 @@
<data android:scheme="content" android:mimeType="image/jpeg"/> <data android:scheme="content" android:mimeType="image/jpeg"/>
<data android:scheme="content" android:mimeType="image/tiff"/> <data android:scheme="content" android:mimeType="image/tiff"/>
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="geo"/>
</intent-filter>
<meta-data <meta-data
android:name="android.app.lib_name" android:name="android.app.lib_name"

View File

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

View File

@ -11,7 +11,7 @@ Comment[ru]=Программа для просмотра и анализа GPS
Comment[sv]=GPS-loggfilsläsare och analysator Comment[sv]=GPS-loggfilsläsare och analysator
Comment[tr]=GPS günlük dosyası görüntüleyici ve analizcisi Comment[tr]=GPS günlük dosyası görüntüleyici ve analizcisi
Comment[uk]=Переглядач та аналізатор GPS логів Comment[uk]=Переглядач та аналізатор GPS логів
Exec=gpxsee %U Exec=gpxsee %F
Icon=gpxsee Icon=gpxsee
Terminal=false Terminal=false
Type=Application Type=Application

View File

@ -1069,8 +1069,6 @@ void GUI::openDir()
bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError) bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
{ {
QString path;
QUrl url(fileName); QUrl url(fileName);
if (url.scheme() == "geo") { if (url.scheme() == "geo") {
if (loadURL(url, showError)) { if (loadURL(url, showError)) {
@ -1079,23 +1077,20 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
return true; return true;
} else if (showError) } else if (showError)
return false; return false;
} else if (url.isLocalFile()) }
path = url.toLocalFile();
else
path = fileName;
QFileInfo fi(path); QFileInfo fi(fileName);
QString canonicalPath(fi.canonicalFilePath()); QString canonicalFileName(fi.canonicalFilePath());
if (_files.contains(canonicalPath)) if (_files.contains(canonicalFileName))
return true; return true;
if (!loadFile(path, tryUnknown, showError)) if (!loadFile(fileName, tryUnknown, showError))
return false; return false;
_files.append(canonicalPath); _files.append(canonicalFileName);
#ifndef Q_OS_ANDROID #ifndef Q_OS_ANDROID
_browser->setCurrent(path); _browser->setCurrent(fileName);
#endif // Q_OS_ANDROID #endif // Q_OS_ANDROID
_fileActionGroup->setEnabled(true); _fileActionGroup->setEnabled(true);
// Explicitly enable the reload action as it may be disabled by loadMapDir() // Explicitly enable the reload action as it may be disabled by loadMapDir()
@ -1108,7 +1103,7 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
if (_files.count() > 1) if (_files.count() > 1)
_mapView->showExtendedInfo(true); _mapView->showExtendedInfo(true);
#ifndef Q_OS_ANDROID #ifndef Q_OS_ANDROID
updateRecentFiles(canonicalPath); updateRecentFiles(canonicalFileName);
#endif // Q_OS_ANDROID #endif // Q_OS_ANDROID
return true; return true;
@ -1895,13 +1890,7 @@ bool GUI::loadMapNode(const TreeNode<Map*> &node, MapAction *&action,
bool GUI::loadMap(const QString &fileName, MapAction *&action, int &showError) bool GUI::loadMap(const QString &fileName, MapAction *&action, int &showError)
{ {
QString path; TreeNode<Map*> maps(MapList::loadMaps(fileName, _mapView->inputProjection()));
QUrl url(fileName);
path = url.isLocalFile() ? url.toLocalFile() : fileName;
TreeNode<Map*> maps(MapList::loadMaps(path, _mapView->inputProjection()));
QList<QAction*> existingActions(_mapsActionGroup->actions()); QList<QAction*> existingActions(_mapsActionGroup->actions());
return loadMapNode(maps, action, existingActions, showError); return loadMapNode(maps, action, existingActions, showError);