[qmapshack] branch upstream updated (77575ed -> dd602b9)
Bas Couwenberg
sebastic at xs4all.nl
Sat Dec 13 14:11:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a change to branch upstream
in repository qmapshack.
from 77575ed Imported Upstream version 0.7.0
new 7ccfff7 Imported Upstream version 0.8.0
new 3a92506 Imported Upstream version 0.8.1
new dd602b9 Imported Upstream version 0.8.2
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.hg_archival.txt | 4 +
.hgtags | 19 +
CMakeLists.txt | 8 +-
CMakeLists.txt.user | 237 ------
changelog.txt | 20 +-
nsi/3rdparty.txt | 9 +-
...ack_Installer.nsi => QMapShack_Installer32.nsi} | 111 +--
nsi/copyfiles.bat | 1 +
nsi/{copyfiles.bat => copyfiles32.bat} | 19 +-
src/CMainWindow.cpp | 43 +-
src/CMainWindow.h | 2 +
src/CMakeLists.txt | 56 +-
src/GeoMath.cpp | 89 +-
src/IMainWindow.ui | 25 +-
src/canvas/CCanvas.cpp | 2 +-
src/canvas/CCanvas.h | 4 +-
src/dem/CDemVRT.cpp | 8 +
src/dem/IDem.cpp | 14 +-
src/dem/IDem.h | 4 +
src/gis/CGisListDB.cpp | 239 +++++-
src/gis/CGisListDB.h | 33 +
src/gis/CGisListWks.cpp | 748 ++++++++++++-----
src/gis/CGisListWks.h | 18 +-
src/gis/CGisSerialization.cpp | 215 -----
src/gis/CGisWidget.cpp | 121 +--
src/gis/CGisWidget.h | 29 +-
src/gis/IGisItem.cpp | 336 ++++++--
src/gis/IGisItem.h | 377 +++------
src/gis/IGisLine.h | 4 +-
src/gis/IGisProject.cpp | 193 -----
src/gis/IGisProject.h | 81 --
src/gis/IGisWidget.ui | 24 +-
src/gis/{IGisLine.cpp => db/CDBFolderDatabase.cpp} | 11 +-
src/{CAbout.h => gis/db/CDBFolderDatabase.h} | 15 +-
.../IDiskCache.cpp => gis/db/CDBFolderGroup.cpp} | 10 +-
src/{CAbout.h => gis/db/CDBFolderGroup.h} | 15 +-
.../{IGisLine.cpp => db/CDBFolderLostFound.cpp} | 11 +-
src/{CAbout.h => gis/db/CDBFolderLostFound.h} | 15 +-
src/gis/{IGisLine.cpp => db/CDBFolderOther.cpp} | 10 +-
src/{CAbout.h => gis/db/CDBFolderOther.h} | 15 +-
src/gis/{IGisLine.cpp => db/CDBFolderProject.cpp} | 10 +-
src/{CAbout.h => gis/db/CDBFolderProject.h} | 15 +-
src/gis/{IGisLine.cpp => db/CDBItem.cpp} | 6 +-
src/gis/{CGisSerialization.h => db/CDBItem.h} | 14 +-
templates/source.cpp => src/gis/db/CDBProject.cpp | 9 +-
src/{CAbout.h => gis/db/CDBProject.h} | 15 +-
src/gis/db/CSetupDB.cpp | 69 ++
src/{units/CTimeZoneSetup.h => gis/db/CSetupDB.h} | 20 +-
src/gis/db/CSetupFolder.cpp | 77 ++
src/gis/{wpt/CProjWpt.h => db/CSetupFolder.h} | 25 +-
src/gis/db/IDBFolder.cpp | 106 +++
src/{map/CMapPropSetup.h => gis/db/IDBFolder.h} | 49 +-
src/gis/{wpt/IProjWpt.ui => db/ISetupDB.ui} | 133 ++-
.../IPositionDialog.ui => gis/db/ISetupFolder.ui} | 70 +-
src/gis/{CGisDraw.h => db/macros.h} | 32 +-
src/gis/gpx/CGpxProject.cpp | 286 ++-----
src/gis/gpx/CGpxProject.h | 69 +-
src/gis/gpx/serialization.cpp | 931 +++++++++++++++++++++
src/gis/ovl/CDetailsOvlArea.cpp | 80 +-
src/gis/ovl/CDetailsOvlArea.h | 9 +-
src/gis/ovl/CGisItemOvlArea.cpp | 180 ++--
src/gis/ovl/CGisItemOvlArea.h | 19 +-
src/gis/ovl/CScrOptOvlArea.cpp | 6 +-
src/gis/ovl/CScrOptOvlArea.h | 4 +-
src/gis/ovl/IDetailsOvlArea.ui | 9 +-
src/gis/prj/CDetailsPrj.cpp | 122 +++
src/gis/{wpt/CDetailsWpt.h => prj/CDetailsPrj.h} | 28 +-
src/gis/prj/IDetailsPrj.ui | 85 ++
src/gis/prj/IGisProject.cpp | 345 ++++++++
src/gis/prj/IGisProject.h | 209 +++++
src/gis/qms/CQmsProject.cpp | 151 ++++
src/{plot/CPlotSpeed.h => gis/qms/CQmsProject.h} | 22 +-
src/gis/qms/serialization.cpp | 704 ++++++++++++++++
src/gis/rte/CGisItemRte.cpp | 118 +--
src/gis/rte/CGisItemRte.h | 11 +-
src/gis/rte/CScrOptRte.cpp | 4 +-
src/gis/rte/CScrOptRte.h | 3 +-
src/gis/search/CSearchGoogle.cpp | 2 +-
src/gis/search/CSearchGoogle.h | 5 +-
src/gis/trk/CCombineTrk.cpp | 36 +-
src/gis/trk/CCombineTrk.h | 5 +-
src/gis/trk/CDetailsTrk.cpp | 97 +--
src/gis/trk/CDetailsTrk.h | 8 +-
src/gis/trk/CGisItemTrk.cpp | 503 +++++------
src/gis/trk/CGisItemTrk.h | 108 ++-
src/gis/trk/CScrOptTrk.cpp | 3 +-
src/gis/trk/CScrOptTrk.h | 3 +-
src/gis/trk/IDetailsTrk.ui | 694 +++++++--------
src/gis/wpt/CDetailsWpt.cpp | 88 +-
src/gis/wpt/CDetailsWpt.h | 7 +-
src/gis/wpt/CGisItemWpt.cpp | 260 +-----
src/gis/wpt/CGisItemWpt.h | 30 +-
src/gis/wpt/CProjWpt.cpp | 2 +-
src/gis/wpt/CScrOptWpt.cpp | 5 +-
src/gis/wpt/CScrOptWpt.h | 3 +-
src/gis/wpt/IDetailsWpt.ui | 230 +++--
src/grid/CGrid.cpp | 7 +-
.../{CInputDialog.cpp => CElevationDialog.cpp} | 45 +-
src/helpers/{CInputDialog.h => CElevationDialog.h} | 17 +-
src/helpers/CHistoryListWidget.cpp | 120 +++
.../CHistoryListWidget.h} | 36 +-
src/helpers/CLinksDialog.cpp | 87 ++
.../CMapPathSetup.h => helpers/CLinksDialog.h} | 22 +-
src/helpers/CSelectProjectDialog.cpp | 62 +-
src/helpers/CSelectProjectDialog.h | 12 +-
.../IElevationDialog.ui} | 76 +-
src/helpers/ILinksDialog.ui | 130 +++
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/DBProject.png | Bin 0 -> 1533 bytes
src/icons/32x32/Database.png | Bin 0 -> 1277 bytes
src/icons/32x32/DatabaseSetup.png | Bin 0 -> 2142 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/Link.png | Bin 0 -> 952 bytes
src/icons/32x32/LoadGIS.png | Bin 1156 -> 982 bytes
src/icons/32x32/Opacity.png | Bin 0 -> 779 bytes
src/icons/32x32/Path.png | Bin 0 -> 536 bytes
src/icons/32x32/PathBlue.png | Bin 0 -> 536 bytes
src/icons/32x32/PathGreen.png | Bin 0 -> 544 bytes
src/icons/32x32/PathOrange.png | Bin 0 -> 538 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/DBProject.png | Bin 0 -> 2245 bytes
src/icons/48x48/Database.png | Bin 0 -> 1946 bytes
src/icons/48x48/DatabaseSetup.png | Bin 0 -> 3348 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/Link.png | Bin 0 -> 1093 bytes
src/icons/48x48/LoadGIS.png | Bin 1682 -> 1508 bytes
src/icons/48x48/Opacity.png | Bin 0 -> 1168 bytes
src/icons/48x48/Path.png | Bin 0 -> 756 bytes
src/icons/48x48/PathBlue.png | Bin 0 -> 756 bytes
src/icons/48x48/PathGreen.png | Bin 0 -> 753 bytes
src/icons/48x48/PathOrange.png | Bin 0 -> 733 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/{Cut.svg => CutHistory.svg} | 56 +-
src/icons/DBProject.svg | 180 ++++
src/icons/Database.svg | 168 ++++
src/icons/DatabaseSetup.svg | 152 ++++
src/icons/FolderDEM.svg | 65 +-
src/icons/FolderMap.svg | 70 +-
src/icons/GisProject.svg | 94 ---
src/icons/GpxProject.svg | 115 +++
src/icons/{PointMove.svg => Link.svg} | 82 +-
src/icons/LoadGIS.svg | 122 ++-
src/icons/{AddWpt.svg => Opacity.svg} | 80 +-
src/icons/{TextItalic.svg => PathBlue.svg} | 48 +-
src/icons/{TextItalic.svg => PathGreen.svg} | 44 +-
src/icons/{TextItalic.svg => PathOrange.svg} | 44 +-
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/{PointMove.svg => SetEle.svg} | 94 ++-
src/icons/{Left.svg => Start.svg} | 31 +-
src/icons/UnitSetup.svg | 106 +++
src/icons/{PointMove.svg => WptProx.svg} | 91 +-
src/locale/qmapshack_cs.ts | 586 +++++++++----
src/locale/qmapshack_de.ts | 761 +++++++++++------
src/locale/qmapshack_es.ts | 584 ++++++++-----
src/map/CMapIMG.cpp | 14 +
src/map/CMapIMG.h | 1 +
src/map/CMapPathSetup.cpp | 1 +
src/mouse/CMouseEditArea.cpp | 16 +-
src/mouse/CMouseEditArea.h | 4 +-
src/mouse/CMouseEditTrk.cpp | 12 +-
src/mouse/CMouseEditTrk.h | 3 +-
src/mouse/CMouseMoveWpt.cpp | 8 +-
src/mouse/CMouseMoveWpt.h | 3 +-
src/mouse/CMouseNormal.cpp | 11 +-
src/mouse/CMouseRangeTrk.cpp | 10 +-
src/mouse/CMouseRangeTrk.h | 3 +-
src/mouse/CScrOptUnclutter.cpp | 7 +-
src/mouse/CScrOptUnclutter.h | 7 +-
src/mouse/IMouseEditLine.cpp | 9 +-
src/mouse/IScrOptEditLine.ui | 3 -
src/resources.qrc | 37 +-
src/units/CUnitImperial.cpp | 15 +
src/units/CUnitImperial.h | 1 +
src/units/CUnitMetric.cpp | 14 +
src/units/CUnitMetric.h | 1 +
src/units/CUnitNautic.cpp | 15 +
src/units/CUnitNautic.h | 1 +
.../CInputDialog.cpp => units/CUnitsSetup.cpp} | 48 +-
src/units/{CTimeZoneSetup.h => CUnitsSetup.h} | 15 +-
src/units/IUnit.h | 4 +-
.../IPositionDialog.ui => units/IUnitsSetup.ui} | 58 +-
210 files changed, 9803 insertions(+), 5015 deletions(-)
create mode 100644 .hg_archival.txt
create mode 100644 .hgtags
delete mode 100644 CMakeLists.txt.user
copy nsi/{QMapShack_Installer.nsi => QMapShack_Installer32.nsi} (80%)
copy nsi/{copyfiles.bat => copyfiles32.bat} (85%)
delete mode 100644 src/gis/CGisSerialization.cpp
delete mode 100644 src/gis/IGisProject.cpp
delete mode 100644 src/gis/IGisProject.h
copy src/gis/{IGisLine.cpp => db/CDBFolderDatabase.cpp} (72%)
copy src/{CAbout.h => gis/db/CDBFolderDatabase.h} (79%)
copy src/{map/cache/IDiskCache.cpp => gis/db/CDBFolderGroup.cpp} (79%)
copy src/{CAbout.h => gis/db/CDBFolderGroup.h} (79%)
copy src/gis/{IGisLine.cpp => db/CDBFolderLostFound.cpp} (71%)
copy src/{CAbout.h => gis/db/CDBFolderLostFound.h} (78%)
copy src/gis/{IGisLine.cpp => db/CDBFolderOther.cpp} (77%)
copy src/{CAbout.h => gis/db/CDBFolderOther.h} (79%)
copy src/gis/{IGisLine.cpp => db/CDBFolderProject.cpp} (76%)
copy src/{CAbout.h => gis/db/CDBFolderProject.h} (78%)
copy src/gis/{IGisLine.cpp => db/CDBItem.cpp} (93%)
rename src/gis/{CGisSerialization.h => db/CDBItem.h} (84%)
copy templates/source.cpp => src/gis/db/CDBProject.cpp (82%)
copy src/{CAbout.h => gis/db/CDBProject.h} (81%)
create mode 100644 src/gis/db/CSetupDB.cpp
copy src/{units/CTimeZoneSetup.h => gis/db/CSetupDB.h} (78%)
create mode 100644 src/gis/db/CSetupFolder.cpp
copy src/gis/{wpt/CProjWpt.h => db/CSetupFolder.h} (71%)
create mode 100644 src/gis/db/IDBFolder.cpp
copy src/{map/CMapPropSetup.h => gis/db/IDBFolder.h} (56%)
copy src/gis/{wpt/IProjWpt.ui => db/ISetupDB.ui} (53%)
copy src/{helpers/IPositionDialog.ui => gis/db/ISetupFolder.ui} (50%)
copy src/gis/{CGisDraw.h => db/macros.h} (68%)
create mode 100644 src/gis/gpx/serialization.cpp
create mode 100644 src/gis/prj/CDetailsPrj.cpp
copy src/gis/{wpt/CDetailsWpt.h => prj/CDetailsPrj.h} (69%)
create mode 100644 src/gis/prj/IDetailsPrj.ui
create mode 100644 src/gis/prj/IGisProject.cpp
create mode 100644 src/gis/prj/IGisProject.h
create mode 100644 src/gis/qms/CQmsProject.cpp
copy src/{plot/CPlotSpeed.h => gis/qms/CQmsProject.h} (72%)
create mode 100644 src/gis/qms/serialization.cpp
copy src/helpers/{CInputDialog.cpp => CElevationDialog.cpp} (53%)
copy src/helpers/{CInputDialog.h => CElevationDialog.h} (74%)
create mode 100644 src/helpers/CHistoryListWidget.cpp
copy src/{gis/ovl/CScrOptOvlArea.h => helpers/CHistoryListWidget.h} (63%)
create mode 100644 src/helpers/CLinksDialog.cpp
copy src/{map/CMapPathSetup.h => helpers/CLinksDialog.h} (73%)
copy src/{canvas/ICanvasSetup.ui => helpers/IElevationDialog.ui} (56%)
create mode 100644 src/helpers/ILinksDialog.ui
create mode 100644 src/icons/32x32/CutHistory.png
create mode 100644 src/icons/32x32/DBProject.png
create mode 100644 src/icons/32x32/Database.png
create mode 100644 src/icons/32x32/DatabaseSetup.png
create mode 100644 src/icons/32x32/GpxProject.png
create mode 100644 src/icons/32x32/Link.png
create mode 100644 src/icons/32x32/Opacity.png
create mode 100644 src/icons/32x32/Path.png
create mode 100644 src/icons/32x32/PathBlue.png
create mode 100644 src/icons/32x32/PathGreen.png
create mode 100644 src/icons/32x32/PathOrange.png
create mode 100644 src/icons/32x32/Pattern.png
create mode 100644 src/icons/32x32/QmsProject.png
create mode 100644 src/icons/32x32/SaveGISAs.png
create mode 100644 src/icons/32x32/SetEle.png
create mode 100644 src/icons/32x32/Start.png
create mode 100644 src/icons/32x32/UnitSetup.png
create mode 100644 src/icons/32x32/WptProx.png
create mode 100644 src/icons/48x48/CutHistory.png
create mode 100644 src/icons/48x48/DBProject.png
create mode 100644 src/icons/48x48/Database.png
create mode 100644 src/icons/48x48/DatabaseSetup.png
create mode 100644 src/icons/48x48/GpxProject.png
create mode 100644 src/icons/48x48/Link.png
create mode 100644 src/icons/48x48/Opacity.png
create mode 100644 src/icons/48x48/Path.png
create mode 100644 src/icons/48x48/PathBlue.png
create mode 100644 src/icons/48x48/PathGreen.png
create mode 100644 src/icons/48x48/PathOrange.png
create mode 100644 src/icons/48x48/Pattern.png
create mode 100644 src/icons/48x48/QmsProject.png
create mode 100644 src/icons/48x48/SaveGISAs.png
create mode 100644 src/icons/48x48/SetEle.png
create mode 100644 src/icons/48x48/Start.png
create mode 100644 src/icons/48x48/UnitSetup.png
create mode 100644 src/icons/48x48/WptProx.png
copy src/icons/{Cut.svg => CutHistory.svg} (61%)
create mode 100644 src/icons/DBProject.svg
create mode 100644 src/icons/Database.svg
create mode 100644 src/icons/DatabaseSetup.svg
delete mode 100644 src/icons/GisProject.svg
create mode 100644 src/icons/GpxProject.svg
copy src/icons/{PointMove.svg => Link.svg} (61%)
copy src/icons/{AddWpt.svg => Opacity.svg} (52%)
copy src/icons/{TextItalic.svg => PathBlue.svg} (62%)
copy src/icons/{TextItalic.svg => PathGreen.svg} (62%)
copy src/icons/{TextItalic.svg => PathOrange.svg} (62%)
create mode 100644 src/icons/Pattern.svg
create mode 100644 src/icons/QmsProject.svg
create mode 100644 src/icons/SaveGISAs.svg
copy src/icons/{PointMove.svg => SetEle.svg} (62%)
copy src/icons/{Left.svg => Start.svg} (75%)
create mode 100644 src/icons/UnitSetup.svg
copy src/icons/{PointMove.svg => WptProx.svg} (62%)
copy src/{helpers/CInputDialog.cpp => units/CUnitsSetup.cpp} (56%)
copy src/units/{CTimeZoneSetup.h => CUnitsSetup.h} (79%)
copy src/{helpers/IPositionDialog.ui => units/IUnitsSetup.ui} (64%)
--
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