Commit Graph

2085 Commits

Author SHA1 Message Date
Tomas Groth
4ab22f6d6e merge trunk 2017-10-10 21:34:48 +02:00
Philip Ridout
46f93a9d1b head 2017-10-10 20:17:48 +01:00
Philip Ridout
66049f0c96 bible pathlib changes 2017-10-10 20:09:20 +01:00
15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
4d68382d52 Fix some issues from the mergefest
bzr-revno: 2779
2017-10-09 19:40:41 -07:00
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Tim Bentley
b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout
70e50f4aaa Pep fixes 2017-09-30 23:45:24 +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
Tim Bentley
5203518ccb head 2017-09-29 19:53:22 +01:00
Tim Bentley
d77f0127e8 head 2017-09-29 19:42:15 +01:00
11fbad77dc Fix some linting issues 2017-09-29 08:55:39 -07:00
0dcf3de267 Tests! 2017-09-28 20:06:00 -07:00
Tim Bentley
bfc8a5ae8c fix tests 2017-09-27 20:12:22 +01:00
Tim Bentley
9d6bd78a70 head 2017-09-26 21:34:47 +01:00
Tim Bentley
4451b65f04 add files2 2017-09-26 21:34:08 +01:00
Tim Bentley
b783783a29 add files 2017-09-26 21:33:58 +01:00
Tim Bentley
5b2ac0f97b more moves 2017-09-26 18:49:41 +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
e90836e817 Fix up some issues with one of the tests 2017-09-25 13:34:05 -07:00
4bb031b22e HEAD 2017-09-25 12:55:33 -07:00
Philip Ridout
047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout
d52fff75a4 Test fox 2017-09-24 19:59:49 +01:00
Philip Ridout
d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
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
3e05a64874 PJlink2 update K 2017-09-22 05:03:28 -07:00
Philip Ridout
b440584cb5 Moved the patched shuilils to the path module 2017-09-20 21:44:57 +01:00
c06cd39cab Fix up all the tests 2017-09-20 09:55:21 -07:00
15c8023357 Moving over to requests 2017-09-19 09:48:34 -07:00
Philip Ridout
0ee8ebb1c2 PEP fixes 2017-09-18 07:32:19 +01:00
Philip Ridout
d801ca9b09 Test patched which method 2017-09-18 07:20:06 +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
2f8cdc81e0 Fix up the version tests and remove old references to 'versionchecker' 2017-09-12 23:08:38 -07:00
Philip Ridout
f0e7381f5c Pathlib changes in presentation plugin 2017-09-07 22:52:39 +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
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
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
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
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
Tim Bentley
9e8b16549c fix more tests 2017-08-12 21:58:16 +01:00
Tim Bentley
14bf5aaf9d fix more tests 2017-08-12 21:44:39 +01:00
6d353dc8e1 Fix deprecated log calls 2017-08-12 13:38:50 -07:00
Tim Bentley
25de11dd42 fix more tests 2017-08-12 21:19:15 +01:00
Tim Bentley
7879430c96 fix more tests 2017-08-12 21:08:12 +01:00
Tim Bentley
1f09c1c860 fix more tests 2017-08-12 21:03:17 +01:00
Tim Bentley
98fd78d382 fix more tests 2017-08-12 20:56:02 +01:00
Tim Bentley
c3e09f7d0e fix more tests 2017-08-12 20:49:17 +01:00
Tim Bentley
edd1bf3487 fix more tests 2017-08-12 20:39:08 +01:00
Tim Bentley
bbcd5691fe fix more tests 2017-08-12 20:34:56 +01:00
Tim Bentley
e896e2fd1f stop thread 2017-08-12 20:27:43 +01:00
Tim Bentley
b3cd5a7b3d fix tests 2017-08-12 20:22:09 +01:00
Tim Bentley
e08440ea2f fix test 2017-08-12 20:14:56 +01:00
Philip Ridout
b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
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
bc03652cda Finish tests 2017-08-11 17:09:14 +01:00
e7ec732f1e Projector code cleanups "H" and new tests 2017-08-11 04:04:33 -07:00
Tim Bentley
7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Philip Ridout
6340b7e89f pep 2017-08-07 22:12:42 +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
7b542a0554 Fix AVMT test 2017-08-06 17:08:41 -07:00
864fd291a0 PJLink2 update G - restructuring 2017-08-06 00:23:26 -07: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
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
ecc2910576 Just ignore the entire test case -_- 2017-08-02 22:02:11 -07:00
afe3cff6b7 Try to get some of the tests working on Jenkins 2017-08-02 21:53:57 -07:00
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
63bd98372a Move applocation over to using pathlib 2017-08-01 21:59:41 +01:00
Jonathan Springer
a7daffe54f merge trunk 2017-07-08 09:12:31 -04:00
b83452b2e5 Fix the import path of UiStrings 2017-07-04 16:13:51 -07:00
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
44fb799c7a noqa cleanlups 2017-06-28 19:58:08 -07:00
Tim Bentley
77aea3e27a head 2017-06-25 18:04:07 +01:00
0e2019faf2 PJLink update F 2017-06-24 19:21:07 -07:00
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
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
208c1b022f Test for db upgrade skip 2017-06-09 06:45:18 -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
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
faea1424d8 -- Added openlp.core.lib.projector.upgrade for db version 1
-- Added test class for projector DB upgrade
-- Remove duplicate TEST_DB entry in tests.resources.projector.data
-- Updated TestProjectorDB to use a temporary directory for test db
-- Fix main db update procedure version check (default to version 0 if no version set)
-- Added extra information to projector info popup
-- Restructure valid command dictionary
-- Pep8 in plugins/songusage, plugins/presentations, and core/ui/lib/pathedit....

bzr-revno: 2747
2017-06-08 18:09:55 +01:00
Philip Ridout
e248668d1b HEAD 2017-06-06 22:20:01 +01:00
Tim Bentley
1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +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
db86f45bd7 Expanded the test_reference_matched_full to include results with dots after numbers, eg. 1. Kings 2017-06-05 05:58:38 +03:00
Jonathan Springer
f0d528954d merge trunk 2017-06-04 14:22:58 -04:00
Olli Suutari
8f5b28026a Renamed another wizzard test + comment. 2017-06-04 18:23:30 +03:00
Olli Suutari
191f9c64d8 Renamed test: def test_on_import_click_no_import_wizzard_attr(self):
to:     def test_on_import_click_no_import_wizard_attr(self):
2017-06-04 18:22:23 +03:00
Olli Suutari
3918027ff1 - Fixed 2 tests 2017-06-04 18:21:25 +03:00
Philip Ridout
a3d95acabd and one renderer test 2017-06-03 23:52:11 +01:00
Philip Ridout
34f8f11efd Bible tests fixed 2017-06-03 23:34:19 +01: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
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