raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,384 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

246 Commits

Author SHA1 Message Date
Gary Talent e07693c95f EW6 Importer: Cleanup array cropping. 2017-03-31 23:26:14 -05:00
Gary Talent 5a36232c93 Add option to import EasyWorship 6 database from any level in the database directory tree. 2017-03-30 19:53:31 -05:00
Gary Talent 76000b4e26 EW6 Importer: Replace appended string paths with os.path.join. 2017-03-30 15:48:23 -05:00
Gary Talent 3f56ca482e Remove empty lines from EW6 importer methods. 2017-03-30 14:45:38 -05:00
Gary Talent b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00
Gary Talent 5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
Raoul Snyman 4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
Raoul Snyman 4183f186ce Various fixes and things: 
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

bzr-revno: 2728
 2017-03-24 19:33:45 -07:00
Raoul Snyman a2a51b95dd Various fixes: 
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
 2017-03-22 21:43:13 -07:00
Simon Hanna 172625b193 Make sure songbeamer songs are decoded correctly 2017-03-13 13:16:12 +01:00
Raoul Snyman 324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tomas Groth dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth 56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
Tomas Groth 02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Tomas Groth 706d52ad5d Improve the songbeamer encoding detection. 2017-01-12 22:04:53 +01:00
Tomas Groth 32d3c0038e Handle a few videopsalm quirks 2017-01-12 22:03:06 +01:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tomas Groth 5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Tomas Groth 88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Tomas Groth 1406224a8f Added support for import of ChordPro 2016-09-25 11:30:00 +02:00
Tomas Groth 453bd53657 Fix the tidy_text method to not insert linefeeds, which is not allowed in XML. 2016-09-23 23:46:43 +02:00
Gary Talent ebbfd39dbd Add validity checking to EasyWorship 6 importer. 2016-09-22 01:19:46 -05:00
Gary Talent 08416db1d3 Fix unicode skip issue with the strip_rtf function. 
Add doc comment to EasyWorship6 import method.
 2016-09-20 22:10:28 -05:00
Tomas Groth 4754d1eb8b Try to fix a mediashout import issue by replacing the line tab char with 2 linebreaks. 2016-09-18 17:28:55 +02:00
Gary Talent 5435dfc5cc Add test for EasyWorship 6 importer. 2016-09-16 23:39:40 -05:00
Gary Talent b5f08bf54c Add support for importing EasyWorship6 databases 2016-09-07 00:15:37 -05:00
Tomas Groth 825a703cd0 pep8 fixes 2016-08-19 17:05:44 +02:00
Tomas Groth c463c46cf6 Fixed various bugs in the songbeamer chord import, and added a test. 2016-08-19 16:51:23 +02:00
Tomas Groth b35d300708 Added support for importing chords and verseorder from songbeamer. 2016-08-18 21:55:22 +02:00
Tomas Groth 25c268145a merge trunk 2016-08-18 21:04:44 +02:00
Tomas Groth 449b46ab3d merge trunk 2016-07-27 21:01:57 +02:00
Tomas Groth b781fa6169 some cleanups, comments and a test. 2016-07-26 21:02:35 +02:00
Tomas Groth de54ec2715 merge trunk 2016-07-25 22:48:30 +02:00
Tomas Groth 611c970eb0 More work on chords 2016-07-25 22:07:07 +02:00
Tomas Groth f5da7e2a2b Make easyslide importer try to recover when reading non-standard xml. Fixes bug 1588822. 
Fixes: https://launchpad.net/bugs/1588822
 2016-07-07 22:51:25 +02:00
Tomas Groth 69951133fe Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945. 
Fixes: https://launchpad.net/bugs/1594945
 2016-07-07 22:47:57 +02:00
Tomas Groth 1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth 99e6ab6657 Fix various issues as suggested by pylint 2016-07-05 22:31:29 +02:00
second@tgc.dk 45d2640159 "Fix various pyodbc related issues. Fixes bug 1590657. 
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152, https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
 2016-06-16 22:12:27 +02:00
