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

6980 Commits

Author SHA1 Message Date
Tim Bentley 3e5dfdb730 Add initial cleanup files for media fixes. 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-09-21 04:56:43 +00:00
Benjamin Hoving 1da59bef0d Create a linting stage 2019-09-18 16:44:39 +00:00
Raoul Snyman 9d16ae2b06 Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes. 
bzr-revno: 2904
 2019-09-15 17:22:22 +02:00
Raoul Snyman cb2ccac22c Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well 
bzr-revno: 2902
 2019-09-14 08:27:40 +01:00
Raoul Snyman 8983324ed5 Remove some old, commented out code. 2019-09-13 14:34:18 -07:00
Raoul Snyman 25a7c6f5b3 Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well 2019-09-12 23:09:19 -07:00
Raoul Snyman ccc9b2a7c1 Fix a linting issue 2019-09-12 15:54:09 -07:00
Raoul Snyman 83cd5c1a88 HEAD 2019-09-11 21:41:43 -07:00
John Lines f2c7bf0367 put default hints plugin directory and chnage name to singingthefaith-hints.tag 2019-09-04 17:06:44 +01:00
John Lines 53bf0fe420 Merge trunk updates 2019-09-03 11:20:46 +01:00
Tim Bentley a721250abd finish fixing the theme regeneration 2019-08-30 12:28:10 +01:00
Tim Bentley 19dfcc15aa Head 2019-08-30 10:32:05 +01:00
Tomas Groth c34372c5a2 Added artist as a supported directive. 2019-08-29 20:50:43 +02:00
Tomas Groth b999b2a55e Added support for more meta directives. 2019-08-28 21:28:27 +02:00
Tomas Groth d3a053c0da Add support for new tags in ChordPro: composer, lyricist and meta. 2019-08-26 22:07:33 +02:00
Tim Bentley db245b3b99 fix up missing translation and Save buttons 2019-08-25 09:20:38 +01:00
John Lines f2513c8474 Implement SongbookNumberInTitle hint 2019-08-23 17:29:39 +01:00
John Lines e42d3431bb Use .format in importer.py 2019-08-23 10:33:48 +01:00
Tim Bentley edf31caa61 Update Translation process and Translations 18082019. 
bzr-revno: 2891
 2019-08-22 16:48:40 +01:00
Tim Bentley d352d9bc41 Update the translation process files and fix issues 2019-08-17 12:08:17 +01:00
John Lines 4cbc4c9d82 Merge trunk updates 2019-08-12 07:34:02 +01:00
Phill a950a9bcce fixes 2019-08-06 22:33:43 +01:00
Phill 5c2b70ff07 HEAD 2019-08-06 21:46:41 +01:00
Phill 197bd42c9d Fix for invalid song beamer files 2019-08-05 20:43:18 +01:00
Tim Bentley 24ab4f2cb1 minor fixes 2019-08-04 14:13:33 +01:00
Tim Bentley a8af8a8d18 fix custom copy 2019-08-04 08:53:56 +01:00
Tim Bentley df2ace541e fix missing state code 2019-07-31 22:01:22 +01:00
Phill 6b9e36e7af Make button action clearer 
Fixes: https://launchpad.net/bugs/1673113
 2019-07-31 21:12:11 +01:00
Phill 5fb9eb70af Fix deleting song books 
Fixes: https://launchpad.net/bugs/1600510
 2019-07-30 20:52:10 +01:00
Phill 603a6ff7d6 Fix bible reference search when text matches multiple books 
Fixes: https://launchpad.net/bugs/1799005
 2019-07-29 21:13:41 +01:00
John Lines 530976cf74 Fix typo 2019-07-28 22:16:02 +01:00
John Lines 8a6e6f767f Make Based on Psalm an automatic comment, do not automatically make Authors type Word 2019-07-28 21:59:51 +01:00
John Lines c3eecd04d9 Implement BoldLine hint 2019-07-28 09:46:38 +01:00
John Lines f15cc88eb9 Strip unwanted formatting characters 2019-07-27 09:03:26 +01:00
Phill bbb2fa935c Few performance changes and fixes to prevent possible bugs 2019-07-27 07:37:16 +01:00
Phill dd4d9b9255 Add a singletom Metaclass 2019-07-20 13:27:28 +01:00
Phill 4f0ee2b0d3 Minor fixes and changes 
bzr-revno: 2887
 2019-07-19 19:43:14 +01:00
