Commit Graph

15323 Commits

Author SHA1 Message Date
Tomas Groth
1481f747f1 merge trunk 2017-09-25 21:41:55 +02:00
Tomas Groth
24c1b36b78 Forgot to change folder. 2017-09-25 21:39:51 +02:00
Tomas Groth
de1a2c6d2e Try to workaround a mysql-connector install issue. 2017-09-25 21:35:52 +02:00
Phill
160c0314ea This is ready to go now!
Upgrade the image plugin to use pathlib.
Other minor changes and fixes.


Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/pathlib6 (revision 2774)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2207/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2110/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1997/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1364/
[SUCCESS] https://ci.open...

bzr-revno: 2769
2017-09-25 20:29:56 +01:00
Tomas Groth
e53703bea8 Update appveyor build to new python and deps versions. 2017-09-25 21:22:46 +02:00
92551f4fa5 Add requests to AppVeyor 2017-09-25 12:01:54 -07:00
Tomas Groth
3094b053ff Various adjustments, main window starts now, still no canvas. 2017-09-25 20:59:43 +02:00
cff194d320 Skip Bible HTTP tests on Jenkins to prevent the server from being blacklisted 2017-09-25 11:50:24 -07:00
Philip Ridout
286e3a6081 minor fix 2017-09-25 17:59:31 +01: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
d52fff75a4 Test fox 2017-09-24 19:59:49 +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
7239b1e400 Add a mock main_window 2017-09-22 22:23:56 -07: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
3fcc58f116 PJlink2 update K
- Update notes in PJLink-Notes.odt/update PDF
- Add PJLink.get_socket() (process socket data)
- Add PJLink.get_buffer() (process non-socket data)
- Update PJLink.get_data() to work with get_socket/get_buffer
- Cleanup ProjectorManager code
- Fix incorrect note reference to song db in test_projector_db
- Fix projector tests for change to PJLink() creation
- Start PJLinkUDP class
- Remove unused pjlink2.py module
- Code oops cleanups

[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2767
2017-09-22 20:15:37 +01: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
131e0213e2 minor fix 2017-09-21 08:40:41 +01: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
99b7239bc0 A little cleanup 2017-09-19 21:36:59 -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
0ee8ebb1c2 PEP fixes 2017-09-18 07:32:19 +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
2cfb03a606 No code changes.
- Added PJLink programming notes as openlp/documentation/PJlink_Notes.odt and PJlink_Notes.pdf
- Update .bzrignore for eric IDE multiple versions

--------------------------------
lp:~alisonken1/openlp/pjlink2-j (revision 2765)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2186/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2089/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1976/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/...

bzr-revno: 2766
2017-09-11 10:41:31 -07:00
Phill
09422d47c4 Thanks to TGC for his json fix
Also fixes some setting upgrades that I inadvertantly missed. As found by superfly

lp:~phill-ridout/openlp/tgcs_json_fix (revision 2766)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2187/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2090/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1977/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1347/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1183/
[SUCC...

bzr-revno: 2765
2017-09-11 10:39:54 -07:00
Philip Ridout
9e9285a896 Added some settings that should have been upgraded 2017-09-09 21:00:48 +01:00
ce8d1f46b9 Added pjlink notes in documentation - update bzignore for eric IDE 2017-09-08 23:57:21 -07: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