Tomas Groth 4fc4fa8969 pep8 fixes 2016-06-14 22:36:51 +02:00
Tomas Groth 41c0d3fcf9 Fix various pyodbc related issues. Fixes bug 1590657. 
Fixes: https://launchpad.net/bugs/1590657
 2016-06-14 21:11:57 +02:00
Tomas Groth e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
Raoul Snyman 0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
Ken Roberts 9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth 3163d33543 Fix of tracback during SongPro import. Fixes bug 1582152. 
Fixes: https://launchpad.net/bugs/1582152
 2016-05-26 15:03:00 +02:00
Tomas Groth fd4cfd1eaa Fix traceback during songshowplus import. Fixes bug 1585489. 
Fixes: https://launchpad.net/bugs/1585489
 2016-05-25 09:04:41 +02:00
Tomas Groth 72120d8b2f Skip PresentationManager files we do not support. 2016-05-24 13:49:08 +02:00
Tomas Groth 90f927ae7f Fix traceback while handling traceback in videopsalm import 2016-05-24 13:40:01 +02:00
Raoul Snyman 7262345912 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database 
Fixes: https://launchpad.net/bugs/1557514
 2016-04-27 20:58:35 +02:00
Tim Bentley 38996c81cc more files 2016-04-22 19:25:57 +01:00
Tomas Groth 2aeb7f9e6f trunk 2016-04-10 22:24:07 +02:00
Tim Bentley b7da0be71e move method 2016-04-05 18:10:51 +01:00
Tim Bentley 85587ce2f3 uno commands 2016-04-04 21:14:04 +01:00
Ian Knight 184b0e538a Implemented recommended changes 2016-03-31 16:09:13 +10:30
Ian Knight 9516588f62 Housekeeping, pep8 errors 2016-03-31 03:50:33 +10:30
Ian Knight 573bc510ff Added ProPresenter 5 & 6 support 2016-03-31 03:41:52 +10:30
Tomas Groth fa282cd103 pep8 fix 2016-03-29 22:45:57 +02:00
Tomas Groth dc0924fbbb Translation fixes. Fixes bug 1545072 
Fixes: https://launchpad.net/bugs/1545072
 2016-03-22 22:11:12 +01:00
Tomas Groth 66cea24673 some more fixes 2016-03-20 21:23:01 +01:00
Tomas Groth 45b122f768 make stuff prettier... 2016-03-20 09:28:41 +01:00
Tomas Groth dca65148c4 forgot to add a file and made some pep8 fixes 2016-03-19 21:42:59 +01:00
Tomas Groth 2937f39999 trunk 2016-03-19 21:30:12 +01:00
Tomas Groth b20eaef054 fix bug that prevents song book entries to be imported. 2016-03-19 21:28:32 +01:00
Tomas Groth 7941d8e2a1 improved copyright text handling and restructed a bit. 2016-03-19 21:27:49 +01:00
Tomas Groth 7b69634552 Fixes for translation support + test 2016-03-19 07:20:12 +01:00
Tomas Groth fdc22b4e4c Add translations support 2016-03-18 23:09:49 +01:00
Tomas Groth 302fcb221b Added another OPS Pro import test 2016-03-16 22:28:29 +01:00
Tomas Groth 1dfad12edc Fix EasyWorship import issues with missing verses and traceback on unknown chars. 
Fixes: https://launchpad.net/bugs/1553922, https://launchpad.net/bugs/1547234
 2016-03-12 22:25:39 +01:00
Tomas Groth e9e5976d22 Finished first test. 2016-03-11 22:56:07 +01:00
Tomas Groth 51ffb92d40 Started work on tests 2016-03-09 22:44:15 +01:00
Tomas Groth 98eb50e9b2 Made the anchor/tag detection more generic. 2016-03-08 22:43:10 +01:00
Tomas Groth e67ad21740 Getting closer... 2016-03-07 23:27:28 +01:00
Tomas Groth d28ca7500e Beginning of an OPS Pro importer 2016-02-29 22:35:53 +01: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
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@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
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
Tomas Groth b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +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
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 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +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
Simon Hanna 6e9547dc33 Strip whitespace from title tag on import of Songbeamer file 2016-01-03 01:39:53 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5 
bzr-revno: 2576
 2015-12-21 21:27:10 +01:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth 89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth 2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth 037d3f4f7d Added support for author types in tests + some VideoPsalm fixes 2015-12-18 23:24:20 +01:00
