Commit Graph

7247 Commits

Author SHA1 Message Date
d4daa05686 Create Screen objects (rather than dictionaries) and capture more details about the screens 2017-12-01 14:53:32 -07:00
b650ef5730 Refactor mocks 2017-11-24 11:08:23 -08:00
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
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
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
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
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
d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
1c10227c38 HEAD 2017-11-14 17:01:57 -07:00
e5c9b7c98e Merge from upstream 2017-11-14 17:01:19 -07: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
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
4f769d5622 Fix the handler passing False
Fixes: https://launchpad.net/bugs/1672777
2017-11-13 21:31:54 +00:00
Tim Bentley
12b71fc068 head 2017-11-11 08:35:02 +00:00
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
3d4ed035e9 PJLink2-L updates 2017-11-10 03:59:38 -08:00
3a404f074c Merge in Phil's changes 2017-11-09 21:47:37 -07:00
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
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
3140ea434d Add support for a multi to single setting migration 2017-11-08 22:06:48 -07:00
5e1b591f62 Apparently some files were missing after the merge 2017-11-06 20:32:40 -07:00
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
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
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
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
d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
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
15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
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
bc2fac7cfd Missed one thing 2017-10-07 00:08:25 -07:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
26c78b374a HEAD 2017-10-04 23:28:57 -07:00
dbf63fed26 All the tests passing. Now the big work to get the new stuff properly integrated 2017-10-04 22:10:52 -07:00
640ebf8c3c Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken. 2017-10-04 00:44:08 -07:00
f6a91839fc Remove unused and unnecessary render class 2017-10-03 16:11:06 -07:00
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
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
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
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
0dcf3de267 Tests! 2017-09-28 20:06:00 -07:00
76bf162383 Fix error with Settings().value() call 2017-09-28 16:50:23 -07:00
77b9fee050 Checkbox is only there is there is a dark style 2017-09-28 16:39:44 -07:00
1b7482243d Centralise style tweaks 2017-09-28 16:28:18 -07:00
c2e16cc8e9 HEAD 2017-09-28 10:32:10 -07:00
93fd4053b2 Add dark theme from QDarkStyle. Part 1: Force the theme 2017-09-28 10:31:28 -07:00
Tim Bentley
0c1b1dc2a5 fix tests 2017-09-27 20:21:08 +01:00
Tim Bentley
71a87f602b fix download date 2017-09-27 19:56:21 +01:00
Tim Bentley
74cdc761d9 end of remote and server migration 2017-09-26 22:18:09 +01:00
Tim Bentley
f58d1047db move endpoint 2017-09-26 22:04:39 +01:00
Tim Bentley
9d6bd78a70 head 2017-09-26 21:34:47 +01:00
Tomas Groth
359362126a merge trunk 2017-09-26 20:43:35 +02:00
Tim Bentley
64ba30b24d add files 2017-09-26 18:51:09 +01:00
Philip Ridout
dfcd95b9d9 pep fixes 2017-09-26 18:02:56 +01:00
Philip Ridout
69fca430b5 HEAD 2017-09-26 17:42:54 +01:00
Philip Ridout
10b13872e5 Modify themes to work with pathlib 2017-09-26 17:39:13 +01:00
e90836e817 Fix up some issues with one of the tests 2017-09-25 13:34:05 -07:00
4bb031b22e HEAD 2017-09-25 12:55:33 -07:00
Tomas Groth
1481f747f1 merge trunk 2017-09-25 21:41:55 +02:00
Tomas Groth
3094b053ff Various adjustments, main window starts now, still no canvas. 2017-09-25 20:59:43 +02:00
Philip Ridout
2c52059275 more fixes 2017-09-24 21:26:39 +01:00
Philip Ridout
047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout
dfe2ae347e Minor misc + pathlib refactors 2017-09-24 09:39:54 +01:00
Philip Ridout
d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
a4bd979f19 Hide the cancel button 2017-09-22 21:10:18 -07:00
50511c4953 HEAD 2017-09-22 21:04:41 -07:00
Phill
35e9300be2 More pathlib changes, focused mainly on the presentation plugin
Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/pathlib5 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2193/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2096/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1983/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1353/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/...

