Andreas Preikschat
5d33376740
again changed olp to openlp
2010-12-09 19:01:04 +01:00
Andreas Preikschat
9515b84c56
whitespaces, string change
2010-12-09 18:44:18 +01:00
Andreas Preikschat
6f21ed4329
trunk
2010-12-09 18:23:14 +01:00
Andreas Preikschat
a15aebcc32
latest changes for merge
2010-12-09 17:53:48 +01:00
Andreas Preikschat
6284480055
trunk r1136
2010-12-09 17:10:15 +01:00
M2j
7e221a6e98
locale aware song sorting
2010-12-09 16:08:04 +01:00
Andreas Preikschat
7e86da26f2
close connection when finished, removed unused variable
2010-12-09 14:35:17 +01:00
M2j
465515d71e
unicode in song title search strings
2010-12-09 14:30:23 +01:00
Andreas Preikschat
01fad9972c
added comments back
2010-12-09 13:49:15 +01:00
M2j
20b1c33a4b
making 'cancel bible import' work
2010-12-09 00:40:28 +01:00
M2j
b465d763cd
use the same call as in the Qt sources
2010-12-09 00:33:38 +01:00
M2j
c33654c68c
Bug #659019
2010-12-08 23:55:28 +01:00
Derek Scotney
3719143f99
Fixes unwanted text imported from some SongSelect files. SongSelect only has a few verse types available for verses and adds extra ones by setting the verse type to 'misc' and then including the actual type on the next line. In the case of a 'misc' type or unknown type, the next line is checked for a valid verse type. The fix has been made for both .txt and .usr file types.
...
bzr-revno: 1136
2010-12-08 20:17:51 +00:00
Tim Bentley
e39c681c44
Add text entry validator to display positions
...
Fix Spelling
bzr-revno: 1135
Fixes: https://launchpad.net/bugs/685317
2010-12-08 19:21:59 +00:00
Meinert Jordan
28de4fbdae
- openlp.org 1.x importer detects the character encoding for the database and shows a inputDialog for correcting the guess.
...
- prefer UTF-8 encoding for CCLI import
- split song order at consecutive white spaces (it rejected song orders with two consecutive spaces)
bzr-revno: 1134
2010-12-08 19:15:12 +00:00
Derek Scotney
cc7780574b
reverted back to revision 1134
2010-12-08 21:14:27 +02:00
Tim Bentley
b405195261
Fix size input validation again
2010-12-08 19:12:38 +00:00
Tim Bentley
2f04bde2aa
Fix size input validation
2010-12-08 19:00:24 +00:00
Andreas Preikschat
9f6a0f7c64
moved file
2010-12-08 18:56:29 +01:00
Andreas Preikschat
aca56b78b5
changed olp1 to OpenLP1
2010-12-08 18:46:22 +01:00
Andreas Preikschat
b044226332
changed class name
2010-12-08 18:19:51 +01:00
Andreas Preikschat
12e7c96463
camelCase changes
2010-12-08 18:18:12 +01:00
M2j
3ad231940c
HEAD 1127
2010-12-08 09:25:28 +01:00
M2j
62766269f1
- remove None in .split() method
...
- change translatable codepage selection strings
2010-12-08 09:21:17 +01:00
Derek Scotney
298a159b5e
Update to verse types
2010-12-07 23:10:57 +02:00
Tim Bentley
ccc640bb27
Stop invalid characters being entered
2010-12-07 20:47:09 +00:00
Derek Scotney
a5fc219abb
Updated to handle CCLI verse type 'misc'
2010-12-07 22:03:20 +02:00
Tim Bentley
a55cdd3a50
Fix string to int problem
2010-12-07 18:55:58 +00:00
Tim Bentley
676beeed48
Head1133
2010-12-07 17:52:17 +00:00
Tim Bentley
1b3db9f429
Fix Theme Bug text color.
...
Fix serious spelling error.
bzr-revno: 1133
Fixes: https://launchpad.net/bugs/686122
2010-12-07 17:28:46 +00:00
Andreas Preikschat
80d704dc0b
r1132
2010-12-07 18:08:55 +01:00
Andreas Preikschat
6fd338c492
tweaked importer
2010-12-07 17:34:19 +01:00
Jon Tibble
b361064300
Fix v2 song importer and various cleanups
...
bzr-revno: 1132
2010-12-07 13:59:28 +00:00
Jon Tibble
7f60e706aa
Unused imports
2010-12-06 23:59:01 +00:00
Jon Tibble
9291516b59
Fix v2 import bug
2010-12-06 23:37:55 +00:00
Jon Tibble
533a0c5b5b
Head r1131
2010-12-06 23:28:01 +00:00
Tim Bentley
117f77a4a4
Spell Vertical
2010-12-06 19:42:17 +00:00
Tim Bentley
04b4cdaf9f
Head1131
2010-12-06 19:39:04 +00:00
Tim Bentley
b01aed6b0d
Fix theme main font color bug
...
Fixes: https://launchpad.net/bugs/686122
2010-12-06 19:36:15 +00:00
Andreas Preikschat
d5e0643b45
attempt to clean up bible importers
2010-12-06 20:30:04 +01:00
Tim Bentley
fd473b81d7
Spell Vertical
2010-12-06 19:28:52 +00:00
Tim Bentley
109d214fb3
Add comment
2010-12-06 19:25:44 +00:00
Raoul Snyman
24f7241e1f
Reworked some of the layout and things of the Theme Wizard.
...
bzr-revno: 1131
2010-12-05 22:15:28 +02:00
Raoul Snyman
3389e487ca
Fixed issues from merges.
...
Set second page of wizard on edit.
2010-12-05 20:02:36 +02:00
Andreas Preikschat
9db57568b0
started olp1 bible import
2010-12-05 17:11:21 +01:00
Andreas Preikschat
e3cb6a6508
changed
2010-12-05 17:07:16 +01:00
Andreas Preikschat
b8e6da0417
completed work
2010-12-05 16:47:23 +01:00
Andreas Preikschat
a66a77bdec
completed work
2010-12-05 16:44:51 +01:00
Raoul Snyman
5b19753bf7
HEAD
2010-12-05 08:57:35 +02:00
Raoul Snyman
222d5fe9be
HEAD
2010-12-05 08:40:35 +02:00