lp:~alisonken1/openlp/strings-lib

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2664

Tim Bentley: Approve on 2016-05-17

Raoul Snyman: Approve on 2016-05-17

Diff: 975 lines (+233/-125)

15 files modified

openlp/core/lib/db.py (+22/-18)
openlp/core/lib/filedialog.py (+2/-1)
openlp/core/lib/htmlbuilder.py (+51/-35)
openlp/core/lib/imagemanager.py (+3/-3)
openlp/core/lib/mediamanageritem.py (+19/-12)
openlp/core/lib/plugin.py (+5/-5)
openlp/core/lib/pluginmanager.py (+14/-11)
openlp/core/lib/renderer.py (+7/-5)
openlp/core/lib/screen.py (+9/-7)
openlp/core/lib/searchedit.py (+3/-2)
openlp/core/lib/serviceitem.py (+12/-9)
openlp/core/lib/theme.py (+2/-1)
openlp/core/lib/ui.py (+3/-3)
openlp/core/lib/webpagereader.py (+9/-9)
tests/functional/openlp_core_lib/test_projector_pjlink1.py (+72/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2665. By Ken Roberts on 2016-05-17

Typo

2664. By Ken Roberts on 2016-05-17

Fix duplicate tags in strings

2663. By Ken Roberts on 2016-05-16

Simplify a line with multiple references in format

2662. By Ken Roberts on 2016-05-16

pep8

2661. By Ken Roberts on 2016-05-16

Revert a few items plus cleanups

2660. By Ken Roberts on 2016-05-15

Convert strings to python3 in core.common.lib

2659. By Tim Bentley on 2016-05-12

"Allow themes to have video files so allow for background videos behind text.
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

2658. By Ken Roberts on 2016-05-12

"Convert __init__.py file strings from python2 to python3 format

Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

2657. By Tomas Groth on 2016-05-09

Added support for detected the new version of mutool which now contains the functionality of mudraw.
Improve mediainfo detection on windows and mac.
Fix crosswalk bible list download.

2656. By Ken Roberts on 2016-05-02

- Convert strings in mainwindow.py
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...