Merge lp://staging/~nikwen/ubuntu-filemanager-app/cancel-archive-extraction into lp://staging/ubuntu-filemanager-app
Proposed by
Niklas Wenzel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Arto Jalkanen | ||||
Approved revision: | 324 | ||||
Merged at revision: | 355 | ||||
Proposed branch: | lp://staging/~nikwen/ubuntu-filemanager-app/cancel-archive-extraction | ||||
Merge into: | lp://staging/ubuntu-filemanager-app | ||||
Prerequisite: | lp://staging/~nikwen/ubuntu-filemanager-app/select-archive-fix | ||||
Diff against target: |
72 lines (+22/-2) 3 files modified
src/app/qml/ui/FolderListPage.qml (+12/-2) src/plugin/archives/archives.cpp (+8/-0) src/plugin/archives/archives.h (+2/-0) |
||||
To merge this branch: | bzr merge lp://staging/~nikwen/ubuntu-filemanager-app/cancel-archive-extraction | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Arto Jalkanen | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Add the ability to cancel archive extractions
Description of the change
Added the ability to cancel archive extractions
To post a comment you must log in.
PASSED: Continuous integration, rev:324 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 436/ 91.189. 93.70:8080/ job/generic- mediumtests- vivid/519 91.189. 93.70:8080/ job/generic- mediumtests- vivid/519/ artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/ubuntu- filemanager- app-vivid- amd64-ci/ 58
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 436/rebuild
http://