lp:~raoul-snyman/openlp/bug-1608194

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2694

Tim Bentley: Approve on 2016-08-13

Diff: 1080 lines (+670/-89)

7 files modified

.bzrignore (+1/-0)
openlp/core/ui/media/systemplayer.py (+13/-13)
openlp/plugins/songs/lib/__init__.py (+8/-9)
openlp/plugins/songs/lib/songselect.py (+76/-41)
tests/functional/openlp_core_ui/test_slidecontroller.py (+2/-2)
tests/functional/openlp_core_ui_media/test_systemplayer.py (+529/-0)
tests/functional/openlp_plugins/songs/test_songselect.py (+41/-24)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1608194: Import from SongSelect no longer works (website updated)

Medium

Fix Committed

Link a bug report

Related blueprints

2694. By Raoul Snyman on 2016-08-13

HEAD

2693. By Raoul Snyman on 2016-08-13

Fix another pep8 issues

2692. By Raoul Snyman on 2016-08-13

Fix some pep8 issues

2691. By Raoul Snyman on 2016-08-13

Fix the tests for SongSelect and write tests for the SystemPlayer

2690. By Azaziah on 2016-08-10

- Generated the new icons for the freshly merged Bible branch

2689. By Azaziah on 2016-08-10

This branch introduces the functionality of unblanking
display from Blank to Black/Theme/Desktop for:

a) Clicking slide in "Live panel"
b) Next/Previous shortcuts (Green arrows)
c) Go to verse x.
d) When starting automatic playback (To end or Loop)
Also added "Unblank display when changing slide in Live" to advanced
options tab for disabling/enabling this behavior for a-c.

Additionally this branch also includes fix for bug
https://bugs.launchpad.net/openlp/+bug/1531691
Do note that this bra...

2688. By Azaziah on 2016-08-10

This branch includes various UI string changes, such as:
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

2687. By Ken Roberts on 2016-08-10

String conversions with templates part 1

- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...

2686. By Azaziah on 2016-08-07

This branch introduces following improvements to Quick Bible search:
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
  (E.g. added actual example verses to Reference error)
- 3 New settings for controllin...

2685. By Phill on 2016-08-04

Part 1 - Moves the language names out of the database in to a module so that they can be translated.