[qmapshack] 02/02: Merge tag 'upstream/0.5.0'
Jaromír Mikeš
mira-guest at moszumanska.debian.org
Tue Oct 7 10:51:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
mira-guest pushed a commit to branch master
in repository qmapshack.
commit fcba90399718369746a9dce1281afc5f22838dd5
Merge: bb61cca a8a994a
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Oct 7 12:51:15 2014 +0200
Merge tag 'upstream/0.5.0'
Upstream version 0.5.0
CMakeLists.txt | 5 +-
CMakeLists.txt.user | 2 +-
src/mouse/IScrOpt.cpp => GpxExamples/COPYRIGHT | 24 +-
README.md | 5 +-
changelog.txt | 19 +
nsi/3rdparty.txt | 29 +-
nsi/MUI_HEADERIMAGE.bmp | Bin 0 -> 34254 bytes
nsi/MUI_WELCOMEFINISHPAGE.bmp | Bin 0 -> 154542 bytes
nsi/QMapShack_Installer.nsi | 46 +-
nsi/copyfiles.bat | 15 +-
nsi/gdalicon.ico | Bin 0 -> 4286 bytes
nsi/konsole.ico | Bin 15086 -> 0 bytes
src/CMainWindow.cpp | 31 +
src/CMainWindow.h | 3 +
src/CMakeLists.txt | 59 +-
src/IAbout.ui | 217 +--
src/canvas/CCanvas.cpp | 185 ++-
src/canvas/CCanvas.h | 48 +-
src/canvas/IDrawContext.h | 1 -
src/canvas/IDrawObject.cpp | 13 +
src/canvas/IDrawObject.h | 55 +-
src/cursors/cursorAdd.png | Bin 0 -> 1194 bytes
src/cursors/cursorMoveArea.png | Bin 0 -> 1801 bytes
src/cursors/cursorMoveLine.png | Bin 0 -> 1503 bytes
src/cursors/cursorSelectRange.png | Bin 0 -> 1357 bytes
src/dem/CDemDraw.cpp | 12 +-
src/dem/CDemDraw.h | 4 +-
src/dem/CDemPropSetup.cpp | 7 +
src/dem/CDemVRT.cpp | 6 +-
src/dem/CDemVRT.h | 3 +-
src/dem/IDem.cpp | 39 +-
src/dem/IDem.h | 12 +-
src/dem/IDemPropSetup.ui | 50 +-
src/gis/CGisDraw.cpp | 5 +
src/gis/CGisDraw.h | 5 +-
src/gis/CGisListWks.cpp | 279 +++-
src/gis/CGisListWks.h | 10 +-
src/gis/CGisProject.cpp | 71 +-
src/gis/CGisProject.h | 2 +
src/gis/CGisWidget.cpp | 130 +-
src/gis/CGisWidget.h | 56 +-
src/gis/IGisItem.cpp | 99 +-
src/gis/IGisItem.h | 39 +-
src/{mouse/IScrOpt.cpp => gis/IGisLine.cpp} | 15 +-
src/{map/CMapMAP.h => gis/IGisLine.h} | 19 +-
src/gis/IGisWidget.ui | 8 +-
src/gis/WptIcons.cpp | 3 +
src/gis/ovl/CDetailsOvlArea.cpp | 269 +++
.../{wpt/CDetailsWpt.h => ovl/CDetailsOvlArea.h} | 40 +-
src/gis/ovl/CGisItemOvlArea.cpp | 574 +++++++
src/gis/ovl/CGisItemOvlArea.h | 148 ++
.../{trk/CScrOptTrk.cpp => ovl/CScrOptOvlArea.cpp} | 60 +-
src/gis/{wpt/CScrOptWpt.h => ovl/CScrOptOvlArea.h} | 22 +-
src/gis/ovl/IDetailsOvlArea.ui | 246 +++
.../{trk/IScrOptTrk.ui => ovl/IScrOptOvlArea.ui} | 43 +-
src/gis/rte/CGisItemRte.cpp | 39 +-
src/gis/rte/CGisItemRte.h | 10 +-
src/gis/rte/CScrOptRte.cpp | 29 +-
src/gis/rte/CScrOptRte.h | 2 +-
src/gis/trk/CDetailsTrk.cpp | 320 ++++
src/gis/trk/CDetailsTrk.h | 73 +
src/gis/trk/CGisItemTrk.cpp | 726 +++++++-
src/gis/trk/CGisItemTrk.h | 186 ++-
src/gis/trk/CScrOptTrk.cpp | 62 +-
src/gis/trk/CScrOptTrk.h | 11 +-
src/gis/trk/IDetailsTrk.ui | 361 ++++
src/gis/trk/IScrOptTrk.ui | 59 +-
src/gis/wpt/CDetailsWpt.cpp | 91 +-
src/gis/wpt/CDetailsWpt.h | 4 +-
src/gis/wpt/CGisItemWpt.cpp | 149 +-
src/gis/wpt/CGisItemWpt.h | 44 +-
src/gis/wpt/CProjWpt.cpp | 16 -
src/gis/wpt/CScrOptWpt.cpp | 28 +-
src/gis/wpt/CScrOptWpt.h | 2 +-
src/gis/wpt/IDetailsWpt.ui | 169 +-
src/grid/CGrid.cpp | 54 +-
src/grid/CGrid.h | 4 +-
src/helpers/CSelectProjectDialog.cpp | 82 +
.../CSelectProjectDialog.h} | 34 +-
src/helpers/ISelectProjectDialog.ui | 80 +
src/helpers/ITextEditWidget.ui | 72 +-
src/icons/16x16/2DFix.png | Bin 472 -> 0 bytes
src/icons/16x16/3DFix.png | Bin 535 -> 0 bytes
src/icons/16x16/Add.png | Bin 292 -> 0 bytes
src/icons/16x16/AddMapWorkspace.png | Bin 740 -> 0 bytes
src/icons/16x16/Cancel.png | Bin 541 -> 0 bytes
src/icons/16x16/Check.png | Bin 495 -> 0 bytes
src/icons/16x16/Close.png | Bin 492 -> 0 bytes
src/icons/16x16/Copy.png | Bin 323 -> 0 bytes
src/icons/16x16/Cut.png | Bin 574 -> 0 bytes
src/icons/16x16/DeleteMultiple.png | Bin 473 -> 0 bytes
src/icons/16x16/DeleteOne.png | Bin 429 -> 0 bytes
src/icons/16x16/Down.png | Bin 418 -> 0 bytes
src/icons/16x16/EditDetails.png | Bin 725 -> 0 bytes
src/icons/16x16/EditText.png | Bin 586 -> 0 bytes
src/icons/16x16/FolderDEM.png | Bin 483 -> 0 bytes
src/icons/16x16/FolderMap.png | Bin 633 -> 0 bytes
src/icons/16x16/Font.png | Bin 400 -> 0 bytes
src/icons/16x16/FromMap.png | Bin 778 -> 0 bytes
src/icons/16x16/GisProject.png | Bin 625 -> 0 bytes
src/icons/16x16/Grid.png | Bin 425 -> 0 bytes
src/icons/16x16/GridSetup.png | Bin 853 -> 0 bytes
src/icons/16x16/GridWizzard.png | Bin 780 -> 0 bytes
src/icons/16x16/Help.png | Bin 585 -> 0 bytes
src/icons/16x16/Info.png | Bin 505 -> 0 bytes
src/icons/16x16/LoadGIS.png | Bin 551 -> 0 bytes
src/icons/16x16/Lock.png | Bin 539 -> 0 bytes
src/icons/16x16/Map.png | Bin 562 -> 0 bytes
src/icons/16x16/MimeDemVRT.png | Bin 655 -> 0 bytes
src/icons/16x16/MimeIMG.png | Bin 680 -> 0 bytes
src/icons/16x16/MimeJNX.png | Bin 685 -> 0 bytes
src/icons/16x16/MimeMAP.png | Bin 793 -> 0 bytes
src/icons/16x16/MimeRMAP.png | Bin 755 -> 0 bytes
src/icons/16x16/MimeVRT.png | Bin 717 -> 0 bytes
src/icons/16x16/MouseWheel.png | Bin 614 -> 0 bytes
src/icons/16x16/NightDay.png | Bin 474 -> 0 bytes
src/icons/16x16/NoFix.png | Bin 408 -> 0 bytes
src/icons/16x16/Off.png | Bin 582 -> 0 bytes
src/icons/16x16/POIText.png | Bin 446 -> 0 bytes
src/icons/16x16/Paste.png | Bin 346 -> 0 bytes
src/icons/16x16/QMapShack.png | Bin 713 -> 0 bytes
src/icons/16x16/Redo.png | Bin 484 -> 0 bytes
src/icons/16x16/Reset.png | Bin 632 -> 0 bytes
src/icons/16x16/Right.png | Bin 388 -> 0 bytes
src/icons/16x16/Route.png | Bin 879 -> 0 bytes
src/icons/16x16/SaveAllGIS.png | Bin 751 -> 0 bytes
src/icons/16x16/SaveGIS.png | Bin 538 -> 0 bytes
src/icons/16x16/Scale.png | Bin 383 -> 0 bytes
src/icons/16x16/SelectColor.png | Bin 750 -> 0 bytes
src/icons/16x16/SetupMapWorkspace.png | Bin 781 -> 0 bytes
src/icons/16x16/Tainted.png | Bin 594 -> 0 bytes
src/icons/16x16/TextBold.png | Bin 344 -> 0 bytes
src/icons/16x16/TextCenter.png | Bin 272 -> 0 bytes
src/icons/16x16/TextItalic.png | Bin 243 -> 0 bytes
src/icons/16x16/TextJustified.png | Bin 234 -> 0 bytes
src/icons/16x16/TextLeft.png | Bin 264 -> 0 bytes
src/icons/16x16/TextRight.png | Bin 262 -> 0 bytes
src/icons/16x16/TextUnderlined.png | Bin 332 -> 0 bytes
src/icons/16x16/TimeZoneSetup.png | Bin 847 -> 0 bytes
src/icons/16x16/ToBottom.png | Bin 427 -> 0 bytes
src/icons/16x16/ToTop.png | Bin 434 -> 0 bytes
src/icons/16x16/ToolTip.png | Bin 558 -> 0 bytes
src/icons/16x16/Track.png | Bin 432 -> 0 bytes
src/icons/16x16/UnLock.png | Bin 541 -> 0 bytes
src/icons/16x16/Undo.png | Bin 493 -> 0 bytes
src/icons/16x16/Up.png | Bin 427 -> 0 bytes
src/icons/16x16/WptMove.png | Bin 518 -> 0 bytes
src/icons/16x16/WptProj.png | Bin 453 -> 0 bytes
src/icons/32x32/AddArea.png | Bin 0 -> 1288 bytes
src/icons/32x32/AddTrk.png | Bin 0 -> 979 bytes
src/icons/32x32/AddWpt.png | Bin 0 -> 852 bytes
src/icons/32x32/Area.png | Bin 0 -> 1172 bytes
src/icons/32x32/AreaMove.png | Bin 0 -> 1680 bytes
src/icons/32x32/LineMove.png | Bin 0 -> 1150 bytes
src/icons/32x32/MimeWMTS.png | Bin 0 -> 1716 bytes
src/icons/32x32/PointMove.png | Bin 0 -> 968 bytes
src/icons/32x32/SelectRange.png | Bin 0 -> 628 bytes
src/icons/32x32/Tainted.png | Bin 1206 -> 1182 bytes
src/icons/32x32/TrkCut.png | Bin 0 -> 1507 bytes
src/icons/32x32/TrkProfile.png | Bin 0 -> 1002 bytes
src/icons/48x48/AddArea.png | Bin 0 -> 2044 bytes
src/icons/48x48/AddTrk.png | Bin 0 -> 1235 bytes
src/icons/48x48/AddWpt.png | Bin 0 -> 1228 bytes
src/icons/48x48/Area.png | Bin 0 -> 1893 bytes
src/icons/48x48/AreaMove.png | Bin 0 -> 2814 bytes
src/icons/48x48/LineMove.png | Bin 0 -> 1784 bytes
src/icons/48x48/MimeWMTS.png | Bin 0 -> 2952 bytes
src/icons/48x48/PointMove.png | Bin 0 -> 1518 bytes
src/icons/48x48/SelectRange.png | Bin 0 -> 849 bytes
src/icons/48x48/Tainted.png | Bin 1971 -> 1896 bytes
src/icons/48x48/TrkCut.png | Bin 0 -> 2422 bytes
src/icons/48x48/TrkProfile.png | Bin 0 -> 1359 bytes
src/icons/AddArea.svg | 217 +++
src/icons/AddTrk.svg | 192 +++
src/icons/AddWpt.svg | 86 +
src/icons/Area.svg | 230 +++
src/icons/AreaMove.svg | 216 +++
src/icons/LineMove.svg | 168 ++
src/icons/MimeWMTS.svg | 98 ++
src/icons/PointMove.svg | 162 ++
src/icons/SelectRange.svg | 148 ++
src/icons/Tainted.svg | 10 +-
src/icons/TrkCut.svg | 121 ++
src/icons/TrkProfile.svg | 99 ++
src/icons/makeicons | 1 -
src/icons/waypoints/32x32/Waypoint.png | Bin 0 -> 533 bytes
src/icons/waypoints/Waypoint.svg | 101 ++
src/locale/qmapshack_cs.ts | 1752 ++++++++++++++------
src/locale/qmapshack_de.ts | 1385 ++++++++++++----
src/locale/qmapshack_es.ts | 939 +++++++++--
src/main.cpp | 14 +
src/map/CMapDraw.cpp | 24 +-
src/map/CMapDraw.h | 16 +
src/map/CMapIMG.cpp | 36 +-
src/map/CMapIMG.h | 17 +-
src/map/CMapItem.cpp | 11 +-
src/map/CMapJNX.cpp | 8 +-
src/map/CMapJNX.h | 16 +-
src/map/CMapMAP.cpp | 122 ++
src/map/CMapMAP.h | 73 +
src/map/CMapPropSetup.cpp | 43 +
src/map/CMapPropSetup.h | 2 +
src/map/CMapVRT.cpp | 6 +-
src/map/CMapVRT.h | 9 +-
src/map/CMapWMTS.cpp | 529 ++++++
src/map/CMapWMTS.h | 115 ++
src/map/IMap.h | 5 +
src/map/IMapList.ui | 5 +-
src/map/IMapPropSetup.ui | 136 +-
src/map/garmin/Garmin.h | 4 +-
src/{mouse/IScrOpt.cpp => map/mapsforge/types.cpp} | 55 +-
src/{mouse/IScrOpt.cpp => map/mapsforge/types.h} | 34 +-
src/map/wmts/CDiskCache.cpp | 156 ++
src/map/{CMapPropSetup.h => wmts/CDiskCache.h} | 48 +-
src/{mouse/IScrOpt.cpp => map/wmts/IDiskCache.cpp} | 16 +-
src/{gis/CGisDraw.h => map/wmts/IDiskCache.h} | 24 +-
src/mouse/CMouseEditArea.cpp | 89 +
.../CMapPropSetup.h => mouse/CMouseEditArea.h} | 31 +-
src/mouse/CMouseEditTrk.cpp | 95 ++
.../trk/CScrOptTrk.h => mouse/CMouseEditTrk.h} | 29 +-
src/mouse/CMouseMoveWpt.cpp | 4 +-
src/mouse/CMouseMoveWpt.h | 2 +-
src/mouse/CMouseNormal.cpp | 122 +-
src/mouse/CMouseNormal.h | 12 +-
src/mouse/{IScrOpt.cpp => CScrOptEditLine.cpp} | 20 +-
src/{map/CMapMAP.h => mouse/CScrOptEditLine.h} | 21 +-
src/mouse/{IScrOpt.cpp => CScrOptPoint.cpp} | 24 +-
src/{map/CMapMAP.h => mouse/CScrOptPoint.h} | 19 +-
src/mouse/{IScrOpt.cpp => CScrOptRange.cpp} | 23 +-
src/{map/CMapMAP.h => mouse/CScrOptRange.h} | 19 +-
src/mouse/CScrOptUnclutter.cpp | 1 +
src/mouse/IMouse.cpp | 17 +-
src/mouse/IMouse.h | 4 +-
src/mouse/IMouseEditLine.cpp | 687 ++++++++
src/mouse/IMouseEditLine.h | 143 ++
src/mouse/IScrOpt.cpp | 41 +-
src/mouse/IScrOpt.h | 4 +
src/mouse/IScrOptEditLine.ui | 100 ++
src/mouse/IScrOptPoint.ui | 108 ++
src/mouse/IScrOptRange.ui | 49 +
src/pics/about.png | Bin 0 -> 27155 bytes
src/pics/noMap256x256.png | Bin 0 -> 19894 bytes
src/plot/CPlotAxis.cpp | 388 +++++
src/plot/CPlotAxis.h | 151 ++
src/plot/CPlotAxisTime.cpp | 130 ++
src/{mouse/IScrOpt.h => plot/CPlotAxisTime.h} | 37 +-
src/plot/CPlotData.cpp | 90 +
src/plot/CPlotData.h | 93 ++
src/plot/CPlotDistance.cpp | 120 ++
src/{map/CMapMAP.h => plot/CPlotDistance.h} | 22 +-
src/plot/CPlotProfile.cpp | 134 ++
src/{map/CMapMAP.h => plot/CPlotProfile.h} | 21 +-
src/plot/CPlotSpeed.cpp | 115 ++
src/{map/CMapMAP.h => plot/CPlotSpeed.h} | 22 +-
src/plot/CPlotTrack.cpp | 160 ++
src/{map/CMapPropSetup.h => plot/CPlotTrack.h} | 46 +-
src/plot/IPlot.cpp | 836 ++++++++++
src/plot/IPlot.h | 128 ++
src/resources.qrc | 99 +-
src/units/CUnitMetric.cpp | 2 +-
src/units/IUnit.cpp | 10 +-
src/units/IUnit.h | 11 +-
262 files changed, 15315 insertions(+), 2153 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