Commit Graph

1921 Commits

Author SHA1 Message Date
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
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
ad55a8d254 Fix issue where enable-chord settings was not setup correctly for tests. 2017-05-30 22:06:27 +02: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
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
3ea37800b7 Fix db.Manager upgrade/PJlink2 update D 2017-05-27 11:21:24 -07: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
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
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
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
7fbeb10207 text fixes 2017-05-21 17:02:02 +01:00
cb5c0f82a3 PJlink class 2 updates C 2017-05-19 22:51:58 -07:00
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
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
Philip Ridout
16d2bd96f0 head 2017-05-15 11:15:32 +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
Philip Ridout
cc705e1958 HEAD 2017-05-14 08:15:29 +01:00
ed144657bc PJLink class 2 updates 2 2017-05-13 02:00:29 -07:00
Tim Bentley
48a87780d4 theme clean up 2017-05-13 08:47:22 +01:00
Philip Ridout
aa794ecf66 minor stylistic changes 2017-05-13 08:35:39 +01:00
Philip Ridout
748eb9cd0b Fix up test 2017-05-13 08:05:44 +01:00
Philip Ridout
30825cb8d1 Might help to ad the new functionality! 2017-05-12 22:37:55 +01:00
Philip Ridout
353b2b3067 Implement a custom widget for editing paths 2017-05-12 22:05:50 +01:00
a5335adbc4 Initial PJLink class 2 updates 2017-05-12 02:51:56 -07:00
Tomas Groth
798093adfe trunk 2017-05-11 22:24:20 +02:00
335fed689d Last few tests with bad imports 2017-05-08 12:04:14 -07:00
aeabd498a0 Remove the now defunct version detection and imports 2017-05-08 11:33:11 -07:00
Theodore Frederick
f3a3c809d5 Add Tests for Ignoring Aspect Ratio 2017-04-30 12:32:27 -05:00
Tomas Groth
aa224b9568 Try to workaround windows problems. 2017-04-25 21:52:20 +02:00
baa09a7dd6 Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now 2017-04-23 22:17:55 -07:00
Tomas Groth
f1b34efcac More tests. 2017-04-21 21:40:28 +02:00
Tomas Groth
6e9520c8b0 Fixed serviceitem test 2017-04-19 21:37:08 +02:00
Tomas Groth
d36d576dc9 Added another chord test. 2017-04-18 21:20:36 +02:00
Tomas Groth
fa9cdc5b94 Added songbeamer chord import test 2017-04-17 21:35:34 +02:00
Tomas Groth
5187b7b945 Added some tests and fixed a bug. 2017-04-11 14:44:28 +02:00
Tomas Groth
111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Philip Ridout
a3146d7a2c PEP Fixes 2017-04-03 21:28:16 +01:00
Philip Ridout
eee14a654a Tests and added icon 2017-04-02 21:28:55 +01:00
Philip Ridout
53b210d9cd Changeged 'combined' bible verses and made a seperate 'saved' list 2017-03-31 19:41:38 +01:00
Gary Talent
b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
dce77d2160 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:19:33 -07:00
6054f0cae9 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:18:04 -07:00
4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
4183f186ce Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

