Commit Graph

173 Commits

Author SHA1 Message Date
Tomas Groth 25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +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 0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tomas Groth aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888.
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Tomas Groth 1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered.
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
2015-02-10 21:24:33 +02:00
Tomas Groth 5b717db63a Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
Fixes: https://launchpad.net/bugs/1417033
2015-02-02 20:40:31 +00:00
Ken Roberts 93ce2caf34 Fix invalid call to QMessageBox() when user wants to delete user-defined source text.
bzr-revno: 2491
2015-01-31 14:18:19 +00:00
Tomas Groth 4c53cb5184 Added tests 2015-01-29 20:54:06 +00: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
Ken Roberts 44bf096bbb Source edit form button test 2015-01-18 20:24:45 -08:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02: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 4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
Tomas Groth da7ff60697 Moved test service files into appropriate folder. 2014-12-06 21:05:45 +00:00
Tomas Groth 304c489cd7 Add test for loading song with linked audio 2014-12-03 22:27:09 +00:00
Tomas Groth 80a8434458 Added one more test for song db upgrade 2014-11-25 15:11:18 +01:00
Tomas Groth 4ca013e211 Added test for song db upgrade 2014-11-25 12:25:41 +01:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Tomas Groth 02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Tomas Groth 74b582032f Fix theme import in windows. Test included. 2014-10-31 13:01:07 +01:00
Ken Roberts d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth 5ecbfa61fd Fix tests so they can run individually.
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Samuel Mehrbrodt 806bb5973e Merge trunk 2014-10-13 19:40:12 +02:00
Samuel Mehrbrodt 637c0060f9 Add test 2014-10-13 13:38:13 +02:00
Ken Roberts 7545fb534f Fix changed imports in mockups 2014-10-06 14:19:08 -07:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Tomas Groth 9b8b114a59 Fixed the new test. 2014-09-25 21:31:31 +01:00
Tomas Groth 4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Tomas Groth dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Tomas Groth 98d5ed7acf Fix the OSIS bible importer
bzr-revno: 2418
2014-09-06 07:44:08 +01:00
Tomas Groth 36326085f8 trunk 2014-08-26 22:19:08 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth 3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00
Samuel Mehrbrodt c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tomas Groth 3a1fda85d5 Fixed windows test failure by removing special char from filenames 2014-08-21 14:51:34 +02:00
Tomas Groth 3b092319c9 trunk 2014-08-21 11:24:40 +02:00
Samuel Mehrbrodt bde55c79f8 No newline at end of file... 2014-08-18 21:15:23 +02:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt 82b3c00863 Add importer for PresentationManager
bzr-revno: 2407
2014-08-04 06:01:41 +01:00
Samuel Mehrbrodt 933ec66efc Fix theme export and add unit test.
bzr-revno: 2406
2014-08-04 06:00:34 +01:00
Tomas Groth 00693b8cce trunk 2014-07-15 15:41:34 +02:00
Tomas Groth 9853b21170 Added test.ppt needed for tests 2014-07-15 11:28:50 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Tomas Groth 88fc41a5eb Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py 2014-07-14 16:15:08 +02:00
Samuel Mehrbrodt 53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Tomas Groth 406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt b7a141f75c Add Presentation Manager import
Fixes: https://launchpad.net/bugs/957017
2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 953adf7145 A blank line! 2014-07-04 10:35:24 +02:00
Samuel Mehrbrodt 87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt 7112356c21 Parse verse order 2014-07-03 23:48:52 +02:00
Samuel Mehrbrodt 9f34552364 PowerPraise importer
Fixes: https://launchpad.net/bugs/1336929
2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt c638834023 Add missing files 2014-06-26 09:59:16 +02:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt 93c3a57ea9 Add missing files 2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Tomas Groth 44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Tomas Groth 346c9e475a updated test 2014-06-15 21:33:05 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Stewart Becker ed295d38dd Fixed a typo: load_Last_file -> load_last_file
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
2014-06-04 05:54:44 +01:00
Tomas Groth d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Tomas Groth 7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Tomas Groth c0b167ca78 Added tests for import of OpenSong bible format 2014-05-21 11:30:36 +02:00
Tomas Groth 37f04c5199 Added simple tests. 2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Samuel Mehrbrodt e8c7547ab2 Try to get ccli number even if there is text in the field 2014-05-03 10:47:31 +02:00
Tomas Groth 689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth 5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt b993af2e90 No newline at end of file... 2014-05-02 10:04:11 +02:00
Samuel Mehrbrodt bdf3109aaa Fix SongShowPlus Import for certain cases
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker eb64c136d0 Deal with empty ccli tag in OpenSong imports 2014-04-30 21:50:57 +01:00
Stewart Becker a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Stewart Becker 4022cff5e5 Fix some issues I ran into when importing our OpenSong 'database' 2014-04-30 21:39:40 +01:00
Tomas Groth cc0f0e1eb0 Support for importing ews files (EasyWorship Service files)
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Tomas Groth bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Stewart Becker 6d63a008f0 Merged in from trunk 2014-04-22 22:46:21 +01:00
Stewart Becker d39e1fd4a2 Added comments to OepnSong files and stricter line-break tests 2014-04-22 22:43:12 +01:00
Tomas Groth 074ab4b1bb Head 2014-04-22 22:18:58 +02:00
Stewart Becker 9a05c7603a Fixed apostrophe format 2014-04-21 19:42:54 +01:00
Stewart Becker e6162e033f Add tests for OpenSongImport, and fixes so that they pass 2014-04-21 16:49:41 +01:00
Samuel Mehrbrodt cec163085c Fix bug 1247493: OpenSong Importer fails
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
2014-04-20 21:15:21 +01:00
Tomas Groth 4560d39ad9 head 2014-04-20 20:33:55 +02:00
Tomas Groth a999e59a4f Fixes for merge 2014-04-20 16:36:56 +02:00
Samuel Mehrbrodt 4253cd4f52 Fix Songbook search
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
2014-04-20 16:32:28 +02:00
Tomas Groth f6231e024a Head 2014-04-20 15:57:12 +02:00
Samuel Mehrbrodt 9460b39a01 Remove utf8 file 2014-04-17 17:00:28 +02:00
Samuel Mehrbrodt 9010e05430 add new openlyrics file 2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt 5929b02586 Test: Songbeamer Authors import 2014-04-16 10:25:17 +02:00
Samuel Mehrbrodt be4a654298 More tests 2014-04-16 00:23:29 +02:00
Andreas Preikschat 8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat 321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Jonathan Springer 25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Tomas Groth 5c405050f1 Added test for ews import. 2014-04-04 19:57:03 +02:00
Tomas Groth 852ec00fd7 Head 2014-03-20 21:11:18 +01:00
Tomas Groth 258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00