[qmapshack] 05/11: Merge tag 'upstream/0.8.1'
Bas Couwenberg
sebastic at xs4all.nl
Sat Dec 13 14:11:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qmapshack.
commit a598e467b6f9011e118c1d2086799cec64d4ea8e
Merge: 54f45d9 3a92506
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Dec 13 01:32:17 2014 +0100
Merge tag 'upstream/0.8.1'
Upstream version 0.8.1
.hg_archival.txt | 4 +-
.hgtags | 1 +
CMakeLists.txt | 2 +-
changelog.txt | 6 +-
src/CMainWindow.cpp | 24 +-
src/CMainWindow.h | 1 +
src/CMakeLists.txt | 35 +-
src/GeoMath.cpp | 89 +--
src/IMainWindow.ui | 11 +
src/dem/CDemVRT.cpp | 8 +
src/dem/IDem.cpp | 14 +-
src/dem/IDem.h | 4 +
src/gis/CGisListDB.cpp | 239 +++++++-
src/gis/CGisListDB.h | 33 ++
src/gis/CGisListWks.cpp | 214 ++++++-
src/gis/CGisListWks.h | 14 +-
src/gis/CGisWidget.cpp | 60 +-
src/gis/IGisItem.cpp | 106 +++-
src/gis/IGisItem.h | 31 +-
src/gis/IGisProject.cpp | 68 ++-
src/gis/IGisProject.h | 98 ++--
src/gis/IGisWidget.ui | 24 +-
.../{CGisListDB.cpp => db/CDBFolderDatabase.cpp} | 14 +-
src/gis/{CGisListDB.h => db/CDBFolderDatabase.h} | 14 +-
src/gis/{CGisListDB.cpp => db/CDBFolderGroup.cpp} | 12 +-
src/gis/{CGisListDB.h => db/CDBFolderGroup.h} | 14 +-
.../{CGisListDB.cpp => db/CDBFolderLostFound.cpp} | 14 +-
src/gis/{CGisListDB.h => db/CDBFolderLostFound.h} | 14 +-
src/gis/{CGisListDB.cpp => db/CDBFolderOther.cpp} | 13 +-
src/gis/{CGisListDB.h => db/CDBFolderOther.h} | 14 +-
.../{CGisListDB.cpp => db/CDBFolderProject.cpp} | 13 +-
src/gis/{CGisListDB.h => db/CDBFolderProject.h} | 14 +-
src/gis/{CGisListDB.cpp => db/CDBItem.cpp} | 9 +-
src/gis/{CGisListDB.cpp => db/CDBItem.h} | 19 +-
src/gis/{CGisListDB.cpp => db/CDBProject.cpp} | 12 +-
src/gis/{CGisListDB.h => db/CDBProject.h} | 14 +-
src/gis/db/CSetupDB.cpp | 69 +++
src/gis/{CGisListDB.h => db/CSetupDB.h} | 24 +-
src/gis/db/CSetupFolder.cpp | 77 +++
src/gis/{bin/CBinProject.h => db/CSetupFolder.h} | 29 +-
src/gis/db/IDBFolder.cpp | 106 ++++
src/gis/{gpx/CGpxProject.h => db/IDBFolder.h} | 49 +-
src/gis/db/ISetupDB.ui | 147 +++++
src/gis/db/ISetupFolder.ui | 116 ++++
src/gis/{CGisListDB.cpp => db/macros.h} | 27 +-
src/gis/gpx/CGpxProject.cpp | 47 +-
src/gis/gpx/CGpxProject.h | 3 +-
src/gis/ovl/CDetailsOvlArea.cpp | 53 +-
src/gis/ovl/CDetailsOvlArea.h | 2 -
src/gis/ovl/CGisItemOvlArea.cpp | 35 +-
src/gis/ovl/CGisItemOvlArea.h | 5 +-
.../{bin/CBinProject.cpp => qms/CQmsProject.cpp} | 49 +-
src/gis/{bin/CBinProject.h => qms/CQmsProject.h} | 13 +-
src/gis/{bin => qms}/serialization.cpp | 57 +-
src/gis/rte/CGisItemRte.cpp | 27 +-
src/gis/rte/CGisItemRte.h | 2 +-
src/gis/search/CSearchGoogle.cpp | 2 +-
src/gis/trk/CDetailsTrk.cpp | 47 +-
src/gis/trk/CDetailsTrk.h | 3 -
src/gis/trk/CGisItemTrk.cpp | 302 +++++-----
src/gis/trk/CGisItemTrk.h | 3 +-
src/gis/wpt/CDetailsWpt.cpp | 59 +-
src/gis/wpt/CDetailsWpt.h | 1 -
src/gis/wpt/CGisItemWpt.cpp | 45 +-
src/gis/wpt/CGisItemWpt.h | 3 +-
src/helpers/CHistoryListWidget.cpp | 3 +-
src/helpers/CLinksDialog.cpp | 87 +++
.../bin/CBinProject.h => helpers/CLinksDialog.h} | 29 +-
src/helpers/ILinksDialog.ui | 130 +++++
src/icons/32x32/DBProject.png | Bin 0 -> 1533 bytes
src/icons/32x32/Database.png | Bin 0 -> 1277 bytes
src/icons/32x32/DatabaseSetup.png | Bin 0 -> 2142 bytes
src/icons/32x32/Link.png | Bin 0 -> 952 bytes
src/icons/32x32/Path.png | Bin 0 -> 536 bytes
src/icons/32x32/PathBlue.png | Bin 0 -> 536 bytes
src/icons/32x32/PathGreen.png | Bin 0 -> 544 bytes
src/icons/32x32/PathOrange.png | Bin 0 -> 538 bytes
src/icons/48x48/DBProject.png | Bin 0 -> 2245 bytes
src/icons/48x48/Database.png | Bin 0 -> 1946 bytes
src/icons/48x48/DatabaseSetup.png | Bin 0 -> 3348 bytes
src/icons/48x48/Link.png | Bin 0 -> 1093 bytes
src/icons/48x48/Path.png | Bin 0 -> 756 bytes
src/icons/48x48/PathBlue.png | Bin 0 -> 756 bytes
src/icons/48x48/PathGreen.png | Bin 0 -> 753 bytes
src/icons/48x48/PathOrange.png | Bin 0 -> 733 bytes
src/icons/DBProject.svg | 180 ++++++
src/icons/Database.svg | 168 ++++++
src/icons/DatabaseSetup.svg | 152 +++++
src/icons/Link.svg | 140 +++++
src/icons/PathBlue.svg | 81 +++
src/icons/PathGreen.svg | 77 +++
src/icons/PathOrange.svg | 77 +++
src/locale/qmapshack_cs.ts | 395 ++++++++-----
src/locale/qmapshack_de.ts | 622 +++++++++++++--------
src/locale/qmapshack_es.ts | 397 ++++++++-----
src/map/CMapIMG.cpp | 14 +
src/map/CMapIMG.h | 1 +
src/map/CMapPathSetup.cpp | 1 +
src/mouse/IScrOptEditLine.ui | 3 -
src/resources.qrc | 14 +
100 files changed, 3977 insertions(+), 1272 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list