This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit d7459150f07d5a3ccf47d23c783c24b0ddff5ec0 Merge: 5462d42 ac61a97 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 24 15:45:41 2015 +0200 Merge tag 'upstream/1.4.0' Upstream version 1.4.0 CMakeLists.txt | 25 +- CMakeLists.txt.user | 2 +- MacOSX/build-cask.sh | 59 + MacOSX/build-qmapshack.sh | 56 + MacOSX/build-routino.sh | 83 + MacOSX/bundle.sh | 91 +- MacOSX/env-path.sh | 49 + call_Uncrustify.cfg | 5 +- changelog.txt | 26 + nsi/3rdparty.txt | 81 +- nsi/HOWTO-BUILD.txt | 168 + nsi/build_routino.bat | 48 + nsi/copyfiles.bat | 5 +- src/CAbout.cpp | 9 +- src/CMainWindow.cpp | 35 +- src/CMainWindow.h | 2 + src/CMakeLists.txt | 19 +- src/GeoMath.cpp | 115 +- src/GeoMath.h | 6 +- src/IAbout.ui | 34 +- src/IMainWindow.ui | 32 +- src/canvas/CCanvas.cpp | 224 +- src/canvas/CCanvas.h | 26 +- src/canvas/IDrawObject.h | 2 +- src/cursors/cursorPrint.png | Bin 0 -> 1476 bytes src/cursors/cursorSave.png | Bin 0 -> 1238 bytes src/dem/CDemDraw.cpp | 4 +- src/dem/CDemItem.h | 2 +- src/dem/CDemVRT.cpp | 11 +- src/dem/IDem.h | 4 +- src/gis/CGisDraw.cpp | 2 +- src/gis/CGisListWks.cpp | 133 +- src/gis/CGisListWks.h | 6 + src/gis/CGisWidget.cpp | 4 +- src/gis/IGisItem.cpp | 74 +- src/gis/IGisItem.h | 7 +- src/gis/WptIcons.cpp | 8 +- src/gis/db/CDBItem.cpp | 2 +- src/gis/db/CDBProject.cpp | 10 +- src/gis/db/CLostFoundProject.cpp | 3 +- src/gis/db/CSetupFolder.cpp | 3 +- src/gis/db/IDB.cpp | 8 +- src/gis/db/IDBFolder.cpp | 10 +- src/gis/gpx/CGpxProject.cpp | 3 +- src/gis/gpx/serialization.cpp | 94 + src/gis/ovl/CDetailsOvlArea.cpp | 3 +- src/gis/ovl/CGisItemOvlArea.cpp | 3 +- src/gis/ovl/CScrOptOvlArea.cpp | 4 +- src/gis/prj/CDetailsPrj.cpp | 97 +- src/gis/prj/CDetailsPrj.h | 2 +- src/gis/prj/IGisProject.cpp | 33 +- src/gis/prj/IGisProject.h | 11 +- src/gis/qms/serialization.cpp | 11 +- src/gis/rte/CGisItemRte.cpp | 9 +- src/gis/rte/CScrOptRte.cpp | 4 +- src/gis/rte/router/CRouterRoutino.cpp | 18 +- src/gis/tnv/serialization.cpp | 4 +- src/gis/trk/CActivityTrk.cpp | 471 +++ src/gis/trk/CActivityTrk.h | 137 + src/gis/trk/CDetailsTrk.cpp | 93 +- src/gis/trk/CDetailsTrk.h | 1 + src/gis/trk/CGisItemTrk.cpp | 182 +- src/gis/trk/CGisItemTrk.h | 78 +- src/gis/trk/CScrOptTrk.cpp | 4 +- src/gis/trk/CSelectActivity.cpp | 72 + .../trk/CSelectActivity.h} | 30 +- src/gis/trk/IDetailsTrk.ui | 75 +- src/gis/trk/ISelectActivity.ui | 28 + src/gis/wpt/CDetailsGeoCache.cpp | 3 +- src/gis/wpt/CDetailsWpt.cpp | 3 +- src/gis/wpt/CGisItemWpt.cpp | 9 +- src/gis/wpt/CScrOptWpt.cpp | 4 +- src/gis/wpt/CSetupNewWpt.cpp | 32 +- src/grid/CGrid.cpp | 17 +- src/grid/CProjWizard.cpp | 12 +- src/helpers/CAppOpts.h | 4 +- src/helpers/CAppSetup.cpp | 99 +- src/helpers/CAppSetup.h | 12 +- src/helpers/CCommandProcessor.cpp | 17 +- src/helpers/CDraw.cpp | 191 + src/helpers/CDraw.h | 93 + src/helpers/CPositionDialog.cpp | 113 +- src/helpers/CPositionDialog.h | 8 +- src/helpers/CTextEditWidget.h | 3 +- src/icons/16x16/ActAero.png | Bin 0 -> 548 bytes src/icons/16x16/ActBike.png | Bin 0 -> 465 bytes src/icons/16x16/ActCable.png | Bin 0 -> 440 bytes src/icons/16x16/ActCar.png | Bin 0 -> 458 bytes src/icons/16x16/ActCycle.png | Bin 0 -> 475 bytes src/icons/16x16/ActFoot.png | Bin 0 -> 386 bytes src/icons/16x16/ActNone.png | Bin 0 -> 354 bytes src/icons/16x16/ActShip.png | Bin 0 -> 456 bytes src/icons/16x16/ActSwim.png | Bin 0 -> 474 bytes src/icons/16x16/Activity.png | Bin 0 -> 654 bytes src/icons/32x32/ActAero.png | Bin 0 -> 1131 bytes src/icons/32x32/ActBike.png | Bin 0 -> 981 bytes src/icons/32x32/ActCable.png | Bin 0 -> 660 bytes src/icons/32x32/ActCar.png | Bin 0 -> 781 bytes src/icons/32x32/ActCycle.png | Bin 0 -> 1036 bytes src/icons/32x32/ActFoot.png | Bin 0 -> 642 bytes src/icons/32x32/ActNone.png | Bin 0 -> 599 bytes src/icons/32x32/ActShip.png | Bin 0 -> 787 bytes src/icons/32x32/ActSwim.png | Bin 0 -> 831 bytes src/icons/32x32/Activity.png | Bin 0 -> 1375 bytes src/icons/32x32/PrintSave.png | Bin 0 -> 811 bytes src/icons/32x32/SetupCoordFormat.png | Bin 0 -> 1108 bytes src/icons/32x32/ShowAll.png | Bin 0 -> 1358 bytes src/icons/32x32/ShowNone.png | Bin 0 -> 1424 bytes src/icons/48x48/ActAero.png | Bin 0 -> 1739 bytes src/icons/48x48/ActBike.png | Bin 0 -> 1515 bytes src/icons/48x48/ActCable.png | Bin 0 -> 905 bytes src/icons/48x48/ActCar.png | Bin 0 -> 1110 bytes src/icons/48x48/ActCycle.png | Bin 0 -> 1596 bytes src/icons/48x48/ActFoot.png | Bin 0 -> 743 bytes src/icons/48x48/ActNone.png | Bin 0 -> 813 bytes src/icons/48x48/ActShip.png | Bin 0 -> 1141 bytes src/icons/48x48/ActSwim.png | Bin 0 -> 1242 bytes src/icons/48x48/Activity.png | Bin 0 -> 2217 bytes src/icons/48x48/PrintSave.png | Bin 0 -> 1069 bytes src/icons/48x48/SetupCoordFormat.png | Bin 0 -> 1725 bytes src/icons/48x48/ShowAll.png | Bin 0 -> 2138 bytes src/icons/48x48/ShowNone.png | Bin 0 -> 2226 bytes src/icons/ActAero.svg | 145 + src/icons/ActBike.svg | 131 + src/icons/ActCable.svg | 100 + src/icons/ActCar.svg | 122 + src/icons/ActCycle.svg | 146 + src/icons/ActFoot.svg | 116 + src/icons/ActNone.svg | 83 + src/icons/ActShip.svg | 100 + src/icons/ActSwim.svg | 106 + src/icons/Activity.svg | 239 ++ src/icons/PrintSave.svg | 149 + src/icons/SetupCoordFormat.svg | 74 + src/icons/ShowAll.svg | 97 + src/icons/ShowNone.svg | 103 + src/icons/makeicons | 3 +- src/locale/qmapshack_cs.ts | 1345 ++++--- src/locale/qmapshack_de.ts | 1086 ++++-- src/locale/qmapshack_es.ts | 1079 ++++-- src/locale/qmapshack_fr.ts | 1083 ++++-- src/locale/{qmapshack_es.ts => qmapshack_nl.ts} | 3852 ++++++++++---------- src/map/CMapDraw.cpp | 2 +- src/map/CMapDraw.h | 6 +- src/map/CMapIMG.cpp | 15 +- src/map/CMapIMG.h | 2 +- src/map/CMapJNX.cpp | 7 +- src/map/CMapRMAP.cpp | 2 +- src/map/CMapTMS.cpp | 28 + src/map/CMapVRT.cpp | 11 +- src/map/CMapWMTS.cpp | 27 + src/map/IMap.h | 21 +- src/map/garmin/CGarminPoint.cpp | 12 +- src/map/garmin/CGarminPolygon.cpp | 33 +- src/map/garmin/CGarminStrTbl6.cpp | 15 +- src/map/garmin/CGarminStrTbl8.cpp | 6 +- src/map/garmin/CGarminStrTblUtf8.cpp | 6 +- src/map/garmin/CGarminTyp.cpp | 1 + src/map/garmin/IGarminStrTbl.h | 11 +- src/mouse/CMouseEditTrk.cpp | 2 +- src/mouse/CMouseMoveWpt.cpp | 3 +- src/mouse/CMouseNormal.cpp | 14 +- src/mouse/CMousePrint.cpp | 326 ++ src/mouse/{CMouseRangeTrk.h => CMousePrint.h} | 59 +- src/mouse/CMouseRangeTrk.cpp | 31 +- src/mouse/CMouseRangeTrk.h | 1 + src/mouse/CScrOptRangeTrk.cpp | 4 +- src/mouse/CScrOptUnclutter.cpp | 3 +- src/mouse/IMouse.cpp | 9 +- src/mouse/IScrOpt.cpp | 51 +- src/mouse/IScrOpt.h | 3 +- src/mouse/IScrOptRangeTrk.ui | 16 +- src/mouse/line/CLineOpAddPoint.cpp | 33 +- src/mouse/line/CLineOpAddPoint.h | 2 + src/mouse/line/CLineOpMovePoint.cpp | 33 +- src/mouse/line/CLineOpMovePoint.h | 2 + src/mouse/line/CLineOpSelectRange.cpp | 12 + src/mouse/line/CLineOpSelectRange.h | 2 + src/mouse/line/CScrOptRangeLine.cpp | 5 +- src/mouse/line/ILineOp.h | 14 + src/mouse/line/IMouseEditLine.cpp | 62 +- src/mouse/line/IMouseEditLine.h | 4 +- src/plot/CPlotAxis.h | 3 +- src/plot/CPlotTrack.cpp | 2 +- src/plot/IPlot.cpp | 120 +- src/plot/IPlot.h | 3 + src/plot/ITrack.cpp | 4 +- src/print/CPrintDialog.cpp | 277 ++ .../CLineOpSelectRange.h => print/CPrintDialog.h} | 66 +- src/print/IPrintDialog.ui | 170 + src/qlgt/CQlgtDb.cpp | 30 +- src/qlgt/CQlgtDiary.cpp | 3 +- src/qlgt/CQlgtFolder.cpp | 6 +- src/qlgt/CQlgtRoute.cpp | 3 +- src/qlgt/CQlgtTrack.cpp | 3 +- src/qlgt/CQlgtTrack.h | 12 +- src/qlgt/CQlgtWpt.cpp | 3 +- src/qlgt/CQmsDb.cpp | 3 +- src/qlgt/IQlgtOverlay.cpp | 4 +- src/qlgt/converter.cpp | 11 +- src/resources.qrc | 39 + src/tool/CRoutinoDatabaseBuilder.cpp | 28 +- src/units/CCoordFormatSetup.cpp | 68 + .../CCoordFormatSetup.h} | 30 +- src/units/CTimeZoneSetup.cpp | 2 +- src/units/CUnitImperial.cpp | 2 +- src/units/CUnitMetric.cpp | 2 +- src/units/CUnitNautic.cpp | 2 +- src/units/{IUnitsSetup.ui => ICoordFormatSetup.ui} | 30 +- src/units/IUnit.cpp | 175 +- src/units/IUnit.h | 46 +- src/units/IUnitsSetup.ui | 14 +- 212 files changed, 11101 insertions(+), 4695 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel