Commit Graph

1872 Commits

Author SHA1 Message Date
Tomas Groth 867c32165a merge trunk 2016-06-21 23:01:53 +02:00
second@tgc.dk 9d2da2307f Fix traceback in VideoPsalm importers traceback handler.
Skip PresentationManager files we do not support.
Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
Fix traceback during songshowplus import. Fixes bug 1585489.

bzr-revno: 2638
Fixes: https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
2016-06-21 22:50:45 +02:00
Tomas Groth db0cdd372b Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
Fixes: https://launchpad.net/bugs/1594945
2016-06-21 22:06:10 +02:00
Tomas Groth cadc21b5c0 Fix traceback in VideoPsalm importers traceback handler. 2016-06-16 23:00:13 +02:00
Tomas Groth 7265065906 Skip PresentationManager files we do not support. 2016-06-16 22:59:31 +02:00
Tomas Groth 8f04f587ec Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
Fixes: https://launchpad.net/bugs/1590657
2016-06-16 22:58:11 +02:00
Tomas Groth 8057d13db6 Fix traceback during songshowplus import. Fixes bug 1585489.
Fixes: https://launchpad.net/bugs/1585489
2016-06-16 22:54:10 +02:00
Raoul Snyman 19a5272e5a Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-08 11:09:56 +02:00
Tomas Groth eb15f09a47 Fix of tracback during SongPro import. Fixes bug 1582152.
Fixes: https://launchpad.net/bugs/1582152
2016-05-16 12:15:53 +02:00
Samuel Mehrbrodt 6e901e336c Fix performance regression in songbook search
Fixes: https://launchpad.net/bugs/1552563
2016-04-29 19:39:52 +02:00
Raoul Snyman 411953285d Fix bug #1557514 by autodetecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:45:39 +02:00
Tomas Groth 895b3bf9b5 Fix slide order change when splitting custom slides. Fixes bug 1554748. Fix EasyWorship import issues with missing verses and traceback on unknown chars. Fix traceback in the bug-report dialog. Fixes bug 1554428. Fix weird test bug in test_pluginmanager.py. 2016-04-21 21:57:00 +02:00
Tomas Groth 2c640389f1 Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. Set progress bar steps to number of chapters in zefania import. Fix song tag detection. Fixes bug 1549549. Fix a method call with too many parentheses, which fixes getting bible books from crosswalk. Fix bug that prevents song book entries to be imported. 2016-04-21 21:49:22 +02:00
Tomas Groth a02aca022a Use the chosen encoding when importing from easyworship db. 2016-01-31 20:36:54 +01:00
Tomas Groth c1108b1593 Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field. 2016-01-23 09:19:12 +01:00
Tomas Groth e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Simon Hanna 4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna 9525453679 Ignore case when matching verse tags during SongBeamerImport 2016-01-10 01:22:31 +01:00
Simon Hanna 076cc57d39 Fix Song import 2016-01-10 01:17:58 +01:00
s.mehrbrodt@gmail.com ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
2016-01-09 19:53:09 +00:00
Raoul Snyman a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
simon.hanna@serve-me.info 04e117181d Strip whitespace from title when importing a Songbeamer song.
bzr-revno: 2596
2016-01-09 16:59:25 +00:00
Simon Hanna 0416e29a83 Merge with trunk 2016-01-09 17:50:08 +01:00
Simon Hanna afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt fe74a19783 Merge 2016-01-09 16:04:34 +01:00
Tomas Groth e16a1916b7 forgot to remove debug print 2016-01-09 14:53:59 +01:00
Tomas Groth e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna 8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +01:00
Samuel Mehrbrodt da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth 5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth 211f93a921 Made importer list sorted, again. 2016-01-08 20:53:58 +01:00
Tomas Groth 21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth 345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
s.mehrbrodt@gmail.com 859288f172 Usability improvements
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
2016-01-08 17:28:47 +00:00
Samuel Mehrbrodt ddefceee04 Fix migration for non-sqlite 2016-01-07 23:12:03 +01:00
Simon Hanna d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna 584a0fda0d Fix the deletion of songs
This was left out when migrating to Qt 5
2016-01-05 23:58:04 +01:00
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Samuel Mehrbrodt c47d1bdca4 Select text in search field when it gains focus
Fixes: https://launchpad.net/bugs/1530340
2016-01-05 16:32:49 +01:00
Samuel Mehrbrodt d274b6cb08 Fix exporting OpenLyrics 2016-01-04 20:00:19 +01:00
Samuel Mehrbrodt 4706ff4af8 Merge trunk 2016-01-04 19:47:03 +01:00
Samuel Mehrbrodt e4ecc3e763 Fix searching with multiple songbooks 2016-01-04 19:46:00 +01:00
Samuel Mehrbrodt a106245d8b Display multiple songbooks in the footer 2016-01-04 13:48:47 +01:00
Simon Hanna c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt c7d7d16921 PEP8 2016-01-04 13:18:11 +01:00
Samuel Mehrbrodt d2ab4862b4 Initial support for multiple songbooks 2016-01-04 13:11:24 +01:00
Simon Hanna 6e9547dc33 Strip whitespace from title tag on import of Songbeamer file 2016-01-03 01:39:53 +01:00