Tomas Groth 6eb17b561d trunk 2015-12-18 21:13:21 +01:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Tomas Groth 6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Tomas Groth e40d8e7126 Added suport for importing songs exported from Lyrix. 2015-12-15 00:00:57 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer 285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tomas Groth 05043edb6d Strip trailing whitespaces from verse-string. 2015-10-28 16:43:17 +00:00
Tomas Groth fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tomas Groth 85f034abdd Make zionwork imported work with python3 
Fixes: https://launchpad.net/bugs/1510282
 2015-10-27 12:28:13 +00:00
Jonathan Springer 6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Tomas Groth 579f532aec Removed unnecessary line. 2015-08-28 14:20:17 +01:00
Tomas Groth 0c24d3705b Fix traceback on windows in the OO/LO song importer. 2015-08-28 11:22:06 +01:00
Tomas Groth 4488fedfdc Fix SongPro import. Fixes bug 1489376. 
Fixes: https://launchpad.net/bugs/1489376
 2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt eac92737a2 Better strings for translation 2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt fce9a1e1f2 OpenLP 2.0 -> OpenLP 2 2015-08-26 09:26:19 +02:00
Tomas Groth 8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth 4266d9cbdf For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Fixes: https://launchpad.net/bugs/1458056
 2015-05-25 12:11:04 +01:00
Tomas Groth 39c79aaed9 PEP8 fixes 2015-03-09 20:57:39 +00:00
Tomas Groth cf9c91f171 Fix parsing of partly broken presentation manager files on windows. 2015-01-30 21:50:36 +00:00
Tomas Groth 46ee502ad6 Fix for chardet input. 2015-01-29 21:20:36 +00:00
Tomas Groth 1b75cc9c6b Fallback to manual encoding detection. 2015-01-29 21:15:39 +00:00
Tomas Groth 8e8228a69a Make xml parsing of presentation manager files recover if errors are encountered. Fixes bug 1414980. 
Fixes: https://launchpad.net/bugs/1414980
 2015-01-29 15:06:44 +01:00
Phill Ridout 051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout 7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Raoul Snyman de213b0f66 Copyright cleanup time, 
bzr-revno: 2479
 2015-01-19 08:34:29 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tomas Groth 36e4b0c8eb Attempt to fix WorshipCenterProImport init under wine tests 2015-01-16 16:25:25 +01:00
Ken Roberts 4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Tomas Groth 46641fecbe Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944). 
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.

bzr-revno: 2450
 2014-12-07 08:11:59 +00:00
Tomas Groth 01cbd921e9 Open opensong files in 'rb' mode. Fixes bug 1396958 
Fixes: https://launchpad.net/bugs/1396958
 2014-11-28 08:13:21 +00:00
Tomas Groth e3bd817c5b Merge with trunk 2014-11-26 09:04:09 +00:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Tomas Groth 0a500eeb8d Fix for WA import with escaped characters, partial fix for bug 1390986 
Fixes: https://launchpad.net/bugs/1390986
 2014-11-10 10:25:31 +01:00
Tomas Groth 8f4ccc5426 Close db session after import to unlock file on windows 2014-11-06 14:14:05 +01:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Tomas Groth 2ed5f2bbe4 Fix for import of Words of Worship file 2014-11-03 11:03:53 +01:00
Jonathan Springer f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Phill Ridout 34a1ab3b3e HEAD 2014-08-26 17:51:52 +01:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt 63f08f0c4a Fix ProPresenter import 
Fixes: https://launchpad.net/bugs/1358418
 2014-08-18 20:45:15 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt 53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Samuel Mehrbrodt b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt 2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Samuel Mehrbrodt f089e7522e Cleanups 2014-07-04 11:35:10 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00