Commit Graph

1098 Commits

Author SHA1 Message Date
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 0fb445e117 PEP8 2014-07-04 11:36:54 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Tomas Groth 33e104d57d Tried to fix some linux vs windows issues. Also added a test. 2014-07-04 10:45:17 +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 c9b47e8e6f PEP8 2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt 3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Tomas Groth 79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Tim Bentley 12c8663f8e indent 2014-07-02 20:52:26 +01:00
Tim Bentley 6847ee2e37 remove bl 2014-07-02 20:47:54 +01:00
Tomas Groth 376f8f3dc7 Added test for thememanager 2014-07-02 21:18:18 +02:00
Tim Bentley f71c4cc7af remove nonvalid test 2014-07-02 19:58:52 +01:00
Tim Bentley 4ac921a2e7 tests 2014-07-02 19:38:10 +01:00
Phill Ridout 05f4f2d72e fixed tests 2014-06-30 21:54:11 +01:00
Samuel Mehrbrodt b4be73b616 Fix bzr tags test 2014-06-26 11:21:46 +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 c3e9d0c5b3 Add test 2014-06-25 17:03:00 +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 d61111ab89 Add proper error messages to EasyWorship import.
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt 340857cecc Detect languages in source code folder when running from source
bzr-revno: 2393
2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt 95b816c843 ProPresenter Import
bzr-revno: 2392
2014-06-11 06:08:10 +01:00
Andreas Preikschat 2791b37525 pep fixes 2014-06-10 11:48:42 +02:00
Andreas Preikschat 3235c334eb sorted imports 2014-06-10 11:42:11 +02:00
Andreas Preikschat 837d95ae41 added a test case 2014-06-10 11:39:24 +02:00
Andreas Preikschat 6d0ee83de1 moved tests 2014-06-10 11:24:50 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt b2e4c6f99f Add test for missing songs.mb 2014-06-09 09:55:48 +02:00
Tomas Groth d832933110 Small fix for locating mudraw on windows and mac.
Enabled presentation plugin on mac and adjusted test accordingly.

bzr-revno: 2390
2014-06-08 21:25:32 +01:00
Tim Bentley 8d67406728 Fix a validation bug with presentations being loaded from services
Fix range bug stopping service items being triggered unless it was the first!

bzr-revno: 2389
2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt 08e41672cb Better name for test 2014-06-08 16:27:03 +02:00
Samuel Mehrbrodt 5c90d7847e Merge trunk 2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt 007e18945e Various string fixes and other tidying up
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils

bzr-revno: 2388
2014-06-08 16:12:23 +02:00
Tim Bentley 567b3f4b57 Fix up description 2014-06-05 17:32:29 +01:00
Tim Bentley f23e603314 Fix up interface better 2014-06-05 17:25:37 +01:00
Tim Bentley 2e82d92ebc Head 2014-06-04 05:55:28 +01: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
Samuel Mehrbrodt a6a43264da Merge trunk 2014-06-03 21:23:21 +02:00
Samuel Mehrbrodt 9f5895dd82 Song duplicates added when using different author types for the same author
bzr-revno: 2386
2014-06-03 17:20:46 +01:00
Tim Bentley 7bea1ea7de fix pep 2014-05-31 21:10:59 +01:00
Tim Bentley 983db7b0f0 fix pep 2014-05-31 21:07:46 +01:00
Tim Bentley 82f97ee736 Fix suffix error in presentation 2014-05-31 21:00:10 +01:00
Tomas Groth 13cc26f26a Support for importing Zefania bible XML format
bzr-revno: 2385
2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt 50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly.
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt 0441f0e71b Better description 2014-05-30 19:59:11 +02:00
Tomas Groth d424270b7f Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac. 2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt 873f18ad65 Add test 2014-05-22 15:48:57 +02:00
Samuel Mehrbrodt dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Tomas Groth d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt 854149408f Add test 2014-05-21 17:31:25 +02:00
Samuel Mehrbrodt 5cd2f7ebff Remove tests 2014-05-21 17:31:02 +02:00
Samuel Mehrbrodt 4fadbef196 PEP8 2014-05-21 17:22:13 +02:00
Samuel Mehrbrodt 2462fcf06e Remove test 2014-05-21 17:18:04 +02:00
Samuel Mehrbrodt d1814f05de Add test 2014-05-21 17:17:08 +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 4039cf1103 More tests 2014-05-20 23:54:18 +02:00
Tomas Groth 58179f8d83 Tests 2014-05-20 20:41:07 +02:00
Tomas Groth 37f04c5199 Added simple tests. 2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt 1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt 35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt 97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt 6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Jonathan Springer 1cd9fff9bd Change how we define which menu items are included in the main menu on Mac OS
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified

bzr-revno: 2382
2014-05-11 05:45:30 +01:00
Tim Bentley ec7a7b74fe test 2014-05-10 08:38:38 +01:00
Samuel Mehrbrodt 9dd9f21135 Add an option to display the songbook in the footer
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth 45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Jonathan Springer 13b9a7de72 Add test for the main window function set_service_modified 2014-05-08 10:57:26 -04:00
Jonathan Springer 6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Tim Bentley c6d6be30c6 fix 2014-05-07 21:38:34 +01:00
Tim Bentley dbf2330896 head 2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt 9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Stefan Strasser fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Tim Bentley 1e6f00c2eb Add test 2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt cca1ce57f3 Add test 2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt 3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Tim Bentley f21d3cfa83 fix tests 2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt 37653bfd13 Add missing tag to test 2014-05-03 17:34:13 +02:00
Samuel Mehrbrodt f60379b542 Add new test 2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt b02fc541a3 Reorganize tests 2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt 922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02: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
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat 2ba7fa4f44 head 2014-05-01 18:58:32 +02:00
Andreas Preikschat 3f75a913e2 removed not working tests 2014-05-01 18:57:45 +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
Andreas Preikschat 0160c583e9 Fix Renderer broken when two option breaks next to each other
bzr-revno: 2374
2014-04-29 17:57:07 +01:00
Andreas Preikschat ff1bc31bfc - Fixed bug #1240037
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts

bzr-revno: 2373
2014-04-29 17:55:30 +01:00
Tomas Groth cc0f0e1eb0 Support for importing ews files (EasyWorship Service files)
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Andreas Preikschat b73d8b088c head 2014-04-29 13:04:32 +02:00
Tomas Groth 48fe8c5e37 Restructured the tests a bit. 2014-04-26 21:47:11 +02:00
Andreas Preikschat 911864a442 removed useless code 2014-04-26 19:31:59 +02:00
Andreas Preikschat 53c584ede4 removed print 2014-04-26 11:26:20 +02:00
Andreas Preikschat 533710fc5b blank line 2014-04-26 11:02:04 +02:00
Andreas Preikschat 6bdadff334 raise exception when item not in list 2014-04-26 11:01:12 +02:00
Andreas Preikschat aa899bfde0 fixes 2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt 20f748d608 Allow authors to be tagged by their type (words music etc)
bzr-revno: 2371
2014-04-26 09:42:26 +01:00
Tim Bentley 9e8f0d82de Add icons to see the state of the remote (on / SSL / authentication)
Stop restarting the server as this crashes it and should not be common.

bzr-revno: 2370
2014-04-26 09:38:44 +01:00
Andreas Preikschat 5a2793bc50 head 2014-04-26 10:19:12 +02:00
Stefan Strasser c2d1589dcb fixed a pep-issue in songs-lib and corrected a comment in a test 2014-04-26 07:07:08 +02:00
Stefan Strasser 1cd7d73d10 fixed bug #1312629 Error on entering invalid character in verse-order
Fixes: https://launchpad.net/bugs/1312629
2014-04-25 22:04:43 +02:00
Tomas Groth bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Stewart Becker 04d5a40542 Fix PEP8 issues 2014-04-22 22:48:48 +01: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
Tomas Groth 7980231273 Skip tests on windows. 2014-04-22 22:13:36 +02:00
Andreas Preikschat 5a3aecf997 fixed bugs in class 2014-04-22 17:06:21 +02:00
Andreas Preikschat 1ae7c32adb fixed import 2014-04-22 12:32:02 +02:00
Andreas Preikschat 70bce87434 head 2014-04-22 12:30:43 +02:00
Andreas Preikschat 6c08a80bfd added test; refactor 2014-04-22 12:29:15 +02:00
Stewart Becker 7deeefafb4 Remove call used only for debugging 2014-04-21 19:52:42 +01:00
Stewart Becker 9a05c7603a Fixed apostrophe format 2014-04-21 19:42:54 +01:00
Stewart Becker 3e1ed273be Show calls to add_verse for debugging 2014-04-21 19:20:06 +01:00
Stewart Becker 57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +01:00
Stewart Becker e6162e033f Add tests for OpenSongImport, and fixes so that they pass 2014-04-21 16:49:41 +01:00
Jonathan Springer 05171453ea merge trunk 2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt cc0af8845e PEP8 2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt 031868ae31 trunk 2014-04-21 11:49:17 +02:00
Raoul Snyman dee8ed2850 Fix an exception raised when loading media players if the configuration is blank 2014-04-21 00:23:26 +02:00
Andreas Preikschat 328b25dbe8 fix: Bug #1146964 Attach button on exception form does not work
bzr-revno: 2368
2014-04-20 22:51:11 +02:00
Jonathan Springer c8d0efe2ea merge trunk 2014-04-20 16:19:41 -04:00
Tim Bentley f7ba5ee0e3 head 2014-04-20 21:19:21 +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