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

7428 Commits

Author SHA1 Message Date
Tim Bentley
cfc487d623 tests 2017-12-28 08:27:44 +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
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
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
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
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
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
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
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
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
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
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
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
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
Raoul Snyman
15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -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
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
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
Raoul Snyman
c2e16cc8e9 HEAD 2017-09-28 10:32:10 -07:00
Raoul Snyman
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
Raoul Snyman
e90836e817 Fix up some issues with one of the tests 2017-09-25 13:34:05 -07:00
Raoul Snyman
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
Raoul Snyman
a4bd979f19 Hide the cancel button 2017-09-22 21:10:18 -07:00
Raoul Snyman
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
Raoul Snyman
e1ca15173d Actually show the progress dialog when we're waiting for the thread to shut down. 2017-09-22 20:50:45 -07:00
Ken Roberts
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
Raoul Snyman
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
Raoul Snyman
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
Raoul Snyman
2f8cdc81e0 Fix up the version tests and remove old references to 'versionchecker' 2017-09-12 23:08:38 -07:00
Raoul Snyman
6fb4381588 HEAD 2017-09-11 22:52:47 -07:00
Raoul Snyman
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
Raoul Snyman
47f96a3286 Duh. Can't have the old names in there, now can we? 2017-09-08 22:57:06 -07:00
Raoul Snyman
1e06f472c6 HEAD 2017-09-08 22:23:37 -07:00
Raoul Snyman
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
Ken Roberts
46f88e418a More minor code cleanups 
- Renamed get_shutter_status to get_av_mute_status (checks shutter and audio)
- Renamed shutter/audio mute test
- Update socket read to get 1K bytes in buffer
- Updated get_status for valid input
- Updated process_sver check valid length
- Update change_status to not use NETWORK_SENDING as a connection status check
- Added read check for packet length > allowed max
- Added test for process_inf1
- Added test for process_inf2
- Added test for process_info
- Added test ...

bzr-revno: 2760
 2017-08-23 20:46:30 +01:00
Philip Ridout
0ecf5747c9 indentation fix 2017-08-18 21:33:43 +01:00
Philip Ridout
9ee24c32bd made some more changes to core/__init__ and applocation 2017-08-18 20:34:20 +01:00
Tim Bentley
54eae8712a pep8 2017-08-13 06:50:44 +01:00
Tim Bentley
2783405a34 More test fixes 2017-08-13 06:28:25 +01:00
Ken Roberts
6d353dc8e1 Fix deprecated log calls 2017-08-12 13:38:50 -07:00
Tim Bentley
e6862f28e3 fix more tests 2017-08-12 21:26:39 +01:00
Philip Ridout
b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Ken Roberts
f30d7f20d3 PJLink update I - minor code cleanups and new tests 2017-08-12 02:48:38 -07:00
Tim Bentley
63a5c3bd91 head 2017-08-11 21:47:52 +01:00
Phill
081c5fe7a0 Definitely ready for merging, unless, of course you guys find some more issues! 
Part 2

Changed the pathedit widget over to using pathlib
Added a 'patched' file dialog
Added a few utility methods

lp:~phill-ridout/openlp/pathlib2 (revision 2763)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2125/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2033/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1938/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis...

bzr-revno: 2758
 2017-08-11 21:31:09 +01:00
Ken Roberts
e7ec732f1e Projector code cleanups "H" and new tests 2017-08-11 04:04:33 -07:00
Philip Ridout
5d99c48fe0 Merge fix 2017-08-10 07:28:30 +01:00
Philip Ridout
469e7f3bb6 remove the wraps decoartor 2017-08-09 21:15:02 +01:00
Tim Bentley
7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Philip Ridout
c4eedc6dca add forgotten files 2017-08-07 22:01:16 +01:00
Philip Ridout
8eb207b67c Head 2017-08-07 21:51:50 +01:00
Philip Ridout
e6faf233ed Merge fixes 2017-08-07 21:50:01 +01:00
Ken Roberts
df47a4b6eb Code cleanups 2017-08-06 16:33:53 -07:00
Ken Roberts
864fd291a0 PJLink2 update G - restructuring 2017-08-06 00:23:26 -07:00
Philip Ridout
11a9f58cb6 path conversion fixes 2017-08-04 22:53:02 +01:00
Philip Ridout
1c8474b8e2 Pep fixes 2017-08-04 19:06:43 +01:00
Philip Ridout
46b42c24e5 head 2017-08-04 19:02:23 +01:00
Philip Ridout
a7750e680b Pathedit line endings 2017-08-04 18:52:55 +01:00
Philip Ridout
03bcc194ea Update the path edit component to use the pathlib module. Add a few utility methods 2017-08-04 18:40:57 +01:00
Tim Bentley
c2321e7c10 Merge head 2017-08-03 18:54:40 +01:00
Raoul Snyman
2e43e7939e HEAD 2017-08-02 21:21:19 -07:00
Philip Ridout
e787896931 test fixes 2017-08-02 07:09:38 +01:00
Philip Ridout
17fb6ba835 Convert applocation over to pathlab. Add utility functions for future use. 2017-08-01 22:06:52 +01:00
Philip Ridout
63bd98372a Move applocation over to using pathlib 2017-08-01 21:59:41 +01:00
Ken Roberts
08848a14e7 Added calls to new functions 2017-07-20 08:31:50 -07:00
Ken Roberts
471d5f4608 Merge trunk 2017-07-20 08:27:42 -07:00
Ken Roberts
f333d8d7a0 Ooops - removed commented code no longer needed 2017-07-12 06:01:46 -07:00
Jonathan Springer
a7daffe54f merge trunk 2017-07-08 09:12:31 -04:00
Ken Roberts
e277c804f9 Cleanups part 3 2017-07-07 16:43:50 -07:00
virbinarus
67add52c21 I removed the blank spaces from the file. 
Allows service items to be expanded and collapsed with the left and right arrow keys.

