lp:~raoul-snyman/openlp/disconnect-slots-2.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2651

Tim Bentley: Approve on 2016-08-14

Diff: 579 lines (+507/-14)

2 files modified

openlp/core/ui/media/systemplayer.py (+29/-14)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+478/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1547964: Escaping video twice results in traceback

Medium

Fix Committed

Link a bug report

Related blueprints

2653. By Raoul Snyman on 2016-08-14

Don't need that line anymore

2652. By Raoul Snyman on 2016-08-14

Fix bug #1547964 by ignoring the exception (it's harmless)

2651. By Raoul Snyman on 2016-08-14

Disconnect the slots for a signal before assigning new ones

2650. By Tim Bentley on 2016-08-14

Translation updates

2649. By Tim Bentley on 2016-08-13

Fix bug and fully test it.

lp:~trb143/openlp/themecombo-24 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1730/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1641/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1579/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1339/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/929/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/997/
[SUCCESS] htt...

2648. By Raoul Snyman on 2016-08-12

Fix SongSelect.

Do updated tests count?

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194-2.4 (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1635/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1573/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1334/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_T...

2647. By Raoul Snyman on 2016-08-12

Update slot signatures to comply with PyQt5.6's stricter checks.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures-2.4 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1722/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1633/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1332/
[SUCCESS] https://ci.openlp....

2646. By Raoul Snyman on 2016-08-02

Fix a permission error that we should have fixed ages ago.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

2645. By Raoul Snyman on 2016-08-02

Fix a permission error that we should have fixed ages ago.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/permission-error-2.4 (revision 2645)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1676/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1587/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-...

2644. By Tomas Groth on 2016-07-27

Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384.
Update Crosswalk webpage parser to match new layout. Fixes bug 1599999.