Merge lp:~suutari-olli/openlp/force-split into lp:openlp
Status: | Superseded | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~suutari-olli/openlp/force-split | ||||||||||||||||
Merge into: | lp:openlp | ||||||||||||||||
Diff against target: |
250 lines (+118/-11) 5 files modified
openlp/core/lib/renderer.py (+3/-3) openlp/plugins/songs/forms/editsongform.py (+49/-0) openlp/plugins/songs/forms/editversedialog.py (+6/-0) openlp/plugins/songs/forms/editverseform.py (+44/-5) tests/functional/openlp_plugins/songs/test_editverseform.py (+16/-3) |
||||||||||||||||
To merge this branch: | bzr merge lp:~suutari-olli/openlp/force-split | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Needs Fixing | ||
Review via email: mp+294228@code.launchpad.net |
This proposal supersedes a proposal from 2016-05-10.
Description of the change
- Added "Split" button for Song editor:
This adds the currently selected Verses tag to
the given position, thus creating a "Force split"
- Increased Optional Split limit from < 5 to < 51
- Increased test coverage
lp:~suutari-olli/openlp/force-split (revision 2665)
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
Unmerged revisions
- 2671. By Azaziah
-
- Reverted to the working solution.
- 2670. By Azaziah
-
- This is broken / Going to revert to older solution after this.
- 2669. By Azaziah
-
Reverted the perfectly functioning Verse split technigue and replaced it with insert [--].
This still needs to be turned into force split in renderer.py - 2668. By Azaziah
-
Merged trunk?
- 2667. By Azaziah
-
Merged trunk?
- 2666. By Azaziah
-
- Fixed the issue whre verse current number is not updated properly on edit single verse mode.
- 2665. By Azaziah
-
Merged trunk (Noticed tests appear to be fixed)
- 2664. By Azaziah
-
- Improved this on Edit single verse (This now detects if the verse type is changed)
- 2663. By Azaziah
-
Added a test for def on_insert_
button_ clicked( self): - 2662. By Azaziah
-
Fixed a test
Cannot test as the UI is not visible.
There will be more comments when it works