bzr-revno: 2768
2017-09-22 20:53:59 -07:00
e1ca15173d Actually show the progress dialog when we're waiting for the thread to shut down. 2017-09-22 20:50:45 -07:00
3e05a64874 PJlink2 update K 2017-09-22 05:03:28 -07:00
Tomas Groth
31826f6962 minor changes. 2017-09-21 22:34:25 +02:00
Tomas Groth
f869765785 Copied some code from the POC display to Canvas. 2017-09-21 22:02:38 +02:00
Philip Ridout
b4a687c85e PEP fixes 2017-09-21 07:20:56 +01:00
Philip Ridout
b440584cb5 Moved the patched shuilils to the path module 2017-09-20 21:44:57 +01:00
c06cd39cab Fix up all the tests 2017-09-20 09:55:21 -07:00
Tomas Groth
3923601202 Initial copy of new renderer into the source tree plus some rearranged files. Nothing working or running yet. 2017-09-19 21:52:24 +02:00
15c8023357 Moving over to requests 2017-09-19 09:48:34 -07:00
Philip Ridout
92c6b9c09d Revert some requested changes 2017-09-18 21:08:28 +01:00
Philip Ridout
d801ca9b09 Test patched which method 2017-09-18 07:20:06 +01:00
Philip Ridout
dbcf4d2f78 HEAD 2017-09-17 20:43:35 +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
2f8cdc81e0 Fix up the version tests and remove old references to 'versionchecker' 2017-09-12 23:08:38 -07:00
6fb4381588 HEAD 2017-09-11 22:52:47 -07:00
d1a47036cf Remove unnecessary slot 2017-09-11 22:52:38 -07:00
Philip Ridout
9e9285a896 Added some settings that should have been upgraded 2017-09-09 21:00:48 +01:00
47f96a3286 Duh. Can't have the old names in there, now can we? 2017-09-08 22:57:06 -07:00
1e06f472c6 HEAD 2017-09-08 22:23:37 -07:00
a6324b6b7f Refactor version check threading 2017-09-08 22:19:22 -07:00
Philip Ridout
f0e7381f5c Pathlib changes in presentation plugin 2017-09-07 22:52:39 +01:00
Philip Ridout
07ba52e90c Applied tgc's patch 2017-09-07 21:27:11 +01:00
Philip Ridout
24358337e7 Pathlib changes 2017-09-06 22:36:31 +01:00
Philip Ridout
292861907e minor edits 2017-09-06 21:18:08 +01:00
Philip Ridout
9cb2b2e3c2 Pathlib changes 2017-09-05 21:48:55 +01:00
Phill
28591ed04a Change the settings upgrade code to handle versioned upgrades
Upgrade settings to store file paths and json encoded Path objects
Enable the json encoders/decoders to work with custom objects with defined json methods
Added in automatic backup before settings upgrade on superflys request


lp:~phill-ridout/openlp/pathlib4 (revision 2769)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2184/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2087/
[SUCCESS] https://ci.openlp.io/job...

bzr-revno: 2764
2017-09-04 21:28:50 -07:00
Philip Ridout
7a3f54e54c Back up settings before upgrading them 2017-09-03 11:18:14 +01:00
Philip Ridout
1908efcdbb Small fix 2017-08-27 20:22:43 +01:00
Philip Ridout
ab2f354f11 Merge tweek 2017-08-27 18:37:54 +01:00
Tim Bentley
187b71c9dc Head 2017-08-27 18:14:00 +01: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
Jonathan Springer
c108132183 Remove extra space 2017-08-27 11:33:11 -04:00
Philip Ridout
05e0f42859 Pylint fixes 2017-08-26 17:50:54 +01:00
Philip Ridout
0e01ef29d4 Pep fixes 2017-08-26 17:00:36 +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
Jonathan Springer
c6aa669ee8 merge trunk 2017-08-26 10:01:04 -04:00
Philip Ridout
f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Phill
cd158b63fd Part 3, converted some more utility methods
Fixed the problem TGC was having.

Superflys fix included (https://bin.snyman.info/mmm5sqj8)

lp:~phill-ridout/openlp/pathlib3 (revision 2764)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2175/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2079/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1966/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1336/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_C...

bzr-revno: 2762
2017-08-24 21:26:25 -07:00
Philip Ridout
0b91725a4f Fixed issues with this branch and recent commits to trunk 2017-08-24 20:53:55 +01:00
Theodore Frederick
ae62538a02 Adds option to ignore aspect ratio and stretch image.
bzr-revno: 2761
2017-08-23 21:21:11 +01:00
Philip Ridout
6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00