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

11697 Commits

Author SHA1 Message Date
Raoul Snyman
f1575dd50b Updated various thread usages 2018-01-03 23:01:35 -07:00
Raoul Snyman
20c1579a55 Just commit some of my recent changes 2018-01-02 23:57:12 -07:00
Ken Roberts
d97ca9e54b Merge trunk 2018-01-02 16:35:14 -08:00
Simon Hanna
399b40745d Fixed the version checking to be more robust 
* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

bzr-revno: 2805
 2018-01-02 21:00:54 +00:00
Phill Ridout
a1ea35c4e7 continued refactor of saving packaged files 2017-12-30 08:08:10 +00:00
Simon Hanna
d490a32f94 Remove sleep statement 2017-12-29 14:59:08 +01:00
Simon Hanna
0f23d12d72 Fix version checking if response is empty 2017-12-29 11:27:58 +01: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
5495ba8cf3 plugins done and tested 2017-12-28 08:08:12 +00:00
Phill Ridout
4b1965520c Start on refactoring file saving 2017-12-27 16:06:36 +00:00
Ken Roberts
33da95371f Cleanups and assert updates 2017-12-25 20:14:39 -08:00
Ken Roberts
598a373929 PJLink Updates N 2017-12-25 00:44:30 -08:00
Raoul Snyman
ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
Raoul Snyman
2eb89c8361 Some enhancements to projectors 2017-12-23 14:53:13 -07:00
Phill Ridout
a866bc5499 Test fixes 2017-12-22 22:35:09 +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
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
Phill
2db71e57c0 Number of fixes, including: 
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread


lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/              [WAITING]
[RUNNING]
[SUCC...

bzr-revno: 2798
 2017-12-21 20:23:26 +00:00
Raoul Snyman
2fa88b17db Refactor threads to use new openlp.core.threading module 2017-12-20 07:17:07 -07:00
Tim Bentley
8f0779f600 Start media 2017-12-20 08:15:53 +00:00
Tim Bentley
5764551e3e fix up widgets 2017-12-19 19:47:02 +00:00
Phill Ridout
590f44e212 HEad 2017-12-18 19:59:35 +00:00
Phill Ridout
370ec244d8 Fix osx finding 'temp' files instead of the python source files 
Fixes: https://launchpad.net/bugs/1738047
 2017-12-17 15:25:54 +00:00
Phill Ridout
8717d62188 Set word wrap on SWORD importer info label 
Fixes: https://launchpad.net/bugs/1736274
 2017-12-17 15:23:38 +00:00
Raoul Snyman
786462148f Fix an old run_thread() call 2017-12-16 23:54:21 -07:00
Raoul Snyman
187714cd87 HEAD 2017-12-16 23:51:23 -07:00
Raoul Snyman
1dda8f339f Refactor threading to a centralised location which can keep track of all the threads 2017-12-16 23:50:23 -07:00
Phill Ridout
f629504b5b Mostly minor path tidy-ups 2017-12-17 04:29:53 +00:00
Raoul Snyman
9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
Ken Roberts
63aa4927a5 - Added pjlink.process_pjlink 
- Split pjlink.check_login() to use process_pjlink()
- Added QAbstractSocket connect enum to constants
- Minor code cleanups for connection and command processing
- Updated packet queueing
- Fix get_object_filtered()
- Fix tests in test_projector_pjlink_base
- Fix tests in test_projector_pjlink_cmd_routing
- Added tests for process_pjlink method
- Updated test_projector_bugfixes_01
- Some OLP style cleanups

-------------------------------------------------------...

bzr-revno: 2795
 2017-12-09 14:47:23 +00:00
Ken Roberts
eec0e325df OLP Style cleanups 2017-12-09 03:17:05 -08:00
Phill Ridout
b0b80649d4 Service maganger fix 2017-12-09 08:22:14 +00:00
Ken Roberts
44b82d8ca2 Fix mocks to use correct python version tests 2017-12-04 16:54:15 -08:00
Phill Ridout
baed193444 PEP8 2017-12-04 20:49:59 +00:00
Ken Roberts
159056f06f PJLink2-M updates 2017-12-03 16:24:47 -08:00
Phill Ridout
582e2e267a Minor fixes 
Fixes: https://launchpad.net/bugs/1735765
 2017-12-02 21:47:11 +00:00
Phill Ridout
4014179032 head 2017-12-02 21:37:06 +00:00
Tim Bentley
90118af85c fix abend 2017-12-02 09:11:22 +00: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
d4daa05686 Create Screen objects (rather than dictionaries) and capture more details about the screens 2017-12-01 14:53:32 -07:00
Ken Roberts
b650ef5730 Refactor mocks 2017-11-24 11:08:23 -08:00
Ken Roberts
2b9d2a994b Bugfix 1734275 Nonstandard LAMP reply 2017-11-24 00:30:37 -08:00
Phill Ridout
572e1efb9c Fix dvd clip selection. Pretty much coppied from lp:~mikey74/openlp/dvdplayerfix/ 
Fixes: https://launchpad.net/bugs/1514545
 2017-11-22 21:56:56 +00:00
Phill Ridout
29f7d8967f service fixes 2017-11-22 21:39:40 +00:00
Phill Ridout
a4cfd2cdda HEAD 2017-11-22 20:22:15 +00:00
Phill Ridout
7badbca8cf Pathfixes 2017-11-22 20:21:57 +00:00
Phill Ridout
bd2efc8ec0 PEP8 2017-11-21 07:23:02 +00:00
Phill Ridout
7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
Phill Ridout
a864dbbbc9 Minor tidyups 2017-11-19 21:57:38 +00:00
Phill Ridout
1b168dd7bf More pathlib refactors 2017-11-18 23:14:28 +00:00
Phill Ridout
a79ec45055 HEAD 2017-11-18 22:40:05 +00:00
Phill Ridout
f07d6e736c Moar pathlib refactors 2017-11-18 22:37:24 +00:00
Ken Roberts
ecaf678a55 - Move openlp.core.lib.projector to openlp.core.projectors 
- Move openlp.core.ui.projector to openlp.core.projectors
- Move tests.functional.openlp_core/lib/test_projector* to tests.functional.openlp.core.projectors
- Fix imports for new projector location
- Convert projector imports to fully-qualified import
- Fix delete projector item in ui.manager
- Fix projector tests
- Merge trunk (fix tests)
- Rename "Projector" dock to "Projector Controller"
--------------------------------------------...

bzr-revno: 2789
 2017-11-18 22:25:36 +00:00
Phill Ridout
9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
Ken Roberts
c46cd951ef Projector imports to fully-qualified, renamed projector dock 2017-11-16 15:53:53 -08: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
d216766586 Remove some unused imports 2017-11-16 17:43:17 +00:00
Phill Ridout
ab810734d8 Rework mediainfo fix 
Fixes: https://launchpad.net/bugs/1732348
 2017-11-16 17:17:47 +00:00
Raoul Snyman
0bef29758c HEAD 2017-11-15 20:52:11 -07:00
Raoul Snyman
923dc1436e Remove monitor migration 2017-11-15 17:19:26 -07:00
Phill Ridout
3560b27bfb Use the OLDXML output type for the new version of mediainfo 
Fixes: https://launchpad.net/bugs/1732348
 2017-11-15 21:58:19 +00:00
Ken Roberts
d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
Raoul Snyman
1c10227c38 HEAD 2017-11-14 17:01:57 -07:00
Raoul Snyman
e5c9b7c98e Merge from upstream 2017-11-14 17:01:19 -07:00
Phill Ridout
4fbed73e95 Typo fix 2017-11-14 22:30:46 +00:00
Phill Ridout
2ccd6a01f0 Set the default filter in accordance to the current service file type 
Fixes: https://launchpad.net/bugs/1673251
 2017-11-14 22:13:38 +00:00
Phill Ridout
66bae6716c chage media replace background context icon, add replace and reset actions to image context menu 
Fixes: https://launchpad.net/bugs/1650358
 2017-11-14 17:35:37 +00:00
Raoul Snyman
1cb11832bd Added some tests for the settings upgrade and fixed a bug I had introduced. 2017-11-14 00:19:10 -07:00
Phill Ridout
4e9fcf2e50 Sort media items by natural order 
Fixes: https://launchpad.net/bugs/1625087
 2017-11-13 21:40:49 +00:00
Phill Ridout
4f769d5622 Fix the handler passing False 
Fixes: https://launchpad.net/bugs/1672777
 2017-11-13 21:31:54 +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
dc1ca6c071 head 2017-11-11 16:29:55 +00:00
Phill Ridout
e763cd81df HEAD 2017-11-11 12:20:45 +00:00
Tim Bentley
12b71fc068 head 2017-11-11 08:35:02 +00:00
Raoul Snyman
6b0de04694 HEAD + Regrouped upgrades 2017-11-10 23:54:54 -07:00
Phill Ridout
1c760e44e5 Small modification to upgrade settings as per superflys request 2017-11-10 22:50:04 +00:00
Ken Roberts
3d4ed035e9 PJLink2-L updates 2017-11-10 03:59:38 -08:00
Raoul Snyman
3a404f074c Merge in Phil's changes 2017-11-09 21:47:37 -07:00
Raoul Snyman
a408e3d74e Fix some linting issues, and fix the test for newer versions of PyLint 2017-11-09 21:11:03 -07:00
Tim Bentley
e0341ab3eb fix tests 2017-11-09 21:24:38 +00:00
Phill Ridout
536a187fb9 PEP8 2017-11-09 20:39:17 +00:00
Phill Ridout
881c3648cc Test fixes 2017-11-09 20:24:46 +00:00
Tim Bentley
7a345d5770 fix code 2017-11-09 19:55:01 +00:00
Tim Bentley
0d1bbe3417 add preview to live 2017-11-09 19:42:30 +00:00
Tim Bentley
1a0a828ad3 fix errors 2017-11-09 19:25:26 +00:00
Phill Ridout
6d66cadb0a head 2017-11-09 19:15:31 +00:00
Phill Ridout
83eaad48ad Fix action test failure by removing un used actions 2017-11-09 19:11:37 +00:00
Raoul Snyman
7a1778052b Refactor the library versions in the exception form to a much more concise get_library_versions() method in openlp.core.version 2017-11-08 23:10:29 -07:00
Raoul Snyman
3140ea434d Add support for a multi to single setting migration 2017-11-08 22:06:48 -07:00
Raoul Snyman
5e1b591f62 Apparently some files were missing after the merge 2017-11-06 20:32:40 -07:00
Phill Ridout
66534a58ab Head 2017-11-06 22:41:36 +00:00
Raoul Snyman
4dba3b178d Fix up issues after merge 2017-11-03 22:34:10 -07:00
Phill Ridout
f307568cbb Misc test fixes 2017-11-03 22:52:24 +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
Phill Ridout
7697febb2a Fixes Bug #1661416 
Fixes: https://launchpad.net/bugs/1661416
 2017-11-02 21:46:02 +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
Phill Ridout
a268c4476b Couple fixes for bugs caused by controll chars 2017-10-28 19:58:34 +01:00
Phill Ridout
960ddedc6f make tidy text part of core.\nRemove redundant (since py3) re.UNICODE flag 
Fixes: https://launchpad.net/bugs/1727517
 2017-10-28 11:04:09 +01:00
Phill Ridout
fe5430e157 HEAD 2017-10-27 22:11:29 +01:00
Raoul Snyman
fb7bff01bc Don't throw an exception when a function does not exist in the registry function list 2017-10-23 15:23:05 -07:00
Raoul Snyman
d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
Philip Ridout
eb107b7237 test fixes 2017-10-10 22:16:04 +01:00
Raoul Snyman
53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
Raoul Snyman
6165fb4992 Add a method to get the types of video supported by WebEngine, renamed some 'set_' methods to 'load_' 2017-10-10 14:14:44 -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
4d68382d52 Fix some issues from the mergefest 
bzr-revno: 2779
 2017-10-09 19:40:41 -07:00
Raoul Snyman
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
Raoul Snyman
fad0298490 Fix a bug when importing settings 2017-10-09 18:09:45 -07:00
Philip Ridout
cecd2298a7 fixes #1660486 - Dragging item in service manager without changes triggeres 'unsaved' 2017-10-08 21:36:11 +01:00
Philip Ridout
2be17b5c6f fixes #1532193 - Typos in songusageplugin.py annother fix shamelessly ported from 2.4 2017-10-08 20:41:07 +01:00
Philip Ridout
37da12affd fixes #1715125 - Missing .osz file extension on save service 2017-10-08 20:29:54 +01:00
Philip Ridout
71ad60d038 fixes #1660478 - Opening recent file does not prompt to save changes 2017-10-08 20:01:09 +01:00
Philip Ridout
98d5f0ec67 fix 1660473, shamlessly ported from 2.4.5 2017-10-08 19:38:56 +01:00
Philip Ridout
779e95b523 Fix for samuel_m issue and bug #1672229 2017-10-08 18:33:03 +01:00
Raoul Snyman
bc2fac7cfd Missed one thing 2017-10-07 00:08:25 -07:00
Raoul Snyman
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Raoul Snyman
26c78b374a HEAD 2017-10-04 23:28:57 -07:00
Raoul Snyman
dbf63fed26 All the tests passing. Now the big work to get the new stuff properly integrated 2017-10-04 22:10:52 -07:00
Raoul Snyman
640ebf8c3c Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken. 2017-10-04 00:44:08 -07:00
Raoul Snyman
f6a91839fc Remove unused and unnecessary render class 2017-10-03 16:11:06 -07:00
Raoul Snyman
8ad2f96d90 Pulled Phil's branch, and merged in Tomas' latest changes too 2017-10-02 09:20:38 -07:00
Tim Bentley
b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Phill
d8ce9d21a5 Removed one qr code from the remotes tab and made the other point to the openlp website mobile downloads so that: 
* Remote tab is less cluttered
* Future proof updates, these only need to be made on the website, meaning that older versions of openlp will not break
* Offer android users the option to use f-store (rather than automatically being sent to the play store)

--------------------------------
lp:~phill-ridout/openlp/qr (revision 2770)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/...

bzr-revno: 2775
 2017-10-01 21:03:18 +01:00
Philip Ridout
13bfa1c2f7 HEAD 2017-10-01 07:58:20 +01:00
Philip Ridout
70d9287a80 Prehead commit 2017-10-01 07:57:11 +01:00
Philip Ridout
c5a6fd9e31 Pep fixes 2017-10-01 00:06:30 +01:00
Philip Ridout
76bbc4500a Pep fixes 2017-09-30 23:51:49 +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
9bb2935208 Tidy ups 2017-09-30 22:45:54 +01:00
Philip Ridout
ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley
dddd5ab4cd Import export 2017-09-30 15:17:37 +01:00
Tomas Groth
ff25d0d59e merge trunk 2017-09-29 20:59:42 +02:00
Tim Bentley
5203518ccb head 2017-09-29 19:53:22 +01:00
Tim Bentley
cd1b6715b6 fix merge comments 2017-09-29 19:53:04 +01:00
Tim Bentley
d77f0127e8 head 2017-09-29 19:42:15 +01:00
Tim Bentley
158fdd3e63 spelling 2017-09-29 19:41:55 +01:00
Philip Ridout
1cfb152395 some WebEngine fixes 2017-09-29 19:06:04 +01:00
Philip Ridout
6780a44496 fixes 2017-09-29 18:31:35 +01:00
Raoul Snyman
0dcf3de267 Tests! 2017-09-28 20:06:00 -07:00
Raoul Snyman
76bf162383 Fix error with Settings().value() call 2017-09-28 16:50:23 -07:00
Raoul Snyman
77b9fee050 Checkbox is only there is there is a dark style 2017-09-28 16:39:44 -07:00
Raoul Snyman
1b7482243d Centralise style tweaks 2017-09-28 16:28:18 -07:00