[qmapshack] 02/05: Merge tag 'upstream/0.10.0'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository qmapshack.

commit b068269e50b32cb46cb9907ac0ba3048632b92d9
Merge: 5585cec 54240e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 11 11:32:12 2015 +0100

    Merge tag 'upstream/0.10.0'
    
    Upstream version 0.10.0

 3rdparty/CGetOpt/CMakeLists.txt                    |   7 +-
 CMakeLists.txt                                     |   5 +-
 CMakeLists.txt.user                                |   2 +-
 changelog.txt                                      |   9 +
 src/CMakeLists.txt                                 |  27 +-
 src/GeoMath.h                                      |   1 +
 src/canvas/CCanvas.cpp                             |   8 +-
 src/canvas/IDrawContext.cpp                        |   2 +-
 src/canvas/IDrawContext.h                          |   2 +-
 src/dem/CDemPropSetup.cpp                          |  44 +-
 src/dem/CDemPropSetup.h                            |   1 +
 src/dem/CDemVRT.cpp                                |  31 +-
 src/dem/IDem.cpp                                   |  71 +++
 src/dem/IDem.h                                     |  25 +-
 src/dem/IDemPropSetup.ui                           | 193 ++++++++-
 src/gis/CGisDraw.cpp                               |   7 +-
 src/gis/CGisWidget.cpp                             |  16 +-
 src/gis/CGisWidget.h                               |   2 +-
 src/gis/IGisItem.cpp                               |  32 +-
 src/gis/IGisItem.h                                 |   9 +-
 src/gis/db/CDBFolderDatabase.cpp                   |   6 +-
 src/gis/db/CDBProject.cpp                          |  18 +-
 src/gis/db/CDBProject.h                            |   4 +-
 src/gis/db/CLostFoundProject.h                     |   2 +-
 src/gis/gpx/CGpxProject.cpp                        |  39 +-
 src/gis/gpx/CGpxProject.h                          |   6 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |   6 +-
 src/gis/ovl/CGisItemOvlArea.h                      |   4 +-
 src/gis/prj/IGisProject.cpp                        |  16 +-
 src/gis/prj/IGisProject.h                          |   8 +-
 src/gis/qms/CQmsProject.cpp                        |  35 +-
 src/gis/qms/CQmsProject.h                          |   6 +-
 src/gis/rte/CGisItemRte.cpp                        |  12 +-
 src/gis/rte/CGisItemRte.h                          |   4 +-
 src/gis/search/CSearchGoogle.h                     |   4 +-
 src/gis/trk/CDetailsTrk.cpp                        |  52 +++
 src/gis/trk/CGisItemTrk.cpp                        |  49 ++-
 src/gis/trk/CGisItemTrk.h                          |  27 +-
 src/gis/trk/IDetailsTrk.ui                         |  46 +-
 .../CQmsProject.h => trk/filter/CFilterDelete.cpp} |  31 +-
 .../filter/CFilterDelete.h}                        |  26 +-
 .../trk/filter/CFilterDouglasPeuker.cpp}           |  36 +-
 .../filter/CFilterDouglasPeuker.h}                 |  27 +-
 .../trk/filter/CFilterMedian.cpp}                  |  35 +-
 .../CQmsProject.h => trk/filter/CFilterMedian.h}   |  26 +-
 .../trk/filter/CFilterNewDate.cpp}                 |  29 +-
 .../filter/CFilterNewDate.h}                       |  26 +-
 .../trk/filter/CFilterObscureDate.cpp}             |  33 +-
 .../filter/CFilterObscureDate.h}                   |  26 +-
 .../trk/filter/CFilterOffsetElevation.cpp}         |  37 +-
 .../filter/CFilterOffsetElevation.h}               |  25 +-
 .../trk/filter/CFilterReplaceElevation.cpp}        |  29 +-
 .../filter/CFilterReplaceElevation.h}              |  26 +-
 .../trk/filter/CFilterSpeed.cpp}                   |  36 +-
 .../CQmsProject.h => trk/filter/CFilterSpeed.h}    |  26 +-
 src/gis/trk/filter/IFilterDelete.ui                |  99 +++++
 src/gis/trk/filter/IFilterDouglasPeuker.ui         | 128 ++++++
 src/gis/trk/filter/IFilterMedian.ui                | 134 ++++++
 src/gis/trk/filter/IFilterNewDate.ui               | 110 +++++
 src/gis/trk/filter/IFilterObscureDate.ui           | 117 +++++
 src/gis/trk/filter/IFilterOffsetElevation.ui       | 144 +++++++
 src/gis/trk/filter/IFilterReplaceElevation.ui      |  99 +++++
 src/gis/trk/filter/IFilterSpeed.ui                 | 122 ++++++
 src/gis/trk/filter/filter.cpp                      | 331 ++++++++++++++
 src/gis/wpt/CGisItemWpt.cpp                        |   6 +-
 src/gis/wpt/CGisItemWpt.h                          |   4 +-
 src/helpers/CHistoryListWidget.cpp                 |   2 +
 src/icons/32x32/Apply.png                          | Bin 0 -> 1930 bytes
 src/icons/32x32/Time.png                           | Bin 0 -> 1293 bytes
 src/icons/48x48/Apply.png                          | Bin 0 -> 3238 bytes
 src/icons/48x48/Time.png                           | Bin 0 -> 1992 bytes
 src/icons/Apply.svg                                |  68 +++
 src/icons/Time.svg                                 | 137 ++++++
 src/locale/qmapshack_cs.ts                         | 474 +++++++++++++++++----
 src/locale/qmapshack_de.ts                         | 474 +++++++++++++++++----
 src/locale/qmapshack_es.ts                         | 474 +++++++++++++++++----
 src/map/CMapIMG.cpp                                |   2 +-
 src/map/IMapPropSetup.ui                           |  12 +
 src/mouse/CScrOptRangeTrk.cpp                      |   4 +
 src/plot/CPlotSpeed.cpp                            |   2 +
 src/resources.qrc                                  |   4 +
 81 files changed, 3681 insertions(+), 578 deletions(-)

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