OpenLP

Merge lp://qastaging/~phill-ridout/openlp/pathlib12 into lp://qastaging/openlp

pathlib12
Merge into trunk

Proposed by Phill on 2018-01-24

Status:

Merged

Approved by:

Raoul Snyman on 2018-01-24

Approved revision:

2817

Merged at revision:

2810

Proposed branch:

lp://qastaging/~phill-ridout/openlp/pathlib12

Merge into:

lp://qastaging/openlp

Diff against target:

682 lines (+181/-291)

6 files modified

openlp/core/lib/serviceitem.py (+9/-8)
openlp/core/ui/mainwindow.py (+8/-6)
openlp/core/ui/servicemanager.py (+128/-241)
tests/functional/openlp_core/lib/test_serviceitem.py (+2/-1)
tests/functional/openlp_core/ui/test_mainwindow.py (+29/-2)
tests/functional/openlp_core/ui/test_servicemanager.py (+5/-33)

To merge this branch:

bzr merge lp://qastaging/~phill-ridout/openlp/pathlib12

Related bugs:

Bug #1650910: Not Handling OSErrors	Low	Fix Committed
Bug #1734432: Progress bar does not show whilst loading a service	Low	Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Tim Bentley	2018-01-24	Approve on 2018-01-24
Raoul Snyman		Approve on 2018-01-24
Review via email: mp+336568@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2018-01-21.

Description of the change

Started work on storing path objects in service file.
Refactored save code and reduced duplication.
Fixed + improved the loading / saving progress bars
improved performance

loading powerpoint from a service still does work

--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/pathlib12 (revision 2817)
https://ci.openlp.io/job/Branch-01-Pull/2428/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2329/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/123/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/45/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/43/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1507/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1320/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/268/ [WAITING]
[RUNNING]
[FAILURE]
Stopping after failure