Merge lp:~ajalkane/ubuntu-filemanager-app/copy-progress-dialog-fix into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen on 2013-09-10
Status: Rejected
Rejected by: Michael Spencer on 2013-09-30
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/copy-progress-dialog-fix
Merge into: lp:ubuntu-filemanager-app
Diff against target: 12 lines (+1/-1)
1 file modified
FileOperationProgressDialog.qml (+1/-1)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/copy-progress-dialog-fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing on 2013-09-10
Ubuntu File Manager Developers 2013-09-10 Pending
Review via email: mp+184864@code.launchpad.net

Commit message

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

Description of the change

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

To post a comment you must log in.
Michael Spencer (ibelieve) wrote :

Thanks for the fix. Because it their were problems with Autopilot that prevented this from passing, I fixed this in the same branch that fixed the Autopilot problems.

Unmerged revisions

63. By Arto Jalkanen on 2013-09-10

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FileOperationProgressDialog.qml'
2--- FileOperationProgressDialog.qml 2013-06-26 23:00:41 +0000
3+++ FileOperationProgressDialog.qml 2013-09-10 19:49:37 +0000
4@@ -49,7 +49,7 @@
5 onProgress: {
6 console.log("On progress ", curItem, totalItems, percent)
7 progress.value = percent
8- if (curItem == totalItems) {
9+ if (percent == 100 && curItem == totalItems) {
10 console.log("All files processed, closing progress dialog")
11 PopupUtils.close(root)
12 } else {

Subscribers

People subscribed via source and target branches