lp://qastaging/~knightrider0xd/openlp/ios-app

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2653

Raoul Snyman: Approve on 2016-04-26

Diff: 103535 lines (+51616/-51518)

4 files modified

openlp/core/resources.py (+51560/-51505)
openlp/plugins/remotes/lib/remotetab.py (+33/-13)
resources/images/openlp-2.qrc (+1/-0)
tests/functional/openlp_core_lib/test_htmlbuilder.py (+22/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2650. By Ian Knight on 2016-04-26

Testing

2649. By Ian Knight on 2016-04-26

Added Test to HTML Builder

2648. By Ian Knight on 2016-04-18

Housekeeping

2647. By Ian Knight on 2016-04-18

Ran generate_resources.sh

2646. By Ian Knight on 2016-04-18

Added QR code and link for iOS app to remote plugin ui

2645. By Ken Roberts on 2016-04-17

"- Update string format to Python3 style
- Added projector lamp values test

Convert string format from Python2
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

2644. By Ian Knight on 2016-04-16

Allows users to change the automatic scrolling behaviour for when a new slide is selected.

Currently on selecting a new slide, the next slide will be scrolled into view.
The changes provide a combo-box in the advanced settings that allow users to select additional options (see branch description for details).

Additional bounds checking and unit tests have been added to support this.

This latest proposal also contains additional input validation and testing thereof for values from Settings(...

2643. By Azaziah on 2016-04-16

"In this re-proposal:

Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628

--------------------------------------------------------------------------------------------------------------

- Merged to trunk on 13.4.16, tests are now passing.

lp:~suutari-olli/openlp/show-no-log..."

2642. By Tim Bentley on 2016-04-16

Media repeat icon

2641. By Tim Bentley on 2016-04-15

Many changes in the code:
* Video over text backgrounds loop
* We have timers for live and preview not sharing the same timer thread (Major bug)!
* We use MediaInfo to get the video time when building the service item not when playing. (Big change and major bug fix)
* Media can loop and button (stop by the stop button) controlls it. (Icon will be changed in next merge).
* Medio Live and Preview no longer clash and stop and start each other.
* Many code fixups and clean ups
* Remove flash as we do not support it and it is dead!
* fix up tests
* service files created before this will not work on this code as I have changed when the length is extracted.

Fixed comments from last merge request.