gallery-app

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

  1. gallery-app-crash_adding_files
  2. Merge into trunk
Proposed by Arthur Mello
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1264
Merged at revision: 1269
Proposed branch: lp://qastaging/~artmello/gallery-app/gallery-app-crash_adding_files
Merge into: lp://qastaging/gallery-app
Diff against target: 308 lines (+100/-43)
8 files modified
src/core/data-collection.cpp (+12/-23)
src/event/event-collection.cpp (+10/-2)
src/gallery-manager.cpp (+22/-1)
src/gallery-manager.h (+4/-0)
src/media/media-collection.cpp (+10/-2)
src/qml/qml-view-collection-model.cpp (+37/-14)
src/qml/qml-view-collection-model.h (+1/-1)
tests/unittests/stubs/gallery-manager_stub.cpp (+4/-0)
To merge this branch: bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-crash_adding_files
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+283010@code.qastaging.launchpad.net

Commit message

Add a timer to make sure all taken photos are added into collection in a batch

Description of the change

Add a timer to make sure all taken photos are added into collection in a batch

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/1228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/371/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1042/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/920
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26756

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

A few inline comments.

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

Add comments to the code
Fix Typo
Fix QML notification of added items if they are not all contiguos

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1264
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/157/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/372
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/921
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26771

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good now and works as expected!

review: Approve
lp://qastaging/~artmello/gallery-app/gallery-app-crash_adding_files updated
1265. By Arthur Mello

Fix warning

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