lp:~virbinarus/openlp/expandserviceitem (revision 2758)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2097/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2007/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1920/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1297/
[[1;32...

bzr-revno: 2752
 2017-07-04 16:29:46 -07:00
Raoul Snyman
b83452b2e5 Fix the import path of UiStrings 2017-07-04 16:13:51 -07:00
Raoul Snyman
7c0157ed4b Remove all instances of 'OpenLP 2' and 'OpenLP 2.4' and fix one entry to be more descriptive 2017-07-04 15:30:41 -07:00
Ken Roberts
d072dd4063 Drop future import comments 2017-06-28 20:19:13 -07:00
Ken Roberts
44fb799c7a noqa cleanlups 2017-06-28 19:58:08 -07:00
VirBinarus
1ce9a53d3b removed blank lines, split up some test functions for readablilty. 2017-06-27 18:42:54 +01:00
Tim Bentley
77aea3e27a head 2017-06-25 18:04:07 +01:00
Tim Bentley
ffa283f39e fix 2017-06-25 18:03:31 +01:00
Ken Roberts
0e2019faf2 PJLink update F 2017-06-24 19:21:07 -07:00
Ken Roberts
bd3bedcaf4 -- Fix docstring for pjlink2 db upgrade 
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...

bzr-revno: 2751
 2017-06-22 17:54:33 +01:00
Tim Bentley
ee00a74d41 Fix chords and display 2017-06-18 06:21:23 +01:00
Tim Bentley
8a2d043862 load settings on display 2017-06-17 09:51:01 +01:00
Ken Roberts
d4d556e39d Minor cleanups on kwargs 2017-06-16 17:25:06 -07:00
VirBinarus
9aef1cdf5d made tests 2017-06-15 19:05:38 +01:00
VirBinarus
524d8f3acb fixed bug #1238385, but no tests 
Fixes: https://launchpad.net/bugs/1238385
 2017-06-13 16:49:48 +01:00
Tim Bentley
33fe52cae1 tidy ups 2017-06-11 20:41:34 +01:00
Tim Bentley
e0308bfce5 start to change error handling 2017-06-10 11:53:52 +01:00
Ken Roberts
b0af7fdd2e Revert songs.upgrade, move pjlink_list from class to __init__ 2017-06-09 22:57:00 -07:00
Tim Bentley
be145b7675 handle the version from the web site 2017-06-09 21:53:13 +01:00
Tim Bentley
da51b046b2 Head 2017-06-09 16:56:40 +01:00
Tim Bentley
fbcef30044 settings tab 2017-06-09 16:55:39 +01:00
Ken Roberts
79ad031272 Fix missing sqlalchemy exception import 2017-06-09 07:04:52 -07:00
Ken Roberts
208c1b022f Test for db upgrade skip 2017-06-09 06:45:18 -07:00
Ken Roberts
4b22def91d More db fixes 2017-06-09 05:12:39 -07:00
Philip Ridout
c0f2a9a777 HEAD 2017-06-09 07:06:49 +01:00
Tim Bentley
e7fa46b5f5 move websocket to asynio 2017-06-08 20:56:19 +01:00
Azaziah
80d30bf272 Fixed bugs: 
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...

bzr-revno: 2749
 2017-06-08 19:17:14 +01:00
Tim Bentley
1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +01:00
Tim Bentley
08a135de78 sort out ftw 2017-06-06 21:45:59 +01:00
Tim Bentley
6d375de3db move deploy and fix tests 2017-06-06 21:35:57 +01:00
Olli Suutari
48c6810f0c - Added a test for checking that next calls the next playlist item 2017-06-05 21:22:14 +03:00
Olli Suutari
798f3738b8 Value of old last used Bible search type is no longer transferred to settings since it's invalid and gets replaced on boot anyways. 2017-06-05 09:05:54 +03:00
Jonathan Springer
f0d528954d merge trunk 2017-06-04 14:22:58 -04:00
Olli Suutari
89856d78b2 two pep8 fixes 2017-06-04 17:30:10 +03:00
Olli Suutari
d247cf2388 Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732 2017-06-04 17:03:41 +03:00
Olli Suutari
c135028b46 Fixed bug https://bugs.launchpad.net/openlp/+bug/1666272 
By renaming: self.playerlist.next() to self.playlist.next()
in maindisplay.py derf next(self)
 2017-06-04 15:26:50 +03:00
Olli Suutari
f8b32578f4 Fixed 32 missing "x" buttons for closing windows and forms. (Left it unavailable for bug report.) 2017-06-04 15:14:23 +03:00
Olli Suutari
3ae8caceb0 Added "last search type" to obsolete settings list. 2017-06-04 14:19:19 +03:00
Olli Suutari
3e70173be4 Renamed "last search type" to "last used search type" 2017-06-04 12:52:15 +03:00
Ken Roberts
9f8433a18e Merge trunk 2017-06-01 15:36:38 -07:00
Ken Roberts
0fc49e3df1 Translations and more minor cleanups 2017-06-01 15:35:57 -07:00
Philip Ridout
2915a8f0e7 Head 2017-06-01 07:18:47 +01:00
Ken Roberts
80369c8b0b pylint fixes - minor cleanups 2017-05-30 16:26:37 -07:00
Tim Bentley
21af845791 Finally got round to finishing the Theme clean up from 2,2! 
Themes now save to JSON and read XML or JSON so fully compatible with 2.4.

Add this to your merge proposal:
--------------------------------
lp:~trb143/openlp/themecleanup (revision 2743)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2036/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1946/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analy...

bzr-revno: 2744
 2017-05-30 22:48:41 +02:00
Philip Ridout
8b71ff765c PEP 2017-05-30 20:54:30 +01:00
Philip Ridout
c0915fa8b6 PEP 2017-05-30 20:51:23 +01:00
Philip Ridout
a4ffbce6c3 HEAD 2017-05-30 19:50:39 +01:00
Philip Ridout
a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Tim Bentley
fc5c6561e7 Minor tweeks 2017-05-30 14:55:39 +01:00
Jonathan Springer
9d43c19a03 Fix transparent display on macOS 2017-05-29 12:33:22 -04:00
Jonathan Springer
fdcb8ae0c7 Use media controller methods to pause and play media when hiding, blanking, and unblanking display to keep UI in sync with media state. 2017-05-29 12:31:14 -04:00
Jonathan Springer
e9d41ebc6e Zero position label when stopping media to match seek sliders behavior 2017-05-29 12:29:15 -04:00
Jonathan Springer
5b9171866b Fix video backboard not being hidden when switching to next non media slide 2017-05-29 12:27:42 -04:00
Jonathan Springer
37c3f96885 Keep position label from causing seek slider and volume slider from jumping 2017-05-29 12:26:14 -04:00
Jonathan Springer
762b9fba4e Fix system player stopping instead of pausing when asked to paused 2017-05-29 12:16:20 -04:00
Ken Roberts
3ea37800b7 Fix db.Manager upgrade/PJlink2 update D 2017-05-27 11:21:24 -07:00
Philip Ridout
48ca33092a PEP 2017-05-26 14:44:28 +01:00
Philip Ridout
78f38780ce head 2017-05-26 14:30:54 +01:00
Tim Bentley
2faf588c99 clean up files 2017-05-24 21:04:48 +01:00
Tim Bentley
7c1fffdf41 clean up pep8 2017-05-24 21:01:46 +01:00
Tim Bentley
3b7852b569 clean up pep8 2017-05-24 20:55:30 +01:00
Tim Bentley
32668193c6 fix up tests 2017-05-24 20:31:48 +01:00
Tim Bentley
6fe9dfeb04 Head 2017-05-23 06:00:42 +01:00
Tim Bentley
b7001116da start to fix tests 2017-05-23 05:59:35 +01:00
Philip Ridout
c3677857e8 More all file filters 2017-05-22 20:56:54 +01:00
Philip Ridout
234ba34a5b Head 2017-05-22 19:27:40 +01:00
Philip Ridout
47b640004e Added some extra params to the constructor 2017-05-22 19:22:43 +01:00
Philip Ridout
f4227c93b2 Changed the allfiles filter from *.* to * 2017-05-22 17:32:24 +01:00
Ken Roberts
8ee2c0b549 -- Update test data for Class 2 tests 
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test

--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci...

bzr-revno: 2740
 2017-05-22 17:26:45 +01:00
Phill
cf4a39732b Fix the depreciated code, and refactor it. 
lp:~phill-ridout/openlp/import-depreciations (revision 2736)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2013/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1923/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1859/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1239/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1097/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/226/
[FA...

bzr-revno: 2738
 2017-05-22 17:25:44 +01:00
Tim Bentley
cad03b9abd fix tests 2017-05-21 17:06:40 +01:00
Tim Bentley
0387286a93 fix up import functionality 2017-05-21 16:30:02 +01:00
Tim Bentley
fa89be414c Clean up theme export 2017-05-21 08:11:36 +01:00
Ken Roberts
cb5c0f82a3 PJlink class 2 updates C 2017-05-19 22:51:58 -07:00
Ken Roberts
81be8f5093 - Added PJLINK_DEFAULT_CODES to pjink1 imports 
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on

--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...

bzr-revno: 2737
 2017-05-17 21:35:43 +01:00
Ken Roberts
503c6e3f69 Initial PJLink class 2 updates 
- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO

--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...

bzr-revno: 2736
 2017-05-17 21:34:14 +01:00
Tomas Groth
5988f1c56a Fixed an issue and added a test. 2017-05-17 22:06:45 +02:00
Ken Roberts
23047ae354 Remove extraneous TODO 2017-05-15 09:32:20 -07:00
Philip Ridout
eedfd0dd34 pep 2017-05-15 11:24:28 +01:00
Philip Ridout
be9d9c45ff Reworked the extension_loader function 2017-05-15 11:09:59 +01:00
Philip Ridout
70019b570b Update and refactor dynamic import code 2017-05-14 11:11:10 +01:00
Ken Roberts
ed144657bc PJLink class 2 updates 2 2017-05-13 02:00:29 -07:00
Tim Bentley
08a58844c6 fix editing theme load and save 2017-05-13 09:37:38 +01:00
Tim Bentley
3d1be586fe fix editing themes 2017-05-13 09:22:48 +01:00