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

Proposed by Arthur Mello
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 1271
Merged at revision: 1243
Proposed branch: lp://qastaging/~artmello/gallery-app/gallery-app-sdk_1_3
Merge into: lp://qastaging/gallery-app
Diff against target: 3436 lines (+589/-1177)
83 files modified
rc/qml/AlbumEditor/AlbumCoverMenu.qml (+3/-3)
rc/qml/AlbumEditor/AlbumEditMenu.qml (+4/-4)
rc/qml/AlbumEditor/AlbumEditor.qml (+10/-20)
rc/qml/AlbumViewer/AlbumCover.qml (+3/-3)
rc/qml/AlbumViewer/AlbumCoverList.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageContents.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageFlipper.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageFlipperPage.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayout.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutAdd.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutLeftDoubleLandscape.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutLeftPortrait.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutRightDoubleLandscape.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/AlbumPageLayoutRightPortrait.qml (+2/-2)
rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml (+2/-2)
rc/qml/AlbumViewer/AlbumOpener.qml (+2/-2)
rc/qml/AlbumViewer/AlbumPageComponent.qml (+2/-2)
rc/qml/AlbumViewer/AlbumPageIndicator.qml (+3/-3)
rc/qml/AlbumViewer/AlbumPreviewComponent.qml (+2/-2)
rc/qml/AlbumViewer/AlbumSpreadViewer.qml (+2/-2)
rc/qml/AlbumViewer/AlbumViewer.qml (+35/-39)
rc/qml/AlbumViewer/AlbumViewerAnimated.qml (+3/-3)
rc/qml/AlbumViewer/AlbumViewerTransition.qml (+0/-404)
rc/qml/AlbumViewer/AlbumViewerTransitionPortraitPage.qml (+0/-171)
rc/qml/AlbumsOverview.qml (+59/-46)
rc/qml/Components/AspectArea.qml (+2/-2)
rc/qml/Components/Checkerboard.qml (+3/-10)
rc/qml/Components/CheckerboardDelegate.qml (+2/-2)
rc/qml/Components/DeleteDialog.qml (+4/-4)
rc/qml/Components/DeleteOrDeleteWithContentsDialog.qml (+5/-5)
rc/qml/Components/EventCard.qml (+4/-4)
rc/qml/Components/MediaGrid.qml (+7/-5)
rc/qml/Components/MediaSelector.qml (+3/-3)
rc/qml/Components/MouseAreaWithMultipoint.qml (+2/-2)
rc/qml/Components/PopupAlbumPicker.qml (+4/-4)
rc/qml/Components/SwipeArea.qml (+3/-3)
rc/qml/Components/TextEditOnClick.qml (+2/-2)
rc/qml/EventsOverview.qml (+63/-30)
rc/qml/GalleryApplication.qml (+4/-4)
rc/qml/LoadingScreen.qml (+3/-10)
rc/qml/MainScreen.qml (+21/-18)
rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml (+5/-5)
rc/qml/MediaViewer/GalleryPhotoComponent.qml (+2/-2)
rc/qml/MediaViewer/GalleryPhotoEditorPage.qml (+4/-4)
rc/qml/MediaViewer/MediaListView.qml (+3/-3)
rc/qml/MediaViewer/MediaViewer.qml (+25/-14)
rc/qml/MediaViewer/PhotoEditor.qml (+4/-4)
rc/qml/MediaViewer/PhotoEditor/ActionsBar.qml (+4/-4)
rc/qml/MediaViewer/PhotoEditor/BusyIndicator.qml (+2/-2)
rc/qml/MediaViewer/PhotoEditor/CropCorner.qml (+3/-3)
rc/qml/MediaViewer/PhotoEditor/CropDragArea.qml (+2/-2)
rc/qml/MediaViewer/PhotoEditor/CropInteractor.qml (+3/-3)
rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml (+3/-3)
rc/qml/MediaViewer/PhotoEditor/EditStack.qml (+3/-3)
rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml (+3/-3)
rc/qml/MediaViewer/PhotoViewerTransition.qml (+2/-2)
rc/qml/MediaViewer/PopupPhotoViewer.qml (+26/-10)
rc/qml/MediaViewer/SingleMediaViewer.qml (+6/-6)
rc/qml/OrganicView/OrganicAlbumView.qml (+2/-2)
rc/qml/OrganicView/OrganicItemInteraction.qml (+3/-3)
rc/qml/OrganicView/OrganicMediaList.qml (+7/-6)
rc/qml/OrganicView/OrganicView.qml (+3/-10)
rc/qml/PhotosOverview.qml (+62/-37)
rc/qml/PickerScreen.qml (+3/-11)
rc/qml/Utility/DissolveAnimation.qml (+2/-2)
rc/qml/Utility/EditingHUD.qml (+3/-3)
rc/qml/Utility/ExpandAnimation.qml (+2/-2)
rc/qml/Utility/FadeInAnimation.qml (+2/-2)
rc/qml/Utility/FadeOutAnimation.qml (+2/-2)
rc/qml/Utility/PhotosToolbarActions.qml (+0/-57)
rc/qml/Utility/SelectionState.qml (+2/-2)
rc/qml/Utility/SelectionToolbarAction.qml (+0/-82)
src/photo/photo.cpp (+1/-0)
src/photo/photo.h (+4/-1)
tests/autopilot/gallery_app/emulators/album_view.py (+27/-0)
tests/autopilot/gallery_app/emulators/photo_viewer.py (+35/-12)
tests/autopilot/gallery_app/emulators/picker_screen.py (+3/-3)
tests/autopilot/gallery_app/tests/test_album_editor.py (+1/-1)
tests/autopilot/gallery_app/tests/test_album_view.py (+22/-14)
tests/autopilot/gallery_app/tests/test_albums_view.py (+2/-3)
tests/autopilot/gallery_app/tests/test_events_view.py (+2/-3)
tests/autopilot/gallery_app/tests/test_photo_viewer.py (+15/-9)
tests/autopilot/gallery_app/tests/test_photos_view.py (+2/-3)
To merge this branch: bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-sdk_1_3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Renato Araujo Oliveira Filho (community) Approve
Review via email: mp+276163@code.qastaging.launchpad.net

