root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Only trigger the last loaded map

Browse Source
This commit is contained in:
Martin Tůma 2020-12-06 12:53:39 +01:00
parent c2e50e5213
commit 2b8c3f64ac
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/GUI/gui.cpp
View File

@ -1434,19 +1434,25 @@ void GUI::loadMap()
QStringList files = QFileDialog::getOpenFileNames(this, tr("Open map file"),
_mapDir, MapList::formats());
QStringList list = files;
MapAction *lastReady = 0;
for (QStringList::Iterator it = list.begin(); it != list.end(); it++)
loadMap(*it);
for (QStringList::Iterator it = list.begin(); it != list.end(); it++) {
MapAction *a = loadMap(*it);
if (a)
lastReady = a;
}
if (!list.isEmpty())
_mapDir = QFileInfo(list.first()).path();
if (lastReady)
lastReady->trigger();
}
bool GUI::loadMap(const QString &fileName)
MapAction *GUI::loadMap(const QString &fileName)
{
// On OS X fileName may be a directory!
if (fileName.isEmpty())
return false;
return 0;
QString error;
QList<Map*> maps = MapList::loadMaps(fileName, error);
@ -1454,7 +1460,7 @@ bool GUI::loadMap(const QString &fileName)
error = tr("Error loading map:") + "\n\n"
+ fileName + "\n\n" + error;
QMessageBox::critical(this, APP_NAME, error);
return false;
return 0;
}
MapAction *lastReady = 0;
@ -1470,10 +1476,7 @@ bool GUI::loadMap(const QString &fileName)
connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded()));
}
if (lastReady)
lastReady->trigger();
return true;
return lastReady;
}
void GUI::mapLoaded()

2
src/GUI/gui.h
View File

@ -120,7 +120,7 @@ private:
bool openPOIFile(const QString &fileName);
bool loadFile(const QString &fileName);
bool loadMap(const QString &fileName);
MapAction *loadMap(const QString &fileName);
void updateStatusBarInfo();
void updateWindowTitle();
void updateNavigationActions();