[qmapshack] 01/02: Merge tag 'debian/1.6.0-2' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Mar 17 20:04:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qmapshack.
commit 7b4e875362eae19d5371664b125aa27b9e9f3e94
Merge: fe5bf39 3414249
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Mar 17 20:44:33 2016 +0100
Merge tag 'debian/1.6.0-2' into jessie-backports
Conflicts:
debian/changelog
debian/control
CMakeLists.txt | 24 +-
CMakeLists.txt.user | 73 +-
CMakeLists.txt.user.044d553 | 292 -
MacOSX/HowtoBuildOSX.txt | 132 +
MacOSX/build-cask.sh | 59 -
MacOSX/build-qmapshack.sh | 72 -
MacOSX/build-routino.sh | 92 +-
MacOSX/bundle.sh | 71 +-
MacOSX/env-path.sh | 56 +-
README.md | 4 +-
call_Uncrustify.cfg | 2 +
changelog.txt | 39 +
cmake/Modules/Qt5PatchedLinguistToolsMacros.cmake | 112 +
cmake/Modules/TranslateDesktop.cmake | 89 +
cmake/Modules/TranslateTs.cmake | 149 +
debian/changelog | 21 +
debian/control | 6 +-
debian/copyright | 6 +-
debian/patches/original-typo.patch | 16 +
debian/patches/routino-version.patch | 21 -
debian/patches/series | 2 +-
nsi/HOWTO-BUILD.txt | 1 +
nsi/QMapShack_Installer.nsi | 10 +-
nsi/copyfiles.bat | 13 +-
qmapshack.1 | 2 +-
qmapshack.desktop => qmapshack.desktop.in | 4 +-
src/CAbout.h | 1 +
src/CMainWindow.cpp | 1922 ++--
src/CMainWindow.h | 45 +-
src/CMakeLists.txt | 961 +-
src/GeoMath.cpp | 24 +-
src/IAbout.ui | 187 +-
src/IMainWindow.ui | 114 +-
src/canvas/CCanvas.cpp | 37 +-
src/canvas/CCanvas.h | 22 +-
src/canvas/CCanvasSetup.cpp | 2 +-
src/canvas/CCanvasSetup.h | 2 +-
src/canvas/IDrawContext.cpp | 12 +-
src/canvas/IDrawContext.h | 6 +-
src/canvas/IDrawObject.cpp | 10 +-
src/canvas/IDrawObject.h | 8 +-
src/dem/CDemDraw.cpp | 14 +-
src/dem/CDemDraw.h | 10 +-
src/dem/CDemList.cpp | 90 +-
src/dem/CDemList.h | 7 +-
src/dem/CDemPathSetup.cpp | 6 +-
src/dem/CDemPathSetup.h | 2 +-
src/dem/CDemPropSetup.cpp | 52 +-
src/dem/CDemPropSetup.h | 4 +-
src/dem/CDemVRT.cpp | 29 +-
src/dem/CDemVRT.h | 4 +-
src/dem/IDem.h | 4 +-
src/dem/IDemList.ui | 33 +
src/dem/IDemProp.cpp | 2 +-
src/device/CDeviceGarmin.cpp | 100 +-
src/device/CDeviceGarmin.h | 30 +-
src/device/CDeviceGarminArchive.cpp | 62 +
.../CDeviceGarminArchive.h} | 30 +-
src/device/CDeviceTwoNav.cpp | 2 +-
src/device/CDeviceTwoNav.h | 2 +-
src/device/CDeviceWatcherLinux.cpp | 2 +
src/device/CDeviceWatcherLinux.h | 2 +-
src/device/CDeviceWatcherMac.cpp | 164 +-
src/device/CDeviceWatcherMac.h | 29 +-
src/device/CDeviceWatcherWindows.cpp | 4 +-
src/device/IDevice.cpp | 92 +-
src/device/IDevice.h | 13 +-
src/gis/CGisDraw.cpp | 2 +-
src/gis/CGisDraw.h | 2 +-
src/gis/CGisListDB.cpp | 386 +-
src/gis/CGisListDB.h | 19 +-
src/gis/CGisListWks.cpp | 562 +-
src/gis/CGisListWks.h | 19 +-
src/gis/CGisWidget.cpp | 143 +-
src/gis/CGisWidget.h | 57 +-
src/gis/CSelDevices.cpp | 15 +-
src/gis/IGisItem.cpp | 158 +-
src/gis/IGisItem.h | 79 +-
src/gis/IGisWidget.ui | 5 +
src/gis/WptIcons.cpp | 13 +-
src/gis/WptIcons.h | 12 +-
src/gis/db/CDBFolderLostFound.cpp | 33 +-
src/gis/db/CDBFolderLostFound.h | 12 +-
src/gis/db/CDBFolderMysql.cpp | 76 +
.../CLineOpMovePoint.h => gis/db/CDBFolderMysql.h} | 40 +-
.../{CDBFolderDatabase.cpp => CDBFolderSqlite.cpp} | 42 +-
.../db/CDBFolderSqlite.h} | 26 +-
src/gis/db/CDBItem.cpp | 58 +-
src/gis/db/CDBItem.h | 14 +-
src/gis/db/CDBProject.cpp | 749 +-
src/gis/db/CDBProject.h | 90 +-
src/gis/db/CLostFoundProject.cpp | 9 +-
src/gis/db/CLostFoundProject.h | 3 +-
src/gis/db/CSelectDBFolder.cpp | 51 +-
src/gis/db/CSelectDBFolder.h | 3 +-
src/gis/db/CSelectSaveAction.cpp | 9 +-
src/gis/db/CSelectSaveAction.h | 1 +
src/gis/db/CSetupDatabase.cpp | 67 +-
src/gis/db/CSetupDatabase.h | 18 +-
src/gis/db/CSetupFolder.cpp | 2 +-
src/gis/db/CSetupFolder.h | 2 +-
src/gis/db/CSetupWorkspace.cpp | 6 +-
src/gis/db/CSetupWorkspace.h | 2 +-
src/gis/db/IDB.cpp | 176 +-
src/gis/db/IDB.h | 21 +-
src/gis/db/IDBFolder.cpp | 261 +-
src/gis/db/IDBFolder.h | 128 +-
src/gis/db/IDBFolderSql.cpp | 156 +
src/gis/db/{CDBFolderDatabase.h => IDBFolderSql.h} | 38 +-
src/gis/db/IDBMysql.cpp | 173 +
.../CCoordFormatSetup.h => gis/db/IDBMysql.h} | 26 +-
src/gis/db/IDBSqlite.cpp | 352 +
src/gis/db/{IDB.h => IDBSqlite.h} | 29 +-
src/gis/db/ISelectSaveAction.ui | 122 +-
src/gis/db/ISetupDatabase.ui | 277 +-
src/gis/db/ISetupWorkspace.ui | 22 +-
src/gis/db/macros.h | 17 +-
src/gis/fit/CFitProject.cpp | 126 +
src/gis/{gpx/CGpxProject.h => fit/CFitProject.h} | 43 +-
src/gis/fit/CFitStream.cpp | 91 +
src/gis/fit/CFitStream.h | 86 +
src/gis/fit/decoder/CFitByteDataTransformer.cpp | 172 +
src/gis/fit/decoder/CFitByteDataTransformer.h | 52 +
src/gis/fit/decoder/CFitCrcState.cpp | 39 +
src/gis/fit/decoder/CFitCrcState.h | 34 +
src/gis/fit/decoder/CFitDecoder.cpp | 122 +
src/gis/fit/decoder/CFitDecoder.h | 51 +
src/gis/fit/decoder/CFitDefinitionMessage.cpp | 153 +
src/gis/fit/decoder/CFitDefinitionMessage.h | 67 +
src/gis/fit/decoder/CFitField.cpp | 97 +
src/gis/fit/decoder/CFitField.h | 62 +
src/gis/fit/decoder/CFitFieldBuilder.cpp | 145 +
src/gis/fit/decoder/CFitFieldBuilder.h | 42 +
src/gis/fit/decoder/CFitFieldDataState.cpp | 72 +
src/gis/fit/decoder/CFitFieldDataState.h | 41 +
src/gis/fit/decoder/CFitFieldDefinition.cpp | 77 +
src/gis/fit/decoder/CFitFieldDefinition.h | 56 +
src/gis/fit/decoder/CFitFieldDefinitionState.cpp | 70 +
src/gis/fit/decoder/CFitFieldDefinitionState.h | 41 +
src/gis/fit/decoder/CFitHeaderState.cpp | 130 +
src/gis/fit/decoder/CFitHeaderState.h | 39 +
src/gis/fit/decoder/CFitMessage.cpp | 94 +
src/gis/fit/decoder/CFitMessage.h | 59 +
src/gis/fit/decoder/CFitRecordContentState.cpp | 92 +
src/gis/fit/decoder/CFitRecordContentState.h | 41 +
src/gis/fit/decoder/CFitRecordHeaderState.cpp | 98 +
src/gis/fit/decoder/CFitRecordHeaderState.h | 34 +
src/gis/fit/decoder/IFitDecoderState.cpp | 139 +
src/gis/fit/decoder/IFitDecoderState.h | 90 +
src/gis/fit/defs/CFitBaseType.cpp | 135 +
src/gis/fit/defs/CFitBaseType.h | 103 +
src/gis/fit/defs/CFitFieldProfile.cpp | 189 +
src/gis/fit/defs/CFitFieldProfile.h | 111 +
src/gis/fit/defs/CFitProfile.cpp | 74 +
src/gis/fit/defs/CFitProfile.h | 53 +
src/gis/fit/defs/CFitProfileLookup.cpp | 1386 +++
src/gis/fit/defs/CFitProfileLookup.h | 42 +
src/gis/fit/defs/HowToFitGenerator.txt | 31 +
src/gis/fit/defs/Profile_Messages.csv | 971 +++
src/gis/fit/defs/Profile_Types.csv | 1196 +++
src/gis/fit/defs/fit_const.h | 43 +
src/gis/fit/defs/fit_enums.h | 1378 +++
src/gis/fit/defs/fit_fields.h | 1030 +++
src/gis/fit/defs/profiles.sh | 316 +
src/gis/fit/serialization.cpp | 223 +
src/gis/gpx/CGpxProject.cpp | 150 +-
src/gis/gpx/CGpxProject.h | 23 +-
src/gis/gpx/serialization.cpp | 152 +-
src/gis/ovl/CDetailsOvlArea.cpp | 82 +-
src/gis/ovl/CDetailsOvlArea.h | 3 +-
src/gis/ovl/CGisItemOvlArea.cpp | 159 +-
src/gis/ovl/CGisItemOvlArea.h | 59 +-
src/gis/ovl/CScrOptOvlArea.cpp | 20 +-
src/gis/ovl/CScrOptOvlArea.h | 2 +-
src/gis/ovl/IDetailsOvlArea.ui | 90 +-
src/gis/prj/CDetailsPrj.cpp | 146 +-
src/gis/prj/CDetailsPrj.h | 12 +-
src/gis/prj/IDetailsPrj.ui | 3 +
src/gis/prj/IGisProject.cpp | 193 +-
src/gis/prj/IGisProject.h | 83 +-
src/gis/qms/CQmsProject.cpp | 64 +-
src/gis/qms/CQmsProject.h | 17 +-
src/gis/qms/serialization.cpp | 131 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 18 +-
src/gis/rte/CCreateRouteFromWpt.h | 4 +-
src/gis/rte/CDetailsRte.cpp | 45 +-
src/gis/rte/CDetailsRte.h | 3 +-
src/gis/rte/CGisItemRte.cpp | 87 +-
src/gis/rte/CGisItemRte.h | 58 +-
src/gis/rte/CScrOptRte.cpp | 34 +-
src/gis/rte/CScrOptRte.h | 2 +-
src/gis/rte/IDetailsRte.ui | 236 +-
src/gis/rte/router/CRouterMapQuest.cpp | 10 +-
src/gis/rte/router/CRouterMapQuest.h | 6 +-
src/gis/rte/router/CRouterRoutino.cpp | 50 +-
src/gis/rte/router/CRouterRoutino.h | 8 +-
src/gis/rte/router/CRouterRoutinoPathSetup.cpp | 6 +-
src/gis/rte/router/CRouterRoutinoPathSetup.h | 2 +-
src/gis/rte/router/CRouterSetup.cpp | 4 +-
src/gis/search/CSearchGoogle.cpp | 6 +-
src/gis/search/CSearchGoogle.h | 11 +-
src/gis/slf/CSlfProject.cpp | 57 +
.../INotifiable.h => gis/slf/CSlfProject.h} | 30 +-
src/gis/slf/CSlfReader.cpp | 288 +
.../CColorLegend.h => gis/slf/CSlfReader.h} | 54 +-
src/gis/tnv/CTwoNavProject.cpp | 6 +-
src/gis/tnv/CTwoNavProject.h | 3 +-
src/gis/tnv/serialization.cpp | 22 +-
src/gis/trk/CActivityTrk.cpp | 138 +-
src/gis/trk/CActivityTrk.h | 58 +-
src/gis/trk/CCombineTrk.cpp | 43 +-
src/gis/trk/CCombineTrk.h | 2 +-
src/gis/trk/CCutTrk.cpp | 6 +-
src/gis/trk/CCutTrk.h | 10 +-
src/gis/trk/CDetailsTrk.cpp | 675 +-
src/gis/trk/CDetailsTrk.h | 37 +-
src/gis/trk/CGisItemTrk.cpp | 778 +-
src/gis/trk/CGisItemTrk.h | 294 +-
src/gis/trk/CKnownExtension.cpp | 146 +-
src/gis/trk/CKnownExtension.h | 47 +-
src/gis/trk/CPropertyTrk.cpp | 80 +-
src/gis/trk/CPropertyTrk.h | 15 +-
src/gis/trk/CScrOptTrk.cpp | 39 +-
src/gis/trk/CScrOptTrk.h | 2 +-
src/gis/trk/CSelectActivity.cpp | 2 +-
src/gis/trk/CSelectActivityColor.cpp | 124 +
.../trk/CSelectActivityColor.h} | 52 +-
src/gis/trk/IDetailsTrk.ui | 1018 ++-
src/gis/trk/ISelectActivityColor.ui | 43 +
src/gis/trk/filter/CFilterDelete.cpp | 2 +-
src/gis/trk/filter/CFilterDeleteExtension.cpp | 74 +
.../{CFilterInvalid.h => CFilterDeleteExtension.h} | 19 +-
src/gis/trk/filter/CFilterDouglasPeuker.cpp | 2 +-
src/gis/trk/filter/CFilterInvalid.cpp | 4 +-
src/gis/trk/filter/CFilterInvalid.h | 1 -
src/gis/trk/filter/CFilterMedian.cpp | 2 +-
src/gis/trk/filter/CFilterNewDate.cpp | 2 +-
src/gis/trk/filter/CFilterObscureDate.cpp | 2 +-
src/gis/trk/filter/CFilterOffsetElevation.cpp | 2 +-
src/gis/trk/filter/CFilterReplaceElevation.cpp | 2 +-
src/gis/trk/filter/CFilterReset.cpp | 2 +-
src/gis/trk/filter/CFilterSpeed.cpp | 2 +-
.../{CFilterReset.cpp => CFilterSplitSegment.cpp} | 18 +-
.../{CFilterInvalid.h => CFilterSplitSegment.h} | 16 +-
src/gis/trk/filter/IFilterDeleteExtension.ui | 132 +
src/gis/trk/filter/IFilterSplitSegment.ui | 99 +
src/gis/trk/filter/filter.cpp | 72 +-
src/gis/wpt/CDetailsGeoCache.cpp | 10 +-
src/gis/wpt/CDetailsWpt.cpp | 57 +-
src/gis/wpt/CDetailsWpt.h | 4 +-
src/gis/wpt/CGisItemWpt.cpp | 78 +-
src/gis/wpt/CGisItemWpt.h | 68 +-
src/gis/wpt/CProjWpt.cpp | 8 +-
src/gis/wpt/CProjWpt.h | 2 +-
src/gis/wpt/CScrOptWpt.cpp | 28 +-
src/gis/wpt/CScrOptWpt.h | 2 +-
src/gis/wpt/CSetupNewWpt.cpp | 6 +-
src/gis/wpt/CSetupNewWpt.h | 4 +-
src/gis/wpt/IDetailsWpt.ui | 76 +-
src/grid/CGridSetup.cpp | 8 +-
src/grid/CGridSetup.h | 2 +-
src/grid/CProjWizard.cpp | 25 +-
src/grid/CProjWizard.h | 2 +-
src/helpers/CAppSetup.cpp | 5 +-
src/helpers/CAppSetup.h | 20 +-
src/helpers/CDraw.cpp | 20 +-
src/helpers/CDraw.h | 4 +-
src/helpers/CElevationDialog.cpp | 6 +-
src/helpers/CElevationDialog.h | 2 +-
src/helpers/CFileExt.h | 2 +-
src/helpers/CInputDialog.cpp | 2 +-
src/helpers/CInputDialog.h | 2 +-
src/helpers/CLimit.cpp | 205 +
src/helpers/CLimit.h | 98 +
src/helpers/CLinksDialog.cpp | 6 +-
src/helpers/CLinksDialog.h | 2 +-
src/helpers/CPhotoViewer.h | 8 +-
src/helpers/CPositionDialog.cpp | 2 +-
src/helpers/CPositionDialog.h | 2 +-
src/helpers/CProgressDialog.cpp | 12 +-
src/helpers/CProgressDialog.h | 4 +-
src/helpers/CSelectCopyAction.cpp | 10 +-
src/helpers/CSelectProjectDialog.cpp | 20 +-
src/helpers/CSelectProjectDialog.h | 4 +-
src/helpers/CValue.cpp | 114 +
src/helpers/CValue.h | 69 +
src/helpers/CWptIconDialog.cpp | 55 +-
src/helpers/CWptIconDialog.h | 8 +-
src/helpers/ISelectCopyAction.ui | 22 +-
src/helpers/IWptIconDialog.ui | 76 +-
src/{gis/db/CDBItem.h => helpers/Signals.h} | 43 +-
src/icons/16x16/ActAero.png | Bin 548 -> 543 bytes
src/icons/16x16/ActBike.png | Bin 465 -> 461 bytes
src/icons/16x16/ActCable.png | Bin 440 -> 438 bytes
src/icons/16x16/ActCar.png | Bin 458 -> 449 bytes
src/icons/16x16/ActCycle.png | Bin 475 -> 467 bytes
src/icons/16x16/ActFoot.png | Bin 386 -> 391 bytes
src/icons/16x16/ActNone.png | Bin 354 -> 342 bytes
src/icons/16x16/ActShip.png | Bin 456 -> 445 bytes
src/icons/16x16/ActSki.png | Bin 0 -> 463 bytes
src/icons/16x16/ActSwim.png | Bin 474 -> 472 bytes
src/icons/16x16/Activity.png | Bin 654 -> 629 bytes
src/icons/16x16/EditDetails.png | Bin 0 -> 735 bytes
src/icons/32x32/2DFix.png | Bin 715 -> 710 bytes
src/icons/32x32/2NavProject.png | Bin 1225 -> 1148 bytes
src/icons/32x32/3DFix.png | Bin 897 -> 875 bytes
src/icons/32x32/A.png | Bin 679 -> 614 bytes
src/icons/32x32/ActAero.png | Bin 1131 -> 1091 bytes
src/icons/32x32/ActBike.png | Bin 981 -> 961 bytes
src/icons/32x32/ActCable.png | Bin 660 -> 614 bytes
src/icons/32x32/ActCar.png | Bin 781 -> 740 bytes
src/icons/32x32/ActCycle.png | Bin 1036 -> 980 bytes
src/icons/32x32/ActFoot.png | Bin 642 -> 606 bytes
src/icons/32x32/ActNone.png | Bin 599 -> 559 bytes
src/icons/32x32/ActShip.png | Bin 787 -> 724 bytes
src/icons/32x32/ActSki.png | Bin 0 -> 890 bytes
src/icons/32x32/ActSwim.png | Bin 831 -> 807 bytes
src/icons/32x32/Activity.png | Bin 1375 -> 1345 bytes
src/icons/32x32/Add.png | Bin 362 -> 350 bytes
src/icons/32x32/AddArea.png | Bin 1385 -> 1362 bytes
src/icons/32x32/AddImage.png | Bin 1121 -> 1112 bytes
src/icons/32x32/AddMapWorkspace.png | Bin 1544 -> 1561 bytes
src/icons/32x32/AddProject.png | Bin 796 -> 771 bytes
src/icons/32x32/AddRte.png | Bin 786 -> 782 bytes
src/icons/32x32/AddTrk.png | Bin 1029 -> 989 bytes
src/icons/32x32/AddWpt.png | Bin 831 -> 788 bytes
src/icons/32x32/Apply.png | Bin 1930 -> 1834 bytes
src/icons/32x32/Area.png | Bin 1172 -> 1105 bytes
src/icons/32x32/AreaMove.png | Bin 1680 -> 1650 bytes
src/icons/32x32/ArrowDef.png | Bin 0 -> 1965 bytes
src/icons/32x32/ArrowUser.png | Bin 0 -> 1241 bytes
src/icons/32x32/Bubble.png | Bin 697 -> 634 bytes
src/icons/32x32/CSrcATemp.png | Bin 753 -> 726 bytes
src/icons/32x32/CSrcAccel.png | Bin 0 -> 630 bytes
src/icons/32x32/CSrcCourse.png | Bin 0 -> 884 bytes
src/icons/32x32/CSrcUnknown.png | Bin 665 -> 650 bytes
src/icons/32x32/CSrcWTemp.png | Bin 1063 -> 1038 bytes
src/icons/32x32/Cancel.png | Bin 882 -> 829 bytes
src/icons/32x32/Check.png | Bin 948 -> 839 bytes
src/icons/32x32/CloneMapWorkspace.png | Bin 1635 -> 1672 bytes
src/icons/32x32/Close.png | Bin 855 -> 1101 bytes
src/icons/32x32/Combine.png | Bin 711 -> 672 bytes
src/icons/32x32/Copy.png | Bin 511 -> 512 bytes
src/icons/32x32/Cut.png | Bin 1241 -> 1193 bytes
src/icons/32x32/CutHistory.png | Bin 1006 -> 1014 bytes
src/icons/32x32/DBProject.png | Bin 1533 -> 1489 bytes
src/icons/32x32/Database.png | Bin 1277 -> 1496 bytes
src/icons/32x32/DatabaseConvert.png | Bin 1554 -> 1293 bytes
src/icons/32x32/DatabaseSetup.png | Bin 2142 -> 2257 bytes
src/icons/32x32/DatabaseSync.png | Bin 0 -> 1850 bytes
src/icons/32x32/DelImage.png | Bin 1077 -> 1078 bytes
src/icons/32x32/DeleteMultiple.png | Bin 898 -> 882 bytes
src/icons/32x32/DeleteOne.png | Bin 751 -> 731 bytes
src/icons/32x32/Device.png | Bin 604 -> 620 bytes
src/icons/32x32/Down.png | Bin 655 -> 621 bytes
src/icons/32x32/EditDetails.png | Bin 1671 -> 1595 bytes
src/icons/32x32/EditText.png | Bin 1069 -> 1051 bytes
src/icons/32x32/Empty.png | Bin 581 -> 541 bytes
src/icons/32x32/Error.png | Bin 1130 -> 1242 bytes
src/icons/32x32/FilterModifyExtension.png | Bin 0 -> 1535 bytes
src/icons/32x32/FitProject.png | Bin 0 -> 1116 bytes
src/icons/32x32/FolderDEM.png | Bin 829 -> 822 bytes
src/icons/32x32/FolderMap.png | Bin 1550 -> 1597 bytes
src/icons/32x32/Font.png | Bin 622 -> 565 bytes
src/icons/32x32/FromMap.png | Bin 1794 -> 1824 bytes
src/icons/32x32/GpxProject.png | Bin 1269 -> 1175 bytes
src/icons/32x32/Grid.png | Bin 503 -> 487 bytes
src/icons/32x32/GridSetup.png | Bin 1979 -> 1945 bytes
src/icons/32x32/GridWizzard.png | Bin 1512 -> 1551 bytes
src/icons/32x32/Help.png | Bin 1153 -> 1298 bytes
src/icons/32x32/Image.png | Bin 1000 -> 1010 bytes
src/icons/32x32/Info.png | Bin 926 -> 1034 bytes
src/icons/32x32/Left.png | Bin 669 -> 619 bytes
src/icons/32x32/Limit.png | Bin 0 -> 1117 bytes
src/icons/32x32/LimitMax.png | Bin 0 -> 632 bytes
src/icons/32x32/LimitMin.png | Bin 0 -> 686 bytes
src/icons/32x32/LimitSys.png | Bin 0 -> 1732 bytes
src/icons/32x32/LimitUsr.png | Bin 0 -> 1276 bytes
src/icons/32x32/LineMove.png | Bin 1150 -> 1078 bytes
src/icons/32x32/LineWidthDef.png | Bin 0 -> 1913 bytes
src/icons/32x32/LineWidthUser.png | Bin 0 -> 1176 bytes
src/icons/32x32/Link.png | Bin 952 -> 886 bytes
src/icons/32x32/LoadGIS.png | Bin 982 -> 931 bytes
src/icons/32x32/LoadView.png | Bin 1512 -> 1530 bytes
src/icons/32x32/Lock.png | Bin 932 -> 899 bytes
src/icons/32x32/Map.png | Bin 1169 -> 1130 bytes
src/icons/32x32/MimeDemVRT.png | Bin 1237 -> 1186 bytes
src/icons/32x32/MimeGEMF.png | Bin 0 -> 2011 bytes
src/icons/32x32/MimeIMG.png | Bin 1783 -> 1775 bytes
src/icons/32x32/MimeJNX.png | Bin 1781 -> 1852 bytes
src/icons/32x32/MimeMAP.png | Bin 1845 -> 1883 bytes
src/icons/32x32/MimeRMAP.png | Bin 1961 -> 1952 bytes
src/icons/32x32/MimeTMS.png | Bin 1353 -> 1379 bytes
src/icons/32x32/MimeVRT.png | Bin 1775 -> 1765 bytes
src/icons/32x32/MimeWMTS.png | Bin 1790 -> 1837 bytes
src/icons/32x32/MouseWheel.png | Bin 1227 -> 1152 bytes
src/icons/32x32/Move.png | Bin 869 -> 848 bytes
src/icons/32x32/MoveArrow.png | Bin 742 -> 783 bytes
src/icons/32x32/MySQL.png | Bin 0 -> 2169 bytes
src/icons/32x32/MySQLNoConn.png | Bin 0 -> 2132 bytes
src/icons/32x32/NightDay.png | Bin 953 -> 886 bytes
src/icons/32x32/NoFix.png | Bin 661 -> 633 bytes
src/icons/32x32/NoGo.png | Bin 1401 -> 1390 bytes
src/icons/32x32/O.png | Bin 734 -> 715 bytes
src/icons/32x32/Off.png | Bin 1073 -> 1103 bytes
src/icons/32x32/Opacity.png | Bin 779 -> 777 bytes
src/icons/32x32/POIText.png | Bin 722 -> 679 bytes
src/icons/32x32/Paste.png | Bin 454 -> 422 bytes
src/icons/32x32/PathBlue.png | Bin 536 -> 535 bytes
src/icons/32x32/PathGreen.png | Bin 544 -> 546 bytes
src/icons/32x32/PathOrange.png | Bin 538 -> 526 bytes
src/icons/32x32/Pattern.png | Bin 1490 -> 1529 bytes
src/icons/32x32/PointHide.png | Bin 813 -> 837 bytes
src/icons/32x32/PointMove.png | Bin 968 -> 848 bytes
src/icons/32x32/PointShow.png | Bin 642 -> 588 bytes
src/icons/32x32/Print.png | Bin 907 -> 882 bytes
src/icons/32x32/PrintSave.png | Bin 811 -> 808 bytes
src/icons/32x32/ProfileToWindow.png | Bin 1018 -> 1034 bytes
src/icons/32x32/Progress.png | Bin 487 -> 476 bytes
src/icons/32x32/QMapShack.png | Bin 1550 -> 1622 bytes
src/icons/32x32/QmsProject.png | Bin 1345 -> 1248 bytes
src/icons/32x32/Redo.png | Bin 932 -> 865 bytes
src/icons/32x32/ReloadImage.png | Bin 1212 -> 1185 bytes
src/icons/32x32/Reset.png | Bin 1261 -> 1162 bytes
src/icons/32x32/Reverse.png | Bin 661 -> 612 bytes
src/icons/32x32/Right.png | Bin 659 -> 609 bytes
src/icons/32x32/Route.png | Bin 887 -> 862 bytes
src/icons/32x32/RouteSetup.png | Bin 842 -> 828 bytes
src/icons/32x32/RteInstr.png | Bin 1118 -> 1102 bytes
src/icons/32x32/SQLite.png | Bin 0 -> 2042 bytes
src/icons/32x32/Save.png | Bin 364 -> 371 bytes
src/icons/32x32/SaveAllGIS.png | Bin 777 -> 757 bytes
src/icons/32x32/SaveGIS.png | Bin 777 -> 757 bytes
src/icons/32x32/SaveGISAs.png | Bin 1344 -> 1323 bytes
src/icons/32x32/SaveView.png | Bin 1469 -> 1458 bytes
src/icons/32x32/Scale.png | Bin 506 -> 494 bytes
src/icons/32x32/SearchGoogle.png | Bin 1923 -> 1959 bytes
src/icons/32x32/SelectColor.png | Bin 1682 -> 1640 bytes
src/icons/32x32/SelectRange.png | Bin 831 -> 798 bytes
src/icons/32x32/SetEle.png | Bin 635 -> 596 bytes
src/icons/32x32/SetupCoordFormat.png | Bin 1108 -> 1178 bytes
src/icons/32x32/SetupMapWorkspace.png | Bin 2020 -> 2011 bytes
src/icons/32x32/SetupWptSym.png | Bin 0 -> 1898 bytes
src/icons/32x32/SizeArrow.png | Bin 663 -> 631 bytes
src/icons/32x32/SlfProject.png | Bin 0 -> 1190 bytes
src/icons/32x32/Start.png | Bin 858 -> 794 bytes
src/icons/32x32/Tainted.png | Bin 1182 -> 1152 bytes
src/icons/32x32/TextBold.png | Bin 535 -> 502 bytes
src/icons/32x32/TextCenter.png | Bin 371 -> 391 bytes
src/icons/32x32/TextItalic.png | Bin 378 -> 347 bytes
src/icons/32x32/TextJustified.png | Bin 315 -> 327 bytes
src/icons/32x32/TextLeft.png | Bin 334 -> 350 bytes
src/icons/32x32/TextRight.png | Bin 364 -> 376 bytes
src/icons/32x32/TextUnderlined.png | Bin 491 -> 384 bytes
src/icons/32x32/Time.png | Bin 1293 -> 1201 bytes
src/icons/32x32/TimeZoneSetup.png | Bin 2257 -> 2194 bytes
src/icons/32x32/ToBottom.png | Bin 660 -> 619 bytes
src/icons/32x32/ToTop.png | Bin 649 -> 625 bytes
src/icons/32x32/ToolTip.png | Bin 1078 -> 1036 bytes
src/icons/32x32/Track.png | Bin 832 -> 790 bytes
src/icons/32x32/TrkCut.png | Bin 1507 -> 1474 bytes
src/icons/32x32/TrkProfile.png | Bin 1002 -> 988 bytes
src/icons/32x32/UnLock.png | Bin 1019 -> 972 bytes
src/icons/32x32/Undo.png | Bin 937 -> 894 bytes
src/icons/32x32/UnitSetup.png | Bin 2459 -> 2334 bytes
src/icons/32x32/Up.png | Bin 645 -> 610 bytes
src/icons/32x32/V.png | Bin 680 -> 622 bytes
src/icons/32x32/VrtBuilder.png | Bin 2402 -> 2345 bytes
src/icons/32x32/WptMove.png | Bin 998 -> 890 bytes
src/icons/32x32/WptProj.png | Bin 821 -> 783 bytes
src/icons/32x32/WptProx.png | Bin 917 -> 967 bytes
src/icons/32x32/Zoom.png | Bin 1154 -> 1081 bytes
src/icons/48x48/2DFix.png | Bin 1046 -> 1022 bytes
src/icons/48x48/2NavProject.png | Bin 1843 -> 1767 bytes
src/icons/48x48/3DFix.png | Bin 1343 -> 1279 bytes
src/icons/48x48/A.png | Bin 941 -> 876 bytes
src/icons/48x48/ActAero.png | Bin 1739 -> 1694 bytes
src/icons/48x48/ActBike.png | Bin 1515 -> 1467 bytes
src/icons/48x48/ActCable.png | Bin 905 -> 830 bytes
src/icons/48x48/ActCar.png | Bin 1110 -> 1055 bytes
src/icons/48x48/ActCycle.png | Bin 1596 -> 1533 bytes
src/icons/48x48/ActFoot.png | Bin 743 -> 742 bytes
src/icons/48x48/ActNone.png | Bin 813 -> 752 bytes
src/icons/48x48/ActShip.png | Bin 1141 -> 954 bytes
src/icons/48x48/ActSki.png | Bin 0 -> 1333 bytes
src/icons/48x48/ActSwim.png | Bin 1242 -> 1179 bytes
src/icons/48x48/Activity.png | Bin 2217 -> 2073 bytes
src/icons/48x48/Add.png | Bin 400 -> 386 bytes
src/icons/48x48/AddArea.png | Bin 2198 -> 2200 bytes
src/icons/48x48/AddImage.png | Bin 1548 -> 1559 bytes
src/icons/48x48/AddMapWorkspace.png | Bin 2416 -> 2458 bytes
src/icons/48x48/AddProject.png | Bin 1021 -> 1032 bytes
src/icons/48x48/AddRte.png | Bin 1032 -> 1040 bytes
src/icons/48x48/AddTrk.png | Bin 1519 -> 1488 bytes
src/icons/48x48/AddWpt.png | Bin 1189 -> 1107 bytes
src/icons/48x48/Apply.png | Bin 3238 -> 3072 bytes
src/icons/48x48/Area.png | Bin 1893 -> 1823 bytes
src/icons/48x48/AreaMove.png | Bin 2814 -> 2773 bytes
src/icons/48x48/ArrowDef.png | Bin 0 -> 3415 bytes
src/icons/48x48/ArrowUser.png | Bin 0 -> 1957 bytes
src/icons/48x48/Bubble.png | Bin 909 -> 923 bytes
src/icons/48x48/CSrcATemp.png | Bin 1080 -> 1052 bytes
src/icons/48x48/CSrcAccel.png | Bin 0 -> 875 bytes
src/icons/48x48/CSrcCourse.png | Bin 0 -> 1346 bytes
src/icons/48x48/CSrcUnknown.png | Bin 953 -> 919 bytes
src/icons/48x48/CSrcWTemp.png | Bin 1599 -> 1567 bytes
src/icons/48x48/Cancel.png | Bin 1019 -> 992 bytes
src/icons/48x48/Check.png | Bin 1392 -> 1177 bytes
src/icons/48x48/CloneMapWorkspace.png | Bin 2521 -> 2555 bytes
src/icons/48x48/Close.png | Bin 1233 -> 1525 bytes
src/icons/48x48/Combine.png | Bin 979 -> 949 bytes
src/icons/48x48/Copy.png | Bin 649 -> 635 bytes
src/icons/48x48/Cut.png | Bin 2027 -> 1939 bytes
src/icons/48x48/CutHistory.png | Bin 1568 -> 1558 bytes
src/icons/48x48/DBProject.png | Bin 2245 -> 2217 bytes
src/icons/48x48/Database.png | Bin 1946 -> 2093 bytes
src/icons/48x48/DatabaseConvert.png | Bin 2617 -> 2693 bytes
src/icons/48x48/DatabaseSetup.png | Bin 3348 -> 3575 bytes
src/icons/48x48/DatabaseSync.png | Bin 0 -> 2834 bytes
src/icons/48x48/DelImage.png | Bin 1442 -> 1457 bytes
src/icons/48x48/DeleteMultiple.png | Bin 1376 -> 1321 bytes
src/icons/48x48/DeleteOne.png | Bin 1133 -> 1096 bytes
src/icons/48x48/Device.png | Bin 825 -> 815 bytes
src/icons/48x48/Down.png | Bin 938 -> 857 bytes
src/icons/48x48/EditDetails.png | Bin 2565 -> 2527 bytes
src/icons/48x48/EditText.png | Bin 1529 -> 1565 bytes
src/icons/48x48/Empty.png | Bin 861 -> 817 bytes
src/icons/48x48/Error.png | Bin 1863 -> 1952 bytes
src/icons/48x48/FilterModifyExtension.png | Bin 0 -> 2488 bytes
src/icons/48x48/FitProject.png | Bin 0 -> 1675 bytes
src/icons/48x48/FolderDEM.png | Bin 1135 -> 1138 bytes
src/icons/48x48/FolderMap.png | Bin 2512 -> 2570 bytes
src/icons/48x48/Font.png | Bin 804 -> 717 bytes
src/icons/48x48/FromMap.png | Bin 3032 -> 3045 bytes
src/icons/48x48/GpxProject.png | Bin 1923 -> 1823 bytes
src/icons/48x48/Grid.png | Bin 661 -> 676 bytes
src/icons/48x48/GridSetup.png | Bin 3319 -> 3295 bytes
src/icons/48x48/GridWizzard.png | Bin 2415 -> 2436 bytes
src/icons/48x48/Help.png | Bin 1770 -> 1958 bytes
src/icons/48x48/Image.png | Bin 1368 -> 1391 bytes
src/icons/48x48/Info.png | Bin 1402 -> 1498 bytes
src/icons/48x48/Left.png | Bin 976 -> 893 bytes
src/icons/48x48/Limit.png | Bin 0 -> 1715 bytes
src/icons/48x48/LimitMax.png | Bin 0 -> 928 bytes
src/icons/48x48/LimitMin.png | Bin 0 -> 993 bytes
src/icons/48x48/LimitSys.png | Bin 0 -> 2882 bytes
src/icons/48x48/LimitUsr.png | Bin 0 -> 2051 bytes
src/icons/48x48/LineMove.png | Bin 1784 -> 1681 bytes
src/icons/48x48/LineWidthDef.png | Bin 0 -> 3192 bytes
src/icons/48x48/LineWidthUser.png | Bin 0 -> 1772 bytes
src/icons/48x48/Link.png | Bin 1093 -> 1286 bytes
src/icons/48x48/LoadGIS.png | Bin 1508 -> 1444 bytes
src/icons/48x48/LoadView.png | Bin 2351 -> 2392 bytes
src/icons/48x48/Lock.png | Bin 1372 -> 1332 bytes
src/icons/48x48/Map.png | Bin 1923 -> 1841 bytes
src/icons/48x48/MimeDemVRT.png | Bin 1846 -> 1751 bytes
src/icons/48x48/MimeGEMF.png | Bin 0 -> 3130 bytes
src/icons/48x48/MimeIMG.png | Bin 2824 -> 2884 bytes
src/icons/48x48/MimeJNX.png | Bin 2874 -> 2918 bytes
src/icons/48x48/MimeMAP.png | Bin 2903 -> 2987 bytes
src/icons/48x48/MimeRMAP.png | Bin 3105 -> 3149 bytes
src/icons/48x48/MimeTMS.png | Bin 2203 -> 2225 bytes
src/icons/48x48/MimeVRT.png | Bin 2839 -> 2805 bytes
src/icons/48x48/MimeWMTS.png | Bin 3014 -> 3015 bytes
src/icons/48x48/MouseWheel.png | Bin 1839 -> 1766 bytes
src/icons/48x48/Move.png | Bin 1126 -> 1086 bytes
src/icons/48x48/MoveArrow.png | Bin 933 -> 1054 bytes
src/icons/48x48/MySQL.png | Bin 0 -> 3449 bytes
src/icons/48x48/MySQLNoConn.png | Bin 0 -> 3485 bytes
src/icons/48x48/NightDay.png | Bin 1455 -> 1355 bytes
src/icons/48x48/NoFix.png | Bin 955 -> 925 bytes
src/icons/48x48/NoGo.png | Bin 2231 -> 2176 bytes
src/icons/48x48/O.png | Bin 1090 -> 1021 bytes
src/icons/48x48/Off.png | Bin 1631 -> 1619 bytes
src/icons/48x48/Opacity.png | Bin 1168 -> 1177 bytes
src/icons/48x48/POIText.png | Bin 1099 -> 1007 bytes
src/icons/48x48/Paste.png | Bin 544 -> 524 bytes
src/icons/48x48/PathBlue.png | Bin 756 -> 743 bytes
src/icons/48x48/PathGreen.png | Bin 753 -> 758 bytes
src/icons/48x48/PathOrange.png | Bin 733 -> 705 bytes
src/icons/48x48/Pattern.png | Bin 2260 -> 2571 bytes
src/icons/48x48/PointHide.png | Bin 1175 -> 1149 bytes
src/icons/48x48/PointMove.png | Bin 1518 -> 1319 bytes
src/icons/48x48/PointShow.png | Bin 869 -> 800 bytes
src/icons/48x48/Print.png | Bin 1162 -> 1139 bytes
src/icons/48x48/PrintSave.png | Bin 1069 -> 1032 bytes
src/icons/48x48/ProfileToWindow.png | Bin 1649 -> 1640 bytes
src/icons/48x48/Progress.png | Bin 650 -> 640 bytes
src/icons/48x48/QMapShack.png | Bin 2512 -> 2751 bytes
src/icons/48x48/QmsProject.png | Bin 2108 -> 1999 bytes
src/icons/48x48/Redo.png | Bin 1344 -> 1245 bytes
src/icons/48x48/ReloadImage.png | Bin 1723 -> 1734 bytes
src/icons/48x48/Reset.png | Bin 1896 -> 1794 bytes
src/icons/48x48/Reverse.png | Bin 1088 -> 970 bytes
src/icons/48x48/Right.png | Bin 912 -> 869 bytes
src/icons/48x48/Route.png | Bin 1246 -> 1275 bytes
src/icons/48x48/RouteSetup.png | Bin 1261 -> 1218 bytes
src/icons/48x48/RteInstr.png | Bin 1518 -> 1462 bytes
src/icons/48x48/SQLite.png | Bin 0 -> 3312 bytes
src/icons/48x48/Save.png | Bin 422 -> 420 bytes
src/icons/48x48/SaveAllGIS.png | Bin 989 -> 1039 bytes
src/icons/48x48/SaveGIS.png | Bin 989 -> 1039 bytes
src/icons/48x48/SaveGISAs.png | Bin 2010 -> 2019 bytes
src/icons/48x48/SaveView.png | Bin 2196 -> 2253 bytes
src/icons/48x48/Scale.png | Bin 514 -> 489 bytes
src/icons/48x48/SearchGoogle.png | Bin 3119 -> 3110 bytes
src/icons/48x48/SelectColor.png | Bin 2613 -> 2573 bytes
src/icons/48x48/SelectRange.png | Bin 1129 -> 1091 bytes
src/icons/48x48/SetEle.png | Bin 903 -> 848 bytes
src/icons/48x48/SetupCoordFormat.png | Bin 1725 -> 1705 bytes
src/icons/48x48/SetupMapWorkspace.png | Bin 3507 -> 3473 bytes
src/icons/48x48/SetupWptSym.png | Bin 0 -> 3293 bytes
src/icons/48x48/SizeArrow.png | Bin 807 -> 701 bytes
src/icons/48x48/SlfProject.png | Bin 0 -> 1859 bytes
src/icons/48x48/Start.png | Bin 1264 -> 1215 bytes
src/icons/48x48/Tainted.png | Bin 1896 -> 1829 bytes
src/icons/48x48/TextBold.png | Bin 742 -> 647 bytes
src/icons/48x48/TextCenter.png | Bin 407 -> 388 bytes
src/icons/48x48/TextItalic.png | Bin 493 -> 455 bytes
src/icons/48x48/TextJustified.png | Bin 381 -> 363 bytes
src/icons/48x48/TextLeft.png | Bin 403 -> 385 bytes
src/icons/48x48/TextRight.png | Bin 405 -> 386 bytes
src/icons/48x48/TextUnderlined.png | Bin 629 -> 521 bytes
src/icons/48x48/Time.png | Bin 1992 -> 1912 bytes
src/icons/48x48/TimeZoneSetup.png | Bin 3847 -> 3801 bytes
src/icons/48x48/ToBottom.png | Bin 932 -> 871 bytes
src/icons/48x48/ToTop.png | Bin 902 -> 868 bytes
src/icons/48x48/ToolTip.png | Bin 1587 -> 1491 bytes
src/icons/48x48/Track.png | Bin 1270 -> 1174 bytes
src/icons/48x48/TrkCut.png | Bin 2422 -> 2396 bytes
src/icons/48x48/TrkProfile.png | Bin 1359 -> 1370 bytes
src/icons/48x48/UnLock.png | Bin 1509 -> 1485 bytes
src/icons/48x48/Undo.png | Bin 1370 -> 1303 bytes
src/icons/48x48/UnitSetup.png | Bin 4223 -> 4048 bytes
src/icons/48x48/Up.png | Bin 915 -> 877 bytes
src/icons/48x48/V.png | Bin 991 -> 887 bytes
src/icons/48x48/VrtBuilder.png | Bin 4166 -> 4119 bytes
src/icons/48x48/WptMove.png | Bin 1537 -> 1415 bytes
src/icons/48x48/WptProj.png | Bin 1239 -> 1122 bytes
src/icons/48x48/WptProx.png | Bin 1341 -> 1396 bytes
src/icons/48x48/Zoom.png | Bin 1784 -> 1712 bytes
src/icons/ActSki.svg | 105 +
src/icons/ArrowDef.svg | 95 +
src/icons/ArrowUser.svg | 119 +
src/icons/CSrcAccel.svg | 126 +
src/icons/CSrcCourse.svg | 388 +
src/icons/DatabaseSync.svg | 166 +
src/icons/FilterModifyExtension.svg | 181 +
src/icons/FitProject.svg | 114 +
src/icons/Limit.svg | 131 +
src/icons/LimitMax.svg | 103 +
src/icons/LimitMin.svg | 100 +
src/icons/LimitSys.svg | 123 +
src/icons/LimitUsr.svg | 147 +
src/icons/LineWidthDef.svg | 102 +
src/icons/LineWidthUser.svg | 124 +
src/icons/MimeGEMF.svg | 91 +
src/icons/MySQL.svg | 175 +
src/icons/MySQLNoConn.svg | 187 +
src/icons/QMapShack.svg | 2094 ++++-
src/icons/SQLite.svg | 175 +
src/icons/SetupWptSym.svg | 87 +
src/icons/SlfProject.svg | 115 +
src/icons/makeicons | 3 +
src/locale/{qmapshack_es.ts => qmapshack.ts} | 8275 +++++++++---------
src/locale/qmapshack_cs.ts | 3471 ++++++--
src/locale/qmapshack_de.desktop | 3 +
src/locale/qmapshack_de.ts | 9153 ++++++++++----------
src/locale/qmapshack_es.ts | 3485 +++++---
src/locale/qmapshack_fr.ts | 3706 +++++---
src/locale/qmapshack_nl.ts | 3768 +++++---
src/main.cpp | 12 +-
src/map/CMapDraw.cpp | 37 +-
src/map/CMapDraw.h | 9 +-
src/map/CMapGEMF.cpp | 300 +
src/map/CMapGEMF.h | 73 +
src/map/CMapIMG.cpp | 12 +-
src/map/CMapIMG.h | 9 +-
src/map/CMapItem.cpp | 11 +-
src/map/CMapItem.h | 2 +-
src/map/CMapJNX.cpp | 2 +-
src/map/CMapJNX.h | 10 +-
src/map/CMapList.cpp | 86 +-
src/map/CMapList.h | 9 +-
src/map/CMapMAP.cpp | 2 +-
src/map/CMapMAP.h | 23 +-
src/map/CMapPathSetup.cpp | 10 +-
src/map/CMapPathSetup.h | 2 +-
src/map/CMapPropSetup.cpp | 49 +-
src/map/CMapPropSetup.h | 4 +-
src/map/CMapRMAP.cpp | 10 +-
src/map/CMapRMAP.h | 20 +-
src/map/CMapTMS.cpp | 18 +-
src/map/CMapTMS.h | 14 +-
src/map/CMapVRT.cpp | 32 +-
src/map/CMapVRT.h | 14 +-
src/map/CMapWMTS.cpp | 14 +-
src/map/CMapWMTS.h | 14 +-
src/map/IMap.cpp | 16 +-
src/map/IMap.h | 32 +-
src/map/IMapList.ui | 33 +
src/map/IMapProp.cpp | 2 +-
src/map/IMapProp.h | 2 +-
src/map/IMapPropSetup.cpp | 2 +-
src/map/cache/CDiskCache.cpp | 2 +-
src/map/cache/CDiskCache.h | 6 +-
src/map/garmin/CGarminStrTbl6.cpp | 2 +-
src/map/garmin/CGarminStrTbl6.h | 8 +-
src/map/garmin/CGarminStrTbl8.h | 2 +-
src/map/garmin/CGarminStrTblUtf8.h | 4 +-
src/map/garmin/CGarminTyp.cpp | 4 +-
src/map/garmin/CGarminTyp.h | 23 +-
src/map/garmin/IGarminStrTbl.h | 4 +-
src/map/mapsforge/types.cpp | 4 +-
src/mouse/CMouseDummy.h | 12 +-
src/mouse/CMouseEditArea.cpp | 6 +-
src/mouse/CMouseEditArea.h | 12 +-
src/mouse/CMouseEditRte.cpp | 6 +-
src/mouse/CMouseEditRte.h | 10 +-
src/mouse/CMouseEditTrk.cpp | 8 +-
src/mouse/CMouseEditTrk.h | 10 +-
src/mouse/CMouseMoveWpt.cpp | 2 +-
src/mouse/CMouseMoveWpt.h | 12 +-
src/mouse/CMouseNormal.cpp | 13 +-
src/mouse/CMouseNormal.h | 29 +-
src/mouse/CMousePrint.h | 10 +-
src/mouse/CMouseRangeTrk.cpp | 41 +-
src/mouse/CMouseRangeTrk.h | 12 +-
src/mouse/CMouseWptBubble.h | 10 +-
src/mouse/CScrOptRangeTrk.cpp | 10 +-
src/mouse/CScrOptRangeTrk.h | 4 +-
src/mouse/CScrOptUnclutter.cpp | 2 +-
src/mouse/CScrOptUnclutter.h | 4 +-
src/mouse/IMouse.cpp | 4 +-
src/mouse/IMouse.h | 14 +-
src/mouse/IScrOpt.h | 6 +-
src/mouse/line/CLineOpAddPoint.h | 12 +-
src/mouse/line/CLineOpDeletePoint.h | 8 +-
src/mouse/line/CLineOpMovePoint.h | 12 +-
src/mouse/line/CLineOpSelectRange.cpp | 18 +-
src/mouse/line/CLineOpSelectRange.h | 14 +-
src/mouse/line/CScrOptEditLine.h | 2 +-
src/mouse/line/CScrOptRangeLine.cpp | 2 +-
src/mouse/line/CScrOptRangeLine.h | 2 +-
src/mouse/line/ILineOp.cpp | 2 +-
src/mouse/line/IMouseEditLine.cpp | 71 +-
src/mouse/line/IMouseEditLine.h | 21 +-
src/mouse/line/IScrOptEditLine.ui | 15 +-
src/plot/CPlot.cpp | 40 +-
src/plot/CPlot.h | 19 +-
src/plot/CPlotAxis.cpp | 214 +-
src/plot/CPlotAxis.h | 47 +-
src/plot/CPlotAxisTime.cpp | 32 +-
src/plot/CPlotAxisTime.h | 19 +-
src/plot/CPlotData.cpp | 33 +-
src/plot/CPlotData.h | 4 +-
src/plot/CPlotProfile.cpp | 38 +-
src/plot/CPlotProfile.h | 16 +-
src/plot/CPlotTrack.h | 4 +-
src/plot/IPlot.cpp | 481 +-
src/plot/IPlot.h | 55 +-
src/plot/ITrack.cpp | 2 +-
src/plot/ITrack.h | 2 +-
src/print/CPrintDialog.cpp | 8 +-
src/print/CPrintDialog.h | 2 +-
src/print/IPrintDialog.ui | 20 +
src/qlgt/CQlgtDb.h | 2 +
src/qlgt/CQlgtDiary.h | 2 +-
src/qlgt/CQlgtRoute.h | 2 +-
src/qlgt/CQlgtTrack.cpp | 11 +-
src/qlgt/CQlgtTrack.h | 69 +-
src/qlgt/CQlgtWpt.cpp | 4 +-
src/qlgt/CQlgtWpt.h | 14 +-
src/qlgt/CQmsDb.cpp | 9 +-
src/qlgt/CQmsDb.h | 5 +-
src/qlgt/IItem.h | 2 +-
src/qlgt/IQlgtOverlay.cpp | 1 -
src/qlgt/IQlgtOverlay.h | 8 +-
src/qlgt/converter.cpp | 8 +-
src/resources.qrc | 45 +
src/test/CGpxProject.cpp | 70 +
src/test/CSlfReader.cpp | 66 +
src/test/input/qtt_gpx_file0.gpx | 5768 ++++++++++++
src/test/input/qtt_gpx_file0.gpx.xml | 23 +
src/test/input/qtt_slf_file0.slf | 2 +
src/test/input/qtt_slf_file0.slf.xml | 27 +
src/test/input/randomize_hr.awk | 27 +
src/test/main.cpp | 200 +
src/test/test_QMapShack.h | 61 +
src/tool/CImportDatabase.cpp | 10 +-
src/tool/CImportDatabase.h | 1 -
src/tool/CMapVrtBuilder.cpp | 6 +-
src/tool/CMapVrtBuilder.h | 2 +-
src/tool/CRoutinoDatabaseBuilder.cpp | 8 +-
src/tool/CRoutinoDatabaseBuilder.h | 2 +-
src/tool/IToolShell.cpp | 9 +-
src/units/CCoordFormatSetup.h | 2 +-
src/units/CTimeZoneSetup.h | 2 +-
src/units/CUnitImperial.cpp | 8 +-
src/units/CUnitImperial.h | 13 +-
src/units/CUnitMetric.cpp | 10 +-
src/units/CUnitMetric.h | 13 +-
src/units/CUnitNautic.cpp | 10 +-
src/units/CUnitNautic.h | 16 +-
src/units/CUnitsSetup.h | 3 +-
src/units/IUnit.cpp | 36 +-
src/units/IUnit.h | 26 +-
src/widgets/CColorChooser.cpp | 64 +
.../wpt/CProjWpt.h => widgets/CColorChooser.h} | 27 +-
src/widgets/CColorLegend.cpp | 40 +-
src/widgets/CColorLegend.h | 28 +-
src/widgets/CDoubleSpinBox.h | 6 +-
src/widgets/CFadingIcon.cpp | 2 +-
src/widgets/CHistoryListWidget.cpp | 16 +-
src/widgets/CLineEdit.cpp | 90 +
src/widgets/{CTinySpinBox.h => CLineEdit.h} | 27 +-
src/widgets/CPhotoAlbum.cpp | 4 +-
src/widgets/CPhotoAlbum.h | 6 +-
src/widgets/CTextEditWidget.cpp | 40 +-
src/widgets/CTinySpinBox.h | 8 +-
src/widgets/IColorChooser.ui | 43 +
templates/header.h | 2 +-
templates/source.c | 2 +-
templates/source.cpp | 2 +-
824 files changed, 54454 insertions(+), 19497 deletions(-)
diff --cc debian/changelog
index 2e24bc5,b3ba84e..285d0a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ qmapshack (1.6.0-2) unstable; urgency=medium
+
+ * Require at least libroutino-dev 3.1 for Routino_Version symbol.
+ * Drop routino-version.patch, not required for Routino 3.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 06 Mar 2016 18:32:07 +0100
+
+ qmapshack (1.6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Vcs-Git URL to use HTTPS.
+ * Bump Standards-Version to 3.9.7, no changes.
+ * Add patches for various typos.
+ * Update copyright files, changes:
+ - Update copyright years for Oliver Eichler & Christian Eichler
+ - Add Peter Schumann & Ivo Kronenberg to copyright holders
+ * Drop debugging-typo.patch, applied upstream.
+ Refresh original-typo.patch, partially applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 25 Feb 2016 22:15:38 +0100
+
+qmapshack (1.5.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 28 Nov 2015 20:00:14 +0100
+
qmapshack (1.5.1-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 79ba543,296f09c..01c1d17
--- a/debian/control
+++ b/debian/control
@@@ -16,9 -16,9 +16,9 @@@ Build-Depends: cmake
qttools5-dev,
qttools5-dev-tools,
qtscript5-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qmapshack.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/qmapshack.git -b jessie-backports
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qmapshack.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qmapshack.git -b jessie-backports
Homepage: https://bitbucket.org/maproom/qmapshack/wiki/Home
Package: qmapshack
--
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