[qmapshack] branch upstream updated (a4597aa -> 34092be)

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch upstream
in repository qmapshack.

      from  a4597aa   Imported Upstream version 1.1.0
       new  34092be   Imported Upstream version 1.2.0

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                                     |   2 +-
 CMakeLists.txt.user                                |  14 +-
 CMakeLists.txt.user.3.3-pre1                       | 188 ------
 changelog.txt                                      |  11 +
 nsi/3rdparty.txt                                   |  87 ++-
 src/CMainWindow.cpp                                |   9 +
 src/CMakeLists.txt                                 |   2 +
 src/canvas/CCanvas.cpp                             |  32 +-
 src/canvas/CCanvas.h                               |  10 +
 src/canvas/CCanvasSetup.cpp                        |  19 +
 src/canvas/ICanvasSetup.ui                         |  31 +-
 src/canvas/IDrawContext.cpp                        |  93 ++-
 src/canvas/IDrawContext.h                          |  15 +-
 src/device/CDeviceGarmin.cpp                       |   5 +
 src/device/CDeviceTwoNav.cpp                       |   6 +
 src/device/IDevice.cpp                             |  42 ++
 src/device/IDevice.h                               |  16 +
 src/gis/CGisListWks.cpp                            |  73 ++-
 src/gis/prj/CDetailsPrj.cpp                        |   4 +-
 src/gis/prj/IGisProject.cpp                        |  18 +
 src/gis/prj/IGisProject.h                          |   2 +
 src/gis/tnv/serialization.cpp                      |  50 +-
 src/gis/trk/CDetailsTrk.cpp                        |  29 +-
 src/gis/trk/CDetailsTrk.h                          |   2 +
 src/gis/trk/CGisItemTrk.cpp                        | 386 +++++++++---
 src/gis/trk/CGisItemTrk.h                          |  39 +-
 src/gis/trk/CScrOptTrk.cpp                         |   4 +-
 src/gis/trk/IDetailsTrk.ui                         |  21 +
 src/grid/CProjWizard.cpp                           |   4 +-
 src/helpers/{CInputDialog.cpp => CFadingIcon.cpp}  |  53 +-
 .../CFilterReset.h => helpers/CFadingIcon.h}       |  23 +-
 src/helpers/CFileExt.h                             |  22 +-
 src/icons/32x32/NoGo.png                           | Bin 0 -> 1401 bytes
 src/icons/48x48/NoGo.png                           | Bin 0 -> 2231 bytes
 src/icons/{waypoints/BoxRed.svg => NoGo.svg}       |  30 +-
 src/locale/qmapshack_cs.ts                         | 681 ++++++++++++---------
 src/locale/qmapshack_de.ts                         | 625 +++++++++++--------
 src/locale/qmapshack_es.ts                         | 615 +++++++++++--------
 src/locale/qmapshack_fr.ts                         | 615 +++++++++++--------
 src/main.cpp                                       |   2 +-
 src/map/CMapDraw.cpp                               |  10 +-
 src/map/CMapDraw.h                                 |   1 +
 src/map/CMapIMG.cpp                                |  25 +-
 src/map/CMapList.cpp                               |  43 +-
 src/map/CMapList.h                                 |   3 +
 src/map/CMapPathSetup.cpp                          |   8 +
 src/map/CMapPathSetup.h                            |   2 +-
 src/map/CMapTMS.cpp                                |   7 +
 src/map/CMapWMTS.cpp                               |   8 +
 src/map/IMap.cpp                                   |   4 +-
 src/map/IMapList.ui                                |  10 +-
 src/map/IMapPathSetup.ui                           |  10 +-
 src/map/OSM_Topo.tms                               |  21 +
 src/map/OpenCycleMap.tms                           |   9 +
 src/map/OpenStreetMap.tms                          |  14 +
 src/map/WorldSat.wmts                              | 377 ++++++++++++
 src/map/WorldTopo.wmts                             | 377 ++++++++++++
 src/map/garmin/IGarminStrTbl.cpp                   |   2 +-
 src/mouse/CMouseEditTrk.cpp                        |   4 +-
 src/mouse/CMouseNormal.cpp                         |  30 +-
 src/mouse/CMouseNormal.h                           |   3 +
 src/mouse/CMouseRangeTrk.cpp                       |  60 +-
 src/mouse/CMouseRangeTrk.h                         |   2 +-
 src/mouse/CScrOptRangeTrk.cpp                      |   1 +
 src/mouse/IMouseEditLine.cpp                       |  32 +-
 src/plot/CPlotDistance.cpp                         |  11 +-
 src/plot/CPlotDistance.h                           |   2 +-
 src/plot/CPlotProfile.cpp                          |  43 +-
 src/plot/CPlotProfile.h                            |   2 +-
 src/plot/CPlotSpeed.cpp                            |   9 +-
 src/plot/CPlotSpeed.h                              |   2 +-
 src/plot/IPlot.cpp                                 | 358 ++++++++---
 src/plot/IPlot.h                                   |  26 +-
 src/resources.qrc                                  |   8 +
 src/units/CUnitMetric.cpp                          |   8 +-
 75 files changed, 3652 insertions(+), 1760 deletions(-)
 delete mode 100644 CMakeLists.txt.user.3.3-pre1
 copy src/helpers/{CInputDialog.cpp => CFadingIcon.cpp} (57%)
 copy src/{gis/trk/filter/CFilterReset.h => helpers/CFadingIcon.h} (74%)
 create mode 100644 src/icons/32x32/NoGo.png
 create mode 100644 src/icons/48x48/NoGo.png
 copy src/icons/{waypoints/BoxRed.svg => NoGo.svg} (58%)
 create mode 100644 src/map/OSM_Topo.tms
 create mode 100644 src/map/OpenCycleMap.tms
 create mode 100644 src/map/OpenStreetMap.tms
 create mode 100644 src/map/WorldSat.wmts
 create mode 100644 src/map/WorldTopo.wmts

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git