Merge lp://qastaging/~trb143/openlp/media_timer2 into lp://qastaging/openlp
Proposed by
Tim Bentley
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 2648 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~trb143/openlp/media_timer2 | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/openlp | ||||||||||||||||||||||||||||
| Diff against target: |
234 lines (+95/-25) 5 files modified
openlp/core/common/__init__.py (+30/-0) openlp/core/ui/media/mediacontroller.py (+1/-1) openlp/plugins/media/mediaplugin.py (+31/-1) openlp/plugins/presentations/lib/pdfcontroller.py (+6/-22) tests/functional/openlp_plugins/media/test_mediaplugin.py (+27/-1) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~trb143/openlp/media_timer2 | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Raoul Snyman | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-04-20.
Description of the change
Add the new icon to slidecontroller
Add check for mediainfo in pre_check code
Refactor code to share between media and presentations
lp:~trb143/openlp/media_timer2 (revision 2656)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Nicely done!