This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit 0c624fc218b0bf6bfc1f4498f914a36f1736c0d0 Merge: 4206d32 ec8542f Author: Bas Couwenberg <[email protected]> Date: Sun Mar 26 13:47:50 2017 +0200 Merge tag 'upstream/1.8.0' Upstream version 1.8.0 3rdparty/alglib/src/alglibinternal.cpp | 8 +- 3rdparty/alglib/src/ap.cpp | 14 +- 3rdparty/alglib/src/dataanalysis.cpp | 2 +- 3rdparty/alglib/src/interpolation.cpp | 4 +- 3rdparty/alglib/src/optimization.cpp | 2 +- CMakeLists.txt | 10 +- CMakeLists.txt.user | 31 +- MacOSX/HowtoBuildOSX.txt | 35 +- MacOSX/build-quazip.sh | 57 + MacOSX/bundle.sh | 1 + MacOSX/env-path.sh | 6 + changelog.txt | 21 + cmake/Modules/CMakeLists.txt | 2 +- cmake/Modules/FindALGLIB.cmake | 13 +- cmake/Modules/FindQuaZip.cmake | 88 + msvc_64/QMapShack_Installer.nsi | 8 +- msvc_64/copyfiles.bat | 9 +- msvc_64/qt.conf | 4 + src/CAbout.cpp | 8 + src/CMainWindow.cpp | 30 +- src/CMainWindow.h | 4 +- src/CMakeLists.txt | 94 +- src/CSingleInstanceProxy.cpp | 102 + templates/header.h => src/CSingleInstanceProxy.h | 27 +- src/IAbout.ui | 28 +- src/IMainWindow.ui | 13 +- src/canvas/CCanvas.cpp | 17 +- src/canvas/CCanvas.h | 6 +- src/canvas/IDrawContext.cpp | 67 +- src/canvas/IDrawObject.cpp | 132 + src/canvas/IDrawObject.h | 9 + src/cursors/wptHighlightBlue.png | Bin 0 -> 5295 bytes .../{wptHighlight.svg => wptHighlightBlue.svg} | 26 +- .../{wptHighlight.png => wptHighlightRed.png} | Bin .../{wptHighlight.svg => wptHighlightRed.svg} | 0 src/dem/CDemDraw.cpp | 4 +- src/dem/IDem.cpp | 22 +- src/device/IDevice.cpp | 6 +- src/gis/CGisListDB.cpp | 50 + src/gis/CGisListDB.h | 2 + src/gis/CGisListWks.cpp | 67 +- src/gis/CGisListWks.h | 2 + src/gis/CGisWidget.cpp | 61 +- src/gis/CGisWidget.h | 16 +- src/gis/IGisWidget.ui | 12 + templates/header.h => src/gis/Poi.h | 19 +- src/gis/WptIcons.cpp | 17 +- src/gis/db/CDBProject.cpp | 55 + src/gis/db/CDBProject.h | 2 + src/gis/ovl/IDetailsOvlArea.ui | 2 +- src/gis/prj/IGisProject.cpp | 56 +- src/gis/prj/IGisProject.h | 9 + src/gis/rte/CGisItemRte.cpp | 160 + src/gis/rte/CGisItemRte.h | 2 + src/gis/rte/IDetailsRte.ui | 2 +- src/gis/rte/router/CRouterBRouter.cpp | 597 +++ src/gis/rte/router/CRouterBRouter.h | 106 + src/gis/rte/router/CRouterRoutino.cpp | 8 +- src/gis/rte/router/CRouterSetup.cpp | 9 + src/gis/rte/router/CRouterSetup.h | 4 + src/gis/rte/router/IRouterBRouter.ui | 220 + .../gis/rte/router/brouter/CRouterBRouterInfo.cpp | 20 +- .../gis/rte/router/brouter/CRouterBRouterInfo.h | 24 +- src/gis/rte/router/brouter/CRouterBRouterSetup.cpp | 625 +++ src/gis/rte/router/brouter/CRouterBRouterSetup.h | 148 + .../rte/router/brouter/CRouterBRouterSetupPage.cpp | 86 + .../CRouterBRouterSetupPage.h} | 32 +- .../router/brouter/CRouterBRouterSetupWizard.cpp | 968 ++++ .../rte/router/brouter/CRouterBRouterSetupWizard.h | 122 + .../rte/router/brouter/CRouterBRouterTilesPage.cpp | 93 + .../CRouterBRouterTilesPage.h} | 36 +- .../router/brouter/CRouterBRouterTilesSelect.cpp | 811 +++ .../rte/router/brouter/CRouterBRouterTilesSelect.h | 114 + .../brouter/CRouterBRouterTilesSelectArea.cpp | 188 + .../router/brouter/CRouterBRouterTilesSelectArea.h | 94 + .../brouter/CRouterBRouterTilesSelectLayout.h | 54 + .../router/brouter/CRouterBRouterTilesStatus.h} | 58 +- .../rte/router/brouter/CRouterBRouterToolShell.cpp | 81 + .../router/brouter/CRouterBRouterToolShell.h} | 50 +- src/gis/rte/router/brouter/IRouterBRouterInfo.ui | 74 + .../router/brouter/IRouterBRouterSetupWizard.ui | 682 +++ .../{ => routino}/CRouterRoutinoPathSetup.cpp | 2 +- .../router/{ => routino}/CRouterRoutinoPathSetup.h | 0 .../{ => routino}/IRouterRoutinoPathSetup.ui | 2 +- src/gis/tcx/CTcxProject.cpp | 495 ++ src/gis/tcx/CTcxProject.h | 67 + src/gis/tcx/serialization.cpp | 265 + src/gis/trk/CActivityTrk.cpp | 4 +- src/gis/trk/CCutTrk.cpp | 21 + src/gis/trk/CCutTrk.h | 12 + src/gis/trk/CGisItemTrk.cpp | 27 +- src/gis/trk/CGisItemTrk.h | 20 + src/gis/trk/ICombineTrk.ui | 32 +- src/gis/trk/ICutTrk.ui | 86 +- src/gis/trk/IDetailsTrk.ui | 8 +- src/gis/wpt/CGisItemWpt.cpp | 7 +- src/gis/wpt/CGisItemWpt.h | 6 + src/gis/wpt/IDetailsWpt.ui | 2 +- src/helpers/CProgressDialog.cpp | 6 +- src/helpers/CSelectProjectDialog.cpp | 1 + src/icons/32x32/CutMode1.png | Bin 0 -> 346 bytes src/icons/32x32/CutMode2.png | Bin 0 -> 289 bytes src/icons/32x32/QMapShack.png | Bin 1622 -> 1623 bytes src/icons/32x32/TcxProject.png | Bin 0 -> 1196 bytes src/icons/48x48/CutMode1.png | Bin 0 -> 469 bytes src/icons/48x48/CutMode2.png | Bin 0 -> 367 bytes src/icons/48x48/QMapShack.png | Bin 2751 -> 2746 bytes src/icons/48x48/TcxProject.png | Bin 0 -> 1839 bytes src/icons/CutMode1.svg | 123 + src/icons/CutMode2.svg | 99 + src/icons/TcxProject.svg | 114 + src/icons/hicolor/128x128/apps/QMapShack.png | Bin 5461 -> 11023 bytes src/icons/hicolor/16x16/apps/QMapShack.png | Bin 868 -> 721 bytes src/icons/hicolor/192x192/apps/QMapShack.png | Bin 8793 -> 18972 bytes src/icons/hicolor/22x22/apps/QMapShack.png | Bin 1153 -> 1025 bytes src/icons/hicolor/24x24/apps/QMapShack.png | Bin 1239 -> 1136 bytes src/icons/hicolor/256x256/apps/QMapShack.png | Bin 12480 -> 28348 bytes src/icons/hicolor/32x32/apps/QMapShack.png | Bin 1178 -> 1623 bytes src/icons/hicolor/36x36/apps/QMapShack.png | Bin 1316 -> 1898 bytes src/icons/hicolor/40x40/apps/QMapShack.png | Bin 1443 -> 2163 bytes src/icons/hicolor/42x42/apps/QMapShack.png | Bin 1530 -> 2267 bytes src/icons/hicolor/48x48/apps/QMapShack.png | Bin 1738 -> 2746 bytes src/icons/hicolor/512x512/apps/QMapShack.png | Bin 19731 -> 72355 bytes src/icons/hicolor/64x64/apps/QMapShack.png | Bin 2323 -> 4086 bytes src/icons/hicolor/72x72/apps/QMapShack.png | Bin 2709 -> 4893 bytes src/icons/hicolor/80x80/apps/QMapShack.png | Bin 3161 -> 5558 bytes src/icons/hicolor/8x8/apps/QMapShack.png | Bin 551 -> 344 bytes src/icons/hicolor/96x96/apps/QMapShack.png | Bin 3908 -> 7338 bytes src/icons/makeicons | 28 +- src/icons/waypoints/1stCategory.svg | 117 + src/icons/waypoints/2ndCategory.svg | 98 + src/icons/waypoints/32x32/1stCategory.png | Bin 0 -> 832 bytes src/icons/waypoints/32x32/2ndCategory.png | Bin 0 -> 963 bytes src/icons/waypoints/32x32/3rdCategory.png | Bin 0 -> 1107 bytes src/icons/waypoints/32x32/4thCategory.png | Bin 0 -> 942 bytes src/icons/waypoints/32x32/Danger.png | Bin 0 -> 910 bytes src/icons/waypoints/32x32/FirstAid.png | Bin 0 -> 467 bytes src/icons/waypoints/32x32/Food.png | Bin 0 -> 1482 bytes src/icons/waypoints/32x32/Generic.png | Bin 0 -> 779 bytes src/icons/waypoints/32x32/HorsCategory.png | Bin 0 -> 850 bytes src/icons/waypoints/32x32/Left.png | Bin 0 -> 663 bytes src/icons/waypoints/32x32/Right.png | Bin 0 -> 623 bytes src/icons/waypoints/32x32/Sprint.png | Bin 0 -> 1384 bytes src/icons/waypoints/32x32/Straight.png | Bin 0 -> 650 bytes src/icons/waypoints/32x32/Summit.png | Bin 0 -> 1208 bytes src/icons/waypoints/32x32/Valley.png | Bin 0 -> 962 bytes src/icons/waypoints/32x32/Water.png | Bin 0 -> 916 bytes src/icons/waypoints/3rdCategory.svg | 99 + src/icons/waypoints/4thCategory.svg | 99 + src/icons/waypoints/Danger.svg | 93 + src/icons/waypoints/FirstAid.svg | 109 + src/icons/waypoints/Food.svg | 94 + src/icons/waypoints/Generic.svg | 91 + src/icons/waypoints/HorsCategory.svg | 99 + src/icons/waypoints/Left.svg | 95 + src/icons/waypoints/Right.svg | 91 + src/icons/waypoints/Sprint.svg | 103 + src/icons/waypoints/Straight.svg | 95 + src/icons/waypoints/Summit.svg | 91 + src/icons/waypoints/Valley.svg | 91 + src/icons/waypoints/Water.svg | 104 + src/locale/qmapshack.ts | 1937 +++++-- src/locale/qmapshack_cs.ts | 1938 +++++-- src/locale/qmapshack_de.ts | 1911 +++++-- src/locale/qmapshack_es.ts | 1915 +++++-- src/locale/qmapshack_fr.ts | 1932 +++++-- src/locale/qmapshack_nl.ts | 1934 +++++-- src/locale/qmapshack_ru.desktop | 3 + src/locale/{qmapshack_cs.ts => qmapshack_ru.ts} | 5495 ++++++++++++-------- src/main.cpp | 16 +- src/map/CMapDraw.cpp | 45 +- src/map/CMapDraw.h | 3 + src/map/CMapIMG.cpp | 151 +- src/map/CMapIMG.h | 12 +- src/map/CMapPropSetup.cpp | 3 + src/map/CMapVRT.cpp | 15 +- src/map/CMapWMTS.cpp | 1 - src/map/IMap.cpp | 38 +- src/map/IMap.h | 24 +- src/map/IMapPropSetup.ui | 69 +- src/mouse/CMouseMoveWpt.cpp | 55 +- src/mouse/CMouseMoveWpt.h | 8 +- src/mouse/CMouseNormal.cpp | 22 +- src/mouse/CMouseNormal.h | 9 +- src/mouse/CMouseRangeTrk.cpp | 139 +- src/mouse/CMouseRangeTrk.h | 9 +- src/mouse/CMouseSelect.cpp | 16 + src/mouse/CMouseSelect.h | 1 + src/mouse/IMouse.cpp | 48 - src/mouse/IMouse.h | 7 - src/mouse/IScrOptSelect.ui | 22 +- src/mouse/line/CLineOpSelectRange.cpp | 38 +- src/mouse/line/ILineOp.cpp | 3 +- src/mouse/line/ILineOp.h | 1 + src/mouse/line/IScrOptRangeLine.ui | 12 + src/plot/IPlot.cpp | 18 + src/plot/IPlot.h | 2 + src/resources.qrc | 25 +- src/setup/CAppSetupLinux.h | 1 + src/setup/CAppSetupMac.h | 1 + src/setup/CAppSetupWin.cpp | 8 + src/setup/CAppSetupWin.h | 3 + src/setup/CLogHandler.cpp | 1 + src/setup/IAppSetup.h | 1 + src/tool/CMapVrtBuilder.cpp | 3 +- src/tool/CRoutinoDatabaseBuilder.cpp | 3 +- src/tool/IToolShell.cpp | 42 +- src/tool/IToolShell.h | 19 +- templates/header.h | 2 +- templates/source.c | 2 +- templates/source.cpp | 2 +- test/unittest/CMakeLists.txt | 8 +- 212 files changed, 21673 insertions(+), 6044 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
