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

2806 Commits

Author SHA1 Message Date
Philip Ridout
097225c9d7 Code change for json config file. Titulate themes ftw page 2019-02-15 20:12:28 +00:00
Tomas Groth
b10aa24119 Attempt to fix appveyor tests 2019-02-14 22:19:26 +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
Raoul Snyman
465ff767d6 Fix an unused import and some incorrect patch()s 2019-02-13 14:36:37 -07:00
Tomas Groth
5ac8bbc3f2 Even more pep8 fixes and removed the old htmlbuilder. 2019-02-13 22:19:24 +01:00
Tomas Groth
31ed94d88c pep8 fixes 2019-02-13 21:28:10 +01:00
Tomas Groth
927b68dc95 Fix more tests 2019-02-13 20:41:10 +01:00
Tim Bentley
6b4ed77fee fix up tests 2019-02-12 20:55:58 +00:00
Tim Bentley
4547b7b4eb fix up tests 2019-02-12 19:55:08 +00:00
Philip Ridout
e62cfc64b8 Fix FTW tests 2019-02-11 21:21:22 +00:00
Samuel Mehrbrodt
cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Philip Ridout
c7e4be5512 fix test 2019-02-07 19:38:11 +00: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
Tomas Groth
2e93377cd3 Fix a few tests. 2019-02-06 21:26:33 +01:00
Tim Bentley
6ea3ac875c fix the fix! renderer not included any more 2019-02-04 17:21:34 +00:00
Tomas Groth
078c8d41eb Fix unresolved conflict - for real. 2019-02-03 21:45:24 +01:00
Tomas Groth
aa5554a696 Fix unresolved conflict. 2019-02-03 21:44:46 +01:00
Tim Bentley
4151c0b79f remove THIS 2019-02-03 09:19:04 +00:00
Tim Bentley
8de6ff8832 Fixed trunk merge so now matches that. 2019-01-31 21:34:20 +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
Philip Ridout
af41798128 Make screen selection reusable 2019-01-26 08:17:07 +00:00
Tim Bentley
469a888563 clean ups and settings 2019-01-20 17:58:41 +00:00
Raoul Snyman
28a920b540 Fix up some of the Javascript tests 2019-01-15 23:15:21 -07: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
Tim Bentley
c2a03e205d try again 2019-01-04 18:21:38 +00:00
Tim Bentley
7836aa4234 try again 2019-01-04 18:15:21 +00:00
Tim Bentley
72cd432f10 try again 2019-01-04 18:11:15 +00:00
Tim Bentley
4d6659e889 try again 2019-01-04 18:01:54 +00:00
Tim Bentley
0601c8e774 for fixes 2019-01-03 21:57:38 +00:00
Tim Bentley
d1eff87c30 for fixes 2019-01-03 21:53:34 +00:00
Tim Bentley
83601e49be for fixes 2019-01-03 21:50:42 +00:00
Tim Bentley
64adcb9d06 for fixes 2019-01-03 21:43:16 +00:00
Tim Bentley
3ed5b214c6 for fixes 2019-01-03 21:37:26 +00:00
Tim Bentley
67badd0f29 for fixes 2019-01-03 21:34:03 +00:00
Tim Bentley
55ba43eae4 for fixes 2019-01-03 21:31:38 +00:00
Tim Bentley
c177755136 for fixes 2019-01-03 21:21:41 +00:00
Tim Bentley
16c594365f for fixes 2019-01-03 21:12:53 +00:00
Tim Bentley
9a9ee4bafd for fixes 2019-01-03 21:00:21 +00:00
Tim Bentley
6780c64855 try again 2019-01-03 20:46:11 +00:00
Tim Bentley
100d72c571 remove unneeded 2019-01-03 20:39:53 +00:00
Tim Bentley
7f799b09d2 fixes 2018-12-22 14:54:35 +00:00
Tim Bentley
9027e92e0f fixes 2018-12-22 14:42:19 +00:00
Tim Bentley
0037ae4b6d fixes 2018-12-22 14:38:04 +00:00
Tim Bentley
3bfa92cd47 fix bits 2018-12-21 15:42:12 +00:00
Tim Bentley
7be849681a fix bits 2018-12-21 15:33:46 +00:00
Tim Bentley
0f538250b9 fixes 2018-12-15 08:31:16 +00:00
Tim Bentley
4316245f36 fixes 2018-12-15 08:15:19 +00:00
Tim Bentley
6fd940558d fixes 2018-12-15 08:07:11 +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
65739d1b95 test fixing 2018-12-13 19:29:13 +00:00
Tim Bentley
71c1051f88 test fixing 2018-12-13 19:25:20 +00:00
Tim Bentley
efa1114fa6 test fixing 2018-12-13 19:06:25 +00:00
Tim Bentley
d9a84baa6e Fix tests 2018-12-11 21:33:44 +00:00
Tim Bentley
79eca4756a Fix tests 2018-12-11 21:20:32 +00:00
Tim Bentley
dd8503e435 Fix tests 2018-12-11 21:11:52 +00:00
Tim Bentley
17e78236c4 Fix tests 2018-12-11 21:06:48 +00:00
Tim Bentley
a64036c8c1 Fix tests 2018-12-11 21:01:03 +00:00
Tim Bentley
36fd65f98c Fix tests 2018-12-11 20:52:17 +00:00
Tim Bentley
2868320d9d Fix tests 2018-12-11 20:39:56 +00:00
Tim Bentley
3478d18ad0 Fix tests 2018-12-11 20:19:30 +00:00
Tim Bentley
ee4cdcc9e7 Fix tests 2018-12-11 20:00:33 +00:00
Tim Bentley
dbd3d8f0ef Fix tests 2018-12-11 19:45:27 +00:00
Tim Bentley
47236b0238 Fix tests 2018-12-11 19:35:35 +00:00
Tim Bentley
e224352846 Fix tests 2018-12-11 18:19:48 +00:00
Tim Bentley
88f413e700 Fix tests and code 2018-12-02 14:00:17 +00:00
Tim Bentley
cfc18d5c1a Fix tests and code 2018-12-02 13:51:24 +00:00
Tim Bentley
c7fe441087 Fix tests and code 2018-12-02 10:19:07 +00:00
Tim Bentley
eeefc81174 Fix tests and code 2018-12-02 10:09:01 +00:00
Tim Bentley
c1c8f3e75d Fix tests and code 2018-12-02 09:49:30 +00:00
Tim Bentley
65fb592d1f Fix tests and code 2018-12-02 09:20:06 +00:00
Tim Bentley
9a39c46e2b Fix tests and code 2018-12-02 09:08:00 +00:00
Tim Bentley
c1a1ac58ba Fix tests and code 2018-12-02 09:03:01 +00:00
Tim Bentley
c24fb0cb59 Fix tests and code 2018-12-02 08:39:53 +00:00
Tim Bentley
fc675e9c99 fix up tests 2018-12-01 14:41:40 +00:00
Tim Bentley
746ec03e15 fix up tests 2018-12-01 14:35:35 +00:00
Tim Bentley
95bdfc1f64 head 2018-12-01 14:10:47 +00:00
Raoul Snyman
e58e0ee485 Fix all the tests 2018-11-30 22:52:49 -07:00
Raoul Snyman
56f76b1179 Fixed up some more tests 2018-11-15 21:34:49 -07:00
Raoul Snyman
16027a43a9 Fixed a couple tests 2018-11-12 22:42:43 -07:00
Philip Ridout
d9d0a917fd head 2018-11-10 08:09:10 +00:00
Philip Ridout
692a386387 Initial widification 2018-11-10 06:26:19 +00:00
Tomas Groth
38c9514b80 Make tests runnable and clean up a bit 2018-10-30 21:12:16 +01:00
Tomas Groth
e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Bastian Germann
bad6212008 Test Py 3.7 compatibility 2018-10-29 00:24:55 +01:00
Tomas Groth
4d8661b669 Improve service loading 2018-10-28 17:34:17 +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
Tim Bentley
26a9b2430d Head 2018-10-27 07:00:51 +01: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
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
Tim Bentley
9546c1d9bf Head 2018-10-25 17:38:39 +01:00
Philip Ridout
a867c54b94 HEAD 2018-10-24 22:02:06 +01:00
Phill
891f1dc397 Migrate bibles to use the centeral proxy settings. Upgrade settings and bible meta data accordingly. 
bzr-revno: 2837
 2018-10-24 20:35:22 +01:00
Bastian Germann
cd5939eb3b This fixes setuptools' dependencies according to scripts/check_dependencies.py. 
The minimum Python version is set to 3.6 because this was agreed to on the mailing list.
Some packages which are optional in the source are declared as optional (uno, pyenchant, pyodbc).

To overcome a module conflict, openlp.py is replaced with run_openlp.py which setuptools installs as /usr/bin/openlp (or openlp.exe on Windows).

Additionally, pyxdg is replaced with appdirs (see License violations issue).

bzr-revno: 2836
 2018-10-24 20:22:28 +02: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
Tim Bentley
c08347ca3e more fixes 2018-10-21 16:35:59 +01:00
Tim Bentley
bc7b772ed2 head 2018-10-20 15:43:33 +01:00
Tim Bentley
1d4a414240 more state stuff 2018-10-20 15:41:32 +01:00
Ken Roberts
a3f2030349 PJLink2 Update T and pep8 2018-10-19 21:33:32 -07:00
Bastian Germann
3104ca78c3 Document pytest as a test runner 2018-10-16 21:57:43 +02:00
Bastian Germann
45a1c3d3f1 Find macOS problem 2018-10-16 21:07:31 +02:00
Bastian Germann
2e39304a1b Find macOS problem 2018-10-16 20:58:51 +02:00
Bastian Germann
dd346487f5 Find macOS problem 2018-10-16 20:55:25 +02:00
Bastian Germann
f0fb9e773d no mandatory icu for tests 2018-10-16 09:09:18 +02:00
Tim Bentley
92492ab0e8 initial phase of vlc and statemanagement 2018-10-13 11:24:01 +01:00
Bastian Germann
035bd08a9a pylint3 2018-10-13 11:12:00 +02:00
Bastian Germann
e124229040 Try to fix CI 2018-10-11 20:25:53 +02:00
Bastian Germann
6edd85146d test_get_locale_key needs PyICU 2018-10-06 21:04:09 +02:00
Bastian Germann
5c4ae0a9e6 replace nose with nose2 2018-10-03 00:32:11 +02: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
Tomas Groth
7a70550c20 Make it possible to set the data-path for portable data. 2018-09-02 21:21:57 +02:00
Kyle Russell
8a5a2628dc Fix pycodestyle line spacing warnings 2018-08-31 20:27:53 -04:00
Kyle Russell
6dc1c37d59 Merge lp:openlp for manifest test resources and font fix 2018-08-31 13:35:30 -04:00
Raoul Snyman
c2a60fb0e9 Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal. 
bzr-revno: 2833
 2018-08-31 16:46:54 +01:00
