Merge lp:~phill-ridout/openlp/bug1367141-2 into lp:openlp
Status: | Merged |
---|---|
Merged at revision: | 2487 |
Proposed branch: | lp:~phill-ridout/openlp/bug1367141-2 |
Merge into: | lp:openlp |
Diff against target: |
315 lines (+100/-29) 10 files modified
openlp/core/__init__.py (+24/-15) openlp/core/lib/mediamanageritem.py (+1/-2) openlp/plugins/images/imageplugin.py (+10/-0) openlp/plugins/images/lib/mediaitem.py (+2/-1) openlp/plugins/presentations/lib/mediaitem.py (+13/-4) openlp/plugins/presentations/lib/presentationcontroller.py (+13/-3) openlp/plugins/presentations/presentationplugin.py (+16/-2) tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+3/-0) tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+2/-1) tests/functional/test_init.py (+16/-1) |
To merge this branch: | bzr merge lp:~phill-ridout/openlp/bug1367141-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+247503@code.launchpad.net |
This proposal supersedes a proposal from 2015-01-22.
Description of the change
Fixes Bug #1367141: Presentations/
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)
Also added code to remove the old thumbnails.
Add this to your merge proposal:
-------
lp:~phill-ridout/openlp/bug1367141-2 (revision 2486)
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
Process finished with exit code 0
No print statements!