This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit 2ad94f6f6b5718a9bf20a5de7251a8db51e047dd Merge: 80939fe 8c9bf12 Author: Bas Couwenberg <[email protected]> Date: Tue Sep 13 09:50:41 2016 +0200 Merge tag 'upstream/1.7.0' Upstream version 1.7.0 .hgsub | 1 - .hgsubstate | 1 - CMakeLists.txt | 4 +- CMakeLists.txt.user | 4 +- CPackConfig.cmake | 2 +- changelog.txt | 18 + cmake/Modules/FindGDAL.cmake | 3 + cmake/Modules/FindPROJ.cmake | 2 + cmake/Modules/FindROUTINO.cmake | 3 + doc/.hgignore | 18 + doc/BugFeatures.html | 41 + doc/BuildWindowsVisualStudio.html | 224 +++ doc/BuildWindowsVisualStudio.md | 229 +++ doc/DeveloperCodingGuideline.html | 96 ++ doc/DeveloperCodingGuideline.md | 92 ++ doc/DeveloperCommitCode.html | 13 + doc/DeveloperCommitCode.md | 19 + doc/DeveloperTranslate.html | 44 + doc/DeveloperTranslate.md | 44 + doc/DocBasicsMapDem.html | 214 +++ doc/DocBasicsMapDem.md | 184 +++ doc/DocCmdOptions.html | 64 + doc/DocCmdOptions.md | 42 + doc/DocControlMapDem.html | 101 ++ doc/DocControlMapDem.md | 98 ++ doc/DocFaq.html | 198 +++ doc/DocFaq.md | 212 +++ doc/DocFix.sh | 71 + doc/DocGetQMapShack.html | 105 ++ doc/DocGetQMapShack.md | 108 ++ doc/DocGettingStarted.html | 47 + doc/DocGettingStarted.md | 60 + doc/DocGisDatabase.html | 13 + doc/DocGisDatabase.md | 19 + doc/DocGisDatabaseAddRemove.html | 99 ++ doc/DocGisDatabaseAddRemove.md | 100 ++ doc/DocGisDatabaseFoldersItems.html | 22 + doc/DocGisDatabaseFoldersItems.md | 37 + doc/DocGisDatabaseLostFound.html | 16 + doc/DocGisDatabaseLostFound.md | 25 + doc/DocGisDatabaseWorkspaceDatabase.html | 12 + doc/DocGisDatabaseWorkspaceDatabase.md | 17 + doc/DocGisDevices.html | 58 + doc/DocGisDevices.md | 70 + doc/DocGisHowToRouting.html | 134 ++ doc/DocGisHowToSaveYourWork.html | 111 ++ doc/DocGisItems.html | 53 + doc/DocGisItems.md | 59 + doc/DocGisItemsArea.html | 39 + doc/DocGisItemsArea.md | 37 + doc/DocGisItemsEditMultiple.html | 136 ++ doc/DocGisItemsEditMultiple.md | 67 + doc/DocGisItemsNew.html | 34 + doc/DocGisItemsNew.md | 41 + doc/DocGisItemsRte.html | 54 + doc/DocGisItemsRte.md | 69 + doc/DocGisItemsTrk2.html | 213 +++ doc/DocGisItemsTrk2.md | 153 ++ doc/DocGisItemsWpt.html | 132 ++ doc/DocGisItemsWpt.md | 73 + doc/DocHandleGpxFiles.html | 36 + doc/DocHandleGpxFiles.md | 41 + doc/DocInstallMapDem.html | 59 + doc/DocInstallMapDem.md | 53 + doc/DocMain.html | 56 + doc/DocMain.md | 52 + doc/DocMapsTipsTricks.html | 288 ++++ doc/DocMapsTipsTricks.md | 317 ++++ doc/DocPlayground.md | 24 + doc/DocSearchGoogle.html | 16 + doc/DocSearchGoogle.md | 25 + doc/DocUseCaseMotorcycleNavigation.html | 113 ++ doc/DocWorkingWithProjects.html | 12 + doc/DocWorkingWithProjects.md | 17 + doc/Home.html | 76 + doc/Home.md | 82 + doc/HtmlMake.py | 156 ++ doc/IGN.wmts | 445 ++++++ doc/LinkCheck.sh | 170 ++ doc/Makefile | 157 ++ doc/NavBar.sh | 186 +++ doc/QuickWayToPrepareRasterMapForQMapShack.html | 54 + doc/QuickWayToPrepareRasterMapForQMapShack.md | 68 + doc/README.txt | 378 +++++ doc/ReportBugs.html | 48 + doc/ReportBugs.md | 53 + doc/RequestFeatures.md | 33 + doc/TroubleShooting.html | 82 + doc/TroubleShooting.md | 101 ++ doc/Ubuntu-14.04-HowTo.html | 47 + doc/Ubuntu-14.04-HowTo.md | 53 + doc/fix.time | 1 + doc/images/DocBasicsMapDem/qmapshack1.png | Bin 0 -> 184129 bytes doc/images/DocControlMapDem/maproom1.png | Bin 0 -> 331907 bytes doc/images/DocControlMapDem/maproom10.png | Bin 0 -> 780674 bytes doc/images/DocControlMapDem/maproom2.png | Bin 0 -> 312760 bytes doc/images/DocControlMapDem/maproom3.png | Bin 0 -> 30491 bytes doc/images/DocControlMapDem/maproom5.png | Bin 0 -> 181551 bytes doc/images/DocControlMapDem/maproom6.png | Bin 0 -> 7860 bytes doc/images/DocControlMapDem/maproom7.png | Bin 0 -> 13852 bytes doc/images/DocControlMapDem/maproom7.svg | 354 +++++ doc/images/DocControlMapDem/maproom8.png | Bin 0 -> 15811 bytes doc/images/DocControlMapDem/maproom8.svg | 372 +++++ doc/images/DocGettingStarted/maproom1.png | Bin 0 -> 72030 bytes doc/images/DocGettingStarted/maproom1_1.png | Bin 0 -> 52188 bytes doc/images/DocGettingStarted/maproom2.png | Bin 0 -> 27104 bytes doc/images/DocGettingStarted/maproom3.png | Bin 0 -> 22347 bytes doc/images/DocGettingStarted/maproom4.png | Bin 0 -> 154109 bytes doc/images/DocGettingStarted/maproom6.png | Bin 0 -> 405576 bytes doc/images/DocGisDatabaseAddRemove/Add.png | Bin 0 -> 350 bytes doc/images/DocGisDatabaseAddRemove/PathBlue.png | Bin 0 -> 535 bytes doc/images/DocGisDatabaseAddRemove/maproom1.png | Bin 0 -> 27119 bytes doc/images/DocGisDatabaseAddRemove/maproom2.png | Bin 0 -> 7063 bytes doc/images/DocGisDatabaseAddRemove/maproom3.png | Bin 0 -> 9273 bytes doc/images/DocGisDatabaseAddRemove/maproom4.png | Bin 0 -> 31819 bytes doc/images/DocGisDatabaseAddRemove/maproom5.png | Bin 0 -> 17538 bytes doc/images/DocGisDatabaseFolderItems/maproom1.png | Bin 0 -> 18842 bytes doc/images/DocGisDatabaseFolderItems/maproom3.png | Bin 0 -> 57511 bytes doc/images/DocGisDatabaseFolderItems/maproom4.png | Bin 0 -> 25238 bytes doc/images/DocGisDatabaseFolderItems/maproom5.png | Bin 0 -> 39268 bytes doc/images/DocGisDatabaseFolderItems/maproom6.png | Bin 0 -> 14666 bytes doc/images/DocGisDatabaseFolderItems/maproom7.png | Bin 0 -> 53188 bytes doc/images/DocGisDatabaseFolderItems/maproom8.png | Bin 0 -> 22024 bytes doc/images/DocGisDatabaseLostFound/maproom1.png | Bin 0 -> 18081 bytes doc/images/DocGisDatabaseLostFound/maproom2.png | Bin 0 -> 17394 bytes doc/images/DocGisDatabaseLostFound/maproom4.png | Bin 0 -> 69409 bytes doc/images/DocGisDatabaseLostFound/maproom5.png | Bin 0 -> 45917 bytes doc/images/DocGisDatabaseLostFound/maproom6.png | Bin 0 -> 44594 bytes .../DocGisDatabaseWorkspaceDatabase/maproom2.png | Bin 0 -> 120831 bytes .../DocGisDatabaseWorkspaceDatabase/maproom2.svg | 847 ++++++++++ doc/images/DocGisDevices/qmapshack2.png | Bin 0 -> 47033 bytes doc/images/DocGisDevices/qmapshack4.png | Bin 0 -> 79817 bytes doc/images/DocGisDevices/qmapshack5.png | Bin 0 -> 29075 bytes doc/images/DocGisDevices/qmapshack6.png | Bin 0 -> 23002 bytes doc/images/DocGisItems/maproom1.png | Bin 0 -> 55875 bytes doc/images/DocGisItems/maproom2.png | Bin 0 -> 19093 bytes doc/images/DocGisItems/maproom3.png | Bin 0 -> 17793 bytes doc/images/DocGisItems/maproom4.png | Bin 0 -> 33655 bytes doc/images/DocGisItems/maproom5.png | Bin 0 -> 25634 bytes doc/images/DocGisItemsArea/maproom1.png | Bin 0 -> 96765 bytes doc/images/DocGisItemsArea/maproom2.png | Bin 0 -> 13840 bytes doc/images/DocGisItemsArea/maproom3.png | Bin 0 -> 57014 bytes doc/images/DocGisItemsEditMultiple/Add.png | Bin 0 -> 400 bytes doc/images/DocGisItemsEditMultiple/Apply_small.png | Bin 0 -> 682 bytes doc/images/DocGisItemsEditMultiple/AreaMove.png | Bin 0 -> 2814 bytes doc/images/DocGisItemsEditMultiple/DeleteOne.png | Bin 0 -> 1133 bytes .../DocGisItemsEditMultiple/DeleteOne_small.png | Bin 0 -> 369 bytes doc/images/DocGisItemsEditMultiple/LineMove.png | Bin 0 -> 1784 bytes doc/images/DocGisItemsEditMultiple/PointMove.png | Bin 0 -> 1518 bytes doc/images/DocGisItemsEditMultiple/Redo.png | Bin 0 -> 1344 bytes doc/images/DocGisItemsEditMultiple/SelectRange.png | Bin 0 -> 1129 bytes doc/images/DocGisItemsEditMultiple/Undo.png | Bin 0 -> 1370 bytes doc/images/DocGisItemsEditMultiple/qms1.png | Bin 0 -> 12023 bytes doc/images/DocGisItemsEditMultiple/qms2.png | Bin 0 -> 93250 bytes doc/images/DocGisItemsEditMultiple/qms2.svg | 1680 ++++++++++++++++++++ doc/images/DocGisItemsNew/maproom1.png | Bin 0 -> 9247 bytes doc/images/DocGisItemsNew/maproom2.png | Bin 0 -> 17938 bytes doc/images/DocGisItemsNew/maproom3.png | Bin 0 -> 15045 bytes doc/images/DocGisItemsNew/maproom4.png | Bin 0 -> 38983 bytes doc/images/DocGisItemsNew/maproom5.png | Bin 0 -> 23057 bytes doc/images/DocGisItemsRte/Apply.png | Bin 0 -> 3238 bytes doc/images/DocGisItemsRte/Copy.png | Bin 0 -> 649 bytes doc/images/DocGisItemsRte/DeleteOne.png | Bin 0 -> 1133 bytes doc/images/DocGisItemsRte/EditDetails.png | Bin 0 -> 2565 bytes doc/images/DocGisItemsRte/LineMove.png | Bin 0 -> 1784 bytes doc/images/DocGisItemsRte/Reset.png | Bin 0 -> 1896 bytes doc/images/DocGisItemsRte/RteInstr.png | Bin 0 -> 1518 bytes doc/images/DocGisItemsRte/qms1.png | Bin 0 -> 122823 bytes doc/images/DocGisItemsRte/qms2.png | Bin 0 -> 120055 bytes doc/images/DocGisItemsRte/qms3.png | Bin 0 -> 35890 bytes doc/images/DocGisItemsRte/qms4.png | Bin 0 -> 16165 bytes doc/images/DocGisItemsRte/qms5.png | Bin 0 -> 39207 bytes doc/images/DocGisItemsRte/qms6.png | Bin 0 -> 21521 bytes doc/images/DocGisItemsTrk/Activity.png | Bin 0 -> 2217 bytes doc/images/DocGisItemsTrk/ActivityTab.png | Bin 0 -> 27213 bytes doc/images/DocGisItemsTrk/Combine.png | Bin 0 -> 979 bytes doc/images/DocGisItemsTrk/Copy.png | Bin 0 -> 649 bytes doc/images/DocGisItemsTrk/DeleteOne.png | Bin 0 -> 1133 bytes doc/images/DocGisItemsTrk/DetailsDialog.png | Bin 0 -> 93274 bytes doc/images/DocGisItemsTrk/EditDetails.png | Bin 0 -> 2565 bytes doc/images/DocGisItemsTrk/FilterEelvation.png | Bin 0 -> 38017 bytes doc/images/DocGisItemsTrk/FilterExtensions.png | Bin 0 -> 28208 bytes doc/images/DocGisItemsTrk/FilterPoints.png | Bin 0 -> 36560 bytes doc/images/DocGisItemsTrk/FilterSplit.png | Bin 0 -> 26695 bytes doc/images/DocGisItemsTrk/FilterTab.png | Bin 0 -> 14313 bytes doc/images/DocGisItemsTrk/FilterTime.png | Bin 0 -> 41188 bytes doc/images/DocGisItemsTrk/GraphArea.png | Bin 0 -> 64156 bytes doc/images/DocGisItemsTrk/GraphsTab.png | Bin 0 -> 22313 bytes doc/images/DocGisItemsTrk/HistoryTab.png | Bin 0 -> 35940 bytes doc/images/DocGisItemsTrk/InfoTab.png | Bin 0 -> 20722 bytes doc/images/DocGisItemsTrk/LineMove.png | Bin 0 -> 1784 bytes doc/images/DocGisItemsTrk/Lock.png | Bin 0 -> 932 bytes doc/images/DocGisItemsTrk/PointHide.png | Bin 0 -> 1175 bytes doc/images/DocGisItemsTrk/PointShow.png | Bin 0 -> 869 bytes doc/images/DocGisItemsTrk/PointsTab.png | Bin 0 -> 27640 bytes doc/images/DocGisItemsTrk/Reverse.png | Bin 0 -> 1088 bytes doc/images/DocGisItemsTrk/Save.png | Bin 0 -> 364 bytes doc/images/DocGisItemsTrk/SelectRange.png | Bin 0 -> 1129 bytes doc/images/DocGisItemsTrk/StyleTab.png | Bin 0 -> 24536 bytes doc/images/DocGisItemsTrk/Tainted.png | Bin 0 -> 1182 bytes doc/images/DocGisItemsTrk/TrkCut.png | Bin 0 -> 2422 bytes doc/images/DocGisItemsTrk/TrkProfile.png | Bin 0 -> 1359 bytes doc/images/DocGisItemsTrk/Zoom.png | Bin 0 -> 1154 bytes doc/images/DocGisItemsTrk/maproom1.png | Bin 0 -> 602263 bytes doc/images/DocGisItemsWpt/AddImage.png | Bin 0 -> 1490 bytes doc/images/DocGisItemsWpt/Bubble.png | Bin 0 -> 851 bytes doc/images/DocGisItemsWpt/Copy.png | Bin 0 -> 591 bytes doc/images/DocGisItemsWpt/DelImage.png | Bin 0 -> 1384 bytes doc/images/DocGisItemsWpt/DeleteOne.png | Bin 0 -> 1075 bytes doc/images/DocGisItemsWpt/EditDetails.png | Bin 0 -> 2507 bytes doc/images/DocGisItemsWpt/Lock.png | Bin 0 -> 932 bytes doc/images/DocGisItemsWpt/Move.png | Bin 0 -> 9212 bytes doc/images/DocGisItemsWpt/PinRed.png | Bin 0 -> 535 bytes doc/images/DocGisItemsWpt/Projection.png | Bin 0 -> 19102 bytes doc/images/DocGisItemsWpt/Tainted.png | Bin 0 -> 1182 bytes doc/images/DocGisItemsWpt/WptBubble.png | Bin 0 -> 77707 bytes doc/images/DocGisItemsWpt/WptDetails.png | Bin 0 -> 91506 bytes doc/images/DocGisItemsWpt/WptHighlight.png | Bin 0 -> 8190 bytes doc/images/DocGisItemsWpt/WptMove.png | Bin 0 -> 1479 bytes doc/images/DocGisItemsWpt/WptProj.png | Bin 0 -> 1181 bytes doc/images/DocHandleGpxFiles/maproom1.png | Bin 0 -> 6535 bytes doc/images/DocHandleGpxFiles/maproom2.png | Bin 0 -> 5780 bytes doc/images/DocHandleGpxFiles/maproom3.png | Bin 0 -> 74901 bytes doc/images/DocHandleGpxFiles/maproom4.png | Bin 0 -> 8281 bytes doc/images/DocSearchGoogle/maproom1.png | Bin 0 -> 4132 bytes doc/images/DocSearchGoogle/maproom2.png | Bin 0 -> 6616 bytes doc/images/DocSearchGoogle/maproom3.png | Bin 0 -> 12294 bytes doc/images/DocSearchGoogle/maproom4.png | Bin 0 -> 19735 bytes doc/images/DocWorkingWithProjects/maproom1.png | Bin 0 -> 8034 bytes doc/images/maproom1.png | Bin 0 -> 452927 bytes doc/nav.time | 1 + doc/playground/DocGisHowToRouting.md | 196 +++ doc/playground/DocGisHowToSaveYourWork.md | 181 +++ doc/playground/DocUseCaseMotorcycleNavigation.md | 168 ++ src/CMakeLists.txt | 6 +- src/gis/CGisListDB.cpp | 276 +++- src/gis/CGisListDB.h | 12 + src/gis/CGisListWks.cpp | 90 +- src/gis/CGisListWks.h | 14 + src/gis/CGisWidget.cpp | 11 +- src/gis/IGisItem.cpp | 39 +- src/gis/IGisItem.h | 11 +- src/gis/IGisLine.cpp | 13 +- src/gis/IGisLine.h | 3 + src/gis/db/CDBFolderLostFound.h | 2 + src/gis/db/CDBFolderMysql.cpp | 21 +- src/gis/db/CDBFolderMysql.h | 3 + src/gis/db/CDBFolderSqlite.cpp | 23 +- src/gis/db/CDBFolderSqlite.h | 3 + src/gis/db/CDBItem.cpp | 20 +- src/gis/db/CDBItem.h | 24 +- src/gis/db/CDBProject.cpp | 97 +- src/gis/db/CDBProject.h | 4 +- src/gis/db/CLostFoundProject.cpp | 22 +- src/gis/db/CSearchDatabase.cpp | 293 ++++ .../CSelectActivity.h => db/CSearchDatabase.h} | 35 +- src/gis/db/CSelectDBFolder.cpp | 5 + src/gis/db/CSelectSaveAction.cpp | 4 +- src/gis/db/IDBFolder.cpp | 95 +- src/gis/db/IDBFolder.h | 26 + src/gis/db/IDBFolderSql.h | 1 + src/gis/db/IDBMysql.cpp | 142 +- src/gis/db/IDBMysql.h | 2 + src/gis/db/IDBSqlite.cpp | 189 ++- src/gis/db/IDBSqlite.h | 3 + src/gis/db/ISearchDatabase.ui | 96 ++ src/gis/db/macros.h | 2 +- src/gis/fit/CFitProject.cpp | 2 + src/gis/fit/CFitProject.h | 1 + src/gis/fit/decoder/CFitCrcState.h | 1 + src/gis/fit/decoder/CFitHeaderState.h | 1 + src/gis/fit/decoder/CFitRecordContentState.h | 1 + src/gis/gpx/CGpxProject.cpp | 23 +- src/gis/ovl/CGisItemOvlArea.cpp | 46 +- src/gis/ovl/CGisItemOvlArea.h | 7 +- src/gis/ovl/CScrOptOvlArea.cpp | 2 +- src/gis/prj/CDetailsPrj.cpp | 63 +- src/gis/prj/IDetailsPrj.ui | 5 - src/gis/prj/IGisProject.cpp | 116 +- src/gis/prj/IGisProject.h | 43 +- src/gis/qms/CQmsProject.cpp | 2 +- src/gis/qms/serialization.cpp | 45 +- src/gis/rte/CCreateRouteFromWpt.cpp | 4 +- src/gis/rte/CDetailsRte.cpp | 2 +- src/gis/rte/CGisItemRte.cpp | 44 +- src/gis/rte/CGisItemRte.h | 8 +- src/gis/rte/CScrOptRte.cpp | 2 +- src/gis/slf/CSlfProject.cpp | 2 + src/gis/tnv/CTwoNavProject.cpp | 3 +- src/gis/trk/CActivityTrk.cpp | 473 +++--- src/gis/trk/CActivityTrk.h | 19 +- src/gis/trk/CDetailsTrk.cpp | 65 +- src/gis/trk/CDetailsTrk.h | 3 +- src/gis/trk/CGisItemTrk.cpp | 61 +- src/gis/trk/CGisItemTrk.h | 14 +- src/gis/trk/CScrOptTrk.cpp | 2 +- src/gis/trk/CSelectActivity.cpp | 72 - src/gis/trk/IDetailsTrk.ui | 34 +- src/gis/trk/ISelectActivity.ui | 28 - src/gis/wpt/CGisItemWpt.cpp | 43 +- src/gis/wpt/CGisItemWpt.h | 8 +- src/gis/wpt/CScrOptWpt.cpp | 2 +- src/helpers/CSelectCopyAction.cpp | 4 +- src/icons/32x32/SearchDatabase.png | Bin 0 -> 2033 bytes src/icons/32x32/SortName.png | Bin 0 -> 658 bytes src/icons/48x48/SearchDatabase.png | Bin 0 -> 3133 bytes src/icons/48x48/SortName.png | Bin 0 -> 946 bytes src/icons/SearchDatabase.svg | 178 +++ src/icons/SortName.svg | 90 ++ src/locale/qmapshack.ts | 1118 ++++++++----- src/locale/qmapshack_cs.ts | 1176 +++++++++----- src/locale/qmapshack_de.ts | 1116 ++++++++----- src/locale/qmapshack_es.ts | 1120 ++++++++----- src/locale/qmapshack_fr.ts | 1119 ++++++++----- src/locale/qmapshack_nl.ts | 1117 ++++++++----- src/map/cache/CDiskCache.cpp | 15 +- src/mouse/CMouseRangeTrk.cpp | 8 +- src/mouse/CMouseRangeTrk.h | 2 +- src/mouse/CScrOptRangeTrk.cpp | 14 +- src/mouse/CScrOptRangeTrk.h | 8 + src/plot/IPlot.cpp | 7 +- src/plot/IPlot.h | 2 +- src/qlgt/CQmsDb.cpp | 5 +- src/resources.qrc | 4 + src/widgets/CTextEditWidget.cpp | 19 +- src/widgets/CTextEditWidgetSelMenu.cpp | 6 +- src/widgets/CTextEditWidgetSelMenu.h | 6 +- 327 files changed, 18066 insertions(+), 3255 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
