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

890 Commits

Author SHA1 Message Date
Phill Ridout b1d88ac4f7 test fix 2017-11-11 16:36:50 +00:00
Phill Ridout e763cd81df HEAD 2017-11-11 12:20:45 +00:00
Phill Ridout 66534a58ab Head 2017-11-06 22:41:36 +00:00
Phill Ridout 3cf0be000b head 2017-11-03 22:46:27 +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
Raoul Snyman 8b34852236 Rename some tests so that they can be picked up by nose2; Fix some patches that were wrong; Fix a bug in our code that the now running tests picked up 2017-10-28 23:01:25 -07:00
Raoul Snyman 53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07: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
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 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 d77f0127e8 head 2017-09-29 19:42:15 +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 047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
Philip Ridout 0ee8ebb1c2 PEP fixes 2017-09-18 07:32:19 +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
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
Philip Ridout f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Philip Ridout 6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00
Tim Bentley bbcd5691fe fix more tests 2017-08-12 20:34:56 +01:00
Philip Ridout b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Tim Bentley bc03652cda Finish tests 2017-08-11 17:09:14 +01:00
Tim Bentley 7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Tim Bentley 5ec2f001e6 finish download process 2017-06-18 07:03:42 +01:00
Samuel Mehrbrodt f5f4226891 PEP8 fixes 2017-06-12 20:09:50 +02:00
Samuel Mehrbrodt 885a1bad01 Merge trunk 2017-06-12 20:04:49 +02:00
Samuel Mehrbrodt 5fbcbb3047 Fix test 2017-06-12 20:04:17 +02:00
Tim Bentley da51b046b2 Head 2017-06-09 16:56:40 +01: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
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
Johannes Thomas Meyer 0850351237 implemented fix suggestions 2017-06-05 23:41:29 +02: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
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
Samuel Mehrbrodt ac2f92f8ac Merge trunk 2017-06-04 15:44:20 +02:00
Samuel Mehrbrodt f89d7992fa PEP8 fixes, cleanup, added two more placeholders for footer template, added last_or_penultimate flag in list 2017-06-04 15:42:21 +02:00
Samuel Mehrbrodt 66c9f8eb82 made use of pystache for footer generation being configurable in song settings 
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality

Fixes: https://launchpad.net/bugs/1695620
 2017-06-04 01:31:47 +02:00
Philip Ridout 34f8f11efd Bible tests fixed 2017-06-03 23:34:19 +01: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
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
Philip Ridout 78f38780ce head 2017-05-26 14:30: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
Tomas Groth 5988f1c56a Fixed an issue and added a test. 2017-05-17 22:06:45 +02:00
Tomas Groth 798093adfe trunk 2017-05-11 22:24:20 +02:00
Raoul Snyman 335fed689d Last few tests with bad imports 2017-05-08 12:04:14 -07:00
Tomas Groth aa224b9568 Try to workaround windows problems. 2017-04-25 21:52:20 +02:00
Raoul Snyman 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 fa9cdc5b94 Added songbeamer chord import test 2017-04-17 21:35:34 +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 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
Raoul Snyman 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
Raoul Snyman c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -07: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
Raoul Snyman 4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
Raoul Snyman 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 7a72b2cad4 download and deploy works 2017-03-05 09:23:28 +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
Raoul Snyman 094b1f73bc Fix a test 2017-03-01 21:43:45 -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
Philip Ridout 162c178d6e HEAD 2017-02-18 07:23:15 +00:00
Tomas Groth 56d2eaa4c2 trunk 2017-01-25 22:17:27 +01: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
Tomas Groth 02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01: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
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 a11e731ab0 Tests 2016-12-18 14:05:10 +00:00
Philip Ridout 61c76c39e6 Tests 2016-12-18 14:01:05 +00:00
Raoul Snyman 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
raoul@snyman.info 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 595fd90d45 Fix some errors on windows 2016-11-29 14:06:54 +01:00
Raoul Snyman d0ed37e1d5 Move contents of html files into actual html files 2016-11-25 16:17:34 +02:00
Raoul Snyman 826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +02: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 94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
Philip Ridout 87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Tim Bentley 2d695f13ea Head 2016-10-26 19:12:38 +01:00
Olli Suutari a7b4d001c7 - Merged trunk and fixed conflict. 2016-10-17 20:40:45 +03:00
suutari.olli@gmail.com ed647f2828 Fixed the issue where web bible's result in traceback in "Search while typing" 
(by removing one miss-placed line)

