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
Tomas Groth
ad55a8d254
Fix issue where enable-chord settings was not setup correctly for tests.
2017-05-30 22:06:27 +02: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
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
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
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
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
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
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
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
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
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
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
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
5468def937
pep8 fixes
2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36
trunk
2016-11-15 21:53:50 +01: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
Gary Talent
5435dfc5cc
Add test for EasyWorship 6 importer.
2016-09-16 23:39:40 -05:00
Gary Talent
b5f08bf54c
Add support for importing EasyWorship6 databases
2016-09-07 00:15:37 -05:00
Tomas Groth
825a703cd0
pep8 fixes
2016-08-19 17:05:44 +02:00
Tomas Groth
c463c46cf6
Fixed various bugs in the songbeamer chord import, and added a test.
2016-08-19 16:51:23 +02:00
Tomas Groth
25c268145a
merge trunk
2016-08-18 21:04:44 +02:00
b657d255cc
Remove blank line
...
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 22:58:27 +02:00
693c18a23a
Add some tests for the MediaShout importer
2016-08-14 22:48:36 +02:00
2bd58e1c29
Fix some pep8 issues
2016-08-13 16:41:24 +02:00
879a51a1fe
Fix the tests for SongSelect and write tests for the SystemPlayer
2016-08-13 16:29:12 +02:00
Tomas Groth
de54ec2715
merge trunk
2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0
More work on chords
2016-07-25 22:07:07 +02:00
Tomas Groth
69951133fe
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
...
Fixes: https://launchpad.net/bugs/1594945
2016-07-07 22:47:57 +02:00
second@tgc.dk
45d2640159
"Fix various pyodbc related issues. Fixes bug 1590657.
...
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."
bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152 , https://launchpad.net/bugs/1585489 , https://launchpad.net/bugs/1590657
2016-06-16 22:12:27 +02:00
Tomas Groth
0c2b68ac54
merge trunk
2016-06-14 23:12:54 +02:00
Tomas Groth
e89803a3ad
merge trunk
2016-06-14 21:06:54 +02:00