bzr-revno: 2728
2017-03-24 19:33:45 -07:00
c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -07:00
Tomas Groth
9ae1af72c7 Minor adjustsments + a test. 2017-03-17 22:12:29 +01:00
Tomas Groth
31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01:00
Simon Hanna
e97c157a19 Add comment 2017-03-13 13:43:55 +01:00
Simon Hanna
f7c944acc9 Add test 2017-03-13 13:42:20 +01:00
3d39e2c77d Ignore a test that is causing a segfault 2017-03-10 16:20:44 -07:00
4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tim Bentley
699342c89d pep8 2017-03-05 17:07:21 +00:00
Tim Bentley
cb9ac8cde2 fix tests 2017-03-05 17:00:21 +00:00
Tim Bentley
1bcb6415c1 fix tests 2017-03-05 16:55:58 +00:00
Tim Bentley
9c3195d166 fix tests 2017-03-05 16:36:16 +00:00
Tim Bentley
06baf5c560 fix up deploy unzip 2017-03-05 09:32:11 +00:00
Tim Bentley
7a72b2cad4 download and deploy works 2017-03-05 09:23:28 +00:00
Tim Bentley
9204dc23a0 add tests 2017-03-04 19:24:44 +00:00
Tim Bentley
b3fb5764c6 fix years 2017-03-04 19:17:59 +00:00
Tim Bentley
f76e030ac9 more cleanups 2017-03-04 17:32:47 +00:00
Tim Bentley
df77c3ebd9 add test 2017-03-04 16:51:51 +00:00
Tim Bentley
0e54621999 test fix 2017-03-04 10:28:07 +00:00
Tim Bentley
5d917de2f8 Head 2017-03-03 19:27:31 +00:00
196a6f95f1 Fix bug #1666005 and bug #1668994
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...

