gallery-app

Merge lp://qastaging/~artmello/gallery-app/gallery-app-remove_image_provider into lp://qastaging/gallery-app

  1. gallery-app-remove_image_provider
  2. Merge into trunk
Proposed by Arthur Mello
Status: Merged
Approved by: Florian Boucault
Approved revision: 1264
Merged at revision: 1275
Proposed branch: lp://qastaging/~artmello/gallery-app/gallery-app-remove_image_provider
Merge into: lp://qastaging/gallery-app
Diff against target: 804 lines (+12/-622)
12 files modified
rc/qml/MediaViewer/SingleMediaViewer.qml (+1/-0)
src/CMakeLists.txt (+0/-3)
src/gallery-application.cpp (+0/-8)
src/photo/CMakeLists.txt (+7/-2)
src/photo/photo-metadata.cpp (+1/-1)
src/photoeditor/CMakeLists.txt (+0/-34)
src/photoeditor/photo-image-provider.cpp (+0/-443)
src/photoeditor/photo-image-provider.h (+0/-124)
tests/unittests/mediaobjectfactory/CMakeLists.txt (+1/-2)
tests/unittests/photo-metadata/CMakeLists.txt (+1/-2)
tests/unittests/photo-metadata/tst_photo-metadata.cpp (+1/-1)
tests/unittests/video/CMakeLists.txt (+0/-2)
To merge this branch: bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-remove_image_provider
Reviewer Review Type Date Requested Status
Florian Boucault (community) Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+282649@code.qastaging.launchpad.net

Commit message

Remove photo-image-provider to use the one provided by ubunut-ui-extras
Move photo-metadata from photoeditor to photo folder

Description of the change

Remove photo-image-provider to use the one provided by ubunut-ui-extras
Move photo-metadata from photoeditor to photo folder

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1263
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/152
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/367
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/907
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26678

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1224/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

Pretty good. Too bad to realise there is still some code duplication (PhotoMetadata). In fact there is a delta between the version in gallery and the one in ui-extras. Can you fix it here? Here is the diff:

http://pastebin.ubuntu.com/14503418/

review: Needs Fixing
lp://qastaging/~artmello/gallery-app/gallery-app-remove_image_provider updated
1264. By Arthur Mello

Reduce delta between photo metadata in gallery and in ui-extras

Revision history for this message
Arthur Mello (artmello) wrote :

I tried to reduce the delta between both versions of photo-metadata. But I don't think we can change the order of exposure time keys on gallery version of it. It is desired that when you import some photo into gallery it shows up in today's event, so when some new file arrives we save the date at Exif.Photo.DateTimeDigitized. When we are reading exposure time we should check this field first, otherwise we could use another date for ordering.

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