This branch also fixes the issue where the new "Clear Bible search results" and 
"Lock button" give focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1775/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

bzr-revno: 2698
 2016-10-17 17:36:09 +01:00
Olli Suutari 97d828af43 - Added pip's fix for sword test 2016-10-04 16:48:54 +03:00
Olli Suutari 3c733ddd20 - Merged trunk on 4.10.16 2016-10-04 16:39:14 +03:00
Tomas Groth 88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Olli Suutari 2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00
Tomas Groth 32cfacff7e Skip MediaShout import testing on non-win platforms. 2016-09-18 17:47:59 +02:00
Olli Suutari ff2e1d1ea7 - The checking for not_called_once does not work apparently, fails in jenkins but passes in nosetests. 2016-09-18 02:07:24 +03:00
Olli Suutari 190baf19d5 - Added two new tests for lock button toggle. 2016-09-18 01:53:47 +03:00
Gary Talent 5435dfc5cc Add test for EasyWorship 6 importer. 2016-09-16 23:39:40 -05:00
Olli Suutari 09da152372 - Added a test for toggle lock button 
- Removed give focus to Select bookname on Select tab, may be confusing.
 2016-09-17 00:43:30 +03:00
Olli Suutari ba3b2396e7 - Merged trunk on 16.9.16 2016-09-16 22:54:25 +03:00
Philip Ridout 2dd770ea11 PEP fixes 2016-09-09 22:47:29 +01:00
Olli Suutari 639c01dfe2 - Merged trunk on 9.9.16 2016-09-09 10:58:15 +03:00
Olli Suutari a99bd8603f - Combined some <strong> tags in expection dialogue. 
- Added new line to the end of the test.
 2016-09-09 10:57:11 +03:00
Olli Suutari 359dded22a - Fixed the test 2016-09-09 10:51:19 +03:00
Gary Talent b5f08bf54c Add support for importing EasyWorship6 databases 2016-09-07 00:15:37 -05:00
Philip Ridout 4a71bda0d1 More BibleImport tests 2016-09-05 21:27:14 +01:00
Philip Ridout 223b198dc8 Moved some import related stuff out of the db module 2016-09-04 22:16:43 +01:00
Philip Ridout 80cdc35433 Move already refactored imorters over to using the log methods in OpenLPMixin 2016-09-04 17:15:57 +01:00
Philip Ridout 6fc1467c5a PEP fixes 2016-09-02 15:32:14 +01:00
Philip Ridout 14187f4884 Mostly refactors of OSIS + tests 2016-09-02 15:23:20 +01:00
Philip Ridout 628027ffc8 Moved validate_xml in to bible import and improved operation. More tests 2016-08-29 17:11:09 +01:00
Philip Ridout e91b87da8c Start on osis importer. Some further improvements of other importers 2016-08-28 22:03:04 +01:00
Philip Ridout 9b41814511 Merge from yet-more-refactors 2016-08-27 14:33:21 +01:00
Olli Suutari 46a7c92a90 - Merged trunk 2016-08-25 22:27:55 +03:00
Philip Ridout 28d94b7d10 moved some static methods to module level 2016-08-21 21:36:59 +01:00
Philip Ridout 894b4fbf10 revert changes to http.py due to circular references 2016-08-20 21:00:50 +01:00
Olli Suutari 8224e39a2c - Added test 2016-08-20 22:14:15 +03:00
Olli Suutari 685c01ec25 - Renamed test title from x_test to test_x 2016-08-20 21:59:31 +03:00
Philip Ridout 7c77d7e8bd Refactor of OpenSong Bible importer + 100% test coverage 2016-08-20 19:12:42 +01:00
Olli Suutari b5c4cb1f85 - pep8 fix (2x blank line) 2016-08-20 01:53:20 +03:00
Olli Suutari 345978286b - Added a test. 2016-08-20 01:49:51 +03:00