[qmapshack] 03/11: Merge tag 'upstream/0.8.0'

Bas Couwenberg sebastic at xs4all.nl
Sat Dec 13 14:11:34 UTC 2014


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

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

commit 54f45d957fa1208c74314b8c7b8c908ef790b51c
Merge: 0a263b2 7ccfff7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 13 01:32:10 2014 +0100

    Merge tag 'upstream/0.8.0'
    
    Upstream version 0.8.0

 .hg_archival.txt                                   |   4 +
 .hgtags                                            |  17 +
 CMakeLists.txt                                     |   6 +-
 CMakeLists.txt.user                                | 237 ------
 changelog.txt                                      |   7 +
 src/CMainWindow.cpp                                |  23 +-
 src/CMainWindow.h                                  |   1 +
 src/CMakeLists.txt                                 |  20 +-
 src/IMainWindow.ui                                 |  14 +-
 src/gis/CGisListWks.cpp                            |  49 +-
 src/gis/CGisListWks.h                              |   2 +
 src/gis/CGisSerialization.cpp                      | 215 -----
 src/gis/CGisWidget.cpp                             |  34 +-
 src/gis/CGisWidget.h                               |   2 +-
 src/gis/IGisItem.cpp                               | 167 ++--
 src/gis/IGisItem.h                                 | 321 ++-----
 src/gis/IGisLine.h                                 |   4 +-
 src/gis/IGisProject.cpp                            |  50 +-
 src/gis/IGisProject.h                              | 100 ++-
 src/gis/bin/CBinProject.cpp                        | 146 ++++
 src/gis/{IGisLine.h => bin/CBinProject.h}          |  22 +-
 src/gis/bin/serialization.cpp                      | 689 +++++++++++++++
 src/gis/gpx/CGpxProject.cpp                        | 257 +-----
 src/gis/gpx/CGpxProject.h                          |  64 +-
 src/gis/gpx/serialization.cpp                      | 931 +++++++++++++++++++++
 src/gis/ovl/CDetailsOvlArea.cpp                    |  31 +-
 src/gis/ovl/CDetailsOvlArea.h                      |   7 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    | 105 +--
 src/gis/ovl/CGisItemOvlArea.h                      |   8 +-
 src/gis/ovl/IDetailsOvlArea.ui                     |   9 +-
 src/gis/rte/CGisItemRte.cpp                        |  82 +-
 src/gis/rte/CGisItemRte.h                          |   7 +-
 src/gis/search/CSearchGoogle.cpp                   |   2 +-
 src/gis/search/CSearchGoogle.h                     |   3 +
 src/gis/trk/CCombineTrk.cpp                        |   2 +-
 src/gis/trk/CDetailsTrk.cpp                        |  52 +-
 src/gis/trk/CDetailsTrk.h                          |   7 +-
 src/gis/trk/CGisItemTrk.cpp                        | 196 ++---
 src/gis/trk/CGisItemTrk.h                          | 101 ++-
 src/gis/trk/IDetailsTrk.ui                         | 694 +++++++--------
 src/gis/wpt/CDetailsWpt.cpp                        |  31 +-
 src/gis/wpt/CDetailsWpt.h                          |   6 +-
 src/gis/wpt/CGisItemWpt.cpp                        | 211 +----
 src/gis/wpt/CGisItemWpt.h                          |  25 +-
 src/gis/wpt/IDetailsWpt.ui                         | 230 +++--
 src/helpers/CElevationDialog.cpp                   |  87 ++
 .../CSearchGoogle.h => helpers/CElevationDialog.h} |  37 +-
 src/helpers/CHistoryListWidget.cpp                 | 120 +++
 .../CHistoryListWidget.h}                          |  40 +-
 src/helpers/CSelectProjectDialog.cpp               |  62 +-
 src/helpers/CSelectProjectDialog.h                 |  12 +-
 src/helpers/IElevationDialog.ui                    | 108 +++
 src/helpers/ISelectProjectDialog.ui                |  61 +-
 src/icons/32x32/AddProject.png                     | Bin 1234 -> 796 bytes
 src/icons/32x32/CutHistory.png                     | Bin 0 -> 1006 bytes
 src/icons/32x32/FolderDEM.png                      | Bin 838 -> 1293 bytes
 src/icons/32x32/FolderMap.png                      | Bin 1354 -> 1664 bytes
 src/icons/32x32/GpxProject.png                     | Bin 0 -> 1269 bytes
 src/icons/32x32/LoadGIS.png                        | Bin 1156 -> 982 bytes
 src/icons/32x32/Opacity.png                        | Bin 0 -> 779 bytes
 src/icons/32x32/Pattern.png                        | Bin 0 -> 1490 bytes
 src/icons/32x32/QmsProject.png                     | Bin 0 -> 1345 bytes
 src/icons/32x32/SaveAllGIS.png                     | Bin 1332 -> 777 bytes
 src/icons/32x32/SaveGIS.png                        | Bin 1130 -> 777 bytes
 src/icons/32x32/SaveGISAs.png                      | Bin 0 -> 1344 bytes
 src/icons/32x32/SetEle.png                         | Bin 0 -> 635 bytes
 src/icons/32x32/Start.png                          | Bin 0 -> 858 bytes
 src/icons/32x32/UnitSetup.png                      | Bin 0 -> 2459 bytes
 src/icons/32x32/WptProx.png                        | Bin 0 -> 917 bytes
 src/icons/48x48/AddProject.png                     | Bin 1713 -> 1021 bytes
 src/icons/48x48/CutHistory.png                     | Bin 0 -> 1568 bytes
 src/icons/48x48/FolderDEM.png                      | Bin 1120 -> 1743 bytes
 src/icons/48x48/FolderMap.png                      | Bin 2065 -> 2664 bytes
 src/icons/48x48/GpxProject.png                     | Bin 0 -> 1923 bytes
 src/icons/48x48/LoadGIS.png                        | Bin 1682 -> 1508 bytes
 src/icons/48x48/Opacity.png                        | Bin 0 -> 1168 bytes
 src/icons/48x48/Pattern.png                        | Bin 0 -> 2260 bytes
 src/icons/48x48/QmsProject.png                     | Bin 0 -> 2108 bytes
 src/icons/48x48/SaveAllGIS.png                     | Bin 2025 -> 989 bytes
 src/icons/48x48/SaveGIS.png                        | Bin 1671 -> 989 bytes
 src/icons/48x48/SaveGISAs.png                      | Bin 0 -> 2010 bytes
 src/icons/48x48/SetEle.png                         | Bin 0 -> 903 bytes
 src/icons/48x48/Start.png                          | Bin 0 -> 1264 bytes
 src/icons/48x48/UnitSetup.png                      | Bin 0 -> 4223 bytes
 src/icons/48x48/WptProx.png                        | Bin 0 -> 1341 bytes
 src/icons/AddProject.svg                           |  65 +-
 src/icons/CutHistory.svg                           | 139 +++
 src/icons/FolderDEM.svg                            |  65 +-
 src/icons/FolderMap.svg                            |  70 +-
 src/icons/GisProject.svg                           |  94 ---
 src/icons/GpxProject.svg                           | 115 +++
 src/icons/LoadGIS.svg                              | 122 ++-
 src/icons/Opacity.svg                              | 100 +++
 src/icons/Pattern.svg                              | 278 ++++++
 src/icons/QmsProject.svg                           | 115 +++
 src/icons/SaveAllGIS.svg                           | 175 ++--
 src/icons/SaveGIS.svg                              | 135 +--
 src/icons/SaveGISAs.svg                            | 152 ++++
 src/icons/SetEle.svg                               | 164 ++++
 src/icons/Start.svg                                | 111 +++
 src/icons/UnitSetup.svg                            | 106 +++
 src/icons/WptProx.svg                              | 151 ++++
 src/locale/qmapshack_cs.ts                         | 431 ++++++----
 src/locale/qmapshack_de.ts                         | 431 ++++++----
 src/locale/qmapshack_es.ts                         | 429 ++++++----
 src/mouse/CMouseEditArea.cpp                       |   2 +-
 src/mouse/IMouseEditLine.cpp                       |   9 +-
 src/resources.qrc                                  |  23 +-
 .../CUnitsSetup.cpp}                               |  67 +-
 .../CGisSerialization.h => units/CUnitsSetup.h}    |  19 +-
 src/units/IUnit.h                                  |   2 +-
 .../IUnitsSetup.ui}                                |  58 +-
 112 files changed, 6155 insertions(+), 3191 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