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

11664 Commits

Author SHA1 Message Date
Tim Bentley 6c8ec8a840 Add logging to mainwindow and clean up logging code 2018-02-03 11:24:39 +00:00
Tim Bentley 6ff1015205 close the splash screen 2018-02-03 07:59:36 +00:00
Tim Bentley f7169ee708 remove ppt viewer 2018-02-02 21:33:41 +00:00
Tim Bentley cffd8e603d cleanups 2018-01-27 11:15:49 +00:00
Tim Bentley c9ff4b2209 fix web api 2018-01-27 09:41:11 +00:00
Raoul Snyman 1f53453ff6 Fixed an issue with the FTW not displaying any download progress. 
Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/fix-ftw-download-progress (revision 2811)
https://ci.openlp.io/job/Branch-01-Pull/2430/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2331/                  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/125/                   [SUCCESS]
https:/...

bzr-revno: 2811
 2018-01-24 21:36:15 +00:00
Phill Ridout 4423b61fc9 Small fix 2018-01-22 21:37:00 +00:00
Phill Ridout ee144ad68b Save the temp file in a different dir 2018-01-22 20:41:30 +00:00
Phill Ridout 7c68e9d022 pep 2018-01-21 07:40:26 +00:00
Phill Ridout 368b0ce75c Tidy ups 2018-01-20 09:30:30 +00:00
Tim Bentley 0ce0231a5f text clean ups 2018-01-19 21:31:36 +00:00
Phill Ridout 7ced39594f Add test 2018-01-19 21:00:56 +00:00
Phill Ridout 89042982d6 HEAD 2018-01-16 20:49:18 +00:00
Phill Ridout 21b362c9a2 doc string! 2018-01-14 09:01:00 +00:00
Raoul Snyman 331554a038 HEAD 2018-01-13 17:45:24 -07:00
Ken Roberts d6087813ae - Ongoing conversions from self.asserts to plain asserts 
- Remove test_ part of method name for bugfix tests no longer used
- Move tests *_change_status_* from pjlink_commands_01 to pjlink_base
- Move test projector_reset_information from pjlink_commands_01 to pjlink_commands_02
- Move lamp_nonstandard_reply from bugfix to pjlink_commands_01
- Move clss_nonstandard_reply 1/2 from bugfix to pjlink_commands_01
- Move test_projector_get_* tests from pjlink_commands_01 to pjlink_base
- Added pjli...

bzr-revno: 2809
 2018-01-13 17:44:36 -07:00
Raoul Snyman d758ed257c Fix progress not showing in the FTW 2018-01-13 16:24:26 -07:00
Phill Ridout 42465605ac fix saving and loading progress bar 
Fixes: https://launchpad.net/bugs/1734432
 2018-01-13 09:02:29 +00:00
Phill Ridout c88a08f9e4 HEAD 2018-01-13 07:25:07 +00:00
Phill Ridout 2095a00dc9 Fix up code so test passes 2018-01-13 07:24:20 +00:00
Ken Roberts 372051067d Update pjlink_class define in db 2018-01-12 23:17:15 -08:00
Raoul Snyman 9e184ebbfd Go back to the way I was doing it originally. Much more succint. 2018-01-12 22:59:44 -07:00
Ken Roberts 17ff6a7d31 PJLink2 update o 2018-01-12 21:41:42 -08:00
Raoul Snyman 11f528d09c Change is_thread_finished() to return True if a thread is missing 2018-01-12 22:24:53 -07:00
Raoul Snyman 83bc19520a Removed a duplicate test file, fixed up some tests, added some more tests 2018-01-12 21:57:16 -07:00
Raoul Snyman ff421df2bf Fix bug #1742910 
Fixes: https://launchpad.net/bugs/1742910
 2018-01-12 11:29:32 -07:00
Raoul Snyman 7e99381dba Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed 2018-01-07 10:50:29 -07:00
Raoul Snyman 35fd553024 If XDG is available, log files belong in the real cache dir 2018-01-06 21:45:13 -07:00
Raoul Snyman 738e8e0283 Remove the Qt style option - it never worked anyway 2018-01-06 21:40:40 -07:00
Raoul Snyman 954d1618bc Fix the direction of the '--no-web-server' command line option 2018-01-06 21:36:45 -07:00
Raoul Snyman 7b28262987 Fix a mismatch of arguments in a call to reload_bibles() 2018-01-06 21:36:17 -07:00
Phill Ridout dd6887d388 HEAD 2018-01-06 09:56:10 +00:00
Phill Ridout e1400dc227 Finally merge the save lite method in to the 'standard' save method' 2018-01-06 09:55:19 +00:00
Raoul Snyman 5612be1b5a Stop the HTTP server properly too 2018-01-06 00:02:45 -07:00
Raoul Snyman f693d3aa37 Call close() to stop everything properly 2018-01-05 21:41:49 -07:00
Raoul Snyman 3e9073275a Fix an issue with versions of websockets > 4.0 2018-01-04 22:32:12 -07:00
Raoul Snyman 2d009f1884 Change a log.error to a log.exception 2018-01-04 14:13:24 -07:00
Raoul Snyman 0601cf1543 Move cleanup to after thread wait; Figured out why the webserver was exiting early 2018-01-04 14:03:15 -07:00
Raoul Snyman db7ff02abb Move the thread code to after the event has been accepted 2018-01-04 10:17:20 -07:00
Raoul Snyman 544c396bbc Fix some linting issues 2018-01-04 00:00:55 -07:00
Raoul Snyman 64b26774a1 For some reason, the thumbnail downloader was still using a string path 2018-01-03 23:37:59 -07:00
Raoul Snyman 13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Raoul Snyman f1575dd50b Updated various thread usages 2018-01-03 23:01:35 -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
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
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