Merge lp://qastaging/~suutari-olli/openlp/azaziah-fixes-and-improvements into lp://qastaging/openlp

Proposed by Azaziah
Status: Superseded
Proposed branch: lp://qastaging/~suutari-olli/openlp/azaziah-fixes-and-improvements
Merge into: lp://qastaging/openlp
Diff against target: 798 lines (+123/-66)
49 files modified
openlp/core/common/settings.py (+5/-1)
openlp/core/lib/searchedit.py (+2/-2)
openlp/core/lib/ui.py (+1/-0)
openlp/core/ui/__init__.py (+3/-3)
openlp/core/ui/aboutform.py (+2/-1)
openlp/core/ui/filerenameform.py (+2/-2)
openlp/core/ui/firsttimelanguageform.py (+2/-1)
openlp/core/ui/formattingtagform.py (+2/-1)
openlp/core/ui/lib/wizard.py (+5/-2)
openlp/core/ui/maindisplay.py (+1/-1)
openlp/core/ui/pluginform.py (+2/-1)
openlp/core/ui/printserviceform.py (+2/-2)
openlp/core/ui/projector/editform.py (+2/-1)
openlp/core/ui/projector/sourceselectform.py (+4/-2)
openlp/core/ui/serviceitemeditform.py (+2/-2)
openlp/core/ui/servicenoteform.py (+2/-2)
openlp/core/ui/settingsform.py (+2/-1)
openlp/core/ui/shortcutlistform.py (+2/-1)
openlp/core/ui/starttimeform.py (+2/-2)
openlp/plugins/alerts/forms/alertform.py (+2/-2)
openlp/plugins/bibles/bibleplugin.py (+1/-1)
openlp/plugins/bibles/forms/booknameform.py (+2/-1)
openlp/plugins/bibles/forms/editbibleform.py (+2/-1)
openlp/plugins/bibles/forms/languageform.py (+2/-1)
openlp/plugins/bibles/lib/__init__.py (+2/-2)
openlp/plugins/bibles/lib/mediaitem.py (+3/-1)
openlp/plugins/custom/customplugin.py (+1/-1)
openlp/plugins/custom/forms/editcustomform.py (+2/-1)
openlp/plugins/custom/forms/editcustomslideform.py (+2/-1)
openlp/plugins/images/forms/addgroupform.py (+2/-1)
openlp/plugins/images/forms/choosegroupform.py (+2/-1)
openlp/plugins/media/forms/mediaclipselectorform.py (+2/-1)
openlp/plugins/songs/forms/authorsform.py (+2/-1)
openlp/plugins/songs/forms/duplicatesongremovalform.py (+3/-0)
openlp/plugins/songs/forms/editsongform.py (+2/-1)
openlp/plugins/songs/forms/editverseform.py (+2/-1)
openlp/plugins/songs/forms/mediafilesform.py (+2/-1)
openlp/plugins/songs/forms/songbookform.py (+2/-1)
openlp/plugins/songs/forms/songmaintenancedialog.py (+1/-1)
openlp/plugins/songs/forms/songmaintenanceform.py (+2/-1)
openlp/plugins/songs/forms/songselectform.py (+2/-1)
openlp/plugins/songs/forms/topicsform.py (+2/-1)
openlp/plugins/songs/songsplugin.py (+1/-1)
openlp/plugins/songusage/forms/songusagedeleteform.py (+1/-1)
openlp/plugins/songusage/forms/songusagedetailform.py (+2/-1)
tests/functional/openlp_core_ui/test_maindisplay.py (+16/-1)
tests/functional/openlp_plugins/bibles/test_lib.py (+4/-1)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+7/-7)
tests/interfaces/openlp_core_lib/test_searchedit.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/azaziah-fixes-and-improvements
Reviewer Review Type Date Requested Status
Tim Bentley Needs Fixing
Raoul Snyman Needs Fixing
Review via email: mp+325053@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-06-04.

This proposal has been superseded by a proposal from 2017-06-05.

Description of the change

Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot after number, the reference search
does not work.

Improvements
- Increased song maintanance window size.
- Removed "?" from all Wizard windows.

Add this to your merge proposal:
--------------------------------
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2762)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2071/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1981/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1898/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1277/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1127/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/256/
[SUCCESS] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/102/

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

Just some minor things.

Also, I really would prefer to see 1 new test, not just updates to tests.

review: Needs Fixing
2763. By Azaziah

- Fixed over idented line on def closeEvent(self, event):
- Added a comment explaing the ' ' in Bible book name auto completion.

2764. By Azaziah

Value of old last used Bible search type is no longer transferred to settings since it's invalid and gets replaced on boot anyways.

Revision history for this message
Tim Bentley (trb143) wrote :

This needs checking on MAC as from memory there were issues with dialog closing and mac os.
This is goin back a number of years in the 2.0 dev period. I have tried to find the changs nut no luck.

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

I'll test it out on my Mac.

2765. By Azaziah

- Added a test for checking that next calls the next playlist item

Unmerged revisions

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.