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

Bas Couwenberg sebastic at debian.org
Thu Dec 21 17:17:17 UTC 2017


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

sebastic pushed a commit to branch master
in repository qmapshack.

commit b8dfe0f898d15d7350fa75ad24ac629725023eab
Merge: 3b41ed0 45c0ce7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 21 16:56:13 2017 +0100

    Merge tag 'upstream/1.10.0'
    
    Upstream version 1.10.0

 CMakeLists.txt                                     |     4 +-
 CMakeLists.txt.user                                |    31 +-
 README.md                                          |     2 +-
 changelog.txt                                      |    19 +
 src/CMainWindow.cpp                                |   137 +-
 src/CMainWindow.h                                  |     9 +-
 src/CMakeLists.txt                                 |  1100 +-
 src/IMainWindow.ui                                 |   106 +-
 src/canvas/CCanvas.cpp                             |   106 +-
 src/canvas/CCanvas.h                               |    11 +-
 src/cursors/cursorRadiusWpt.png                    |   Bin 0 -> 1557 bytes
 src/dem/IDemList.ui                                |    14 +-
 src/device/IDevice.cpp                             |    22 +
 src/device/IDevice.h                               |     3 +
 src/gis/{CSetupFilter.cpp => CGisDatabase.cpp}     |    49 +-
 src/gis/{CSetupFilter.h => CGisDatabase.h}         |    31 +-
 src/gis/CGisDraw.cpp                               |     8 +-
 src/gis/CGisListDB.cpp                             |     8 +-
 src/gis/CGisListWks.cpp                            |   142 +-
 src/gis/CGisListWks.h                              |     8 +
 src/gis/{CGisWidget.cpp => CGisWorkspace.cpp}      |   257 +-
 src/gis/{CGisWidget.h => CGisWorkspace.h}          |    41 +-
 src/gis/CSetupFilter.cpp                           |     8 +-
 src/gis/CSetupFilter.h                             |     6 +-
 src/gis/IGisDatabase.ui                            |   123 +
 src/gis/IGisItem.cpp                               |    30 +-
 src/gis/IGisItem.h                                 |     5 +-
 src/gis/{IGisWidget.ui => IGisWorkspace.ui}        |    87 +-
 src/gis/db/CDBFolderLostFound.cpp                  |     8 +-
 src/gis/db/CDBItem.cpp                             |    10 +-
 src/gis/db/CDBProject.cpp                          |     9 +-
 src/gis/db/CExportDatabaseThread.cpp               |     2 +-
 src/gis/db/CSearchDatabase.cpp                     |     2 +-
 src/gis/db/IDBFolder.cpp                           |    16 +-
 src/gis/gpx/serialization.cpp                      |     2 +-
 src/gis/ovl/CGisItemOvlArea.h                      |     2 +-
 src/gis/ovl/CScrOptOvlArea.cpp                     |    12 +-
 src/gis/prj/CDetailsPrj.cpp                        |     6 +-
 src/gis/prj/IGisProject.cpp                        |    65 +-
 src/gis/prj/IGisProject.h                          |    10 +
 src/gis/qlb/CQlbProject.cpp                        |   145 +
 src/gis/{CSetupFilter.h => qlb/CQlbProject.h}      |    36 +-
 src/gis/qms/serialization.cpp                      |     3 +
 src/gis/rte/CCreateRouteFromWpt.cpp                |     6 +-
 src/gis/rte/CGisItemRte.cpp                        |     8 +-
 src/gis/rte/CGisItemRte.h                          |     2 +-
 src/gis/rte/CScrOptRte.cpp                         |    20 +-
 src/gis/rte/router/CRouterBRouter.cpp              |    59 +-
 src/gis/rte/router/CRouterBRouter.h                |     4 +-
 src/gis/rte/router/CRouterMapQuest.cpp             |     6 +-
 src/gis/rte/router/CRouterRoutino.cpp              |     4 +-
 src/gis/rte/router/CRouterSetup.cpp                |     2 +-
 src/gis/rte/router/IRouter.h                       |    19 +
 src/gis/rte/router/IRouterBRouter.ui               |    43 +-
 src/gis/rte/router/IRouterRoutino.ui               |    15 +-
 src/gis/suunto/CLogProject.cpp                     |   259 +
 .../CMouseDummy.h => gis/suunto/CLogProject.h}     |    41 +-
 src/gis/suunto/CSmlProject.cpp                     |   260 +
 .../CMouseDummy.h => gis/suunto/CSmlProject.h}     |    41 +-
 src/gis/suunto/ISuuntoProject.cpp                  |   182 +
 src/gis/suunto/ISuuntoProject.h                    |    81 +
 src/gis/trk/CActivityTrk.cpp                       |    36 +-
 src/gis/trk/CCombineTrk.cpp                        |     8 +-
 src/gis/trk/CDetailsTrk.cpp                        |     8 +-
 src/gis/trk/CGisItemTrk.cpp                        |   270 +-
 src/gis/trk/CGisItemTrk.h                          |    45 +-
 src/gis/trk/CKnownExtension.cpp                    |   121 +-
 src/gis/trk/CKnownExtension.h                      |    35 +-
 src/gis/trk/CPropertyTrk.cpp                       |    27 +-
 src/gis/trk/CPropertyTrk.h                         |    11 +-
 src/gis/trk/CScrOptTrk.cpp                         |    26 +-
 src/gis/trk/CTableTrk.cpp                          |    18 +-
 src/gis/trk/filter/CFilterDeleteExtension.cpp      |     2 +-
 src/gis/trk/filter/filter.cpp                      |     6 +-
 src/gis/wpt/CGisItemWpt.cpp                        |   195 +-
 src/gis/wpt/CGisItemWpt.h                          |    41 +-
 src/gis/wpt/CScrOptWpt.cpp                         |    68 +-
 src/gis/wpt/CScrOptWpt.h                           |     4 +
 src/gis/wpt/CScrOptWptRadius.cpp                   |    98 +
 src/gis/wpt/{CScrOptWpt.h => CScrOptWptRadius.h}   |    20 +-
 src/gis/wpt/IScrOptWpt.ui                          |    56 +
 src/gis/wpt/{IScrOptWpt.ui => IScrOptWptRadius.ui} |   106 +-
 src/helpers/CDraw.cpp                              |     5 +-
 src/helpers/CDraw.h                                |     3 +-
 src/helpers/CProgressDialog.cpp                    |    12 +
 src/helpers/CProgressDialog.h                      |     3 +
 src/icons/32x32/Filter.png                         |   Bin 0 -> 694 bytes
 src/icons/32x32/LogProject.png                     |   Bin 0 -> 1279 bytes
 src/icons/32x32/QlbProject.png                     |   Bin 0 -> 1296 bytes
 src/icons/32x32/SmlProject.png                     |   Bin 0 -> 1222 bytes
 src/icons/32x32/ToggleDatabase.png                 |   Bin 0 -> 1356 bytes
 src/icons/32x32/TrackMinMax.png                    |   Bin 0 -> 1244 bytes
 src/icons/32x32/WptAvoid.png                       |   Bin 0 -> 1736 bytes
 src/icons/32x32/WptDelProx.png                     |   Bin 0 -> 711 bytes
 src/icons/32x32/WptEditProx.png                    |   Bin 0 -> 1134 bytes
 src/icons/48x48/Filter.png                         |   Bin 0 -> 996 bytes
 src/icons/48x48/LogProject.png                     |   Bin 0 -> 1888 bytes
 src/icons/48x48/QlbProject.png                     |   Bin 0 -> 1990 bytes
 src/icons/48x48/SmlProject.png                     |   Bin 0 -> 1814 bytes
 src/icons/48x48/ToggleDatabase.png                 |   Bin 0 -> 2045 bytes
 src/icons/48x48/TrackMinMax.png                    |   Bin 0 -> 1969 bytes
 src/icons/48x48/WptAvoid.png                       |   Bin 0 -> 2794 bytes
 src/icons/48x48/WptDelProx.png                     |   Bin 0 -> 1110 bytes
 src/icons/48x48/WptEditProx.png                    |   Bin 0 -> 1780 bytes
 src/icons/Filter.svg                               |    74 +
 src/icons/LogProject.svg                           |   111 +
 src/icons/QlbProject.svg                           |   111 +
 src/icons/SmlProject.svg                           |   111 +
 src/icons/ToggleDatabase.svg                       |   184 +
 src/icons/TrackMinMax.svg                          |   210 +
 src/icons/WptAvoid.svg                             |   163 +
 src/icons/WptDelProx.svg                           |    76 +
 src/icons/WptEditProx.svg                          |   287 +
 src/icons/waypoints/32x32/Summit.png               |   Bin 1194 -> 1169 bytes
 src/icons/waypoints/Summit.svg                     |    47 +-
 src/locale/qmapshack.ts                            |  1362 +-
 src/locale/{qmapshack_es.ts => qmapshack_ca.ts}    |  5371 ++---
 src/locale/qmapshack_cs.ts                         |  2224 ++-
 src/locale/qmapshack_de.ts                         |  1476 +-
 src/locale/qmapshack_es.ts                         | 19921 ++++++++++---------
 src/locale/qmapshack_fr.ts                         |  1820 +-
 src/locale/qmapshack_nl.ts                         |  1432 +-
 src/locale/qmapshack_ru.ts                         |  1461 +-
 src/map/IMapList.ui                                |    12 +-
 src/mouse/CMouseDummy.h                            |     3 -
 src/mouse/CMouseEditArea.cpp                       |     6 +-
 src/mouse/CMouseEditRte.cpp                        |     6 +-
 src/mouse/CMouseEditTrk.cpp                        |     6 +-
 src/mouse/CMouseMoveWpt.cpp                        |    39 +-
 src/mouse/CMouseMoveWpt.h                          |     8 +-
 src/mouse/CMouseNormal.cpp                         |    71 +-
 src/mouse/CMouseNormal.h                           |     4 +-
 src/mouse/CMouseRadiusWpt.cpp                      |   144 +
 src/mouse/{CMouseMoveWpt.h => CMouseRadiusWpt.h}   |    29 +-
 src/mouse/CMouseRangeTrk.cpp                       |    39 +-
 src/mouse/CMouseRangeTrk.h                         |     1 +
 src/mouse/CMouseSelect.cpp                         |    18 +-
 src/mouse/CMouseWptBubble.cpp                      |    12 +-
 src/mouse/CMouseWptBubble.h                        |     1 -
 src/mouse/IMouse.h                                 |    15 +-
 src/mouse/IMouseSelect.cpp                         |     5 -
 src/mouse/IMouseSelect.h                           |     2 -
 src/mouse/IScrOpt.cpp                              |     2 +
 src/mouse/line/CLineOpAddPoint.cpp                 |     3 +
 src/mouse/line/CLineOpDeletePoint.cpp              |     2 +-
 src/mouse/line/ILineOp.cpp                         |    93 +-
 src/mouse/line/ILineOp.h                           |    17 +-
 src/mouse/line/IMouseEditLine.cpp                  |    11 +
 src/mouse/line/IMouseEditLine.h                    |     2 +
 src/plot/CPlot.cpp                                 |     4 +-
 src/plot/CPlotProfile.cpp                          |     4 +-
 src/plot/IPlot.cpp                                 |     8 +-
 src/print/CPrintDialog.cpp                         |     2 +-
 src/qlgt/converter.cpp                             |    21 +-
 src/resources.qrc                                  |   897 +-
 src/tool/CRoutinoDatabaseBuilder.cpp               |     6 +
 src/tool/CRoutinoDatabaseBuilder.h                 |     1 +
 src/tool/IMapVrtBuilder.ui                         |    16 +-
 src/tool/IRoutinoDatabaseBuilder.ui                |    55 +-
 src/units/CUnitsSetup.cpp                          |    20 +
 src/units/ITimeZoneSetup.ui                        |    21 +-
 src/units/IUnit.cpp                                |    50 +-
 src/units/IUnit.h                                  |    14 +
 src/units/IUnitsSetup.ui                           |   145 +-
 src/widgets/CHistoryListWidget.cpp                 |     8 +-
 165 files changed, 25631 insertions(+), 17604 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