[qmapshack] 02/02: Merge tag 'upstream/0.3.0'
Jaromír Mikeš
mira-guest at moszumanska.debian.org
Fri Aug 15 21:42:54 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 85ee7be65ca76f2754c5346468829b44a3593611
Merge: f40ba44 f040497
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Fri Aug 15 23:42:05 2014 +0200
Merge tag 'upstream/0.3.0'
Upstream version 0.3.0
3rdparty/CGetOpt/CGetOpt.cpp | 35 +
3rdparty/CGetOpt/getopt.pro | 4 -
3rdparty/CGetOpt/main.cpp | 36 -
CMakeLists.txt | 4 +-
CMakeLists.txt.user | 10 +-
CPackConfig.cmake | 2 +-
changelog.txt | 9 +
cmake/Modules/FindGDAL.cmake | 8 +-
cmake/Modules/FindPROJ.cmake | 8 +-
nsi/3rdparty.txt | 86 +
nsi/Help.ico | Bin 0 -> 9662 bytes
nsi/QMapShack.ico | Bin 0 -> 9662 bytes
nsi/QMapShack_Installer.nsi | 254 +++
nsi/copyfiles.bat | 87 +
nsi/kfm_home.ico | Bin 0 -> 15086 bytes
nsi/konsole.ico | Bin 0 -> 15086 bytes
qmapshack.1 | 26 +-
src/CMainWindow.cpp | 74 +-
src/CMainWindow.h | 15 +
src/CMakeLists.txt | 78 +-
src/GeoMath.cpp | 29 +-
src/GeoMath.h | 4 +
src/IAbout.ui | 2 +-
src/IMainWindow.ui | 10 +
src/animation/COPYRIGHT | 14 +
src/animation/README | 3 -
src/animation/WTFPL-2 | 14 +
src/canvas/CCanvas.cpp | 69 +-
src/canvas/CCanvas.h | 33 +-
src/canvas/CCanvasSetup.cpp | 2 +-
src/canvas/ICanvasSetup.ui | 12 +-
src/canvas/IDrawContext.cpp | 57 +-
src/canvas/IDrawContext.h | 14 +-
src/cursors/COPYRIGHT | 14 +
src/cursors/cursorArrow.png | Bin
src/cursors/cursorMove.png | Bin
src/cursors/cursorMoveWpt.png | Bin 0 -> 1386 bytes
src/cursors/wptHighlight.png | Bin 0 -> 3546 bytes
src/cursors/wptHighlight.svg | 142 ++
src/dem/CDemDraw.cpp | 6 +-
src/dem/CDemDraw.h | 2 +-
src/dem/CDemVRT.cpp | 47 +-
src/dem/CDemVRT.h | 6 +-
src/dem/IDem.h | 2 +-
src/dem/IDemPathSetup.ui | 10 -
src/gis/CGisDraw.cpp | 2 +-
src/gis/CGisListWks.cpp | 104 +-
src/gis/CGisListWks.h | 11 +
src/gis/CGisProject.cpp | 294 ++-
src/gis/CGisProject.h | 84 +
src/gis/CGisWidget.cpp | 114 +-
src/gis/CGisWidget.h | 41 +
src/gis/IGisItem.cpp | 126 +-
src/gis/IGisItem.h | 230 ++-
src/gis/IGisWidget.ui | 10 +-
src/gis/WptIcons.cpp | 30 +-
src/gis/WptIcons.h | 11 +
src/gis/rte/CGisItemRte.cpp | 88 +-
src/gis/rte/CGisItemRte.h | 12 +-
src/gis/rte/CScrOptRte.cpp | 82 +
src/{mouse/CMouseNormal.h => gis/rte/CScrOptRte.h} | 34 +-
src/gis/rte/IScrOptRte.ui | 84 +
src/gis/trk/CGisItemTrk.cpp | 377 +++-
src/gis/trk/CGisItemTrk.h | 69 +-
src/gis/trk/CScrOptTrk.cpp | 82 +
src/{mouse/CMouseNormal.h => gis/trk/CScrOptTrk.h} | 34 +-
src/gis/trk/IScrOptTrk.ui | 99 +
src/gis/wpt/CDetailsGeoCache.cpp | 108 +
.../CMouseNormal.h => gis/wpt/CDetailsGeoCache.h} | 31 +-
src/gis/wpt/CDetailsWpt.cpp | 247 +++
src/gis/{CGisListWks.h => wpt/CDetailsWpt.h} | 40 +-
src/gis/wpt/CGisItemWpt.cpp | 403 +++-
src/gis/wpt/CGisItemWpt.h | 89 +-
src/gis/wpt/CProjWpt.cpp | 121 ++
src/{mouse/CMouseNormal.h => gis/wpt/CProjWpt.h} | 33 +-
src/gis/wpt/CScrOptWpt.cpp | 108 +
src/gis/{CGisWidget.h => wpt/CScrOptWpt.h} | 40 +-
src/gis/wpt/IDetailsGeoCache.ui | 290 +++
src/gis/wpt/IDetailsWpt.ui | 341 ++++
.../ICanvasSetup.ui => gis/wpt/IProjWpt.ui} | 114 +-
src/gis/wpt/IScrOptWpt.ui | 161 ++
src/grid/CGrid.cpp | 14 +-
src/grid/CProjWizard.cpp | 15 +-
src/grid/IGridSetup.ui | 12 +-
src/grid/IProjWizard.ui | 37 +-
.../CCanvasSetup.cpp => helpers/CInputDialog.cpp} | 50 +-
.../CMouseNormal.h => helpers/CInputDialog.h} | 33 +-
src/helpers/CPositionDialog.cpp | 154 ++
.../CMouseNormal.h => helpers/CPositionDialog.h} | 31 +-
src/helpers/CTextEditWidget.cpp | 351 ++++
src/helpers/CTextEditWidget.h | 85 +
src/helpers/CWptIconDialog.cpp | 110 +
.../CMouseNormal.h => helpers/CWptIconDialog.h} | 30 +-
src/helpers/IInputDialog.ui | 84 +
src/helpers/IPositionDialog.ui | 100 +
src/helpers/ITextEditWidget.ui | 456 +++++
src/helpers/IWptIconDialog.ui | 31 +
src/icons/16x16/Copy.png | Bin 0 -> 323 bytes
src/icons/16x16/Cut.png | Bin 0 -> 574 bytes
src/icons/16x16/EditDetails.png | Bin 0 -> 725 bytes
src/icons/16x16/EditText.png | Bin 0 -> 586 bytes
src/icons/16x16/Lock.png | Bin 0 -> 539 bytes
src/icons/16x16/Paste.png | Bin 0 -> 346 bytes
src/icons/16x16/Redo.png | Bin 0 -> 484 bytes
src/icons/16x16/Tainted.png | Bin 0 -> 594 bytes
src/icons/16x16/TextBold.png | Bin 0 -> 344 bytes
src/icons/16x16/TextCenter.png | Bin 0 -> 272 bytes
src/icons/16x16/TextItalic.png | Bin 0 -> 243 bytes
src/icons/16x16/TextJustified.png | Bin 0 -> 234 bytes
src/icons/16x16/TextLeft.png | Bin 0 -> 264 bytes
src/icons/16x16/TextRight.png | Bin 0 -> 262 bytes
src/icons/16x16/TextUnderlined.png | Bin 0 -> 332 bytes
src/icons/16x16/TimeZoneSetup.png | Bin 0 -> 847 bytes
src/icons/16x16/Track.png | Bin 0 -> 432 bytes
src/icons/16x16/UnLock.png | Bin 0 -> 541 bytes
src/icons/16x16/Undo.png | Bin 0 -> 493 bytes
src/icons/16x16/WptMove.png | Bin 0 -> 518 bytes
src/icons/16x16/WptProj.png | Bin 0 -> 453 bytes
src/icons/32x32/Copy.png | Bin 0 -> 415 bytes
src/icons/32x32/Cut.png | Bin 0 -> 1241 bytes
src/icons/32x32/EditDetails.png | Bin 0 -> 1671 bytes
src/icons/32x32/EditText.png | Bin 0 -> 1069 bytes
src/icons/32x32/Lock.png | Bin 0 -> 932 bytes
src/icons/32x32/Paste.png | Bin 0 -> 454 bytes
src/icons/32x32/Redo.png | Bin 0 -> 932 bytes
src/icons/32x32/Tainted.png | Bin 0 -> 1206 bytes
src/icons/32x32/TextBold.png | Bin 0 -> 535 bytes
src/icons/32x32/TextCenter.png | Bin 0 -> 371 bytes
src/icons/32x32/TextItalic.png | Bin 0 -> 378 bytes
src/icons/32x32/TextJustified.png | Bin 0 -> 315 bytes
src/icons/32x32/TextLeft.png | Bin 0 -> 334 bytes
src/icons/32x32/TextRight.png | Bin 0 -> 364 bytes
src/icons/32x32/TextUnderlined.png | Bin 0 -> 491 bytes
src/icons/32x32/TimeZoneSetup.png | Bin 0 -> 2257 bytes
src/icons/32x32/Track.png | Bin 0 -> 832 bytes
src/icons/32x32/UnLock.png | Bin 0 -> 1019 bytes
src/icons/32x32/Undo.png | Bin 0 -> 937 bytes
src/icons/32x32/WptMove.png | Bin 0 -> 998 bytes
src/icons/32x32/WptProj.png | Bin 0 -> 821 bytes
src/icons/48x48/Copy.png | Bin 0 -> 517 bytes
src/icons/48x48/Cut.png | Bin 0 -> 2027 bytes
src/icons/48x48/EditDetails.png | Bin 0 -> 2565 bytes
src/icons/48x48/EditText.png | Bin 0 -> 1529 bytes
src/icons/48x48/Lock.png | Bin 0 -> 1372 bytes
src/icons/48x48/Paste.png | Bin 0 -> 544 bytes
src/icons/48x48/Redo.png | Bin 0 -> 1344 bytes
src/icons/48x48/Tainted.png | Bin 0 -> 1971 bytes
src/icons/48x48/TextBold.png | Bin 0 -> 742 bytes
src/icons/48x48/TextCenter.png | Bin 0 -> 407 bytes
src/icons/48x48/TextItalic.png | Bin 0 -> 493 bytes
src/icons/48x48/TextJustified.png | Bin 0 -> 381 bytes
src/icons/48x48/TextLeft.png | Bin 0 -> 403 bytes
src/icons/48x48/TextRight.png | Bin 0 -> 405 bytes
src/icons/48x48/TextUnderlined.png | Bin 0 -> 629 bytes
src/icons/48x48/TimeZoneSetup.png | Bin 0 -> 3847 bytes
src/icons/48x48/Track.png | Bin 0 -> 1270 bytes
src/icons/48x48/UnLock.png | Bin 0 -> 1509 bytes
src/icons/48x48/Undo.png | Bin 0 -> 1370 bytes
src/icons/48x48/WptMove.png | Bin 0 -> 1537 bytes
src/icons/48x48/WptProj.png | Bin 0 -> 1239 bytes
src/icons/Copy.svg | 81 +
src/icons/Cut.svg | 113 ++
src/icons/EditDetails.svg | 126 ++
src/icons/EditText.svg | 151 ++
src/icons/Lock.svg | 88 +
src/icons/Paste.svg | 88 +
src/icons/Redo.svg | 68 +
src/icons/Tainted.svg | 162 ++
src/icons/TextBold.svg | 78 +
src/icons/TextCenter.svg | 102 +
src/icons/TextItalic.svg | 79 +
src/icons/TextJustified.svg | 102 +
src/icons/TextLeft.svg | 102 +
src/icons/TextRight.svg | 102 +
src/icons/TextUnderlined.svg | 88 +
src/icons/TimeZoneSetup.svg | 146 ++
src/icons/Track.svg | 179 ++
src/icons/UnLock.svg | 87 +
src/icons/Undo.svg | 68 +
src/icons/WptMove.svg | 164 ++
src/icons/WptProj.svg | 196 ++
src/icons/cache/Apache-2.0 | 202 ++
src/icons/cache/COPYRIGHT | 1 +
src/icons/waypoints/32x32/Default.png | Bin 1559 -> 1923 bytes
src/icons/waypoints/Default.svg | 27 +-
src/locale/qmapshack_cs.ts | 2127 +++++++++++++++++++
src/locale/qmapshack_de.ts | 2143 ++++++++++++++++++++
src/locale/qmapshack_es.ts | 2127 +++++++++++++++++++
src/main.cpp | 56 +-
src/map/CMapDraw.cpp | 2 +-
src/map/CMapIMG.cpp | 24 +-
src/map/CMapIMG.h | 2 +-
src/map/CMapRMAP.cpp | 4 +-
src/map/CMapVRT.cpp | 68 +-
src/map/IMapPathSetup.ui | 10 -
src/map/garmin/CGarminPolygon.cpp | 4 +-
src/mouse/CMouseMoveWpt.cpp | 138 ++
src/mouse/{CMouseNormal.h => CMouseMoveWpt.h} | 31 +-
src/mouse/CMouseNormal.cpp | 176 +-
src/mouse/CMouseNormal.h | 38 +-
src/mouse/CScrOptUnclutter.cpp | 161 ++
src/mouse/{CMouseNormal.h => CScrOptUnclutter.h} | 46 +-
src/mouse/IMouse.cpp | 48 +-
src/mouse/IMouse.h | 17 +-
src/mouse/{IMouse.cpp => IScrOpt.cpp} | 17 +-
src/mouse/{CMouseNormal.h => IScrOpt.h} | 33 +-
src/pics/compass.png | Bin 0 -> 9906 bytes
src/pics/compass.svg | 343 ++++
src/pics/splash.png | Bin 0 -> 376705 bytes
src/pics/timezones.png | Bin 0 -> 83526 bytes
src/resources.qrc | 75 +-
src/units/CTimeZoneSetup.cpp | 88 +
src/{mouse/IMouse.cpp => units/CTimeZoneSetup.h} | 22 +-
.../ICanvasSetup.ui => units/ITimeZoneSetup.ui} | 66 +-
src/units/IUnit.cpp | 449 +++-
src/units/IUnit.h | 27 +-
216 files changed, 17146 insertions(+), 761 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