[qmapshack] 02/05: Merge tag 'upstream/1.9.1'
Bas Couwenberg
sebastic at debian.org
Sun Sep 17 17:54:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit 3ef9e340ebf1f6d93642d464508b97b236a26827
Merge: ea84dd9 9fa8191
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 17 19:29:03 2017 +0200
Merge tag 'upstream/1.9.1'
Upstream version 1.9.1
CMakeLists.txt | 2 +-
CMakeLists.txt.user | 2 +-
.../Contents/Resources/fr.lproj/locversion.plist | 15 +
.../Contents/Resources/nl.lproj/locversion.plist | 15 +
MacOSX/resources/Contents/Resources/qms-style.qss | 31 +
changelog.txt | 19 +
src/CMainWindow.cpp | 212 ++-
src/CMainWindow.h | 11 +
src/CMakeLists.txt | 28 +-
src/CSingleInstanceProxy.cpp | 2 +-
src/IMainWindow.ui | 13 +
src/canvas/CCanvas.cpp | 30 +-
src/canvas/CCanvas.h | 1 +
src/canvas/ICanvasSetup.ui | 4 +-
src/device/CDeviceGarmin.cpp | 7 +
src/device/CDeviceGarmin.h | 1 +
src/gis/CGisListWks.cpp | 73 +-
src/gis/CGisListWks.h | 9 +-
src/gis/CGisWidget.cpp | 29 +-
src/gis/CGisWidget.h | 15 +-
src/gis/IGisItem.cpp | 2 +-
src/gis/IGisItem.h | 13 +-
src/gis/IGisWidget.ui | 2 +-
src/gis/WptIcons.cpp | 10 +
src/gis/db/CDBProject.cpp | 15 +-
src/gis/db/CSelectSaveAction.cpp | 7 +-
src/gis/db/IDBFolder.h | 4 +-
src/gis/db/IDBMysql.cpp | 4 +-
src/gis/db/IDBSqlite.cpp | 4 +-
src/gis/fit/CFitProject.cpp | 9 +
src/gis/fit/CFitStream.h | 2 +-
src/gis/fit/decoder/CFitFieldDataState.h | 1 +
src/gis/fit/defs/CFitProfileLookup.cpp | 17 +
src/gis/fit/defs/fit_enums.h | 23 +
src/gis/fit/serialization.cpp | 58 +-
src/gis/ovl/CGisItemOvlArea.cpp | 8 +-
src/gis/ovl/CGisItemOvlArea.h | 2 +-
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/prj/CDetailsPrj.cpp | 40 +-
src/gis/prj/IGisProject.cpp | 53 +-
src/gis/prj/IGisProject.h | 21 +
src/gis/qms/serialization.cpp | 18 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 2 +-
src/gis/rte/CDetailsRte.cpp | 2 +-
src/gis/rte/CGisItemRte.cpp | 8 +-
src/gis/rte/CGisItemRte.h | 2 +-
src/gis/rte/CScrOptRte.cpp | 2 +-
.../rte/router/brouter/CRouterBRouterTilesPage.cpp | 2 +-
src/gis/trk/CActivityTrk.cpp | 209 ++-
src/gis/trk/CActivityTrk.h | 4 +
src/gis/trk/CDetailsTrk.cpp | 13 +-
src/gis/trk/CDetailsTrk.h | 1 -
src/gis/trk/CGisItemTrk.cpp | 96 +-
src/gis/trk/CGisItemTrk.h | 4 +-
src/gis/trk/CKnownExtension.cpp | 11 +-
src/gis/trk/CScrOptTrk.cpp | 11 +-
src/gis/trk/CScrOptTrk.h | 2 +
src/gis/trk/CTrackData.h | 5 +-
src/gis/trk/IDetailsTrk.ui | 13 +-
src/gis/trk/IScrOptTrk.ui | 16 +-
src/gis/wpt/CGisItemWpt.cpp | 8 +-
src/gis/wpt/CGisItemWpt.h | 2 +-
src/gis/wpt/CScrOptWpt.cpp | 2 +-
src/helpers/CProgressDialog.cpp | 57 +-
src/helpers/CProgressDialog.h | 11 +-
src/helpers/CSelectCopyAction.cpp | 8 +-
src/helpers/CToolBarConfig.cpp | 8 +-
src/helpers/CToolBarConfig.h | 3 +
src/helpers/CToolBarSetupDialog.cpp | 6 +-
src/helpers/IToolBarSetupDialog.ui | 7 +
src/icons/16x16/ActNone.png | Bin 342 -> 781 bytes
src/icons/16x16/ActTrain.png | Bin 0 -> 491 bytes
src/icons/16x16/NoActivity.png | Bin 0 -> 781 bytes
src/icons/32x32/ActNone.png | Bin 559 -> 1794 bytes
src/icons/32x32/ActTrain.png | Bin 0 -> 780 bytes
src/icons/32x32/AutoSave.png | Bin 0 -> 602 bytes
src/icons/32x32/CSrcDistance.png | Bin 763 -> 602 bytes
src/icons/32x32/CSrcEnergy.png | Bin 0 -> 1077 bytes
src/icons/32x32/CSrcSeaLevelPressure.png | Bin 1894 -> 1772 bytes
src/icons/32x32/CSrcVertSpeed.png | Bin 1215 -> 1152 bytes
src/icons/32x32/CutHistoryAfter.png | Bin 1451 -> 1433 bytes
src/icons/32x32/CutHistoryBefore.png | Bin 1316 -> 1322 bytes
src/icons/32x32/FitProject.png | Bin 1116 -> 1060 bytes
src/icons/32x32/FullScreen.png | Bin 0 -> 832 bytes
src/icons/32x32/MimeGEMF.png | Bin 2011 -> 1961 bytes
src/icons/32x32/MySQLNoConn.png | Bin 2132 -> 2357 bytes
src/icons/32x32/PastePlain.png | Bin 904 -> 884 bytes
src/icons/32x32/RegularScreen.png | Bin 0 -> 857 bytes
src/icons/32x32/SQLiteNoConn.png | Bin 1986 -> 2241 bytes
src/icons/32x32/Template.png | Bin 0 -> 532 bytes
src/icons/32x32/ToggleDem.png | Bin 792 -> 926 bytes
src/icons/32x32/ToggleDocks.png | Bin 1491 -> 1554 bytes
src/icons/32x32/ToggleGis.png | Bin 1096 -> 1130 bytes
src/icons/32x32/ToggleMaps.png | Bin 1146 -> 1416 bytes
src/icons/32x32/ToggleRouter.png | Bin 1055 -> 1130 bytes
src/icons/32x32/ToolBar.png | Bin 393 -> 386 bytes
src/icons/32x32/ToolBarSetup.png | Bin 2080 -> 2344 bytes
src/icons/48x48/ActNone.png | Bin 752 -> 2817 bytes
src/icons/48x48/ActTrain.png | Bin 0 -> 1090 bytes
src/icons/48x48/AutoSave.png | Bin 0 -> 767 bytes
src/icons/48x48/CSrcDistance.png | Bin 944 -> 920 bytes
src/icons/48x48/CSrcEnergy.png | Bin 0 -> 1641 bytes
src/icons/48x48/CSrcSeaLevelPressure.png | Bin 3227 -> 3085 bytes
src/icons/48x48/CSrcVertSpeed.png | Bin 1957 -> 1825 bytes
src/icons/48x48/CutHistoryAfter.png | Bin 2318 -> 2281 bytes
src/icons/48x48/CutHistoryBefore.png | Bin 2211 -> 2133 bytes
src/icons/48x48/FitProject.png | Bin 1675 -> 1622 bytes
src/icons/48x48/FullScreen.png | Bin 0 -> 1270 bytes
src/icons/48x48/MimeGEMF.png | Bin 3130 -> 3144 bytes
src/icons/48x48/MySQLNoConn.png | Bin 3485 -> 3782 bytes
src/icons/48x48/PastePlain.png | Bin 1186 -> 1184 bytes
src/icons/48x48/RegularScreen.png | Bin 0 -> 1150 bytes
src/icons/48x48/SQLiteNoConn.png | Bin 3352 -> 3726 bytes
src/icons/48x48/Template.png | Bin 0 -> 750 bytes
src/icons/48x48/ToggleDem.png | Bin 1095 -> 1246 bytes
src/icons/48x48/ToggleDocks.png | Bin 2168 -> 2337 bytes
src/icons/48x48/ToggleGis.png | Bin 1562 -> 1706 bytes
src/icons/48x48/ToggleMaps.png | Bin 1730 -> 2156 bytes
src/icons/48x48/ToggleRouter.png | Bin 1493 -> 1651 bytes
src/icons/48x48/ToolBar.png | Bin 429 -> 396 bytes
src/icons/48x48/ToolBarSetup.png | Bin 3512 -> 3774 bytes
src/icons/ActNone.svg | 215 ++-
src/icons/ActTrain.svg | 141 ++
src/icons/AutoSave.svg | 125 ++
src/icons/CSrcEnergy.svg | 328 ++++
src/icons/FullScreen.svg | 193 +++
src/icons/RegularScreen.svg | 156 ++
src/icons/Template.svg | 104 ++
src/icons/waypoints/32x32/1stCategory.png | Bin 832 -> 823 bytes
src/icons/waypoints/32x32/2ndCategory.png | Bin 963 -> 1065 bytes
src/icons/waypoints/32x32/3rdCategory.png | Bin 1107 -> 1164 bytes
src/icons/waypoints/32x32/4thCategory.png | Bin 942 -> 1030 bytes
src/icons/waypoints/32x32/BoxBlue.png | Bin 438 -> 453 bytes
src/icons/waypoints/32x32/BoxGreen.png | Bin 429 -> 458 bytes
src/icons/waypoints/32x32/BoxRed.png | Bin 435 -> 447 bytes
src/icons/waypoints/32x32/CityCapitol.png | Bin 604 -> 601 bytes
src/icons/waypoints/32x32/CityLarge.png | Bin 502 -> 500 bytes
src/icons/waypoints/32x32/CityMedium.png | Bin 424 -> 430 bytes
src/icons/waypoints/32x32/CitySmall.png | Bin 352 -> 334 bytes
src/icons/waypoints/32x32/Danger.png | Bin 910 -> 962 bytes
src/icons/waypoints/32x32/Default.png | Bin 1923 -> 2018 bytes
src/icons/waypoints/32x32/DiamondBlue.png | Bin 329 -> 326 bytes
src/icons/waypoints/32x32/DiamondGreen.png | Bin 436 -> 446 bytes
src/icons/waypoints/32x32/DiamondRed.png | Bin 327 -> 327 bytes
src/icons/waypoints/32x32/End.png | Bin 0 -> 780 bytes
src/icons/waypoints/32x32/FirstAid.png | Bin 467 -> 495 bytes
src/icons/waypoints/32x32/FlagBlue.png | Bin 699 -> 631 bytes
src/icons/waypoints/32x32/FlagGreen.png | Bin 750 -> 703 bytes
src/icons/waypoints/32x32/FlagRed.png | Bin 692 -> 625 bytes
src/icons/waypoints/32x32/Food.png | Bin 1482 -> 1531 bytes
src/icons/waypoints/32x32/Generic.png | Bin 779 -> 765 bytes
src/icons/waypoints/32x32/HorsCategory.png | Bin 850 -> 876 bytes
src/icons/waypoints/32x32/Left.png | Bin 663 -> 653 bytes
src/icons/waypoints/32x32/LeftFork.png | Bin 0 -> 771 bytes
src/icons/waypoints/32x32/MiddleFork.png | Bin 0 -> 796 bytes
src/icons/waypoints/32x32/PinBlue.png | Bin 626 -> 542 bytes
src/icons/waypoints/32x32/PinGreen.png | Bin 678 -> 603 bytes
src/icons/waypoints/32x32/PinRed.png | Bin 622 -> 545 bytes
src/icons/waypoints/32x32/Residence.png | Bin 1840 -> 1921 bytes
src/icons/waypoints/32x32/Right.png | Bin 623 -> 616 bytes
src/icons/waypoints/32x32/RightFork.png | Bin 0 -> 784 bytes
src/icons/waypoints/32x32/SharpLeft.png | Bin 0 -> 938 bytes
src/icons/waypoints/32x32/SharpRight.png | Bin 0 -> 944 bytes
src/icons/waypoints/32x32/SlightLeft.png | Bin 0 -> 972 bytes
src/icons/waypoints/32x32/SlightRight.png | Bin 0 -> 966 bytes
src/icons/waypoints/32x32/Sprint.png | Bin 1384 -> 1411 bytes
src/icons/waypoints/32x32/Start.png | Bin 0 -> 777 bytes
src/icons/waypoints/32x32/Straight.png | Bin 650 -> 662 bytes
src/icons/waypoints/32x32/Summit.png | Bin 1208 -> 1194 bytes
src/icons/waypoints/32x32/UTurn.png | Bin 0 -> 1040 bytes
src/icons/waypoints/32x32/Valley.png | Bin 962 -> 963 bytes
src/icons/waypoints/32x32/Water.png | Bin 916 -> 884 bytes
src/icons/waypoints/32x32/Waypoint.png | Bin 533 -> 497 bytes
src/icons/waypoints/End.svg | 101 ++
src/icons/waypoints/LeftFork.svg | 107 ++
src/icons/waypoints/MiddleFork.svg | 108 ++
src/icons/waypoints/RightFork.svg | 108 ++
src/icons/waypoints/SharpLeft.svg | 110 ++
src/icons/waypoints/SharpRight.svg | 110 ++
src/icons/waypoints/SlightLeft.svg | 109 ++
src/icons/waypoints/SlightRight.svg | 110 ++
src/icons/waypoints/Start.svg | 101 ++
src/icons/waypoints/UTurn.svg | 118 ++
src/locale/qmapshack.ts | 1203 +++++++++------
src/locale/qmapshack_cs.ts | 1225 +++++++++------
src/locale/qmapshack_de.ts | 1248 +++++++++------
src/locale/qmapshack_es.ts | 1596 ++++++++++++--------
src/locale/qmapshack_fr.ts | 1223 +++++++++------
src/locale/qmapshack_nl.ts | 1211 +++++++++------
src/locale/qmapshack_ru.ts | 1238 +++++++++------
src/map/CMapIMG.cpp | 4 +-
src/map/CMapIMG.h | 2 +-
src/map/CMapTMS.cpp | 121 +-
src/map/CMapTMS.h | 42 +-
src/map/CMapVRT.cpp | 10 +-
src/map/CMapWMTS.cpp | 122 +-
src/map/CMapWMTS.h | 35 +-
src/map/IMap.h | 3 +-
src/map/IMapOnline.cpp | 148 ++
src/map/{CMapTMS.h => IMapOnline.h} | 88 +-
src/mouse/CMouseEditArea.cpp | 7 +-
src/mouse/CMouseEditRte.cpp | 8 +-
src/mouse/CMouseEditTrk.cpp | 8 +-
src/mouse/CMouseSelect.cpp | 14 +-
src/mouse/CMouseSelect.h | 3 +-
src/mouse/CScrOptRangeTrk.cpp | 2 +-
src/mouse/IScrOptRangeTrk.ui | 2 +-
src/mouse/IScrOptSelect.ui | 18 +-
src/mouse/line/ILineOp.cpp | 2 +
src/mouse/line/IScrOptEditLine.ui | 4 +-
src/qlgt/CQlgtDb.cpp | 2 +-
src/qlgt/CQmsDb.cpp | 2 +-
src/resources.qrc | 54 +-
src/setup/CAppSetupMac.cpp | 10 +
src/templates/Hiking_Tour_Summary.ui | 369 +++++
src/tool/CMapVrtBuilder.cpp | 40 +
src/tool/CMapVrtBuilder.h | 1 +
src/tool/IMapVrtBuilder.ui | 179 ++-
src/tool/IToolShell.h | 4 +-
src/widgets/CTemplateWidget.cpp | 258 ++++
.../CMapVrtBuilder.h => widgets/CTemplateWidget.h} | 38 +-
src/widgets/CTextEditWidget.cpp | 16 +
src/widgets/CTextEditWidget.h | 3 +-
.../ICanvasSetup.ui => widgets/ITemplateWidget.ui} | 114 +-
src/widgets/ITextEditWidget.ui | 36 +-
225 files changed, 10270 insertions(+), 4136 deletions(-)
--
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