Commit Graph

11478 Commits

Author SHA1 Message Date
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 4dce06a9fc pylint errors 2017-08-13 07:29:04 +01:00
Tim Bentley ffef5ff5e0 pylint errors 2017-08-13 07:17:47 +01:00
Tim Bentley 54eae8712a pep8 2017-08-13 06:50:44 +01:00
Tim Bentley f436ef2f10 More test fixes 2017-08-13 06:44:10 +01:00
Tim Bentley 2783405a34 More test fixes 2017-08-13 06:28:25 +01:00
Tim Bentley 9e8b16549c fix more tests 2017-08-12 21:58:16 +01:00
Tim Bentley 751ec88d94 fix more tests 2017-08-12 21:52:19 +01:00
Tim Bentley 14bf5aaf9d fix more tests 2017-08-12 21:44:39 +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
Tim Bentley 2c813be4cc fixed missed string 2017-08-11 17:37:57 +01:00
Tim Bentley 8d7e4dbe01 remove whitespace 2017-08-11 17:19:07 +01:00
Tim Bentley bc03652cda Finish tests 2017-08-11 17:09:14 +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
Tim Bentley bfade0050a fix split to work with chords 2017-08-09 06:02:42 +01:00
Tim Bentley 897f2c2d89 Head 2017-08-09 05:42:06 +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 d895365ff8 Bible gateway fix 2017-08-02 07:10:26 +01: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 5ec2f001e6 finish download process 2017-06-18 07:03:42 +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 aa9891612b Add download trace dialog 2017-06-11 18:30:37 +01:00
Tim Bentley dbea7ed090 refactor plugin apis 2017-06-11 16:24:02 +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 93053cd723 get version 2017-06-08 22:36:17 +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
Johannes Thomas Meyer e37ef1b74b added SongBook name and Song Number to "Entire Song" Search
lp:~samothjtm/openlp/bug-1695587 (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2076/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1986/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1902/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1280/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1130/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/259...

bzr-revno: 2748
2017-06-08 10:46:14 -07: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
Johannes Thomas Meyer 0850351237 implemented fix suggestions 2017-06-05 23:41:29 +02: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
Olli Suutari a703294db2 - Fixed over idented line on def closeEvent(self, event):
- Added a comment explaing the ' ' in Bible book name auto completion.
2017-06-05 08:53:47 +03:00
Olli Suutari dae544abc1 Improved the regex to check dot after book number and after book name. 2017-06-05 00:22:13 +03:00
Olli Suutari dd603f6486 Fixed the issue where books with "." can't be used in reference search. 2017-06-04 23:40:18 +03:00
Jonathan Springer f0d528954d merge trunk 2017-06-04 14:22:58 -04:00
Olli Suutari 5270b1a716 Fixed the new trailing space added by previous pep fix 2017-06-04 17:46:04 +03: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 731ce0c338 Increased the size of the songmaintancedialogue form for better visual user interface. 2017-06-04 16:20:59 +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 c14398b912 Fixed bug: https://bugs.launchpad.net/openlp/+bug/1652559 2017-06-04 13:43:41 +03:00
Olli Suutari 7a27a4adbe Fixed bug #1678292 2017-06-04 13:13:10 +03:00
Olli Suutari 3e70173be4 Renamed "last search type" to "last used search type" 2017-06-04 12:52:15 +03:00
Johannes Thomas Meyer e6d4857c81 added SongBook name, Song Number and Alternative Title to Entire Search
Fixes: https://launchpad.net/bugs/1695587
2017-06-03 12:44:28 +02: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
Philip Ridout 5b4bff29fe Logging clean ups 2017-05-31 20:29:43 +01:00
Ken Roberts 80369c8b0b pylint fixes - minor cleanups 2017-05-30 16:26:37 -07:00
Tomas Groth 81492013ed Fixed songshowplus encoding issue.
Fixed issue where enable-chord settings was not setup correctly for tests.

bzr-revno: 2745
2017-05-30 22:50:26 +02: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
Tomas Groth 1dc0b0a4b5 pep8 fixes 2017-05-30 22:15:20 +02:00
Tomas Groth 4a3e4e1ad4 Fix songshowplus encoding issue. 2017-05-30 22:05:18 +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
Phill 533bef159a Add a custom widget for editing and selecting paths. Implemented in OpenLP, with the exception of the import wizards, as I have other plans for refactoring these!
lp:~phill-ridout/openlp/path_edit (revision 2737)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2009/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1919/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1235/
[SUCCESS] https://ci.openl...

bzr-revno: 2742
2017-05-23 05:58:49 +01:00
Philip Ridout c3677857e8 More all file filters 2017-05-22 20:56:54 +01:00
Gary Talent 549ec886a5 Add support for importing EasyWorship 6 databases
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07: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