This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository qmapshack.
from 60993e5 Imported Upstream version 1.6.0 new 125f98c Imported Upstream version 1.6.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt | 5 +- CMakeLists.txt.user | 4 +- MacOSX/HowtoBuildOSX.txt | 6 +- MacOSX/build-routino.sh | 1 + MacOSX/bundle.sh | 15 +- MacOSX/env-path.sh | 1 + README.md | 4 +- call_Uncrustify.cfg | 9 +- changelog.txt | 17 +- features.txt | 2 +- {nsi => msvc_64}/3rdparty.txt | 11 +- {nsi => msvc_64}/Help.ico | Bin {nsi => msvc_64}/MUI_HEADERIMAGE.bmp | Bin {nsi => msvc_64}/MUI_WELCOMEFINISHPAGE.bmp | Bin {nsi => msvc_64}/QMapShack.ico | Bin {nsi => msvc_64}/QMapShack_Installer.nsi | 8 +- {nsi => msvc_64}/build_routino.bat | 0 {nsi => msvc_64}/copyfiles.bat | 24 +- {nsi => msvc_64}/gdalicon.ico | Bin {nsi => msvc_64}/kfm_home.ico | Bin nsi/HOWTO-BUILD.txt | 169 -- nsi/QMapShack_Installer32.nsi | 266 --- nsi/copyfiles32.bat | 92 - qmapshack.1 | 2 +- src/CMainWindow.cpp | 39 +- src/CMainWindow.h | 1 + src/CMakeLists.txt | 39 +- src/GeoMath.cpp | 80 +- src/GeoMath.h | 33 +- src/IMainWindow.ui | 15 +- src/canvas/CCanvas.cpp | 140 +- src/canvas/CCanvas.h | 32 +- src/canvas/IDrawContext.cpp | 175 +- src/canvas/IDrawContext.h | 105 +- src/cursors/cursorSelectArea.png | Bin 0 -> 1209 bytes src/dem/CDemDraw.cpp | 10 +- src/dem/CDemList.cpp | 2 +- src/dem/CDemPathSetup.cpp | 2 +- src/dem/IDem.cpp | 51 +- src/dem/IDem.h | 4 +- src/dem/IDemList.ui | 2 +- src/device/CDeviceGarmin.cpp | 12 +- src/device/CDeviceGarminArchive.cpp | 2 +- src/device/CDeviceTwoNav.cpp | 6 +- src/device/CDeviceWatcherLinux.cpp | 6 +- src/device/CDeviceWatcherMac.cpp | 4 +- src/device/CDeviceWatcherWindows.cpp | 148 +- src/device/IDevice.cpp | 40 + src/device/IDevice.h | 2 + src/gis/CGisListDB.cpp | 14 +- src/gis/CGisListWks.cpp | 144 +- src/gis/CGisWidget.cpp | 211 +- src/gis/CGisWidget.h | 43 +- src/gis/IGisItem.cpp | 45 +- src/gis/IGisItem.h | 22 +- src/gis/IGisLine.cpp | 6 +- src/gis/WptIcons.cpp | 9 +- src/gis/db/CDBProject.cpp | 14 +- src/gis/db/CSelectDBFolder.cpp | 2 +- src/gis/db/IDBFolderSql.cpp | 6 +- src/gis/db/IDBSqlite.cpp | 8 +- src/gis/fit/CFitProject.cpp | 85 +- src/gis/fit/CFitProject.h | 5 +- src/gis/fit/CFitStream.cpp | 6 +- src/gis/fit/CFitStream.h | 6 +- src/gis/fit/decoder/CFitByteDataTransformer.cpp | 8 +- src/gis/fit/decoder/CFitCrcState.h | 2 +- src/gis/fit/decoder/CFitDefinitionMessage.cpp | 23 +- src/gis/fit/decoder/CFitDefinitionMessage.h | 9 +- src/gis/fit/decoder/CFitFieldDataState.cpp | 2 +- src/gis/fit/decoder/CFitFieldDataState.h | 2 +- src/gis/fit/decoder/CFitFieldDefinitionState.cpp | 5 - src/gis/fit/decoder/CFitFieldDefinitionState.h | 2 +- src/gis/fit/decoder/CFitHeaderState.cpp | 13 +- src/gis/fit/decoder/CFitHeaderState.h | 2 +- src/gis/fit/decoder/CFitMessage.cpp | 14 +- src/gis/fit/decoder/CFitMessage.h | 7 +- src/gis/fit/decoder/CFitRecordContentState.cpp | 2 +- src/gis/fit/decoder/CFitRecordContentState.h | 2 +- src/gis/fit/decoder/CFitRecordHeaderState.cpp | 4 +- src/gis/fit/decoder/CFitRecordHeaderState.h | 2 +- src/gis/fit/decoder/IFitDecoderState.cpp | 24 +- src/gis/fit/decoder/IFitDecoderState.h | 12 +- src/gis/fit/defs/fit_const.h | 6 +- src/gis/fit/serialization.cpp | 210 +- src/gis/gpx/CGpxProject.h | 2 +- src/gis/gpx/serialization.cpp | 21 +- src/gis/ovl/CDetailsOvlArea.cpp | 2 +- src/gis/ovl/CGisItemOvlArea.cpp | 15 +- src/gis/ovl/CGisItemOvlArea.h | 1 + src/gis/ovl/CScrOptOvlArea.cpp | 3 +- src/gis/prj/CDetailsPrj.cpp | 24 +- src/gis/prj/IGisProject.cpp | 47 +- src/gis/prj/IGisProject.h | 3 + src/gis/qms/CQmsProject.cpp | 6 +- src/gis/qms/CQmsProject.h | 2 +- src/gis/rte/CCreateRouteFromWpt.cpp | 2 +- src/gis/rte/CDetailsRte.cpp | 8 +- src/gis/rte/CGisItemRte.cpp | 32 +- src/gis/rte/CGisItemRte.h | 1 + src/gis/rte/CScrOptRte.cpp | 4 +- src/gis/rte/router/CRouterMapQuest.cpp | 2 +- src/gis/rte/router/CRouterRoutino.cpp | 24 +- src/gis/rte/router/CRouterRoutinoPathSetup.cpp | 2 +- src/gis/rte/router/IRouterRoutino.ui | 2 +- src/gis/slf/CSlfProject.cpp | 4 - src/gis/slf/CSlfProject.h | 2 +- src/gis/slf/CSlfReader.cpp | 78 +- src/gis/slf/CSlfReader.h | 24 +- src/gis/tnv/CTwoNavProject.cpp | 8 +- src/gis/tnv/serialization.cpp | 12 +- src/gis/trk/CActivityTrk.cpp | 28 +- src/gis/trk/CCombineTrk.cpp | 80 +- src/gis/trk/CCombineTrk.h | 13 +- src/gis/trk/CDetailsTrk.cpp | 18 +- src/gis/trk/CGisItemTrk.cpp | 795 +++----- src/gis/trk/CGisItemTrk.h | 324 ++- src/gis/trk/CKnownExtension.cpp | 16 +- src/gis/trk/CKnownExtension.h | 6 +- src/gis/trk/CPropertyTrk.cpp | 29 +- src/gis/trk/CPropertyTrk.h | 53 +- src/gis/trk/CScrOptTrk.cpp | 10 +- src/gis/trk/filter/CFilterDelete.cpp | 4 - src/gis/trk/filter/CFilterDelete.h | 2 +- src/gis/trk/filter/CFilterDeleteExtension.cpp | 6 +- src/gis/trk/filter/CFilterDeleteExtension.h | 2 +- src/gis/trk/filter/CFilterInvalid.cpp | 4 - src/gis/trk/filter/CFilterInvalid.h | 2 +- src/gis/trk/filter/CFilterNewDate.cpp | 5 - src/gis/trk/filter/CFilterNewDate.h | 2 +- src/gis/trk/filter/CFilterReplaceElevation.cpp | 4 - src/gis/trk/filter/CFilterReplaceElevation.h | 2 +- src/gis/trk/filter/CFilterReset.cpp | 4 - src/gis/trk/filter/CFilterReset.h | 2 +- src/gis/trk/filter/CFilterSplitSegment.cpp | 4 - src/gis/trk/filter/CFilterSplitSegment.h | 2 +- src/gis/trk/filter/filter.cpp | 6 +- src/gis/wpt/CDetailsGeoCache.cpp | 13 +- src/gis/wpt/CGisItemWpt.cpp | 10 +- src/gis/wpt/CGisItemWpt.h | 1 + src/gis/wpt/CScrOptWpt.cpp | 3 +- src/grid/CGrid.cpp | 38 +- src/grid/CGrid.h | 4 +- src/grid/CProjWizard.cpp | 10 +- src/grid/IProjWizard.ui | 4 +- src/helpers/CAppSetup.cpp | 342 ---- src/helpers/CAppSetup.h | 92 - src/helpers/CFileExt.h | 2 +- src/helpers/CLimit.cpp | 2 +- src/helpers/CLinksDialog.cpp | 2 +- src/helpers/CSettings.h | 2 +- src/helpers/CValue.cpp | 2 +- src/helpers/CValue.h | 2 +- src/helpers/CWptIconDialog.cpp | 7 +- src/helpers/Signals.h | 4 +- src/icons/32x32/Area.png | Bin 1105 -> 1772 bytes src/icons/32x32/SelectArea.png | Bin 0 -> 290 bytes src/icons/32x32/SelectExactArea.png | Bin 0 -> 686 bytes src/icons/32x32/SelectIntersectArea.png | Bin 0 -> 779 bytes src/icons/32x32/Track.png | Bin 790 -> 1052 bytes src/icons/48x48/Area.png | Bin 1823 -> 2854 bytes src/icons/48x48/SelectArea.png | Bin 0 -> 428 bytes src/icons/48x48/SelectExactArea.png | Bin 0 -> 849 bytes src/icons/48x48/SelectIntersectArea.png | Bin 0 -> 1133 bytes src/icons/48x48/Track.png | Bin 1174 -> 1613 bytes src/icons/Area.svg | 30 +- src/icons/{PointMove.svg => SelectArea.svg} | 62 +- src/icons/{LineMove.svg => SelectExactArea.svg} | 92 +- .../{PointMove.svg => SelectIntersectArea.svg} | 88 +- src/icons/Track.svg | 61 +- src/locale/qmapshack.ts | 1373 +++++++------ src/locale/qmapshack_cs.ts | 2082 ++++++++++++-------- src/locale/qmapshack_de.ts | 1264 +++++++----- src/locale/qmapshack_es.ts | 1409 ++++++++----- src/locale/qmapshack_fr.ts | 1417 ++++++++----- src/locale/qmapshack_nl.ts | 1429 +++++++++----- src/main.cpp | 18 +- src/map/CMapDraw.cpp | 27 +- src/map/CMapGEMF.cpp | 134 +- src/map/CMapGEMF.h | 5 +- src/map/CMapIMG.cpp | 923 +++------ src/map/CMapIMG.h | 128 +- src/map/CMapJNX.cpp | 2 +- src/map/CMapPathSetup.cpp | 2 +- src/map/CMapRMAP.cpp | 2 +- src/map/CMapTMS.cpp | 8 +- src/map/CMapVRT.cpp | 1 - src/map/CMapWMTS.cpp | 10 +- src/map/IMap.cpp | 6 +- src/map/IMap.h | 6 +- src/map/IMapList.ui | 2 +- src/map/cache/CDiskCache.cpp | 6 +- src/map/garmin/CGarminPoint.cpp | 62 +- src/map/garmin/CGarminPoint.h | 7 + src/map/garmin/CGarminPolygon.cpp | 37 +- src/map/garmin/CGarminPolygon.h | 41 +- src/mouse/CMouseDummy.cpp | 2 +- src/mouse/CMouseEditArea.cpp | 2 +- src/mouse/CMouseEditArea.h | 2 +- src/mouse/CMouseEditRte.cpp | 2 +- src/mouse/CMouseEditRte.h | 3 +- src/mouse/CMouseEditTrk.cpp | 12 +- src/mouse/CMouseEditTrk.h | 2 +- src/mouse/CMouseMoveWpt.cpp | 32 +- src/mouse/CMouseNormal.cpp | 56 +- src/mouse/CMouseNormal.h | 15 +- src/mouse/CMousePrint.cpp | 295 +-- src/mouse/CMousePrint.h | 49 +- src/mouse/CMouseRangeTrk.h | 2 +- src/mouse/CMouseSelect.cpp | 155 ++ src/mouse/{CMouseWptBubble.h => CMouseSelect.h} | 49 +- src/mouse/CMouseWptBubble.cpp | 6 +- src/mouse/CMouseWptBubble.h | 1 - templates/source.cpp => src/mouse/CScrOptPrint.cpp | 10 +- .../{line/CScrOptEditLine.h => CScrOptPrint.h} | 17 +- src/mouse/CScrOptSelect.cpp | 142 ++ .../ovl/CScrOptOvlArea.h => mouse/CScrOptSelect.h} | 37 +- src/mouse/CScrOptUnclutter.cpp | 6 +- src/mouse/IMouse.h | 7 - src/mouse/{CMousePrint.cpp => IMouseSelect.cpp} | 112 +- src/mouse/{CMousePrint.h => IMouseSelect.h} | 35 +- src/mouse/IScrOpt.cpp | 2 - src/mouse/IScrOpt.h | 4 +- src/mouse/IScrOptPrint.ui | 78 + src/mouse/IScrOptSelect.ui | 372 ++++ src/mouse/line/CLineOpAddPoint.cpp | 6 +- src/mouse/line/CLineOpDeletePoint.cpp | 7 +- src/mouse/line/CLineOpDeletePoint.h | 4 +- src/mouse/line/CLineOpSelectRange.cpp | 12 +- src/mouse/line/ILineOp.cpp | 81 +- src/mouse/line/ILineOp.h | 17 +- src/mouse/line/IMouseEditLine.cpp | 52 +- src/mouse/line/IMouseEditLine.h | 17 +- src/plot/CPlot.cpp | 44 +- src/plot/CPlot.h | 3 +- src/plot/CPlotAxis.cpp | 17 +- src/plot/CPlotAxis.h | 11 +- src/plot/CPlotProfile.cpp | 21 +- src/plot/IPlot.cpp | 67 +- src/plot/IPlot.h | 9 +- src/plot/ITrack.cpp | 16 +- src/plot/ITrack.h | 6 +- src/print/CPrintDialog.cpp | 2 +- src/qlgt/CQlgtDb.cpp | 6 +- src/qlgt/CQlgtDiary.cpp | 6 +- src/qlgt/CQlgtFolder.cpp | 2 +- src/qlgt/CQlgtTrack.cpp | 4 +- src/qlgt/CQlgtTrack.h | 4 +- src/qlgt/CQlgtWpt.cpp | 2 +- src/qlgt/CQmsDb.cpp | 2 +- src/qlgt/converter.cpp | 15 +- src/resources.qrc | 7 + src/{helpers => setup}/CAppOpts.h | 0 src/setup/CAppSetupLinux.cpp | 68 + .../CFitCrcState.h => setup/CAppSetupLinux.h} | 23 +- src/setup/CAppSetupMac.cpp | 144 ++ .../CFitProfileLookup.h => setup/CAppSetupMac.h} | 28 +- src/setup/CAppSetupWin.cpp | 73 + .../CFitCrcState.h => setup/CAppSetupWin.h} | 22 +- src/{helpers => setup}/CCommandProcessor.cpp | 10 +- src/{helpers => setup}/CCommandProcessor.h | 5 +- src/setup/CLogHandler.cpp | 121 ++ .../CFitProfileLookup.h => setup/CLogHandler.h} | 37 +- src/setup/IAppSetup.cpp | 125 ++ .../CCommandProcessor.h => setup/IAppSetup.h} | 27 +- src/test/CGisItemTrk.cpp | 56 + src/test/CGpxProject.cpp | 52 +- src/test/CKnownExtension.cpp | 95 + .../CQmsProject.cpp} | 47 +- src/test/CSlfReader.cpp | 46 +- src/test/TestHelper.cpp | 159 ++ src/test/TestHelper.h | 90 + src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx | 117 ++ .../input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml | 25 + src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx | 117 ++ src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml | 25 + src/test/input/{ => gpx}/qtt_gpx_file0.gpx | 0 src/test/input/gpx/qtt_gpx_file0.gpx.xml | 23 + src/test/input/qms/V1.6.0_file1.qms | Bin 0 -> 8012 bytes src/test/input/qms/V1.6.0_file1.qms.xml | 26 + src/test/input/qms/V1.6.0_file2.qms | Bin 0 -> 6168 bytes src/test/input/qms/V1.6.0_file2.qms.xml | 26 + src/test/input/qtt_gpx_file0.gpx.xml | 23 - src/test/input/qtt_slf_file0.slf.xml | 27 - src/test/input/{ => slf}/qtt_slf_file0.slf | 0 src/test/input/slf/qtt_slf_file0.slf.xml | 27 + src/test/main.cpp | 272 +-- src/test/test_QMapShack.h | 58 +- src/tool/CMapVrtBuilder.cpp | 5 +- src/tool/CRoutinoDatabaseBuilder.cpp | 8 +- src/units/CCoordFormatSetup.cpp | 3 +- src/units/CUnitImperial.cpp | 44 +- src/units/CUnitImperial.h | 10 +- src/units/CUnitMetric.cpp | 19 +- src/units/CUnitMetric.h | 7 +- src/units/CUnitNautic.cpp | 11 +- src/units/CUnitNautic.h | 5 +- src/units/CUnitsSetup.cpp | 4 - src/units/CUnitsSetup.h | 2 +- src/units/IUnit.cpp | 30 +- src/units/IUnit.h | 30 +- src/widgets/CHistoryListWidget.cpp | 2 +- src/widgets/CPhotoAlbum.cpp | 4 +- 303 files changed, 11249 insertions(+), 8467 deletions(-) rename {nsi => msvc_64}/3rdparty.txt (76%) rename {nsi => msvc_64}/Help.ico (100%) rename {nsi => msvc_64}/MUI_HEADERIMAGE.bmp (100%) rename {nsi => msvc_64}/MUI_WELCOMEFINISHPAGE.bmp (100%) rename {nsi => msvc_64}/QMapShack.ico (100%) rename {nsi => msvc_64}/QMapShack_Installer.nsi (93%) rename {nsi => msvc_64}/build_routino.bat (100%) rename {nsi => msvc_64}/copyfiles.bat (83%) rename {nsi => msvc_64}/gdalicon.ico (100%) rename {nsi => msvc_64}/kfm_home.ico (100%) delete mode 100644 nsi/HOWTO-BUILD.txt delete mode 100644 nsi/QMapShack_Installer32.nsi delete mode 100644 nsi/copyfiles32.bat create mode 100644 src/cursors/cursorSelectArea.png delete mode 100644 src/helpers/CAppSetup.cpp delete mode 100644 src/helpers/CAppSetup.h create mode 100644 src/icons/32x32/SelectArea.png create mode 100644 src/icons/32x32/SelectExactArea.png create mode 100644 src/icons/32x32/SelectIntersectArea.png create mode 100644 src/icons/48x48/SelectArea.png create mode 100644 src/icons/48x48/SelectExactArea.png create mode 100644 src/icons/48x48/SelectIntersectArea.png copy src/icons/{PointMove.svg => SelectArea.svg} (69%) copy src/icons/{LineMove.svg => SelectExactArea.svg} (61%) copy src/icons/{PointMove.svg => SelectIntersectArea.svg} (62%) create mode 100644 src/mouse/CMouseSelect.cpp copy src/mouse/{CMouseWptBubble.h => CMouseSelect.h} (51%) copy templates/source.cpp => src/mouse/CScrOptPrint.cpp (86%) copy src/mouse/{line/CScrOptEditLine.h => CScrOptPrint.h} (74%) create mode 100644 src/mouse/CScrOptSelect.cpp copy src/{gis/ovl/CScrOptOvlArea.h => mouse/CScrOptSelect.h} (63%) copy src/mouse/{CMousePrint.cpp => IMouseSelect.cpp} (66%) copy src/mouse/{CMousePrint.h => IMouseSelect.h} (74%) create mode 100644 src/mouse/IScrOptPrint.ui create mode 100644 src/mouse/IScrOptSelect.ui rename src/{helpers => setup}/CAppOpts.h (100%) create mode 100644 src/setup/CAppSetupLinux.cpp copy src/{gis/fit/decoder/CFitCrcState.h => setup/CAppSetupLinux.h} (69%) create mode 100644 src/setup/CAppSetupMac.cpp copy src/{gis/fit/defs/CFitProfileLookup.h => setup/CAppSetupMac.h} (65%) create mode 100644 src/setup/CAppSetupWin.cpp copy src/{gis/fit/decoder/CFitCrcState.h => setup/CAppSetupWin.h} (69%) rename src/{helpers => setup}/CCommandProcessor.cpp (78%) copy src/{helpers => setup}/CCommandProcessor.h (91%) create mode 100644 src/setup/CLogHandler.cpp copy src/{gis/fit/defs/CFitProfileLookup.h => setup/CLogHandler.h} (60%) create mode 100644 src/setup/IAppSetup.cpp rename src/{helpers/CCommandProcessor.h => setup/IAppSetup.h} (58%) create mode 100644 src/test/CGisItemTrk.cpp create mode 100644 src/test/CKnownExtension.cpp copy src/{gis/trk/filter/CFilterDeleteExtension.h => test/CQmsProject.cpp} (52%) create mode 100644 src/test/TestHelper.cpp create mode 100644 src/test/TestHelper.h create mode 100644 src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx create mode 100644 src/test/input/gpx/gpx_ext_GarminTPX1_gpxtpx.gpx.xml create mode 100644 src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx create mode 100644 src/test/input/gpx/gpx_ext_GarminTPX1_tp1.gpx.xml rename src/test/input/{ => gpx}/qtt_gpx_file0.gpx (100%) create mode 100644 src/test/input/gpx/qtt_gpx_file0.gpx.xml create mode 100644 src/test/input/qms/V1.6.0_file1.qms create mode 100644 src/test/input/qms/V1.6.0_file1.qms.xml create mode 100644 src/test/input/qms/V1.6.0_file2.qms create mode 100644 src/test/input/qms/V1.6.0_file2.qms.xml delete mode 100644 src/test/input/qtt_gpx_file0.gpx.xml delete mode 100644 src/test/input/qtt_slf_file0.slf.xml rename src/test/input/{ => slf}/qtt_slf_file0.slf (100%) create mode 100644 src/test/input/slf/qtt_slf_file0.slf.xml -- 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