lp:~artmello/gallery-app/gallery-app-merge_branchs_to_trunk
Created by
Arthur Mello
and last modified
- Get this branch:
- bzr branch lp:~artmello/gallery-app/gallery-app-merge_branchs_to_trunk
Only
Arthur Mello
can upload to this branch. If you are
Arthur Mello
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- PS Jenkins bot: Needs Fixing (continuous-integration)
- Ubuntu Phablet Team: Pending requested
-
Diff: 2286 lines (+380/-1082)44 files modifiedCMakeLists.txt (+0/-1)
debian/control (+0/-3)
rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml (+16/-0)
rc/qml/AlbumsOverview.qml (+1/-0)
rc/qml/Components/MediaGrid.qml (+19/-0)
rc/qml/MediaViewer/PhotoViewerDelegate.qml (+21/-8)
rc/qml/MediaViewer/ZoomablePhotoComponent.qml (+2/-1)
rc/qml/OrganicView/OrganicMediaList.qml (+24/-0)
rc/qml/Utility/PhotosToolbarActions.qml (+1/-0)
src/album/CMakeLists.txt (+3/-0)
src/gallery-application.cpp (+2/-5)
src/gallery-manager.cpp (+0/-53)
src/gallery-manager.h (+0/-6)
src/media/media-monitor.cpp (+38/-3)
src/media/media-monitor.h (+1/-0)
src/media/media-source.cpp (+19/-4)
src/medialoader/CMakeLists.txt (+1/-4)
src/medialoader/gallery-standard-image-provider.cpp (+11/-49)
src/medialoader/gallery-standard-image-provider.h (+0/-4)
src/medialoader/gallery-thumbnail-image-provider.cpp (+0/-102)
src/medialoader/gallery-thumbnail-image-provider.h (+0/-59)
src/medialoader/preview-manager.cpp (+0/-423)
src/medialoader/preview-manager.h (+0/-87)
src/photo/photo-caches.cpp (+3/-0)
src/photo/photo.cpp (+2/-17)
src/video/video.cpp (+3/-2)
tests/autopilot/gallery_app/tests/__init__.py (+4/-1)
tests/autopilot/gallery_app/tests/test_albums_view.py (+29/-1)
tests/autopilot/gallery_app/tests/test_events_view.py (+26/-1)
tests/autopilot/gallery_app/tests/test_photo_viewer.py (+2/-2)
tests/autopilot/gallery_app/tests/test_photos_view.py (+16/-7)
tests/unittests/CMakeLists.txt (+1/-1)
tests/unittests/gallerystandardimageprovider/CMakeLists.txt (+0/-2)
tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp (+0/-5)
tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt (+0/-34)
tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp (+0/-54)
tests/unittests/mediamonitor/CMakeLists.txt (+36/-0)
tests/unittests/mediamonitor/tst_mediamonitor.cpp (+96/-0)
tests/unittests/mediaobjectfactory/CMakeLists.txt (+0/-3)
tests/unittests/stubs/gallery-manager_stub.cpp (+0/-9)
tests/unittests/stubs/gallery-standard-image-provider_stub.cpp (+1/-9)
tests/unittests/stubs/gallery-thumbnail-image-provider_stub.cpp (+0/-55)
tests/unittests/stubs/preview-manager_stub.cpp (+0/-65)
tests/unittests/video/tst_video.cpp (+2/-2)
Related source package recipes
Branch information
Recent revisions
- 920. By Ugo Riboni
-
Remove the PreviewManager since all the previews are now handled by the SDK thumbnailer
- 918. By Ugo Riboni
-
Touch the file when reverting to original so that the thumbnail will be properly regenerated
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:gallery-app