John Lines 9cdf4faa5b Merge trunk updates 2019-07-19 11:51:25 +01:00
John Lines bd61ad1f6d Add BlankLine hint and deal with a leading asterisk on a verse number 2019-07-17 10:54:03 +01:00
John Lines 72747c3936 Add AddSpaceAfterColon hint 2019-07-16 12:40:23 +01:00
John Lines a9d0e0909f Update GPL version, use constructor, add comment to signal unepected verse order 2019-07-15 17:25:43 +01:00
John Lines 0c1eb50312 New hints for AddSpaceAfterSemi and CCLI 2019-07-13 13:17:06 +01:00
John Lines 36b5528d43 New style string formatting, restructure indent=0 cases 2019-07-12 15:36:14 +01:00
John Lines 515abee3ae Convert double to single quotes, make hint variable names consistent 2019-07-12 12:26:12 +01:00
John Lines bc70eea7b9 Minimize differences needed to run under OpenLP 2.4.6 2019-07-12 11:49:00 +01:00
Phill 9c35b7dcdc Minor fixes, and changes 2019-07-03 14:23:23 +01:00
Nico Opiyo b42034de47 Changed variable names to camelCase and added parameter for Jenkins JS tests 2019-07-01 20:45:08 +03:00
Nico Opiyo 14f53eef89 Pulled in latest changes from trunk 2019-07-01 09:47:38 +03:00
Raoul Snyman 61b85f15bc Fix a bug when cleaning up thumbnails where all presentation controllers, whether enabled or not, would be cycled through. 2019-06-30 16:28:38 -07:00
John Lines d52d5bb0e2 Fix lint warning in tests and importer.py 2019-06-30 20:13:33 +01:00
John Lines e566a6788c Fix flake8 warnings, print statements, inline comments 2019-06-30 19:03:38 +01:00
john 8f91f0c787 Fix undefined auto_verse_order_ok case, and add some test resources 2019-06-29 15:43:32 +01:00
john 2bfa620ebf Merge trunk updates 2019-06-29 15:04:27 +01:00
john 5f2e2b72d7 Use path objects and remove redundant brackets 2019-06-29 12:12:46 +01:00
Phill 28da80ecf9 Fix up and improve the Words Of Worship importer 
bzr-revno: 2883
 2019-06-28 21:15:27 +01:00
Phill 8565db715f Moar minor changes 2019-06-28 20:26:46 +01:00
Phill e81a97f582 PEP Fixes 2019-06-28 19:29:39 +01:00
Phill f79e8803c9 Word of Worship file importer fixes / rework 2019-06-28 19:09:25 +01:00
john 703eb0079b Merge trunk updates 2019-06-27 13:10:34 +01:00
john 8a4c349f9e Tidy up auto verse order generation 2019-06-27 13:01:11 +01:00
Johnthan dcabe95ac0 fix 1832874 and 1833876 
bzr-revno: 2882
 2019-06-25 19:33:47 +01:00
Phill 5b571c4f74 Fixes for path issues 2019-06-21 21:53:42 +01:00
Johnmfl 865ac820d3 added space to Fix Lint errors 2019-06-19 16:52:50 -04:00
Johnmfl 64b7a1347b Fixed Lint errors 2019-06-19 16:31:46 -04:00
Johnmfl beb3861ae7 Fix #1832874 and #1832876 del temp song files add info to dup song delete form 2019-06-18 20:28:09 -04:00
john 66712873b4 Singing The Faith Importer - Add the importer, and tests 2019-06-17 09:44:34 +01:00
john 20d0b40f8b Singing The Faith Importer - Initial version 2019-06-17 09:30:45 +01:00
Tim Bentley e68af29694 Head 2019-06-11 20:49:13 +01:00
Tim Bentley 08891d8731 updates 2019-06-11 20:48:34 +01:00
Tomas Groth 9bf639a3cb merge trunk 2019-06-11 21:13:35 +02:00
Tim Bentley edce402a60 fix up media for breakages 2019-06-11 19:40:20 +01:00
Raoul Snyman 596c484bd7 Add presentations through LibreOffice on macOS. 
bzr-revno: 2878
 2019-06-10 22:01:02 -07:00
