Commit Graph

78 Commits

Author SHA1 Message Date
Samuel Mehrbrodt
fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01:00
Tomas Groth
fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
Samuel Mehrbrodt
cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Tim Bentley
392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley
953f0bae34 try again 2019-01-04 19:48:42 +00:00
Bastian Germann
191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02:00
Bastian Germann
6aa998edd0 Replace PyICU with PyQt's QCollator
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
2018-10-27 12:50:15 +02:00
Simon Hanna
a4c1e306b5 Remote imports from openlp/core/lib/__init__.py and update other files accordingly 2018-08-25 16:08:19 +02:00
Tim Bentley
2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
Tim Bentley
36276d4fac fix tests 2018-02-23 16:22:48 +00:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
f9e20e2108 tests 2017-12-28 08:22:55 +00:00
Tim Bentley
e17386d5ab functional more bits 2017-12-22 17:51:59 +00:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07: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
Johannes Thomas Meyer
0850351237 implemented fix suggestions 2017-06-05 23:41:29 +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
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
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
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00
672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
Samuel Mehrbrodt
9cd49f194f PEP8 2016-04-29 19:32:09 +02:00
Samuel Mehrbrodt
868b538dd2 Fix test and add new one 2016-04-29 19:10:50 +02:00
Chris Hill
0c8f9e3b71 Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs 2016-04-17 22:22:30 +01:00
Chris Hill
330a1758c8 Use get_natural_key instead of _natural_sort_key 2016-04-03 11:57:39 +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
faa434d937 pep8 fixes 2016-03-13 19:37:08 +01:00
Chris Hill
41d627e3f9 natural sort lower case 2016-02-13 16:57:09 +00:00
Chris Hill
76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
Chris Hill
f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00: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
da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tim Bentley
8df7c3a9ea add tests 2016-01-05 19:32:12 +00: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
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +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
Chris Hill
c95ca007b5 updated unit test 2015-06-20 23:35:22 +01:00
Chris Hill
ed9146ae06 fixed bug #1000729 'Support more song fields in the search' - added unit tests
Fixes: https://launchpad.net/bugs/1000729
2015-06-14 21:58:56 +01:00
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Phill Ridout
9fef267fd3 Changed the year 2015-01-02 11:42:17 +00:00
Phill Ridout
cb0e4dc7ba added copyright header to test 2014-12-19 22:01:15 +00:00