bzr-revno: 2725
2017-03-02 17:58:46 +00:00
094b1f73bc Fix a test 2017-03-01 21:43:45 -07:00
f68336a49f Make the settings dialog as small as possible
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
Tomas Groth
dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
phill.ridout@gmail.com
cf4b9d4fc1 Bible media item refactors.
Added the ability to sort the 'select' aka 'advanced' bible books combo box alphabetically. (note resources will need regen to show the button icon, I'll submit this in another merge proposal to keep this one a tiny bit cleaner.
Lots of Tests!

bzr-revno: 2722
2017-02-24 06:51:43 +00:00
Tomas Groth
37e4a05be7 Fix another test. 2017-02-21 06:17:21 +01:00
Tomas Groth
e40e7920d6 Fix a broken test. 2017-02-20 22:43:18 +01:00
Tomas Groth
3edbcff3ab trunk 2017-02-19 22:37:07 +01:00
Philip Ridout
162c178d6e HEAD 2017-02-18 07:23:15 +00:00
e5c5edb157 Remove unneeded mock in projectordb test 2017-01-27 06:44:11 -08:00
6590033945 Oops and pep8 2017-01-27 05:26:36 -08:00
9513ab42bf Added some more projectordb tests 2017-01-27 05:19:33 -08:00
Tomas Groth
56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
32328cfe6a Hide the Projectors manager by default so that it doesn't confuse people 2017-01-22 11:12:41 -07:00
second@tgc.dk
df668fde84 Clean search lyrics for formatting tags. Fixes bug #1655988.
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.

bzr-revno: 2718
2017-01-20 21:42:01 +00:00
suutari.olli@gmail.com
eaacfe0ab8 In this branch:
- Added "Full License" field for Bibles (1623631)
- Added a setting for controlling visibility of "Written by:" (1557579)
- Added placeholder texts for Bible metadata fields
- Re-organized uistrings to alphabetical order

bzr-revno: 2716
2017-01-20 21:57:54 +01:00
Tomas Groth
02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Tim Bentley
b532024401 Fix up comments in test 2017-01-11 20:15:55 +00:00
Tim Bentley
ad788f5ee7 Fix up date in about form 2017-01-11 20:03:04 +00:00
Olli Suutari
1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley
74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tim Bentley
0d540ae40b Add remotes file checking 2016-12-24 09:10:13 +00:00
Olli Suutari
a9520ced68 - Merged trunk on 23.12.16 2016-12-23 22:16:24 +02:00
Tomas Groth
d1bca6d52a trunk 2016-12-23 10:14:22 +01:00
Tim Bentley
caacb7df88 finish these tests 2016-12-22 17:31:53 +00:00
Tim Bentley
fe3014fc66 Add tests 2016-12-22 17:02:39 +00:00
Tim Bentley
126c5462a0 Head 2016-12-22 15:12:03 +00:00
Tim Bentley
b6a7a1f929 start to deploy 2016-12-22 15:05:09 +00:00
Tim Bentley
7bd645bc72 pep8 2016-12-21 10:00:14 +00:00
Tim Bentley
5896e053bc Fix tests again 2016-12-21 09:52:05 +00:00
Tim Bentley
a69df60978 Fix tests again 2016-12-21 09:47:33 +00:00
Tim Bentley
8570fb5e8c Fix tests 2016-12-21 09:41:57 +00:00
Tim Bentley
95e70465de Add files 2016-12-20 21:21:17 +00:00
Tim Bentley
4008ed008f Move url size 2016-12-20 21:20:54 +00:00
Philip Ridout
d9ccd966d8 Pep fixes 2016-12-18 18:47:54 +00:00
Philip Ridout
849bbd2c51 Pep fixes 2016-12-18 18:42:28 +00:00
Philip Ridout
c618c7f295 Tests 2016-12-18 14:08:29 +00:00
Philip Ridout
a11e731ab0 Tests 2016-12-18 14:05:10 +00:00
Philip Ridout
61c76c39e6 Tests 2016-12-18 14:01:05 +00:00
739f083286 Fix segfault on click on a spinner on macOS
Fix spurious traceback on some platforms or configurations of media players
Make the tab style affect only the media library tabs, not everything else too
Hide the splash screen when the backup dialog shows and when the exception form shows


Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/mac-niggles (revision 2713)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1873/
[SUCCESS] https://ci.openlp.io/job/B...

bzr-revno: 2711
2016-12-17 07:19:15 +00:00
77e048f6de Fix the tests 2016-12-16 00:01:15 +02:00
c86d669346 Added a test 2016-12-15 23:29:29 +02:00
3639785151 Fix bug #1642684 by rather just setting the edit text to a blank string
Fixes: https://launchpad.net/bugs/1642684
2016-12-15 16:11:42 +02:00
ddb92c3cd5 Fix a problem with the test 2016-12-13 21:50:34 +02:00
f17204aa19 Fix a problem with the test 2016-12-13 21:43:27 +02:00
c818c3ce8c Added a test 2016-12-13 16:55:11 +02:00
d2e2985229 Add an importer for WordProject bibles, and fix some annoying GUI quirks in wizards.
http://forums.openlp.org/discussion/3340/wordproject-format

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/wordproject-importer (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1848/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1759/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1697/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2708
2016-12-04 07:53:18 +00:00
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Tomas Groth
1bb2e9e278 Another fix for tests on windows. 2016-11-29 21:57:33 +01:00
Tomas Groth
8595a2171f Another test fix for windows. 2016-11-29 14:54:29 +01:00
Tomas Groth
595fd90d45 Fix some errors on windows 2016-11-29 14:06:54 +01:00
d0ed37e1d5 Move contents of html files into actual html files 2016-11-25 16:17:34 +02:00
826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +02:00
second@tgc.dk
20ab44be0f Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3
This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback 

bzr-revno: 2706
2016-11-22 21:34:14 +01:00
Tomas Groth
8275f1139a Change tests to reflect change. 2016-11-21 22:07:01 +01:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Philip Ridout
f031df3637 Fixed Tests 2016-11-12 11:19:52 +00:00
Philip Ridout
7a2df5eab3 Added test! 2016-11-11 20:50:47 +00:00
Philip Ridout
94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
Tim Bentley
be556248b8 fix tests 2016-11-06 08:52:15 +00:00
phill.ridout@gmail.com
09fb235999 lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2702
2016-11-01 21:01:29 +00:00
Philip Ridout
87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Philip Ridout
ec19cc5f07 Modified some resources and added test 2016-10-30 08:29:22 +00:00
Philip Ridout
997cb859d3 Changed some icons to use svg 2016-10-27 18:45:50 +01:00
Tim Bentley
4adcef75fa Head 2016-10-26 19:13:49 +01:00
Tim Bentley
2d695f13ea Head 2016-10-26 19:12:38 +01:00