Commit Graph

999 Commits

Author SHA1 Message Date
Samuel Mehrbrodt 68ebb22d17 Merge trunk 2019-04-08 23:03:57 +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
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
Philip Ridout eb115a0ad4 More pathlib clean ups 2019-03-17 10:01:52 +00:00
Philip Ridout 07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Ken Roberts cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08:00
Bob Luursema 490f9bbe15 Fix linting 2019-03-05 22:21:12 +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
Philip Ridout f3485513f1 Test and PEP8 fixes 2019-02-27 22:14:08 +00:00
Samuel Mehrbrodt fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01: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 31ed94d88c pep8 fixes 2019-02-13 21:28:10 +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 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 392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley 953f0bae34 try again 2019-01-04 19:48:42 +00:00
Tim Bentley f0e19b2a09 try again 2019-01-04 18:28:39 +00:00
Tim Bentley 9ded7b43f6 try again 2019-01-04 18:25:43 +00:00
Kyle Nweeia 98bc575ba2 2018-12-13 20:46:55 -05:00
Kyle Nweeia ea14f6cea8 2018-12-13 20:27:59 -05:00
Tim Bentley fc675e9c99 fix up tests 2018-12-01 14:41:40 +00:00
Raoul Snyman e58e0ee485 Fix all the tests 2018-11-30 22:52:49 -07:00
Tomas Groth e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Bastian Germann 191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02: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
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
Raoul Snyman 4bed8eabed Attempt to remove/reduce circular imports 2018-10-26 11:26:12 -07:00
Raoul Snyman 80c57a9c6d HEAD 2018-10-25 19:15:25 -07:00
Philip Ridout a867c54b94 HEAD 2018-10-24 22:02:06 +01:00
Philip Ridout aa744e0d99 PEP fixes 2018-10-22 21:42:25 +01:00
Philip Ridout bdec3f407b Remove proxy settings from individual bibles and use the centeral OpenLP proxy server settings. 2018-10-22 21:17:55 +01:00
Raoul Snyman aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
Raoul Snyman 37424b3b13 HEAD 2018-09-07 07:59:21 -07:00
Raoul Snyman 67e6806924 HEAD, plus loading screens from settings 2018-09-06 23:43:01 -07:00
Simon Hanna a4c1e306b5 Remote imports from openlp/core/lib/__init__.py and update other files accordingly 2018-08-25 16:08:19 +02:00
Tim Bentley b6dc37fb0b remove more and fix code 2018-06-10 20:29:00 +01:00
Raoul Snyman b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
Tim Bentley 2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
Raoul Snyman a0d6f2d94a HEAD 2018-03-07 21:46:50 -07:00
Tim Bentley 36276d4fac fix tests 2018-02-23 16:22:48 +00:00
Tim Bentley f7169ee708 remove ppt viewer 2018-02-02 21:33:41 +00:00
Tim Bentley c9ff4b2209 fix web api 2018-01-27 09:41:11 +00:00
Raoul Snyman 7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
Raoul Snyman 13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Tim Bentley 162742927e head fixes 2017-12-29 10:19:33 +00:00
Tim Bentley 41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley cfc487d623 tests 2017-12-28 08:27:44 +00:00
Tim Bentley f9e20e2108 tests 2017-12-28 08:22:55 +00:00
Phill Ridout bbc1bf3732 few missed changes 2017-12-24 08:52:53 +00:00
Phill Ridout a4054d3c2c Move song test resources to a 'song' sub directory'
A few other minor changes
2017-12-24 08:42:46 +00:00
Phill Ridout cb53a266ce HEAD 2017-12-24 07:40:07 +00:00
Phill Ridout 5f1212b68e Pep8 2017-12-24 07:33:22 +00:00
Phill Ridout d35e0329c3 More test fixes? 2017-12-24 07:15:50 +00:00
Tim Bentley 9e6ecb7272 fix errors 2017-12-24 07:11:30 +00:00
Raoul Snyman ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
Tim Bentley 560467757a pep8 2017-12-23 09:30:02 +00:00
Tim Bentley 35d2ce263e finished 2017-12-23 09:22:53 +00:00
Tim Bentley 6729e78231 almost finished 2017-12-23 09:09:45 +00:00
Tim Bentley 17b62ee6c9 functional more bits 2017-12-23 07:55:26 +00:00
Phill Ridout a866bc5499 Test fixes 2017-12-22 22:35:09 +00:00
Phill Ridout 38c124224f more test tidy ups 2017-12-22 22:21:38 +00:00
Tim Bentley aee4f76093 functional more bits 2017-12-22 22:20:04 +00:00
Phill Ridout 3bdf6d0bd6 HEAD 2017-12-22 21:21:39 +00:00
Phill Ridout c3c1f1dc66 Test tidy ups 2017-12-22 21:20:49 +00:00
Tim Bentley e9b4d2d7be functional more bits 2017-12-22 21:16:06 +00:00
Tim Bentley 19918d0aa9 functional more bits 2017-12-22 21:04:29 +00:00
Tim Bentley e17386d5ab functional more bits 2017-12-22 17:51:59 +00:00
Tim Bentley 1abc6e6316 functional more bits 2017-12-22 17:15:30 +00:00
Tim Bentley dd53bfd157 functional bibles 2017-12-22 16:53:40 +00:00
Tim Bentley 9843d48478 bible tests and head 2017-12-22 15:50:45 +00:00
Tim Bentley 0ed4ac5224 more assert updates and py.test fixes
py.test now runs on the whole test without major errors.

