lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2661

Tim Bentley: Approve on 2016-05-16

Raoul Snyman: Approve on 2016-05-16

Diff: 687 lines (+472/-19)

9 files modified

openlp/core/lib/__init__.py (+26/-2)
openlp/core/lib/serviceitem.py (+2/-0)
openlp/core/ui/lib/listpreviewwidget.py (+8/-6)
openlp/core/ui/slidecontroller.py (+15/-3)
openlp/plugins/presentations/lib/presentationcontroller.py (+2/-2)
tests/functional/openlp_core_lib/test_lib.py (+190/-2)
tests/functional/openlp_core_lib/test_serviceitem.py (+5/-2)
tests/functional/openlp_core_ui/test_slidecontroller.py (+170/-1)
tests/functional/openlp_core_ui_lib/test_listpreviewwidget.py (+54/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1080596: Presentation preview shows desktop when live shows desktop

Medium

Fix Committed

Link a bug report

Related blueprints

2652. By Ian Knight on 2016-05-16

Check for Div0 and added unit test cases

2651. By Ian Knight on 2016-05-06

Housekeeping

2650. By Ian Knight on 2016-05-05

Fixed create_thumb_invalid_size_test

2649. By Ian Knight on 2016-05-05

Added Functional Tests, cleaned PEP8 errors

2648. By Ian Knight on 2016-05-05

Housekeeping, added check for thumbnails to avoid icon scaling issues

2647. By Ian Knight on 2016-05-04

Merge from trunk

2646. By Ian Knight on 2016-05-04

Corrected aspect ratio on slide previews

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..."