OpenLP

Merge lp:~phill-ridout/openlp/bug1367141-2 into lp:openlp

  1. bug1367141-2
  2. Merge into trunk
Proposed by Phill
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
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/Images with same name gets the same thumbnail
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://ci.openlp.org/job/Branch-01-Pull/906/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/837/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/783/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/694/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/293/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/435/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/306/

Process finished with exit code 0

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

No print statements!

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

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.