Merge lp://staging/~fransschreuder1/cachemere/trunk into lp://staging/cachemere
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~fransschreuder1/cachemere/trunk |
Merge into: | lp://staging/cachemere |
Diff against target: |
2077 lines (+1347/-405) 16 files modified
CMakeLists.txt.user (+86/-375) app/cachemere.qml (+19/-0) app/ui/CMakeLists.txt (+1/-1) app/ui/CompassTab.qml (+200/-0) app/ui/DetailsTab.qml (+67/-4) app/ui/GeocachesTab.qml (+3/-3) app/ui/MapTab.qml (+39/-1) app/ui/NESW.svg (+166/-0) app/ui/WaypointDialog.qml (+284/-0) app/ui/compass.svg (+255/-0) app/ui/utils.js (+14/-0) backend/modules/Cachemere/backend.cpp (+1/-0) backend/modules/Cachemere/geocache.cpp (+128/-3) backend/modules/Cachemere/geocache.h (+45/-1) manifest.json.in (+1/-1) po/com.mikeasoft.cachemere.pot (+38/-16) |
To merge this branch: | bzr merge lp://staging/~fransschreuder1/cachemere/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Sheldon | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2015-04-16.
Description of the change
*Added a compass tab (with direction to the cache coordinate
*Changed metric units according to system settings
*Changed compass into SVG
*Changed colour of letters to white
Unmerged revisions
- 28. By FransSchreuder
-
changed namespace, in order to publish the app under cachemere.
fransschreuder - 27. By FransSchreuder
-
fixed compass animation, now stop animation when compass is updated. Compass will stabilize around target rotation and looks more relaxed
- 26. By Frans Schreuder
-
Animation for compass (rotation)
- 25. By Jeroen Buurmans <email address hidden>
-
Changed the waypoint icon to a red cross.
- 24. By Frans Schreuder
-
Beep when near selected waypoint (not necessarily the starting point)
- 23. By Frans Schreuder
-
*Added images for geocaches (treasure chest open / closed)
*Added cachemere logo to current location - 22. By FransSchreuder
-
Added pin to mark waypoints on map: thanks to Jeroen Buurmans for the artwork
- 21. By Frans Schreuder
-
*Improved waypoints dialog (3 digits now have 3 select controls)
*fixed typo in button colours - 20. By FransSchreuder
-
*Fixed waypoints list on map
*Fixed geocache list on map
*Active geocache can also be selected from map - 19. By FransSchreuder
-
Fixed function call to updateGpsStatus