Raoul Snyman
8d379e6785 Add some tests, we're up to 52% coverage now! 2018-08-30 22:49:26 -07:00
Kyle Russell
c366e58683 Improve usability of image plugin choosegroupform 
In order to add an image to an existing group when no group was preselected,
the user must currently choose the existing group name from the comboxbox
and also select the Existing Group radio button.  It should be assumed that
by selecting a group name from the combobox, the user intendeds to add the
image to an existing group, and the accompanying radio button should
automatically be selected.  This reduces the number of required clicks, and
the likelihood of not actually adding the image to the correct group.

Likewise, if a user enters text into the New Group field, the dialog
should assume that the user's intent is to create a new group and auto
select the appropriate radio button.

Also removes some choosegroupdialog specific component logic from mediaitem,
since it's now covered by the choosegroupdialog implementation.  Better
encapsulation, and improves testability. (Testing that the existing group
radio button was selected when choosedialogform was initialized with a
preselected group requires much more effort when the radio button selection
logic spanned two components.)

Adds simple test cases for the scenarios described above.
 2018-08-29 23:11:30 -04:00
Simon Hanna
7321810e78 Improve the regex, removing the displayed warning 2018-08-27 16:16:26 +02:00
Simon Hanna
aaef55106c Remove imports from openlp/core/ui/__init__.py and update related files 2018-08-25 16:36:46 +02: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
Simon Hanna
3e5eb698d9 Return None instead of raising an error when converting path objects 2018-08-12 13:12:03 +02:00
Tomas Groth
0aadec661f Fix some pylint failures and add qtawesome to appveyor install. 2018-08-05 22:28:01 +02:00
Tim Bentley
3a0d0ff2ea Head 2018-08-04 21:58:13 +01:00
Ken Roberts
edada54d7e Fix windows not using lo as network interface 2018-08-03 15:32:32 -07:00
Tim Bentley
023753b2fc fix tests 2018-07-15 20:54:41 +01:00
Phill Ridout
6a8bf83d27 Add cetralised proxy support 
bzr-revno: 2823
 2018-07-12 21:10:35 +01:00
Tomas Groth
e3d163bf7a Remove debug print 2018-07-06 22:23:33 +02:00
Tomas Groth
ac14c0186d fix pylint test 2018-07-05 22:33:07 +02:00
Tomas Groth
588cf96b5a Fix a test 2018-07-05 21:18:16 +02:00
Tomas Groth
56a811c094 More pycodestyle fixes 2018-07-04 22:42:55 +02:00
Tomas Groth
318e90f893 Fixes for pycodestyle 2018-07-02 22:38:47 +02:00
Tim Bentley
c064259e7e fix up after projector merge 2018-06-28 21:40:54 +01:00
Ken Roberts
bc832c7c72 PJLink2 update S 2018-06-28 08:37:37 -07:00
Tim Bentley
51f8eaa911 add tests 2018-06-27 22:01:30 +01:00
Tim Bentley
5c26cf8cf0 fixes 2018-06-26 20:44:54 +01:00
Tim Bentley
13f52e96db new tree 2018-06-26 18:08:36 +01:00