lp:~trb143/openlp/asserts (revision 2826)
https://ci.openlp.io/job/Branch-01-Pull/2371/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2272/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2132/               [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1458/                [SUCCESS]
https://ci.openlp.io/job/Branch-04...

bzr-revno: 2799
2017-12-22 15:11:30 +00:00
Tim Bentley ed3d92d818 Fix tests and make pytest run clean 2017-12-22 10:45:39 +00:00
Phill Ridout e9f4637895 Impress tests 2017-12-17 15:28:21 +00:00
Raoul Snyman d75b3f3ef1 Add some tests for threading, and fix a problem in a test related to the threading change 2017-12-17 00:25:29 -07:00
Raoul Snyman 9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
Raoul Snyman c7ea4c460e Fix up some stuff around the screen list 2017-12-01 17:35:21 -07:00
Raoul Snyman 64a245bef9 HEAD 2017-12-01 14:58:34 -07:00
Raoul Snyman b3669c4f5d Change things around a bit 2017-11-30 15:46:03 -07:00
Raoul Snyman d9e2994deb Actually run the function, ID10T 2017-11-30 15:29:41 -07:00
Raoul Snyman 8fa9bdcf58 Skip the test if not on Linux 2017-11-30 15:15:11 -07:00
Phill Ridout 7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
Phill Ridout 9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
Phill 71eaccb547 Various fixes
lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/               [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/                [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/B...

bzr-revno: 2788
2017-11-16 18:52:59 +00:00
Phill Ridout 35e13022a6 image media test fixes 2017-11-15 18:33:21 +00:00
Phill Ridout 9606b99976 Fix md5 thumbnail regression
Fixes: https://launchpad.net/bugs/1692187
2017-11-13 20:07:20 +00:00
Phill Ridout b1d88ac4f7 test fix 2017-11-11 16:36:50 +00:00
Phill Ridout e763cd81df HEAD 2017-11-11 12:20:45 +00:00
Phill Ridout 66534a58ab Head 2017-11-06 22:41:36 +00:00
Phill Ridout 3cf0be000b head 2017-11-03 22:46:27 +00:00
Raoul Snyman 6718be4cff HEAD 2017-11-03 15:31:48 -07:00
Phill Ridout 94dd107abe Changed merged errors
Fixes: https://launchpad.net/bugs/1400415
2017-11-03 20:55:41 +00:00
Raoul Snyman 8b34852236 Rename some tests so that they can be picked up by nose2; Fix some patches that were wrong; Fix a bug in our code that the now running tests picked up 2017-10-28 23:01:25 -07:00
Raoul Snyman 53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
Philip Ridout 46f93a9d1b head 2017-10-10 20:17:48 +01:00
Philip Ridout 66049f0c96 bible pathlib changes 2017-10-10 20:09:20 +01:00
Raoul Snyman 15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
Raoul Snyman bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
Raoul Snyman b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Tim Bentley b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout 70e50f4aaa Pep fixes 2017-09-30 23:45:24 +01:00
Philip Ridout d8a32d3962 HEAD 2017-09-30 22:47:50 +01:00
Philip Ridout ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley d77f0127e8 head 2017-09-29 19:42:15 +01:00
Tim Bentley b783783a29 add files 2017-09-26 21:33:58 +01:00
Tim Bentley 5b2ac0f97b more moves 2017-09-26 18:49:41 +01:00
Philip Ridout 047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
Philip Ridout 0ee8ebb1c2 PEP fixes 2017-09-18 07:32:19 +01:00
Philip Ridout 7f98003d54 test fixes 2017-09-17 20:43:15 +01:00
Philip Ridout 8ed5903ced Moved most of the presentation plugin over to pathlib 2017-09-15 20:01:09 +01:00
Raoul Snyman bf3e891567 HEAD 2017-09-06 21:56:14 -07:00
Tim Bentley 7abef1df22 fix lables and render bug 2017-08-27 18:13:14 +01:00
Tim Bentley b546f3cecb Head 2017-08-27 17:26:06 +01:00
Philip Ridout 8f9cb4a090 Modify setting upgrade code to provide versioned updates. Upgrade settings to use JSON encoded Path objects 2017-08-26 16:06:11 +01:00
Philip Ridout f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Philip Ridout 6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00
Tim Bentley bbcd5691fe fix more tests 2017-08-12 20:34:56 +01:00
Philip Ridout b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Tim Bentley bc03652cda Finish tests 2017-08-11 17:09:14 +01:00
Tim Bentley 7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Tim Bentley 5ec2f001e6 finish download process 2017-06-18 07:03:42 +01:00
Samuel Mehrbrodt f5f4226891 PEP8 fixes 2017-06-12 20:09:50 +02:00
Samuel Mehrbrodt 885a1bad01 Merge trunk 2017-06-12 20:04:49 +02:00
Samuel Mehrbrodt 5fbcbb3047 Fix test 2017-06-12 20:04:17 +02:00
Tim Bentley da51b046b2 Head 2017-06-09 16:56:40 +01:00
Philip Ridout c0f2a9a777 HEAD 2017-06-09 07:06:49 +01:00
Tim Bentley 93053cd723 get version 2017-06-08 22:36:17 +01:00
Azaziah 80d30bf272 Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...

bzr-revno: 2749
2017-06-08 19:17:14 +01:00
Philip Ridout e248668d1b HEAD 2017-06-06 22:20:01 +01:00
Tim Bentley 1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +01:00
Johannes Thomas Meyer 0850351237 implemented fix suggestions 2017-06-05 23:41:29 +02:00
Olli Suutari db86f45bd7 Expanded the test_reference_matched_full to include results with dots after numbers, eg. 1. Kings 2017-06-05 05:58:38 +03:00
Olli Suutari 8f5b28026a Renamed another wizzard test + comment. 2017-06-04 18:23:30 +03:00
Olli Suutari 191f9c64d8 Renamed test: def test_on_import_click_no_import_wizzard_attr(self):
to:     def test_on_import_click_no_import_wizard_attr(self):
2017-06-04 18:22:23 +03:00
Olli Suutari 3918027ff1 - Fixed 2 tests 2017-06-04 18:21:25 +03:00
Samuel Mehrbrodt ac2f92f8ac Merge trunk 2017-06-04 15:44:20 +02:00
Samuel Mehrbrodt f89d7992fa PEP8 fixes, cleanup, added two more placeholders for footer template, added last_or_penultimate flag in list 2017-06-04 15:42:21 +02:00
Samuel Mehrbrodt 66c9f8eb82 made use of pystache for footer generation being configurable in song settings
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality

Fixes: https://launchpad.net/bugs/1695620
2017-06-04 01:31:47 +02:00
Philip Ridout 34f8f11efd Bible tests fixed 2017-06-03 23:34:19 +01:00
Philip Ridout 2915a8f0e7 Head 2017-06-01 07:18:47 +01:00