Tomas Groth 4c1f67f84b Set song import/export default directory to None 2019-06-10 22:10:38 +02:00
Tomas Groth 4074d110ff some path/str fixes 2019-06-07 22:46:51 +02:00
Tomas Groth 3861d340a3 trunk 2019-06-07 22:25:30 +02:00
Tomas Groth f27fded597 Fix line calculation for the theme preview. Try to make VLC loading more robust. 2019-06-06 22:10:39 +02:00
Raoul Snyman 7819a9eb02 Fix license issues 2019-06-04 21:57:26 -07:00
Raoul Snyman bae4cb2a44 HEAD 2019-06-04 21:53:18 -07:00
Tomas Groth 1d176515d0 merge trunk 2019-06-04 22:03:54 +02:00
Tomas Groth 3963923e2d Fix as suggested 2019-06-04 22:03:19 +02:00
Tomas Groth 8b489de954 Generate a real footer 2019-06-03 22:11:19 +02:00
Phill aaaab9bf43 Add media extensions in the service manager 2019-06-01 07:59:45 +01:00
Phill 8fe469aca3 Re-add period 2019-05-31 21:04:51 +01:00
Phill f4111e4431 Fix up filters 2019-05-31 20:59:38 +01:00
Tomas Groth efdae7ab6f trunk 2019-05-29 21:22:52 +02:00
Tomas Groth 2efaffec7a pep8 2019-05-29 21:22:12 +02:00
Tomas Groth 949231a35f Fix traceback on Mac tests 2019-05-29 21:18:25 +02:00
Phill c2550777c3 VLC extension tidyups 2019-05-26 11:30:37 +01:00
Tomas Groth 38a310a1aa Remove unused code 2019-05-25 21:21:19 +02:00
Tomas Groth 6e03382f1f Reenable setting slidecontroller index when openlp is not in focus. 2019-05-24 21:21:19 +02:00
Tomas Groth e6baed1105 pep8 fixes 2019-05-23 22:30:46 +02:00
Tomas Groth a3fdaff2c4 Fix test and remove debug prints 2019-05-23 21:41:00 +02:00
Phill dd0d531be3 Fix images 2019-05-23 20:33:46 +01:00
Nico Opiyo e8edb7e52f Pulled in changes from trunk 2019-05-22 10:28:25 +03:00
Phill 5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Tomas Groth 3d8d573389 Always make sure the powerpoint slide index map is created 2019-05-21 22:07:25 +02:00
Tomas Groth 89ecdf2a96 try to make impress support going before start 2019-05-20 22:35:48 +02:00
Tomas Groth 1d71cb83ba merge trunk 2019-05-20 21:56:29 +02:00
Raoul Snyman 3d18478ac7 Fix up the tests 2019-05-18 08:56:22 -07:00
Raoul Snyman f74e0c7dc8 Revert some changes from the HEAD merge; Add the lib directory to sys.path for running tests 2019-05-17 23:04:20 -07:00
Raoul Snyman dad969bc0e Fix some small issues from the move to a new ScreenList object 2019-05-17 22:21:38 -07:00
Raoul Snyman 482b80aa82 Print out the location of the log file 2019-05-17 22:10:51 -07:00
Raoul Snyman 8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
Raoul Snyman bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Phill 0f640368e1 Just to trigger the tests :-) 
bzr-revno: 2867
 2019-05-07 17:56:21 +01:00
Tomas Groth 8f48fa26e9 head 2019-05-05 20:41:17 +02:00
Phill 7aa7e5c635 Move some changes out of annother branch 2019-05-04 12:49:20 +01:00
Phill 15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
Tim Bentley feaee351b2 head 2019-05-03 18:26:37 +01:00
Bastian Germann 3e23de5bbe Make pylint happy 2019-05-02 19:11:55 +02:00
Bastian Germann 605eadb0c2 Add epub, cbz, and fb2 support to pdf controller 2019-05-02 15:45:07 +02:00
Bastian Germann 2ee21a77c4 Use PyMuPDF over executables if not explicitly set 2019-05-02 11:19:23 +02:00
Bastian Germann a3ef19dbd9 Make pylint happy 2019-05-01 11:00:53 +02:00
Bastian Germann a610133919 Introduce PyMuPDF as additional PDF controller 2019-05-01 10:39:01 +02:00
Bastian Germann d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
Tim Bentley f5a2a58234 head 2019-04-21 07:27:05 +01:00
Tim Bentley 468df46c9c More fixes and corrections 2019-04-20 21:29:12 +01:00
Bastian Germann be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Tomas Groth f669b8cd7e Followup fix... 2019-04-13 10:24:15 +02:00
Tomas Groth 41d876be52 Fix errors detected by pylint. 2019-04-12 21:16:00 +02:00
Tim Bentley 49384aa672 head 2019-04-09 19:35:10 +01:00
Tim Bentley 737d320b3d handle missing live display preserve prview 2019-04-09 17:47:23 +01:00
Samuel Mehrbrodt c038476b80 Fix songstab 2019-04-08 23:06:05 +02:00
Samuel Mehrbrodt 68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Tomas Groth 52bdb8db02 Added support for disabling Impress Presentation Screen. Fixes bug 1798651 
Fixes: https://launchpad.net/bugs/1798651
 2019-04-02 22:22:05 +02:00
Phill 98f7c28d65 Add proxy settings to ftw. Option to skip sample data 
bzr-revno: 2853
 2019-03-28 22:03:32 +01:00
Samuel Mehrbrodt 720d79e46a Fix songbook as first slide display 
bzr-revno: 2851
 2019-03-28 21:19:15 +01:00
Tomas Groth 2ebccbfb91 trunk 2019-03-27 21:33:21 +01:00
Tomas Groth 4e739a3ed9 Disable the presentation console 2019-03-27 21:29:19 +01:00
Tim Bentley 0a2de8e606 fix pep8.5 2019-03-27 19:21:11 +00:00
Tim Bentley b7bb59a837 vlc tests pass 2019-03-27 17:46:12 +00:00
Tim Bentley 6cb16a9f0a media now works and plays 2019-03-25 21:45:19 +00:00
Tim Bentley f849b0eeb0 head 2019-03-25 21:24:51 +00:00
Philip Ridout 8789073eb3 Linting changes 2019-03-17 20:35:11 +00:00
Nico Opiyo fe6130a534 Fixed buggy alerts and refactored CSS 2019-03-17 22:05:31 +03:00
Philip Ridout eb115a0ad4 More pathlib clean ups 2019-03-17 10:01:52 +00:00
Philip Ridout 7c284ad520 Fix deleting bibles 
Fixes: https://launchpad.net/bugs/1748719
 2019-03-16 21:07:44 +00:00
Philip Ridout cae0c2eb09 Revert commented code 2019-03-16 10:58:59 +00:00
Philip Ridout 296adb59a0 Bible import issues 2019-03-16 10:20:46 +00:00
Philip Ridout e1d2c67f33 HEAD? 2019-03-15 20:56:32 +00:00
Nico Opiyo 53d8b239ff Added scrolling option to alerts 2019-03-12 22:37:07 +03:00
Philip Ridout 50598e9058 pathlib cleanups 2019-03-10 21:01:39 +00:00
Philip Ridout 07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Tomas Groth 07ebc22fa7 Update the appveyor build script. Fix various bugs that caused the frozen app from working. 
bzr-revno: 2848
 2019-03-07 21:51:00 +01:00
Bob Luursema 490f9bbe15 Fix linting 2019-03-05 22:21:12 +01:00
Bob Luursema 40ceb07f18 Hotfix 2019-03-05 22:02:49 +01:00
Bob Luursema c68d6dc3de Fixed bug 1800761 2019-03-05 21:55:37 +01:00
Bob Luursema 2a6378f489 Almost fixed bug 1800761 2019-03-04 21:37:11 +01:00
Nico Opiyo 72980b5365 Added queuing functionality to the alerts 2019-03-04 13:29:08 +03:00
Philip Ridout 07ffb7c0d0 Fix choruses, bridges & etc. being imported as verses in CCLI txt files 2019-03-03 13:32:31 +00:00
Philip Ridout c761592095 Catch some OSErrors to provide user friendly error messages. Few other minor fixes 
Fixes: https://launchpad.net/bugs/1650910
 2019-03-03 09:49:01 +00:00
Nico Opiyo 1bdc2f5df6 Refactored the hex_to_rgb method in the alerts manager class 2019-03-01 16:22:34 +03:00
Nico Opiyo 7a5ddc454e Refactored the tests for the alerts to mkae them DRY 2019-03-01 15:39:29 +03:00
Philip Ridout 670c06db60 Add proxy settings button to FTW, ftw refactors, a few fixes! 2019-02-27 21:12:16 +00:00
Nico Opiyo d44e54c1b3 Refactored transition code and added settings from alert settings configuration 2019-02-22 14:31:38 +03:00
Samuel Mehrbrodt 94fa2e912a Fix songbook as first slide display 2019-02-22 08:34:40 +01:00
Samuel Mehrbrodt fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01:00
Tomas Groth aa982492e4 Implement going to the previous serviceitem. 2019-02-15 20:33:43 +01:00
Tomas Groth b10aa24119 Attempt to fix appveyor tests 2019-02-14 22:19:26 +01:00
Tomas Groth ad0eacd4f0 merge trunk 2019-02-14 20:49:32 +01:00
Tim Bentley fc579f120a Head 2 2019-02-14 19:42:34 +00:00
Tim Bentley c0d328dc06 Head 2019-02-14 19:40:35 +00:00
Tomas Groth fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
Raoul Snyman d99c2f6996 Migration from WebKit to Webengine. Also introduced reveal.js for slide rendering, new screen setup dialogs and many other changes. 
bzr-revno: 2844
 2019-02-14 00:04:30 -07:00
