Cachemere

Merge lp://staging/~fransschreuder1/cachemere/trunk into lp://staging/cachemere

  1. trunk
  2. Merge into trunk
Proposed by FransSchreuder
Status: Needs review
Proposed branch: lp://staging/~fransschreuder1/cachemere/trunk
Merge into: lp://staging/cachemere
Diff against target: 7874 lines (+6591/-724)
29 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+1/-1)
CMakeLists.txt.user (+0/-622)
app/cachemere.qml (+23/-1)
app/ui/BrowserTab.qml (+1/-0)
app/ui/CMakeLists.txt (+1/-1)
app/ui/CompassTab.qml (+315/-0)
app/ui/DetailsTab.qml (+72/-5)
app/ui/GeocachesTab.qml (+29/-12)
app/ui/ListItemWithActions.qml (+456/-0)
app/ui/MapTab.qml (+148/-38)
app/ui/NESW.svg (+166/-0)
app/ui/WaypointDialog.qml (+392/-0)
app/ui/cachemere.svg (+2109/-0)
app/ui/compass.svg (+255/-0)
app/ui/treasure_closed.svg (+728/-0)
app/ui/treasure_open.svg (+1138/-0)
app/ui/utils.js (+19/-0)
app/ui/waypoint.svg (+107/-0)
backend/modules/Cachemere/backend.cpp (+1/-0)
backend/modules/Cachemere/cachemodel.cpp (+7/-0)
backend/modules/Cachemere/cachemodel.h (+1/-0)
backend/modules/Cachemere/geocache.cpp (+136/-2)
backend/modules/Cachemere/geocache.h (+47/-2)
cachemere.apparmor (+2/-1)
manifest.json.in (+2/-2)
po/com.mikeasoft.cachemere.pot (+96/-16)
po/fr.po (+102/-21)
po/nl.po (+236/-0)
To merge this branch: bzr merge lp://staging/~fransschreuder1/cachemere/trunk
Reviewer Review Type Date Requested Status
Michael Sheldon Pending
Review via email: mp+256557@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-04-13.

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
*Added waypoints + dialog to edit them

To post a comment you must log in.
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hello Mike,

I have done quite a few changes on Cachemere, now I also added a dialog to add / edit waypoints.
I hope you like my changes and find some time to review.

Regards,

Frans

ps:
I read you work for Canonical / Ubuntu touch. Which part are you working on?

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Frans, that looks great; I'll try and find time to review it all properly this weekend.

I mostly work on the keyboard, but I do odd bits and pieces on other projects like content-hub and the browser from time to time as well :).

Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Ah, so did I find the right person for a feature request?
I am still missing a degree symbol on the keyboard (for entering GPS coordinates in maps)

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Yep, I'd be the right person to poke about that sort of thing, best idea would be to file a bug report for it here: https://bugs.launchpad.net/ubuntu-keyboard

That way it can get tracked and scheduled into our normal process, otherwise there's a strong chance it'll get lost in the pile of other things I have to do ;)

Reply
lp://staging/~fransschreuder1/cachemere/trunk updated
13. By Frans Schreuder

Added this line to all position sources:
preferredPositioningMethods: PositionSource.SatellitePositioningMethod

14. By Frans Schreuder

Added Dutch translation

15. By FransSchreuder

* Show distance in center of compass
* Show Accuracy of GPS on Compass tab

16. By FransSchreuder

Added flickable delete action button to geocaches, now able to delete geocaches.
Confirmation dialog needed?

17. By FransSchreuder

Added active waypoint to map
changed some button colours

18. By FransSchreuder

*added current selected waypoint (if any) to map
*Added status information of GPS below compass

19. By FransSchreuder

Fixed function call to updateGpsStatus

20. By FransSchreuder

*Fixed waypoints list on map
*Fixed geocache list on map
*Active geocache can also be selected from map

Revision history for this message
FransSchreuder (fransschreuder1) :
Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hi Mike,

I think I made quite a nice tool out of it now:

    I have fixed the mapitems that were not working (inactive geocaches)
    Added waypoints to the map
    active geocache can now be selected by clicking the item on the map as well
    Added PreferredPositioningMethods to Satellite

I hope you can merge my changes soon and put it in the ubuntu store.

Frans

Reply
lp://staging/~fransschreuder1/cachemere/trunk updated
21. By Frans Schreuder

*Improved waypoints dialog (3 digits now have 3 select controls)
*fixed typo in button colours

22. By FransSchreuder

Added pin to mark waypoints on map: thanks to Jeroen Buurmans for the artwork

23. By Frans Schreuder

*Added images for geocaches (treasure chest open / closed)
*Added cachemere logo to current location

24. By Frans Schreuder

Beep when near selected waypoint (not necessarily the starting point)

25. By Jeroen Buurmans <email address hidden>

Changed the waypoint icon to a red cross.

26. By Frans Schreuder

Animation for compass (rotation)

27. By FransSchreuder

fixed compass animation, now stop animation when compass is updated. Compass will stabilize around target rotation and looks more relaxed

28. By FransSchreuder

changed namespace, in order to publish the app under cachemere.fransschreuder

Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Hello Mike,

I took the freedom to publish te app on my own. If you are ready to review and merge things, I can remove my version from the ubuntu store again.

Frans

Reply
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Frans,

 Sure thing; sorry I haven't found time to review this yet, past couple of weeks my spare time was mostly taken up with the new Podbird release and this week I'm away on a work trip all week. I'll try and find some time for it after I get home next week.

Cheers,
 Mike.

Reply
Revision history for this message
FransSchreuder (fransschreuder1) wrote :

Enjoy your trip! Meanwhile download my version from the Ubuntu Store and enjoy some Geocaches during the free hours of your work trip.

Reply

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches