lp://staging/~phill-ridout/openlp/pathlib8
- Get this branch:
- bzr branch lp://staging/~phill-ridout/openlp/pathlib8
Branch merges
- Tomas Groth: Approve
- Tim Bentley: Approve
-
Diff: 3277 lines (+662/-713)66 files modifiedopenlp/core/lib/serviceitem.py (+2/-2)
openlp/core/ui/maindisplay.py (+1/-1)
openlp/core/ui/servicemanager.py (+3/-1)
openlp/core/ui/slidecontroller.py (+1/-1)
openlp/plugins/songs/forms/editsongform.py (+34/-38)
openlp/plugins/songs/forms/mediafilesform.py (+11/-4)
openlp/plugins/songs/forms/songexportform.py (+13/-29)
openlp/plugins/songs/forms/songimportform.py (+43/-68)
openlp/plugins/songs/lib/__init__.py (+5/-5)
openlp/plugins/songs/lib/db.py (+5/-4)
openlp/plugins/songs/lib/importers/cclifile.py (+27/-31)
openlp/plugins/songs/lib/importers/chordpro.py (+3/-4)
openlp/plugins/songs/lib/importers/dreambeam.py (+10/-8)
openlp/plugins/songs/lib/importers/easyslides.py (+1/-1)
openlp/plugins/songs/lib/importers/easyworship.py (+30/-46)
openlp/plugins/songs/lib/importers/foilpresenter.py (+2/-5)
openlp/plugins/songs/lib/importers/lyrix.py (+3/-4)
openlp/plugins/songs/lib/importers/openlp.py (+1/-1)
openlp/plugins/songs/lib/importers/openlyrics.py (+2/-5)
openlp/plugins/songs/lib/importers/openoffice.py (+5/-12)
openlp/plugins/songs/lib/importers/opensong.py (+3/-5)
openlp/plugins/songs/lib/importers/opspro.py (+9/-10)
openlp/plugins/songs/lib/importers/powerpraise.py (+4/-6)
openlp/plugins/songs/lib/importers/powersong.py (+7/-3)
openlp/plugins/songs/lib/importers/presentationmanager.py (+11/-11)
openlp/plugins/songs/lib/importers/propresenter.py (+11/-9)
openlp/plugins/songs/lib/importers/songbeamer.py (+14/-14)
openlp/plugins/songs/lib/importers/songimport.py (+26/-27)
openlp/plugins/songs/lib/importers/songpro.py (+3/-1)
openlp/plugins/songs/lib/importers/songshowplus.py (+84/-87)
openlp/plugins/songs/lib/importers/sundayplus.py (+3/-7)
openlp/plugins/songs/lib/importers/videopsalm.py (+8/-9)
openlp/plugins/songs/lib/importers/wordsofworship.py (+55/-56)
openlp/plugins/songs/lib/importers/worshipassistant.py (+11/-15)
openlp/plugins/songs/lib/importers/zionworx.py (+1/-1)
openlp/plugins/songs/lib/mediaitem.py (+16/-18)
openlp/plugins/songs/lib/openlyricsexport.py (+10/-9)
openlp/plugins/songs/lib/upgrade.py (+31/-2)
openlp/plugins/songs/reporting.py (+2/-3)
openlp/plugins/songs/songsplugin.py (+1/-3)
tests/functional/openlp_plugins/images/test_upgrade.py (+1/-0)
tests/functional/openlp_plugins/songs/test_chordproimport.py (+3/-1)
tests/functional/openlp_plugins/songs/test_easyslidesimport.py (+4/-3)
tests/functional/openlp_plugins/songs/test_ewimport.py (+35/-54)
tests/functional/openlp_plugins/songs/test_lyriximport.py (+5/-4)
tests/functional/openlp_plugins/songs/test_mediashout.py (+6/-6)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+2/-2)
tests/functional/openlp_plugins/songs/test_openlyricsexport.py (+10/-8)
tests/functional/openlp_plugins/songs/test_openlyricsimport.py (+5/-4)
tests/functional/openlp_plugins/songs/test_openoffice.py (+2/-2)
tests/functional/openlp_plugins/songs/test_opensongimport.py (+9/-8)
tests/functional/openlp_plugins/songs/test_opsproimport.py (+5/-5)
tests/functional/openlp_plugins/songs/test_powerpraiseimport.py (+4/-3)
tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py (+4/-3)
tests/functional/openlp_plugins/songs/test_propresenterimport.py (+5/-4)
tests/functional/openlp_plugins/songs/test_songbeamerimport.py (+8/-7)
tests/functional/openlp_plugins/songs/test_songproimport.py (+3/-2)
tests/functional/openlp_plugins/songs/test_songselect.py (+4/-3)
tests/functional/openlp_plugins/songs/test_songshowplusimport.py (+10/-9)
tests/functional/openlp_plugins/songs/test_sundayplusimport.py (+3/-1)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+4/-3)
tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+5/-4)
tests/functional/openlp_plugins/songs/test_worshipassistantimport.py (+5/-4)
tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py (+3/-3)
tests/functional/openlp_plugins/songs/test_zionworximport.py (+4/-3)
tests/helpers/songfileimport.py (+1/-1)
Related bugs
Bug #1689131: Store media_file with relative path | Wishlist | Fix Committed |
Related blueprints
Recent revisions
- 2771. By Phill
-
pathlib changes to the theme code
lp:~phill-ridout/openlp/pathlib7 (revision 2773)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 2214/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/2117/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/2003/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Code_ Analysis/ 1369/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Test_ Coverage/ 1200/ - 2770. By Raoul Snyman
-
Change the way the version thread works, using the proper QThread method. Also make OpenLP wait for the version thread on shutdown so that we get fewer segfaults on exit.
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~raoul-snyman/openlp/fix-version-check (revision 2779)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 2212/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/2115/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/2001/
[SUCCESS] ... - 2769. By Phill
-
This is ready to go now!
Upgrade the image plugin to use pathlib.
Other minor changes and fixes.Add this to your merge proposal:
-------------- ------- ------- ----
lp:~phill-ridout/openlp/pathlib6 (revision 2774)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 2207/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/2110/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1997/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Code_ Analysis/ 1364/
[SUCCESS] https://ci.open... - 2768. By Phill
-
More pathlib changes, focused mainly on the presentation plugin
Add this to your merge proposal:
-------------- ------- ------- ----
lp:~phill-ridout/openlp/pathlib5 (revision 2777)
[SUCCESS] https://ci.openlp. io/job/ Branch- 01-Pull/ 2193/
[SUCCESS] https://ci.openlp. io/job/ Branch- 02-Functional- Tests/2096/
[SUCCESS] https://ci.openlp. io/job/ Branch- 03-Interface- Tests/1983/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04a-Code_ Analysis/ 1353/
[SUCCESS] https://ci.openlp. io/job/ Branch- 04b-Test_ Coverage/...
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/openlp