Tomas Groth 5ac8bbc3f2 Even more pep8 fixes and removed the old htmlbuilder. 2019-02-13 22:19:24 +01:00
Tomas Groth 27f37df7e8 More pep8 fixes 2019-02-13 21:54:35 +01:00
Tomas Groth 31ed94d88c pep8 fixes 2019-02-13 21:28:10 +01:00
Samuel Mehrbrodt 99f0d37253 Remove blank lines 2019-02-08 14:39:40 +01:00
Samuel Mehrbrodt cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Kyle Nweeia 652b94e1ac Fixed bug #1678632 - SongSelect Importer Infinite Loop. 
bzr-revno: 2843
Fixes: https://launchpad.net/bugs/1678632
 2019-02-06 21:34:55 +01:00
Raoul Snyman 62b0eedfc6 Get Pyro working again 2019-01-30 00:18:03 -07:00
Raoul Snyman 64251747fb HEAD 2019-01-29 10:27:34 -07:00
Tim Bentley f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +00:00
Tim Bentley 168efffb60 Move settings 2019-01-20 16:20:45 +00:00
Tim Bentley 8ed4216975 settings updates 2019-01-20 09:29:47 +00:00
Tim Bentley 5b7beffe64 fix code 2019-01-10 22:01:07 +00:00
Tim Bentley e39cad307b fix code 2019-01-10 21:20:44 +00:00
Tim Bentley 392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley da73e2f762 for fixes 2019-01-03 22:08:13 +00:00
Tim Bentley 3bfa92cd47 fix bits 2018-12-21 15:42:12 +00:00
Kyle Nweeia d086e83656 2018-12-11 21:30:22 -05:00
Tim Bentley 95bdfc1f64 head 2018-12-01 14:10:47 +00:00
Tim Bentley 6228ed89b6 Cleanups 2018-11-20 21:41:23 +00:00
Tim Bentley a3d0dc28de More missing lib fixes and MediaInfo cleanup 2018-11-18 17:29:47 +00:00
Tomas Groth a1c4374b1d Fix hang in powerpointcontroller 2018-11-13 22:41:45 +01:00
Tomas Groth ffb673a3d4 Some fixes for powerpoint presentation. Still some work to do... 2018-11-12 21:15:50 +01:00
Tomas Groth 79fba1b4c9 Do some rewirering of alerts. 2018-11-08 22:06:35 +01:00
Tim Bentley 0540453892 Clean up error handling 2018-11-04 17:13:56 +00:00
Raoul Snyman 4c103e4305 Fix the problem where the slides were being incorrectly indexed 2018-11-02 22:48:43 -07:00
Tim Bentley 0694d1b3d0 Stop media crashing 2018-11-01 20:51:42 +00:00
Tomas Groth e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Tomas Groth 4d8661b669 Improve service loading 2018-10-28 17:34:17 +01:00
Tomas Groth 055d165830 Fixed loading and viewing presentations. 2018-10-28 07:28:33 +01:00
Bastian Germann 6aa998edd0 Replace PyICU with PyQt's QCollator 
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
 2018-10-27 12:50:15 +02:00
Raoul Snyman df3b3520ff Fix up some tests and things 2018-10-26 23:01:13 -07:00
Tim Bentley 26a9b2430d Head 2018-10-27 07:00:51 +01:00
Raoul Snyman dc5a9590ba Fix up some more linting issues 2018-10-26 21:13:33 -07:00
Raoul Snyman 417912aae2 Fix the tests 2018-10-26 18:53:43 -07:00
Raoul Snyman d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
Raoul Snyman ec479e589b Fix a bunch of linting issues (which should also help resolve other circular dependencies) 2018-10-26 16:15:31 -07:00