Commit Graph

2982 Commits

Author SHA1 Message Date
Daniel 61cf097d45 Revert "Don't load images twice"
This is beyond the scope of this branch, I would leave this in, but there is a lot of strange code including commented code in this file, so I'm leaving it out. It would be a better idea to fix the whole file in another branch (or Tim might be fixing this file with the media fixes)
2019-10-29 22:54:14 +00:00
Daniel 76ff4be598 Fix "Use default location" buttons 2019-10-26 10:00:07 +00:00
Daniel d2e31c26e9 Added new values to theme.json and added logic for ui
Also fixed normal speed not working and changed "Default" to "Normal" in the enums as it makes more sense.
2019-10-26 09:57:00 +00:00
Daniel 34eb93f565 Fix shadows toggle button 2019-10-26 09:37:20 +00:00
Raoul Snyman 2ace207485 Merge branch 'skip-pymupdf-tests-if-not-installed' into 'master'
Do not test PyMuPDF if it's not installed

Closes #288

See merge request openlp/openlp!48
2019-10-24 20:29:35 +00:00
Daniel 471ab7923d Use flexbox to align stuff
I don't know what you would need it for, but the manual position setting in the theme currently only works for the footer, won't be a hassle to do for main though.
2019-10-24 20:22:49 +00:00
Simon Hanna bc51c7ca7f Do not test PyMuPDF if it's not installed
Fixes #288
2019-10-24 19:56:08 +02:00
Daniel c0aa199ac3 Add background_source to Theme and use it in the theme wizard
The theme wizard (while editing a theme) now changes both background_source and background_filename then sets filename to the new cache location on apply (also added the filename_source var to Theme). The new var is needed so when the user goes to change the theme again, they see the file they selected, not the cached one. This commit fixes the issue of changing theme backgrounds not deleting the cached file but deleting the original file.
2019-10-23 22:54:29 +00:00
Raoul Snyman 1c4224e3d7 Skip certain tests if we're running on GitLab or AppVeyor 2019-10-18 16:54:00 +00:00
Raoul Snyman 99d2ec7715 Create a Theme Preview dialog, plus some theme background fixes.
- Update .gitignore to ignore virtualenvs and eggs directory
- Create a dialog to generate theme previews/thumbnails
- Use theme preview generation dialog all over
- Create a test for the new method
- Update existing theme manager tests
- Skip Bible HTTP tests when in GitLab CI
- Make theme backgrounds scale and centred
2019-10-18 06:12:09 +00:00
Raoul Snyman 1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it 2019-10-10 15:28:16 +00:00
John Kirkland a129485805 Resolved issue #282 by deleting the get_books function in HTTPBible,
allowing it to use the on in the parent class, BibleImport.
2019-10-09 08:27:28 +00:00
Raoul Snyman a1a101793d Fix issue #280 where the constructor was not accepting the custom_geometry argument 2019-10-09 08:26:42 +00:00
Tomas Groth 1e8f72d49f LiveWorship importer 2019-10-07 17:12:38 +00:00
Stoivo 6e640fe7a5 Sort the authors when exporting the songs
I export all our songs and store it in git so I know what changes and can revert
if someone change incorrectly.
2019-10-01 20:58:20 +00:00
Mat c6ed9e6a01 Allow searching by Song Number 2019-09-26 20:49:05 +00:00
Bastian Germann 1a756def20 Replace launchpad references 2019-09-21 13:15:11 +02:00
Bastian Germann 9941aaac16 Replace mention of pylint by flake8 2019-09-21 13:14:23 +02:00
Bastian Germann 95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02:00
Tim Bentley ab19467c0b Merge branch 'test_fixes' into 'master'
test_fixes

