lp:~alisonken1/openlp/strings-core-ui

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2666

Raoul Snyman: Approve on 2016-05-20

Tim Bentley: Approve on 2016-05-20

Diff: 1609 lines (+375/-307)

22 files modified

openlp/core/lib/projector/db.py (+1/-1)
openlp/core/ui/aboutdialog.py (+112/-108)
openlp/core/ui/aboutform.py (+1/-1)
openlp/core/ui/advancedtab.py (+13/-13)
openlp/core/ui/exceptionform.py (+16/-18)
openlp/core/ui/firsttimeform.py (+51/-40)
openlp/core/ui/firsttimewizard.py (+11/-9)
openlp/core/ui/formattingtagcontroller.py (+13/-10)
openlp/core/ui/formattingtagform.py (+4/-3)
openlp/core/ui/generaltab.py (+1/-1)
openlp/core/ui/mainwindow.py (+6/-3)
openlp/core/ui/plugindialog.py (+1/-1)
openlp/core/ui/pluginform.py (+3/-1)
openlp/core/ui/servicemanager.py (+28/-24)
openlp/core/ui/settingsform.py (+1/-1)
openlp/core/ui/shortcutlistform.py (+5/-4)
openlp/core/ui/slidecontroller.py (+47/-33)
openlp/core/ui/starttimeform.py (+3/-3)
openlp/core/ui/themeform.py (+6/-4)
openlp/core/ui/thememanager.py (+31/-24)
openlp/core/ui/themewizard.py (+4/-4)
tests/functional/openlp_core_lib/test_projectordb.py (+17/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2667. By Ken Roberts on 2016-05-20

core_lib files string conversions

2666. By Ken Roberts on 2016-05-19

core_ui_aboutdialog strings conversions

2665. By Tim Bentley on 2016-05-19

Fix ssl version to allow Android to use ssl. SSL is now auto negotiated. Fix SeriveManager service theme hiding. Bug since 1.9 series. Fix missing check dependancies for six, Fix PEP 8 errors

2664. By Ken Roberts on 2016-05-17

Convert strings from python2 to python3 format

- Strings converted except as noted
- Updated projector pjlink test
- Simplify lines with multiple references to single variable

--------------------------------
lp:~alisonken1/openlp/strings-lib (revision 2665)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1559/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1470/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04a...

2663. By Tim Bentley on 2016-05-17

Service Manager themes are not updated in service items when the settings theme is changed

2662. By Simon Hanna on 2016-05-17

* Change the Combobox used for the state of plugins to a checkbox.
* Do not show the plugins version numbers as they provide no additional information
* Show the plugin details (about text) even if the plugin is disabled

2661. By Ian Knight on 2016-05-16

Fixes bug 1080596 where presentations in the preview pane display live view rather than preview of selected slide.
In addition, fixes the aspect ratio & quality of thumbnails by saving them in the correct aspect ratio at a higher resolution, and loading them through the image manager.

New test cases implemented, or existing cases modified to test coverage complete for changes.

lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-...

2660. By Ken Roberts on 2016-05-16

- Convert strings from python2 to python3 in openlp/core/common files
- Added another projector db test

python2: "%s inline" % 'text1'
python2: "%s inline %s" % ('text1', text2')
python3: "{text1} inline {text2}".format(text1="text1", text2="text2")

--------------------------------
lp:~alisonken1/openlp/strings-common (revision 2661)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1550/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1461/
[SUCCESS] https://ci.openlp.io/job/...

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

-----..."