Commit message

Update QML code to work with Ubuntu.Components 1.3

Description of the change

Update QML code to work with Ubuntu.Components 1.3

To post a comment you must log in.
1247. By Arthur Mello

Fix camera icon on Photos/Events view

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1248. By Arthur Mello

Fix header on AlbumViewer and PopupPhotoViewer
Fix camera icon on AlbumsOverview

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1249. By Arthur Mello

Toggle header visibility

1250. By Arthur Mello

Fix typo

1251. By Arthur Mello

Fix toggle fullscreen

1252. By Arthur Mello

Fix header visibility and fullscreen on AlbumViewer

1253. By Arthur Mello

Fix check for camera button on PhotosView

1254. By Arthur Mello

Fix camera button check for events view

1255. By Arthur Mello

Fix check for camera button in Albums view

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1256. By Arthur Mello

Fix aspect ratio of thumbnails for Events/Photos overview

1257. By Arthur Mello

Make share picker header equal from MediaViewer and Photos/Events view

1258. By Arthur Mello

Fix PickerScreen

1259. By Arthur Mello

Fix AP tests for PopupPhotoViewer

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1260. By Arthur Mello

Fix AP tests related with AlbumViewer

1261. By Arthur Mello

Fix flake8 issues

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1262. By Arthur Mello

Fix AP tests

1263. By Arthur Mello

Fix canBeEdited property to remove warning log message

1264. By Arthur Mello

Fix header issue on PopupPhotoViewer

1265. By Arthur Mello

Remove legacy code from old album viewer animations not used anymore

1266. By Arthur Mello

Move AlbumEditor to a Loader

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
1267. By Arthur Mello

Update version for other Ubuntu imports

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
1268. By Arthur Mello

Update all QtQuick imports

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) :
1269. By Arthur Mello

Fix typo

1270. By Arthur Mello

Fix more QtQuick imports

1271. By Arthur Mello

Fix GalleryApplication import

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

code looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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