See merge request openlp/openlp!13
2019-09-21 06:22:42 +00:00
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 3271e15401 Merge remote-tracking branch 'upstream/master' into test_fixes 2019-09-19 20:07:44 -04:00
Raoul Snyman c1933352ea Ignore some generated files, make generate resources script check for an existing file; ignore pdfcontroller test for now 2019-09-18 18:29:05 +00:00
Benjamin Hoving e0fc84f218 remove test_bzr_tags 2019-09-17 19:20:15 -04:00
Benjamin Hoving 04a70ac59e remove test_pylint 2019-09-17 19:20:04 -04: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 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 671abe1def Fix the queued alerts not being displayed 2019-09-12 15:39:57 -07:00
Raoul Snyman 3b87327682 Fix all the tests 2019-09-11 23:06:35 -07:00
Raoul Snyman 83cd5c1a88 HEAD 2019-09-11 21:41:43 -07:00
Raoul Snyman 3af3068027 Fix alerts to scroll properly, and simplify how everything works 2019-09-11 21:41:30 -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 3c677bc077 Linting fix 2019-09-03 13:42:06 +01:00
John Lines b2f3496093 add tests with hints subdirectory 2019-09-03 12:53:54 +01:00
John Lines 53bf0fe420 Merge trunk updates 2019-09-03 11:20:46 +01:00
John Lines 6b8352abea fix tests to allow for SongbookNumberInTitle defaulting to false and add hints tests 2019-09-03 10:52:09 +01:00
Tim Bentley f6713ddf52 Fix linting errors 2019-08-30 13:09:02 +01:00
Tim Bentley 19dfcc15aa Head 2019-08-30 10:32:05 +01:00
Tim Bentley 9e376c1e85 updates 2019-08-30 10:23:12 +01:00
Tomas Groth 842b0c07c7 trunk 2019-08-28 21:50:03 +02:00
Tomas Groth b999b2a55e Added support for more meta directives. 2019-08-28 21:28:27 +02:00
Raoul Snyman 2557eeeaa6 Changed button to say 'Contribute', moved some text around, removed some unnecessary text 2019-08-22 20:21:15 -07:00
Raoul Snyman 3ce073c4bf Fix image height, update tests, and make 'npm test' only run the tests once instead of continually 2019-08-22 09:40:45 -07: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 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 2e89ec1f29 enable whole song impoerter test 2019-07-19 12:11:16 +01:00
John Lines 9cdf4faa5b Merge trunk updates 2019-07-19 11:51:25 +01:00
Phill c1ff239002 Lint fix 2019-07-18 20:26:54 +01:00
Phill ba99025a5f Fix tests 2019-07-18 20:14:58 +01:00
Raoul Snyman 5121431281 Add Zeroconf services to OpenLP so that external devices can find OpenLP on the network.
bzr-revno: 2885
2019-07-04 12:00:24 -07:00
Phill 9c35b7dcdc Minor fixes, and changes 2019-07-03 14:23:23 +01:00
Raoul Snyman a8e46110ed Fix an incorrect if and update tests 2019-07-02 23:30:01 -07:00
Raoul Snyman 7c1eb9f24d Update test 2019-07-02 20:53:20 -07:00
Raoul Snyman 11ad9dbb22 Further refactor the code, and fix up the tests 2019-07-02 20:05:01 -07:00
Raoul Snyman 0618f63ede Added a Zeroconf service to aid devices detecting OpenLP on the network 2019-07-01 15:36:14 -07: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
Nico Opiyo 0eff721f24 Fixed unit tests for alerts branch 2019-06-30 22:16:54 +03:00
John Lines d52d5bb0e2 Fix lint warning in tests and importer.py 2019-06-30 20:13:33 +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 184462d852 Test fixed for single verse, all verses failing test not run yet 2019-06-29 14:59:03 +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 e81a97f582 PEP Fixes 2019-06-28 19:29:39 +01:00
Phill 26e4606ed2 Fix test data 2019-06-28 19:20:11 +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
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 7143fbb8d1 Fix streaming part1 2019-06-14 18:54:04 +01:00
Tomas Groth 9bf639a3cb merge trunk 2019-06-11 21:13:35 +02:00
Tomas Groth 7cb8758fdd Fixed test on windows by mocking out render. 2019-06-11 21:12:33 +02:00
Raoul Snyman 596c484bd7 Add presentations through LibreOffice on macOS.
bzr-revno: 2878
2019-06-10 22:01:02 -07:00
Tomas Groth 0c7fe8d97c fix test 2019-06-09 22:06:20 +02:00
Tomas Groth 04d3efef9e fix some broken tests 2019-06-07 23:05:02 +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
Phill 52eb196e5b PEP8 2019-05-31 21:19:15 +01:00
Phill cdf29876e2 More media clean-up 2019-05-26 21:53:54 +01:00
Phill c2550777c3 VLC extension tidyups 2019-05-26 11:30:37 +01:00
Phill c901ec3d75 Move suffixes from list to set, remove VlcPlayer.is_active as it was never ser 2019-05-24 23:11:11 +01:00
Phill 3476174313 Pep fix 2019-05-23 20:49:13 +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
Ken Roberts fa7e8f9d3c PJLink 2 Update v07
bzr-revno: 2871
2019-05-20 20:25:33 +01:00
Raoul Snyman 3d18478ac7 Fix up the tests 2019-05-18 08:56:22 -07:00
Raoul Snyman 8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
Ken Roberts 2069c94a10 Remove extraneous parens 2019-05-15 06:23:58 -07:00
Ken Roberts 0c14ddf31f PJLink2 Update v07 2019-05-11 02:07:40 -07:00
Raoul Snyman bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Tim Bentley 9e22ed86e3 remove unneeded test 2019-05-08 14:58:06 +01:00
Ken Roberts b4d5425887 PJLink2 Update v06
bzr-revno: 2869
2019-05-07 17:57:35 +01:00
Ken Roberts 984e79faa9 PJLink2 Update v05
bzr-revno: 2868
2019-05-07 17:57:02 +01:00
Phill 0f640368e1 Just to trigger the tests :-)
bzr-revno: 2867
2019-05-07 17:56:21 +01:00
Ken Roberts 855828939f PJLink2 update v06 2019-05-04 21:08:32 -07:00
Tim Bentley a7821bdd26 rename additions to arguments 2019-05-04 20:47:06 +01:00
Tim Bentley 3526c3de64 Head 2019-05-04 20:29:20 +01:00
Phill 5cb0d2a772 test fix 2019-05-04 19:13:57 +01:00
Phill 1d736a58f5 Fix up tests 2019-05-04 13:05:53 +01:00
Phill 7aa7e5c635 Move some changes out of annother branch 2019-05-04 12:49:20 +01:00
Ken Roberts a503c61a51 PJLink2 update v05 2019-05-04 03:21:48 -07:00
Phill 15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
Ken Roberts 2a479a15da pjlink2 update v04 2019-05-03 22:25:07 -07:00
Tim Bentley feaee351b2 head 2019-05-03 18:26:37 +01:00
Bastian Germann db9cc8c310 Add PyMuPDF as additional PDF controller and missing mupdf file formats
bzr-revno: 2864
2019-05-02 14:47:05 -07: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 1c23a1f372 Make PDF tests run for each backend 2019-05-02 15:12:45 +02:00
Bastian Germann 2ed038ee2e Make PyMuPDF mandatory for tests 2019-05-02 12:35:29 +02:00
Tomas Groth 5f63b1297f trunk 2019-05-01 21:22:01 +02:00
Tomas Groth 85879122ab Implement suggestions and fix test. 2019-05-01 21:19:21 +02:00
Tomas Groth e14dd69817 trunk 2019-04-30 21:02:42 +02:00
Bastian Germann d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
Ken Roberts d6cf6cf6bf PJLink2 update V03 2019-04-28 00:03:51 -07:00
Ken Roberts ddd14a5fc2 pjlink2 update v02 2019-04-26 00:39:37 -07:00
Tim Bentley e607a95b86 Fix tests 2019-04-21 09:53:59 +01:00
Ken Roberts 5f6887f837 PJLink2 Update V1 2019-04-20 18:04:59 -07: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
Tim Bentley 49384aa672 head 2019-04-09 19:35:10 +01:00
Samuel Mehrbrodt b478b4e58f Make footer configurable
bzr-revno: 2854
2019-04-08 23:07:24 -07:00
Samuel Mehrbrodt 68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Nico Opiyo 628cfbf213 Fixed alert positioning with CSS flexbox and also fixed non-scrolling alert display 2019-04-05 17:29:27 +03:00
Nico Opiyo e56971fa81 Fixed queue bug when showing alerts from the queue 2019-04-02 22:08:27 +03:00
Nico Opiyo 0e1989f06f Fixed all tests and changed entrance transition to class based toggling 2019-03-29 17:18:54 +03:00
Nico Opiyo c25f4d8197 Cleaned up Javascript and refactored the functions and tests plus optimized animation of text 2019-03-29 15:36:32 +03:00
Phill 98f7c28d65 Add proxy settings to ftw. Option to skip sample data
bzr-revno: 2853
2019-03-28 22:03:32 +01:00
Tim Bentley ae2109e509 fix pep8.5 2019-03-27 18:59:03 +00:00
Tim Bentley b7bb59a837 vlc tests pass 2019-03-27 17:46:12 +00:00
Raoul Snyman bddc3f02dc Just skip the darn test 2019-03-26 22:52:15 -07:00
Raoul Snyman a69ff65bfc Duh. Height 2019-03-26 10:03:09 -07:00
Raoul Snyman 386985349d The width of the PDF is not the same as the width of the screen 2019-03-26 09:45:10 -07:00
Raoul Snyman 136735c53f Get the screen resolution directly from Windows and X11, or return the previous resolution 2019-03-25 15:16:45 -07:00
Raoul Snyman efa446a356 Get the screen resolution directly from macOS, or return the previous resolution 2019-03-25 14:26:48 -07:00
Tim Bentley f849b0eeb0 head 2019-03-25 21:24:51 +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 e1d2c67f33 HEAD? 2019-03-15 20:56:32 +00:00
Philip Ridout 056b902cf9 PEP8 2019-03-15 20:47:47 +00:00
Nico Opiyo 7a1c82096d Fixed tests and refactored event listeners for effective testing 2019-03-15 17:46:26 +03: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 0578ab8908 Test fix 2019-03-09 07:06:00 +00:00
Philip Ridout 07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Philip Ridout 87216707d3 Test fixes 2019-03-09 06:58:52 +00:00
Philip Ridout 1523d9ffa6 mac test fix? 2019-03-08 22:51:27 +00:00