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

9509 Commits

Author SHA1 Message Date
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 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
Tomas Groth 542fe4e887 small changes 2014-07-11 23:45:01 +02:00
Tomas Groth 3edabb268e removed websockets 2014-07-11 22:35:23 +02:00
Samuel Mehrbrodt 53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Tomas Groth 98a58d45bf pep8 fixes 2014-07-11 15:35:44 +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 6d5e6f0faf Remove debug output 2014-07-09 14:45:54 +02:00
Samuel Mehrbrodt 383f7ef6e2 Option for displaying copyright symbol 2014-07-09 14:33:26 +02:00
Tomas Groth e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Samuel Mehrbrodt b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt df6669220a Space 2014-07-07 18:17:54 +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 398508f49b Gui entry 2014-07-07 15:36:07 +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 201cfad9c4 Remove unused imports 2014-07-07 14:25:00 +02:00
Tomas Groth bec0071e7c Small adjustments 2014-07-07 13:30:03 +02:00
Samuel Mehrbrodt b92ca3f209 Fix service up movement 
Fixes: https://launchpad.net/bugs/1338316
 2014-07-07 13:17:24 +02:00
Tomas Groth 32ff9cdeb7 Patch by Samuel 2014-07-06 21:48:23 +02:00
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt 5d7b60f714 Changing Author type functional 2014-07-05 21:56:32 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt aec5a8546b Merge trunk 2014-07-04 16:16:14 +02:00
Samuel Mehrbrodt 7f9ae1374e Started authortype editing 
Fixes: https://launchpad.net/bugs/1336933
 2014-07-04 16:16:02 +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
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
Tomas Groth 9d87fa46ca Try to fix playing-when-loading 2014-07-03 20:43:35 +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 8a545ceaf7 Try to fix some timing issues 2014-07-03 16:19:11 +02:00
Tomas Groth 79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Tomas Groth d19e7bf3aa Fix disc loading for windows 2014-07-03 11:27:54 +02:00
Tomas Groth 6f7f3be3ff Fix optical drive detection on windows 2014-07-03 09:09:55 +02:00
Samuel Mehrbrodt 046f661d37 Add an importer for Worship Assistant 
bzr-revno: 2396
 2014-07-03 05:42:47 +01:00
Tomas Groth d402bf86cb trunk 2014-07-02 22:48:56 +02:00
Tim Bentley f649f0af3c Fix initialisation 2014-07-02 19:13:23 +01:00
Tim Bentley b3041a5287 Fix version 2014-07-01 22:11:13 +01:00
Tim Bentley 7d2f8fa6cd Fix setup.py 2014-07-01 22:10:26 +01:00
Tomas Groth 3c91a6bbfd Fixed seeking when playing mediaclip 2014-07-01 22:06:55 +02:00
Tomas Groth 154334a332 Fix for dvd loading 2014-07-01 19:48:36 +02:00
Phill Ridout 9b6979b840 Changed log.warn to log.warning 2014-06-30 21:59:22 +01:00
Samuel Mehrbrodt af6537116c Close file also on success 2014-06-30 14:36:35 +02:00
Samuel Mehrbrodt 9702870afa Close and delete zip in case of exception 2014-06-30 09:30:19 +02:00
Samuel Mehrbrodt 7364d4962f Small fixes 2014-06-30 09:18:26 +02:00
Samuel Mehrbrodt 78f1756380 Fix biblegateway url 2014-06-26 10:35:53 +02:00
Samuel Mehrbrodt a52dc69c89 Remove debug output 2014-06-26 10:04:33 +02:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Tomas Groth e773d82341 Updated VLC bindings to latest build 2014-06-26 09:41:22 +02:00
Samuel Mehrbrodt 5eb0ac618e PEP8 2014-06-25 17:04:13 +02:00
Samuel Mehrbrodt c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt 4ebfa33aac Parse verse names 2014-06-25 15:49:03 +02:00
Samuel Mehrbrodt f92afc296b First go at an importer for Worship Assistant 2014-06-25 14:23:31 +02:00
Tomas Groth 248e703345 Fixed loading of libvlc.dll on windows 2014-06-24 19:46:23 +02:00
Samuel Mehrbrodt 39fbbf779d Move this line out of try/catch block 2014-06-23 15:54:13 +02:00
Samuel Mehrbrodt aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Samuel Mehrbrodt e174365051 Fix theme export 
Fixes: https://launchpad.net/bugs/1332990
 2014-06-23 13:38:17 +02:00
Tomas Groth 49342f4a69 Improve Powerpoint error handling 2014-06-22 22:12:59 +02:00
Tomas Groth 956af8706b Small suggested changes 2014-06-17 09:27:12 +02:00
Tomas Groth 44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Tomas Groth 7a47e5cb67 fixed bug #719514 ' Themes: <file> and <otherfile> are the same file' 
Fixes: https://launchpad.net/bugs/719514
 2014-06-15 22:35:31 +02:00
Tomas Groth 2a1a93d319 Made it possible to name optical clips, and fixed some issues. 2014-06-14 23:48:07 +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 50a226d51b Better wording 2014-06-11 07:18:32 +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 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt 6e9bba3a74 Rename file 2014-06-09 11:08:27 +02:00
Samuel Mehrbrodt e424c33283 This has been removed in trunk 2014-06-09 10:59:52 +02:00
Samuel Mehrbrodt e973a9e4e3 Merge trunk 2014-06-09 10:51:41 +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 0794a1e0c6 Give proper error messages in EasyWorship import 
Fixes: https://launchpad.net/bugs/1326664
 2014-06-08 17:20:23 +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 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 a912db6abf new bug 2014-06-01 18:12:00 +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
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 56ebf2de00 Revert change in check for language dir 2014-05-28 19:17:26 +02:00
Tomas Groth 06825e4aeb Added support for audio cds and udisks2 2014-05-23 15:39:25 +02:00
Samuel Mehrbrodt ea30fb4bdc Accidentally removed string 2014-05-22 23:35:38 +02:00
Samuel Mehrbrodt e70a09c93e Detect language folder in source directory 2014-05-22 15:40:05 +02:00
Samuel Mehrbrodt 49a48c6463 more string fixes 2014-05-21 19:20:44 +02:00
Tomas Groth d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt 2466a7d8fa Add hints for author types 2014-05-21 17:09:44 +02:00
Samuel Mehrbrodt d10507e250 Small string fixes 2014-05-21 16:47:44 +02:00
Tomas Groth b352c05ff0 Fix spelling in a comment 2014-05-21 11:33:23 +02:00
Tomas Groth 7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Tomas Groth 58179f8d83 Tests 2014-05-20 20:41:07 +02:00
Samuel Mehrbrodt de8074b00a Improve single click behavior (remove flickering) 2014-05-19 21:19:05 +02:00
Tomas Groth 37f04c5199 Added simple tests. 2014-05-14 22:53:43 +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 9b173dc0fe Refactor author match check 2014-05-13 11:27:22 +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 6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Jonathan Springer 60fa4c2dca Make vlcplayer stop call asynchronous to aviod a deadlock with the UI thread 2014-05-07 18:52:06 -04: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
Samuel Mehrbrodt 55c9e3e196 Log warning when CCLI no can't be parsed 2014-05-07 21:17:47 +02:00
Samuel Mehrbrodt 6440ac008f Remove unused code 2014-05-07 15:59:31 +02:00
Samuel Mehrbrodt 13d9e77c08 Fix bug 1313538 
Fixes: https://launchpad.net/bugs/1313538
 2014-05-07 13:56:14 +02:00
Samuel Mehrbrodt 3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt a9e620c175 Remove direct usage of AuthorSong 2014-05-07 12:30:55 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Samuel Mehrbrodt aaacbeac69 Fixes 2014-05-07 12:21:27 +02:00
Samuel Mehrbrodt ef2a03d510 Fix bug 1316979 by making the authors relation viewonly 
Fixes: https://launchpad.net/bugs/1316979
 2014-05-07 11:51:59 +02:00
Tomas Groth 0d48c09180 Added support for import of Zefania XML bibles. 2014-05-06 21:53:08 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Samuel Mehrbrodt 9b396e7699 Fix bug 1211913 
Fixes: https://launchpad.net/bugs/1211913
 2014-05-05 18:20:54 +02:00
Tim Bentley d6d3cd1394 Fix call path 2014-05-03 21:00:17 +01:00
Samuel Mehrbrodt 7a1741258a Typo 2014-05-03 17:25:45 +02:00
Samuel Mehrbrodt a6a08bcfdd Fix bug 1157938 
Fixes: https://launchpad.net/bugs/1157938
 2014-05-03 17:01:43 +02:00
Samuel Mehrbrodt 635ab98f73 Fix bug 1216234 
Fixes: https://launchpad.net/bugs/1216234
 2014-05-03 16:19:29 +02:00
Samuel Mehrbrodt afaf9480c3 Rename variable 2014-05-03 15:58:31 +02:00
Samuel Mehrbrodt a7bdb9dfa0 Fix bug 1310523 
Fixes: https://launchpad.net/bugs/1310523
 2014-05-03 15:56:32 +02:00
Samuel Mehrbrodt 938f59416d Fix bug 1199639 
Fixes: https://launchpad.net/bugs/1199639
 2014-05-03 15:46:48 +02:00
Samuel Mehrbrodt 8b76dcc216 Fix bug 1310523 2014-05-03 14:56:58 +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 e0d813db3f Add an option to display the songbook in the footer 2014-05-03 12:03:50 +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
Andreas Preikschat 87587ab8e8 short lines 2014-05-02 08:50:54 +02:00
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat 4231692ae1 removed print 2014-05-02 08:34:57 +02:00
Andreas Preikschat 8fb086134e dead code, not used variables, docs, unused imports 2014-05-01 19:49:43 +02:00