lp:~raoul-snyman/openlp/bug-1557514

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2654

Tim Bentley: Approve on 2016-04-27

Tomas Groth: Pending requested 2016-04-27

Diff: 294 lines (+139/-28)

4 files modified

.bzrignore (+1/-0)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/importers/openlp.py (+61/-27)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+76/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1557514: Error when importing OLP Song Database

Medium

Fix Committed

Link a bug report

Related blueprints

2653. By Raoul Snyman on 2016-04-27

Forgot to add the test file

2652. By Raoul Snyman on 2016-04-27

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

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

2646. By Gabriel Loo on 2016-04-21

Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).

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