gallery-app

Merge lp://qastaging/~phablet-team/gallery-app/gallery-app-photo-editor into lp://qastaging/gallery-app

gallery-app-photo-editor
Merge into trunk

Proposed by Ugo Riboni on 2014-11-30

Status:	Merged
Approved by:	Bill Filler on 2015-03-18
Approved revision:	1153
Merged at revision:	1175
Proposed branch:	lp://qastaging/~phablet-team/gallery-app/gallery-app-photo-editor
Merge into:	lp://qastaging/gallery-app
Diff against target:	10279 lines (+4628/-4484) 88 files modified rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml (+12/-3) rc/qml/Components/MediaGrid.qml (+2/-2) rc/qml/MainScreen.qml (+2/-2) rc/qml/MediaViewer/CropCorner.qml (+0/-66) rc/qml/MediaViewer/CropDragArea.qml (+0/-56) rc/qml/MediaViewer/CropInteractor.qml (+0/-176) rc/qml/MediaViewer/CropOverlay.qml (+0/-636) rc/qml/MediaViewer/EditPopover.qml (+0/-99) rc/qml/MediaViewer/EditPreview.qml (+0/-177) rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml (+43/-0) rc/qml/MediaViewer/GalleryPhotoComponent.qml (+2/-2) rc/qml/MediaViewer/GalleryPhotoEditorPage.qml (+42/-0) rc/qml/MediaViewer/MediaViewer.qml (+21/-141) rc/qml/MediaViewer/PhotoEditor.qml (+230/-0) rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml (+88/-0) rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml (+56/-0) rc/qml/MediaViewer/PhotoEditor/CropCorner.qml (+66/-0) rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml (+56/-0) rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml (+140/-0) rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml (+581/-0) rc/qml/MediaViewer/PhotoEditor/EditStack.qml (+134/-0) rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml (+104/-0) rc/qml/MediaViewer/PhotoEditor/GraphicsRoutines.js (+108/-0) rc/qml/MediaViewer/SingleMediaViewer.qml (+15/-4) rc/qml/OrganicView/OrganicMediaList.qml (+2/-2) src/CMakeLists.txt (+3/-0) src/database/CMakeLists.txt (+0/-2) src/database/database.cpp (+0/-12) src/database/database.h (+0/-3) src/database/photo-edit-table.cpp (+0/-124) src/database/photo-edit-table.h (+0/-47) src/gallery-application.cpp (+21/-4) src/gallery-application.h (+2/-0) src/gallery-manager.cpp (+0/-26) src/gallery-manager.h (+0/-3) src/media-object-factory.cpp (+1/-1) src/media/media-source.cpp (+0/-44) src/media/media-source.h (+0/-10) src/medialoader/CMakeLists.txt (+0/-6) src/medialoader/gallery-standard-image-provider.cpp (+0/-479) src/medialoader/gallery-standard-image-provider.h (+0/-128) src/medialoader/photo-metadata.cpp (+0/-285) src/medialoader/photo-metadata.h (+0/-69) src/photo/CMakeLists.txt (+1/-6) src/photo/photo-caches.cpp (+0/-183) src/photo/photo-caches.h (+0/-75) src/photo/photo-edit-state.cpp (+0/-77) src/photo/photo-edit-state.h (+0/-89) src/photo/photo-edit-thread.cpp (+0/-287) src/photo/photo-edit-thread.h (+0/-63) src/photo/photo.cpp (+11/-574) src/photo/photo.h (+0/-53) src/photoeditor/CMakeLists.txt (+47/-0) src/photoeditor/file-utils.cpp (+97/-0) src/photoeditor/file-utils.h (+42/-0) src/photoeditor/imaging.cpp (+363/-0) src/photoeditor/imaging.h (+169/-0) src/photoeditor/orientation.cpp (+152/-0) src/photoeditor/orientation.h (+64/-0) src/photoeditor/photo-caches.cpp (+183/-0) src/photoeditor/photo-caches.h (+76/-0) src/photoeditor/photo-data.cpp (+275/-0) src/photoeditor/photo-data.h (+92/-0) src/photoeditor/photo-edit-command.h (+58/-0) src/photoeditor/photo-edit-thread.cpp (+185/-0) src/photoeditor/photo-edit-thread.h (+56/-0) src/photoeditor/photo-image-provider.cpp (+443/-0) src/photoeditor/photo-image-provider.h (+124/-0) src/photoeditor/photo-metadata.cpp (+281/-0) src/photoeditor/photo-metadata.h (+67/-0) tests/autopilot/gallery_app/emulators/album_view.py (+2/-2) tests/autopilot/gallery_app/emulators/events_view.py (+27/-0) tests/autopilot/gallery_app/emulators/photo_viewer.py (+55/-15) tests/autopilot/gallery_app/tests/test_events_view.py (+1/-1) tests/autopilot/gallery_app/tests/test_photo_viewer.py (+20/-40) tests/autopilot/gallery_app/tests/test_picker_mode.py (+1/-1) tests/unittests/CMakeLists.txt (+0/-1) tests/unittests/gallerystandardimageprovider/CMakeLists.txt (+0/-36) tests/unittests/gallerystandardimageprovider/media-collection.h (+0/-28) tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp (+0/-78) tests/unittests/mediaobjectfactory/CMakeLists.txt (+2/-6) tests/unittests/stubs/database_stub.cpp (+0/-8) tests/unittests/stubs/gallery-manager_stub.cpp (+0/-10) tests/unittests/stubs/gallery-standard-image-provider_stub.cpp (+0/-70) tests/unittests/stubs/photo-caches_stub.cpp (+0/-27) tests/unittests/stubs/photo-edit-table_stub.cpp (+0/-47) tests/unittests/stubs/photo_stub.cpp (+1/-98) tests/unittests/video/CMakeLists.txt (+2/-0)
To merge this branch:	bzr merge lp://qastaging/~phablet-team/gallery-app/gallery-app-photo-editor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-03-10
Arthur Mello (community)		2014-11-30	Approve on 2015-01-15
Ugo Riboni		2015-03-02	Pending
Review via email: mp+243243@code.qastaging.launchpad.net

Commit message

Replace the built-in photo editor with the one from ubuntu-ui-extras

Description of the change

Replace the built-in photo editor with the one from ubuntu-ui-extras

You need to have this branch installed for this to work:
https://code.launchpad.net/~phablet-team/ubuntu-ui-extras/photo-editor

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-01:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Arthur Mello (artmello) wrote on 2014-12-18:

It looks really nice but there is one thing with multiples crops that seems strange to me. Steps to reproduce:

1. Opens a photo;
2. Crop it;
3. Rotate it (or exec any other editing besides crop);
4. Try to crop again.

The photo preview displayed on the second crop will be the original one. If I confirm the second crop and undo the edits from the stack I will pass trough all the previews states.

That is how it should work or should I be able to exec incremental crops?

review: Needs Information

Revision history for this message

Arthur Mello (artmello) wrote on 2014-12-19:

There was some changes in Thumbnailer on the last image (r184). I retest the branch and some of the situations I mention on my last comment are gone, especially when you start a new crop just after another. But I am still able to reproduce the behavior with crop, other editing and crop again. But whit that this could be an issue with Thumbnailer and not on gallery.

Revision history for this message

Arthur Mello (artmello) wrote on 2015-01-15:

lgtm

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-03:

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~phablet-team/gallery-app/gallery-app-photo-editor updated on 2015-03-10

1153. By Arthur Mello on 2015-03-10: Merge with trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

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

to all changes:

Ubuntu Phablet Team