[qmapshack] 02/04: Merge tag 'upstream/1.2.1'

[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 11a819938895e4e6332b9162b4471854a054e79b
Merge: 442c098 aaf2348
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 25 16:14:15 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                |  14 +-
 ...eLists.txt.user => CMakeLists.txt.user.3.3-pre1 |  20 +-
 changelog.txt                                      |  14 +
 src/CMainWindow.cpp                                |  34 ++
 src/CMainWindow.h                                  |   3 +
 src/CMakeLists.txt                                 |   9 +
 src/IMainWindow.ui                                 |  16 +-
 src/gis/CGisListDB.cpp                             |  30 +-
 src/gis/CGisListWks.cpp                            |  34 +-
 src/gis/CGisWidget.cpp                             |  48 ++
 src/gis/CGisWidget.h                               |  14 +
 src/gis/IGisItem.cpp                               |  19 +-
 src/gis/IGisItem.h                                 |  51 +-
 src/gis/db/CDBFolderDatabase.cpp                   |   1 +
 src/gis/db/CDBFolderDatabase.h                     |   6 +
 src/gis/db/CDBProject.cpp                          | 246 ++++++--
 src/gis/db/CDBProject.h                            |   4 +
 src/gis/db/CSelectDBFolder.cpp                     |  79 +++
 .../CPositionDialog.h => gis/db/CSelectDBFolder.h} |  25 +-
 .../db/CSelectSaveAction.cpp}                      |  48 +-
 .../db/CSelectSaveAction.h}                        |  36 +-
 src/gis/db/CSetupFolder.cpp                        |   4 +-
 src/gis/db/CSetupFolder.h                          |   2 +-
 src/gis/db/IDB.cpp                                 |  23 +-
 src/gis/db/IDB.h                                   |   3 +
 src/gis/db/IDBFolder.cpp                           |  53 +-
 src/gis/db/IDBFolder.h                             |   4 +-
 src/gis/db/ISelectDBFolder.ui                      |  78 +++
 src/gis/db/ISelectSaveAction.ui                    | 119 ++++
 src/gis/db/ISetupFolder.ui                         |  24 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |  15 +
 src/gis/ovl/CScrOptOvlArea.cpp                     |   2 -
 src/gis/ovl/IDetailsOvlArea.ui                     |   6 +
 src/gis/prj/CDetailsPrj.cpp                        |   4 +-
 src/gis/prj/IGisProject.cpp                        |  26 +-
 src/gis/prj/IGisProject.h                          |  42 +-
 src/gis/rte/CGisItemRte.cpp                        |  15 +
 src/gis/trk/CGisItemTrk.cpp                        |  78 ++-
 src/gis/trk/CGisItemTrk.h                          |   3 +
 src/gis/trk/CScrOptTrk.cpp                         |   2 +-
 src/gis/trk/IDetailsTrk.ui                         |  16 +-
 src/gis/wpt/CDetailsWpt.cpp                        |   4 +-
 src/gis/wpt/CGisItemWpt.cpp                        |  48 +-
 src/gis/wpt/CGisItemWpt.h                          |   4 +-
 src/gis/wpt/CScrOptWpt.cpp                         |   3 +-
 src/gis/wpt/CSetupNewWpt.cpp                       | 132 +++++
 .../CPositionDialog.h => gis/wpt/CSetupNewWpt.h}   |  27 +-
 src/gis/wpt/IDetailsWpt.ui                         |   4 +-
 src/gis/wpt/IScrOptWpt.ui                          |   2 +-
 src/gis/wpt/ISetupNewWpt.ui                        | 115 ++++
 src/helpers/CFileExt.h                             |  18 +-
 src/helpers/CPositionDialog.cpp                    |  83 +--
 src/helpers/CPositionDialog.h                      |   8 +
 src/helpers/CSelectProjectDialog.cpp               |   9 +
 src/helpers/CSelectProjectDialog.h                 |   2 +
 src/helpers/ISelectProjectDialog.ui                | 119 ++--
 src/locale/qmapshack_cs.ts                         | 640 ++++++++++++--------
 src/locale/qmapshack_de.ts                         | 651 +++++++++++++--------
 src/locale/qmapshack_es.ts                         | 640 ++++++++++++--------
 src/locale/qmapshack_fr.ts                         | 637 ++++++++++++--------
 src/map/CMapIMG.cpp                                |   2 +
 src/map/CMapPathSetup.cpp                          |   2 +-
 src/mouse/CMouseNormal.cpp                         |  18 +-
 src/mouse/CMouseRangeTrk.cpp                       |   9 +
 src/mouse/CScrOptRangeTrk.cpp                      |   5 -
 src/mouse/IMouseEditLine.cpp                       |   8 +-
 src/qlgt/CQlgtDb.cpp                               |  19 +-
 src/qlgt/CQmsDb.cpp                                |  10 +
 src/qlgt/CQmsDb.h                                  |   1 +
 src/qlgt/IQlgtOverlay.cpp                          |  10 +-
 src/qlgt/IQlgtOverlay.h                            |   1 +
 src/qlgt/converter.cpp                             |  32 +
 73 files changed, 3172 insertions(+), 1363 deletions(-)

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