Martin Thompson
2ae4c5a1b1
Merged
2010-09-06 20:42:39 +01:00
Martin Thompson
84bff09d03
REmoved prints
2010-09-02 21:30:01 +01:00
Martin Thompson
11a9d3d8f5
Handles versetypes like 'V3a'
2010-09-02 21:21:31 +01:00
Martin Thompson
192010588f
Test for & in authors
2010-09-02 20:43:28 +01:00
Philip Ridout
7e0245344a
Adding the Words of Worship importer.
...
bzr-revno: 1001
2010-09-01 07:11:31 +02:00
Martin Thompson
b4cfea211e
Import completely unlabelled songs. Import unreferenced verses
2010-08-31 20:49:57 +01:00
Martin Thompson
733bedebe8
Passes first tests again
2010-08-30 21:19:16 +01:00
Martin Thompson
6c83e98fd5
Merged from trunk
2010-08-30 20:23:16 +01:00
Raoul Snyman
2d9b39986a
Some more fixes for the OpenSong import.
2010-08-29 22:05:36 +02:00
Raoul Snyman
0e919ab903
Only show the display screen on startup if it is not on the primary screen.
...
bzr-revno: 1000
2010-08-29 21:29:45 +02:00
Raoul Snyman
75d64a165c
Removed the commented out line, since this works.
2010-08-29 21:16:17 +02:00
Tim Bentley
6867f64b94
Renderer fixes and change theme export suffix
...
bzr-revno: 999
2010-08-29 19:59:36 +01:00
Raoul Snyman
90ac6da839
Don't show the display on startup if there's only one monitor.
2010-08-29 20:12:36 +02:00
Raoul Snyman
130e315333
HEAD
2010-08-29 19:54:36 +02:00
Tim Bentley
002b5de1c3
remove slash
2010-08-29 15:44:14 +01:00
Tim Bentley
93c87c396b
add space
2010-08-29 15:42:47 +01:00
Tim Bentley
4379004f0e
rename theme suffix
2010-08-29 15:27:51 +01:00
Tim Bentley
f065f95d00
Head998
2010-08-29 15:20:21 +01:00
Jon Tibble
9278f271f8
Cleanups and song form fix (Bug #612282 )
...
bzr-revno: 998
2010-08-29 12:23:35 +01:00
Jon Tibble
9a1ed78fd5
Cleanups
2010-08-29 00:52:10 +01:00
Raoul Snyman
59d2e2dab6
Fixed up the OpenSong importer.
2010-08-29 01:09:05 +02:00
Philip Ridout
271bbe22b2
Made the constants more like constants!
2010-08-28 21:46:03 +01:00
Jon Tibble
0abf1597eb
Fix trunk merging
2010-08-28 20:54:50 +01:00
Raoul Snyman
7fcd2512ce
HEAD
2010-08-28 21:49:12 +02:00
Jon Tibble
168033566a
Head r997
2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7
Really fix song maintenance as subform (Bug #612282 )
2010-08-28 20:32:24 +01:00
Tim Bentley
10aa9432d6
Fix font sizes and performance of previews
2010-08-28 19:44:49 +01:00
Tim Bentley
618813f020
Display and renderer changes
...
bzr-revno: 997
2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca
String fixes
2010-08-28 16:49:51 +01:00
Jonathan Corwin
764c3d42c9
More fixes
2010-08-28 11:57:03 +01:00
Philip Ridout
f712ccca50
Signal fix as mentioned by Meths
2010-08-28 03:51:29 +01:00
Jon Tibble
000d23f7c6
Cleanup long lines
2010-08-28 02:31:11 +01:00
Jonathan Corwin
c4f3bccb59
Problems with outlines in qtwebkit 533.3. Shadow colour and kerning
2010-08-28 00:19:50 +01:00
Jon Tibble
bb31492609
Fix song maintenance as subform (Bug #612282 )
2010-08-27 23:49:27 +01:00
Jonathan Corwin
97d088f0ac
renderer merge
2010-08-27 23:35:09 +01:00
Philip Ridout
1611251ec2
and an empty line at the end
2010-08-27 21:18:48 +01:00
Philip Ridout
e4f4626f04
shortened some long lines.
2010-08-27 21:14:23 +01:00
Philip Ridout
4e059f8cc5
Forgot to add the wowimport.py file
2010-08-27 21:02:59 +01:00
Philip Ridout
6b6da86c54
wow_import implemented in to import wizard
...
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
2010-08-27 20:53:22 +01:00
Tim Bentley
3645c9400e
Fix theme bug reported on Redhat bugzilla
...
bzr-revno: 996
2010-08-27 20:18:37 +01:00
Jon Tibble
5cfdaf3b77
Update OpenLPv2 song importer
...
bzr-revno: 995
2010-08-27 19:50:08 +01:00
Tim Bentley
759019e5eb
Fix theme import Redhat Bugzilla
2010-08-27 19:48:06 +01:00
Tim Bentley
7d1515e875
994
2010-08-27 19:42:00 +01:00
Tim Bentley
a4f1b29cca
Fix bug losing transitions
2010-08-27 19:28:19 +01:00
Tim Bentley
3c637f6c2d
chnage theme suffix
2010-08-27 17:44:42 +01:00
Tim Bentley
e1afe3be94
Head994
2010-08-27 17:10:15 +01:00
Jon Tibble
6266c3369e
Cleanup the OpenLPv2 song importer
2010-08-27 16:25:29 +01:00
Raoul Snyman
62cb7ae7fe
I was playing, and somehow it got into trunk :-(. This fixes bug #625183 .
...
bzr-revno: 994
2010-08-27 13:23:39 +02:00
Raoul Snyman
596b49af9e
Fixed up some HTML that crept in somewhere.
2010-08-27 11:11:57 +02:00
Raoul Snyman
3d60cc894d
Added the initial openlp.org 1.x importer.
2010-08-26 22:53:24 +02:00