Commit Graph

15065 Commits

Author SHA1 Message Date
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
9f8433a18e Merge trunk 2017-06-01 15:36:38 -07:00
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
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
Phill
392de6bcde Merged in trunk
Adds more flexibility to 'locking' bible verses.
fixes #1625681 "If Bible search results are locked, duplicated results are listed"


lp:~phill-ridout/openlp/saved_bible_verses (revision 2746)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2030/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1940/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1871/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1251/
[SUCCESS] https://ci.openlp.io...

bzr-revno: 2743
2017-05-30 22:45:16 +02:00
Tomas Groth
1dc0b0a4b5 pep8 fixes 2017-05-30 22:15:20 +02:00
Tomas Groth
ad55a8d254 Fix issue where enable-chord settings was not setup correctly for tests. 2017-05-30 22:06:27 +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
b2f5f2e9e2 test fixes 2017-05-30 20:40:01 +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
49a074b95e Fix systemplayer get_info test 2017-05-29 13:31:56 -04:00
Jonathan Springer
db334bfa11 Update systemplayer update_ui test for changes 2017-05-29 13:30:19 -04:00
Jonathan Springer
238475845f Fix maindisplay macOS window flags test for changes 2017-05-29 13:26:42 -04: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
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
a775f0ddb8 remove extra file 2017-05-24 21:09: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
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
2b9b227e3d -- Add pjlink version 1 old database for testing db upgrade
No code changes at this time.

(resubmit was due to trying to add updated test data before tests were updated)

--------------------------------
lp:~alisonken1/openlp/pjlink2-c-resources (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2019/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1929/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1864/
[SUCCESS] https://ci.openlp.io/job/Branch...

bzr-revno: 2739
2017-05-22 17:26:07 +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
7fbeb10207 text fixes 2017-05-21 17:02:02 +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