lp://qastaging/~alisonken1/openlp/strings_mainwindow

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Bentley: Approve on 2016-05-02

Raoul Snyman: Approve on 2016-04-30

Diff: 255 lines (+56/-38)

3 files modified

openlp/core/ui/maindisplay.py (+8/-6)
openlp/core/ui/mainwindow.py (+29/-27)
tests/functional/openlp_core_lib/test_projectordb.py (+19/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2656. By Ken Roberts on 2016-04-29

pep8 in test_openlpimporter.py

2655. By Ken Roberts on 2016-04-29

Convert strings to python3 in mainwindow

2654. By Raoul Snyman on 2016-04-27

Fix bug #1557514 by auto-detecting the columns of the tables in the songs database

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

2653. By Ian Knight on 2016-04-27

Added QR code and link to iOS remote app and test to HTML Builder.

lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

2652. By Tomas Groth on 2016-04-27

Added support for importing SWORD bibles using PySword.

2651. By Chris Hill on 2016-04-26

Natural sort for authors, topics, songbooks, themes in Edit Song comboboxen & Song Maintenance form, as mentioned previously by Raoul - Matthew 21:28–29! :)

Also some minor fixes that I picked up after merge 2637 for natural sorting:
x Author, Topics, Theme search were performing two sorts (one database sort, then a natural sort in code). Removed the first database sort.
x Changed all sorting to use in-place sort() rather than copy sorted(), as apparently there's a speed bonus (http://stacko...

2650. By Ken Roberts on 2016-04-23

- Update string format to Python3 style
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

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

Jenkins down - local pep8 and tests (except windows tests) passed.

Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...

2649. By Tim Bentley on 2016-04-23

Finish moving things around

2648. By Tim Bentley on 2016-04-23

Add Icon and defense tests for missing mediainfo

2647. By Azaziah on 2016-04-21

This branch introduces the following fixes/features:

- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
  (Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
  be set if panels are locked.
- Panels are now locked by default, this prevents users from
  totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
  (By default disabled, added a hidden setting fo...