Commit Graph

602 Commits

Author SHA1 Message Date
Tim Bentley 3e8af699c3 fix import issues 2016-04-04 22:19:37 +01:00
chris@minkus.me.uk 5a3e5c655c Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests

--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...

bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
2016-04-03 16:57:52 +01:00
Chris Hill 330a1758c8 Use get_natural_key instead of _natural_sort_key 2016-04-03 11:57:39 +01:00
Ian Knight 573bc510ff Added ProPresenter 5 & 6 support 2016-03-31 03:41:52 +10:30
Chris Hill 8de2f013eb merge w/ trunk 2016-03-28 12:52:59 +01:00
Tomas Groth 7c6e1902c4 Fix tag detection. Fixes bug 1549549.
Fixes: https://launchpad.net/bugs/1549549
2016-03-22 22:08:56 +01:00
Tomas Groth 45b122f768 make stuff prettier... 2016-03-20 09:28:41 +01:00
Tomas Groth dca65148c4 forgot to add a file and made some pep8 fixes 2016-03-19 21:42:59 +01:00
Tomas Groth 2937f39999 trunk 2016-03-19 21:30:12 +01:00
Chris Hill 9c5da3d196 merge w/ trunk 2016-03-19 15:09:50 +00:00
Chris Hill bb0adc6f5d fixed bug #1280295 'Enable natural sorting for song book searches', refactored to move filtering to database, updated test
Fixes: https://launchpad.net/bugs/1280295
2016-03-19 15:01:10 +00:00
Tomas Groth 7b69634552 Fixes for translation support + test 2016-03-19 07:20:12 +01:00
Tomas Groth fdc22b4e4c Add translations support 2016-03-18 23:09:49 +01:00
Tomas Groth 302fcb221b Added another OPS Pro import test 2016-03-16 22:28:29 +01:00
Tomas Groth faa434d937 pep8 fixes 2016-03-13 19:37:08 +01:00
Tomas Groth e9e5976d22 Finished first test. 2016-03-11 22:56:07 +01:00
Tomas Groth 51ffb92d40 Started work on tests 2016-03-09 22:44:15 +01:00
Tomas Groth 98eb50e9b2 Made the anchor/tag detection more generic. 2016-03-08 22:43:10 +01:00
Tomas Groth e67ad21740 Getting closer... 2016-03-07 23:27:28 +01:00
chris@minkus.me.uk 3f7cb577b4 Fix for bug #1000729. Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search, based on the existing 'Author' search.
bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1000729
2016-03-05 20:48:27 +00:00
Tomas Groth 5809a2d6f4 Added test 2016-02-29 20:29:32 +01:00
Chris Hill 57200fa84e merge with trunk 2016-02-19 20:28:39 +00:00
Tomas Groth 4c883c8cf0 Remove songs used in tests that is not in public domain. 2016-02-15 21:49:23 +01:00
Chris Hill 41d627e3f9 natural sort lower case 2016-02-13 16:57:09 +00:00
Chris Hill 3eecea213d merge with trunk 2016-02-13 16:40:16 +00:00
Tomas Groth e99fe71ca2 Added test 2016-02-12 21:23:18 +01:00
Raoul Snyman dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Chris Hill 76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
second@tgc.dk 8d083af742 More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
Chris Hill f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00:00
Raoul Snyman 734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +02:00
s.mehrbrodt@gmail.com 8fbd431bed Fix entering Songbooks with keyboard
Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt 0f1c7bae44 Add test 2016-01-30 15:13:35 +01:00
Tomas Groth c1108b1593 Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field. 2016-01-23 09:19:12 +01:00
Tomas Groth b1660c0525 Added test 2016-01-13 21:56:55 +01:00
Tim Bentley 31d6f931e5 head 2016-01-11 21:58:21 +00:00
Tim Bentley 3f0025a013 add tests 2016-01-11 21:57:45 +00:00
simon.hanna@serve-me.info 98258bc753 Reenable the stylesheet
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00:00
springermac@gmail.com e6959992f9 Fix Mac OS X display flags test
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

bzr-revno: 2604
2016-01-11 21:27:11 +01:00
Jonathan Springer a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna 09faa0cb87 Add a test 2016-01-10 21:06:41 +01:00
Simon Hanna 4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna 0f1d6718bd Add tests for ignored case 2016-01-10 01:34:53 +01:00
Simon Hanna 70e1f3926b Add test for fix 2016-01-10 01:18:27 +01:00
s.mehrbrodt@gmail.com ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
2016-01-09 19:53:09 +00:00
Raoul Snyman a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Simon Hanna 0416e29a83 Merge with trunk 2016-01-09 17:50:08 +01:00
Simon Hanna afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt 2785fbaa2d Fix tests 2016-01-09 16:53:49 +01:00
Samuel Mehrbrodt ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt fe74a19783 Merge 2016-01-09 16:04:34 +01:00
Tomas Groth e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna bf4225838e Fix failing test due to name conflict 2016-01-09 01:15:23 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth 5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth 21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth 345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tim Bentley 7fd37c1033 head 2016-01-08 17:44:47 +00:00
simon.hanna@serve-me.info e8e553b663 Modify all forms to remove the help button from their status bar.
I don't think I missed a form. The Wizards remain untouched as the help button works there

bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Simon Hanna d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Simon Hanna 46301b63f4 Add docstrings to tests 2016-01-05 22:35:35 +01:00
Tim Bentley 8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Samuel Mehrbrodt 5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt bfdd9e81ab Extend test for multiple songbooks 2016-01-04 20:23:42 +01:00
Samuel Mehrbrodt ccd8b0625f Fix test 2016-01-04 20:20:21 +01:00
Samuel Mehrbrodt ecd2c28cc7 Add test 2016-01-04 20:14:00 +01:00
Simon Hanna 7ed23514b4 Add test for about() function of MediaPlugin 2016-01-04 01:28:13 +01:00
Simon Hanna 8121f77e2d Add test for about() function of SongUsagePlugin 2016-01-04 01:27:56 +01:00
Simon Hanna c7563a5a64 Add documentation to tests 2016-01-03 00:37:22 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna 990a8a9502 Add tests for the SongFormat class 2015-12-30 22:36:37 +01:00
Raoul Snyman 9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Raoul Snyman 8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5
bzr-revno: 2576
2015-12-21 21:27:10 +01:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth 89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth 2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth 6eb17b561d trunk 2015-12-18 21:13:21 +01:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Tomas Groth 6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt 020864dd26 PEP8 2015-12-17 22:28:36 +01:00
Samuel Mehrbrodt 0ce6804171 Fix pep8 2015-12-17 21:27:08 +01:00
Jonathan Springer 0a935bdb90 merge trunk 2015-12-13 19:21:58 -05:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Tim Bentley dcf97bf93b head 2015-12-05 12:45:01 +00:00
Jonathan Springer 3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Tim Bentley 6a48bb5ac2 Style fixes 2015-11-28 20:13:16 +00:00
Tim Bentley 3a31f86e84 Head 2015-11-28 17:05:06 +00:00
Tim Bentley 64867b52a8 Add tests for Presentations 2015-11-28 17:04:46 +00:00
Tomas Groth be222ca597 Fix tests that fails on py35. 2015-11-25 22:47:56 +01:00
Tim Bentley a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley b4d7798300 fix join in tests 2015-11-08 21:23:15 +00:00
Tim Bentley 97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Jonathan Springer 285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00