openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
12,859 Commits 6 Branches 56 Tags 311 MiB
Commit Graph

1003 Commits

Author SHA1 Message Date
Tomas Groth 7fecaa1d70 Added language detection when importing 
Fixes: https://launchpad.net/bugs/1214875
 2014-08-27 15:10:33 +02:00
Tomas Groth 36326085f8 trunk 2014-08-26 22:19:08 +01:00
Phill Ridout 9ca8be20fb HEAD 2014-08-26 17:09:28 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth 359a209341 Fixed copy/paste error. 2014-08-25 21:31:35 +01:00
Tomas Groth a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tomas Groth 71a1b26e1c Changed test desciption. 2014-08-24 16:14:29 +01:00
Tomas Groth 3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00
Tomas Groth 43d3823bfb trunk 2014-08-24 15:38:17 +01:00
Tomas Groth 254acf4601 trunk 2014-08-24 15:37:51 +01:00
Tim Bentley 2f8d8f912e Fix conversion error and add tests for service manager context menu 
bzr-revno: 2412
 2014-08-24 15:37:47 +01:00
Samuel Mehrbrodt c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tim Bentley 565c2312d0 head 2014-08-24 10:37:49 +01:00
Tim Bentley 09bb622af8 Final tests 2014-08-24 10:32:26 +01:00
Tim Bentley 516fd30bc7 fix conversion bug 2014-08-23 21:42:10 +01:00
Phill Ridout a2a4e6c4c7 HEAD 2014-08-22 17:26:46 +01:00
Tomas Groth fd4dc4caf7 Fixed another windows test by properly constructing paths. 2014-08-21 15:07:02 +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 49fca807f4 deleted file leftover from merge 2014-08-21 14:41:46 +02:00
Tomas Groth 3b092319c9 trunk 2014-08-21 11:24:40 +02:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Tomas Groth db477f8d9c trunk 2014-08-04 18:12:03 +01:00
Stewart Becker 04bafa62fa Added an option to wrap footer text 
bzr-revno: 2409
 2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt 16399e2ea5 This prevents updates from running (which should only run on outdated databases that existed before) 
bzr-revno: 2408
 2014-08-04 06:02:58 +01: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
Stewart Becker 2f984c45c4 Style fixes for Tim 2014-07-24 22:57:16 +01:00
Stewart Becker d90fcface2 Style fixes for Tim 2014-07-24 20:28:57 +01:00
Stewart Becker 668864c38d Tidy up tests and formatting 2014-07-22 21:06:48 +01:00
Stewart Becker 9a1ce000b7 Patch Registry.execute so that it is undoen at end of test 2014-07-21 22:45:27 +01:00
Stewart Becker 2555bc50d4 Add test for wrap footer setting 2014-07-21 18:13:20 +01:00
Phill Ridout 6a09b727b5 HEAD 2014-07-20 21:17:50 +01:00
Phill Ridout 67ab508286 Tweeked test to use a call list 2014-07-20 21:00:06 +01:00
Samuel Mehrbrodt fa5787e5d8 Add test 2014-07-17 23:16:00 +02:00
Tomas Groth a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth 00693b8cce trunk 2014-07-15 15:41:34 +02:00
Tomas Groth b6cd13fc91 pep8 fixes 2014-07-15 12:02:56 +02:00
Tomas Groth e1c00f9689 Fix tests for pptview - again 2014-07-15 11:50:52 +02:00
Tomas Groth 0a018a59fb Fix tests for pptview 2014-07-15 11:45:23 +02:00
Tomas Groth 597e06153c Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes 2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt b2afbd688d Add an importer for PowerPraise 
bzr-revno: 2404
 2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt 6c40962afb Allow editing of author types and fix bug in servicemanager 
bzr-revno: 2403
 2014-07-14 17:25:59 +01:00
Tomas Groth 88fc41a5eb Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py 2014-07-14 16:15:08 +02:00
Tomas Groth 29f8eedeaf Merged with trunk and reverted changes to the tag test 2014-07-14 09:19:47 +02:00
Tomas Groth 022ac9bfac trunk 2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt af64bece26 Improve Song Copyright 
bzr-revno: 2402
 2014-07-13 21:57:05 +01:00
Raoul Snyman ba9ff89354 [fix] PEP8 error: no whitespace 2014-07-13 13:04:37 +02:00
Raoul Snyman f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Samuel Mehrbrodt 79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Tomas Groth 3edabb268e removed websockets 2014-07-11 22:35:23 +02:00
Tomas Groth 98a58d45bf pep8 fixes 2014-07-11 15:35:44 +02:00
Tomas Groth 52f298fdc1 change to unix style lineending 2014-07-11 14:54:00 +02:00
Tomas Groth 9d64837602 fixed image test 2014-07-11 14:43:40 +02:00
Tomas Groth 4920f86351 removed leftover file from merge 2014-07-11 14:21:49 +02:00
Tomas Groth 406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt 7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt 79009a1a7f Add test 2014-07-09 14:41:55 +02:00
Tomas Groth e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Tomas Groth e6f5136708 Suggested changes to tests 2014-07-07 19:22:58 +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
Tomas Groth 695079dd00 Improve powerpoint error handling. 
bzr-revno: 2399
 2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt 520c251923 Cleanup: Move song import plugins into subfolder 
bzr-revno: 2398
 2014-07-07 17:08:32 +01:00
Tim Bentley 2770c76895 Fix setup.py for python3 to remove binary strings. 
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.

bzr-revno: 2397
 2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt b7a141f75c Add Presentation Manager import 
Fixes: https://launchpad.net/bugs/957017
 2014-07-07 15:30:55 +02:00
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 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 87eb8804de Fixes 2014-07-04 00:06:18 +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 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
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
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 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
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
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 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
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
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +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 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 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
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
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
Tomas Groth 074ab4b1bb Head 2014-04-22 22:18:58 +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 57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +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
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
Andreas Preikschat c691fc55d0 added a test 2014-04-20 15:00:14 +02:00
Tim Bentley a2c99317c6 fixes 2014-04-19 06:42:45 +01:00
Tim Bentley f48a3346db fixes 2014-04-19 06:29:00 +01:00
Tim Bentley af792941af pep8 again 2014-04-19 06:13:46 +01:00
Tim Bentley 5dc35112c3 pep8 again 2014-04-19 06:09:54 +01:00
Samuel Mehrbrodt d3443d12c2 Remove one test for now 2014-04-17 16:32:56 +02:00
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Samuel Mehrbrodt 5f86811f82 Fix tests 2014-04-16 23:01:57 +02:00
Jonathan Springer b6e0aa6c2e PEP8 clean up in tests 2014-04-16 16:44:22 -04:00
Samuel Mehrbrodt 9010e05430 add new openlyrics file 2014-04-16 22:42:44 +02:00