Merge lp://staging/~meese/pantheon-photos/fix-1273847 into lp://staging/~pantheon-photos/pantheon-photos/trunk
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~meese/pantheon-photos/fix-1273847 | ||||
Merge into: | lp://staging/~pantheon-photos/pantheon-photos/trunk | ||||
Diff against target: |
152741 lines (+151513/-109) 43 files modified
Makefile (+27/-4) icons/earth_map.svg (+230/-0) icons/gps-marker-selected.svg (+1388/-0) icons/gps-marker.svg (+941/-0) icons/import.svg (+55/-0) icons/places.svg (+679/-0) src/CheckerboardLayout.vala (+4/-1) src/CollectionPage.vala (+4/-0) src/MediaDataRepresentation.vala (+51/-1) src/MediaPage.vala (+67/-43) src/Page.vala (+24/-10) src/Photo.vala (+74/-14) src/PhotoPage.vala (+4/-0) src/Resources.vala (+9/-1) src/SearchFilter.vala (+98/-1) src/Thumbnail.vala (+11/-10) src/camera/ImportPage.vala (+1/-1) src/core/SourceInterfaces.vala (+16/-0) src/db/DatabaseTable.vala (+13/-1) src/db/Db.vala (+16/-0) src/db/GeoLocationTable.vala (+205/-0) src/db/PhotoTable.vala (+68/-15) src/db/mk/db.mk (+2/-1) src/library/Branch.vala (+78/-0) src/library/LibraryWindow.vala (+47/-0) src/library/TrashSidebarEntry.vala (+2/-0) src/library/mk/library.mk (+1/-0) src/libshotwell.deps (+6/-0) src/main.vala (+2/-2) src/maps/CountryCodes.vala (+4189/-0) src/maps/LocationSearchEntry.vala (+201/-0) src/maps/MapMarkerPage.vala (+54/-0) src/maps/MapPage.vala (+307/-0) src/maps/MapWidget.vala (+563/-0) src/maps/Maps.vala (+16/-0) src/maps/PositionMarker.vala (+115/-0) src/maps/mk/maps.mk (+33/-0) src/photos/PhotoMetadata.vala (+13/-0) src/sidebar/metadata/LibraryProperties.vala (+97/-2) src/sidebar/metadata/MetadataSidebar.vala (+5/-1) ui/locations.dat (+141768/-0) ui/map.ui (+27/-0) units.mk (+2/-1) |
||||
To merge this branch: | bzr merge lp://staging/~meese/pantheon-photos/fix-1273847 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danielle Foré | Needs Fixing | ||
Cody Garver | Pending | ||
Review via email: mp+232955@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-08-30.
Description of the change
Adds maps to photos.
-Metadata sidebar map widget that can be double clicked to set a GPS location in the photo's DB
-Interactive map page that can be accessed from the library sidebar. Automagically groups photo markers that overlap locations and displays thumbnails when markers are clicked. Clicking the thumbnails will switch to a collection view of all the photos in the group.
-libchamplain and clutter are required to build/use
Unmerged revisions
- 2583. By meese
-
merge fix
- 2582. By meese
-
merge
- 2581. By meese
-
fixes
- 2580. By meese
-
search changes from review
- 2579. By meese
-
add places icon for sidebar
- 2578. By meese
-
change gps markers to icons from Maya. Make default zoom in closer
- 2577. By meese
-
adds location search entry for setting gps markers and other fixes from review
- 2576. By meese
-
change back to geographic map for default, make page not visible if no photos have gps data, remove page border, trim down extra map options
- 2575. By meese
-
merge from trunk
- 2574. By meese
-
spelling fix
Breaks Photo Viewer for me, refuses to launch when I try to open an image with it.
Can you lock the map min height to the height of its area in the window? Here's are 2 screenshots, the first one is current minimum dimensions of the map, the second is closer to what I propose.