[qmapshack] 02/03: Merge tag 'upstream/1.1.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 51d27f29715732ef3397c6eaa01c47480a6866ad
Merge: c882535 a4597aa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 29 17:50:36 2015 +0200

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0

 CMakeLists.txt                                  |   4 +-
 CMakeLists.txt.user                             |   4 +-
 changelog.txt                                   |   9 +
 src/CMainWindow.cpp                             |  51 +-
 src/CMainWindow.h                               |   2 +
 src/CMakeLists.txt                              |   3 +
 src/GeoMath.cpp                                 |  10 +-
 src/GeoMath.h                                   |   6 +-
 src/IAbout.ui                                   |  76 ++-
 src/IMainWindow.ui                              |  18 +-
 src/canvas/CCanvas.cpp                          | 123 ++++-
 src/canvas/CCanvas.h                            |   5 +
 src/device/CDeviceTwoNav.cpp                    |  12 +
 src/device/IDevice.cpp                          |   4 +-
 src/device/IDevice.h                            |   2 +-
 src/gis/CGisListWks.cpp                         |  33 +-
 src/gis/CGisWidget.cpp                          |   2 +-
 src/gis/CSelDevices.cpp                         |  76 +++
 src/{plot/CPlotDistance.h => gis/CSelDevices.h} |  22 +-
 src/gis/IGisItem.cpp                            |  27 +-
 src/gis/ISelDevices.ui                          |  67 +++
 src/gis/db/CDBProject.cpp                       |   3 +
 src/gis/gpx/CGpxProject.cpp                     |  16 +-
 src/gis/gpx/serialization.cpp                   |   4 +-
 src/gis/ovl/CGisItemOvlArea.cpp                 |   6 +-
 src/gis/prj/CDetailsPrj.cpp                     | 304 +++++++++--
 src/gis/prj/CDetailsPrj.h                       |  16 +-
 src/gis/prj/IDetailsPrj.ui                      |  38 +-
 src/gis/prj/IGisProject.cpp                     |  21 +
 src/gis/prj/IGisProject.h                       |  30 +-
 src/gis/qms/CQmsProject.cpp                     |   1 +
 src/gis/qms/serialization.cpp                   |  17 +-
 src/gis/rte/CGisItemRte.cpp                     |   2 +-
 src/gis/tnv/CTwoNavProject.cpp                  |   5 +-
 src/gis/tnv/CTwoNavProject.h                    |   1 +
 src/gis/tnv/serialization.cpp                   | 106 +++-
 src/gis/trk/CDetailsTrk.cpp                     |  18 +-
 src/gis/trk/CDetailsTrk.h                       |   2 +-
 src/gis/trk/CGisItemTrk.cpp                     | 263 +++++++---
 src/gis/trk/CGisItemTrk.h                       |  47 +-
 src/gis/trk/CScrOptTrk.cpp                      |   4 +
 src/gis/wpt/CDetailsGeoCache.cpp                |   2 +-
 src/gis/wpt/CGisItemWpt.cpp                     |   8 +-
 src/grid/CGrid.cpp                              |   2 +-
 src/helpers/CPhotoAlbum.cpp                     |   9 +-
 src/helpers/CWptIconDialog.cpp                  |   1 +
 src/icons/32x32/FolderDEM.png                   | Bin 1293 -> 829 bytes
 src/icons/32x32/FolderMap.png                   | Bin 1664 -> 1550 bytes
 src/icons/32x32/ProfileToWindow.png             | Bin 0 -> 1018 bytes
 src/icons/48x48/FolderDEM.png                   | Bin 1743 -> 1135 bytes
 src/icons/48x48/FolderMap.png                   | Bin 2664 -> 2512 bytes
 src/icons/48x48/ProfileToWindow.png             | Bin 0 -> 1649 bytes
 src/icons/FolderDEM.svg                         |  20 +-
 src/icons/FolderMap.svg                         |  53 +-
 src/icons/ProfileToWindow.svg                   | 118 +++++
 src/locale/qmapshack_cs.ts                      | 581 ++++++++++++---------
 src/locale/qmapshack_de.ts                      | 659 ++++++++++++++----------
 src/locale/qmapshack_es.ts                      | 581 ++++++++++++---------
 src/locale/qmapshack_fr.ts                      | 579 ++++++++++++---------
 src/map/CMapIMG.cpp                             |  26 +-
 src/map/CMapJNX.cpp                             |   2 +-
 src/map/CMapTMS.cpp                             |  10 +-
 src/map/garmin/CGarminTyp.cpp                   |   3 +-
 src/mouse/CMouseEditArea.cpp                    |   2 +-
 src/mouse/CMouseEditTrk.cpp                     |   7 +-
 src/mouse/CMouseRangeTrk.cpp                    |   6 +-
 src/mouse/IMouseEditLine.cpp                    |  50 +-
 src/plot/CPlotAxis.h                            |   4 +-
 src/plot/CPlotData.h                            |   2 -
 src/plot/CPlotDistance.cpp                      |   9 +-
 src/plot/CPlotDistance.h                        |   2 +-
 src/plot/CPlotProfile.cpp                       |  75 ++-
 src/plot/CPlotProfile.h                         |   2 +-
 src/plot/CPlotSpeed.cpp                         |   8 +-
 src/plot/CPlotSpeed.h                           |   2 +-
 src/plot/CPlotTrack.cpp                         |   2 +-
 src/plot/CPlotTrack.h                           |   2 +-
 src/plot/IPlot.cpp                              | 172 ++++++-
 src/plot/IPlot.h                                |   8 +-
 src/qlgt/converter.cpp                          |   8 +-
 src/resources.qrc                               |   2 +
 src/units/IUnit.cpp                             |   6 +-
 src/units/IUnit.h                               |   1 +
 83 files changed, 3078 insertions(+), 1406 deletions(-)

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