Commit Graph

770 Commits

Author SHA1 Message Date
Tim Bentley 5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
Raoul Snyman c235b793b0 Fix bug #644106
Fix a related bug in the song importer.
2010-09-21 20:12:46 +02:00
Tim Bentley 79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Jeffrey S. Smith 49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Jeffrey S. Smith d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Christian Richter 9539e0fb22 Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5
bzr-revno: 1044
2010-09-18 23:18:32 +01:00
rimach 9971027e4d Head, Remove unneeded lines 2010-09-18 20:37:02 +02:00
Jonathan Corwin 93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Raoul Snyman 1e5645995c Some more spelling/grammatical corrections. 2010-09-17 22:06:41 +02:00
Raoul Snyman 794493d0d1 Fixed bug #640460. 2010-09-17 21:02:25 +02:00
Raoul Snyman c54450377f Attempting to solve bug #635338
bzr-revno: 1037
2010-09-17 16:32:07 +02:00
rimach d2bf1fedae correct piped soffice start, fix Python2.5 problem with unicode strings in optparse 2010-09-16 23:01:44 +02:00
Raoul Snyman a3aaf7dce8 Some fancy footwork around encodings. 2010-09-16 20:51:29 +02:00
Martin Thompson ec9230be38 Put comment in right place 2010-09-15 22:02:32 +01:00
rimach 5f7348ed2e Head 2010-09-15 22:51:22 +02:00
rimach ea1321ef20 add pipe using for soffice 2010-09-15 22:51:01 +02:00
Martin Thompson f7fafae09c Fixed merge fail 2010-09-15 21:46:16 +01:00
Martin Thompson ebf3ce587d Tweaks from review 2010-09-15 21:12:03 +01:00
Raoul Snyman ef9684320c HEAD 2010-09-14 22:34:44 +02:00
Raoul Snyman 2f33ae1bab Add in code to display a disabled message if an importer is not available. 2010-09-14 22:33:33 +02:00
Tim Bentley efb58a710f Remove whitespace 2010-09-14 17:44:21 +01:00
Jon Tibble 1968803619 More cleanups 2010-09-14 15:43:21 +01:00
Jon Tibble 5fe753c833 Cleanups 2010-09-14 15:21:44 +01:00
Jon Tibble 23859bb241 Head r1030 2010-09-14 14:04:04 +01:00
Raoul Snyman 0a84fc0bcc Added extra labels to show that an item is disabled.
Added functionality to the SongFormat class to keep track of availability of importers.
2010-09-13 23:09:13 +02:00
Martin Thompson a8dd0f5ddc Merged and fixed importing of 'other' verse types 2010-09-13 21:12:45 +01:00
Raoul Snyman d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
Martin Thompson 062a88e2f2 Better handling of progress bar. Attempt to get 'other' type verses into database 2010-09-12 21:31:23 +01:00
Raoul Snyman 4e8f663444 Set the correct default encoding.
Centralise decoding to a single function.
HEAD
2010-09-11 21:00:01 +02:00
Raoul Snyman c1ed2a76e2 Detect v1.0 database at the beginning of the import, not half way through.
Do some detection of the encoding.
2010-09-11 20:51:27 +02:00
Jonathan Corwin 81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Derek Scotney efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Tim Bentley b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Raoul Snyman b8893f4ab2 Merge in the openlp.org 1.x importer.
bzr-revno: 1017
2010-09-08 06:57:13 +02:00
Tim Bentley 1dd5ee185c Fix song editing bug
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
2010-09-07 19:41:09 +01:00
Tim Bentley 4c648f142c Fix song editing display bug
Fixes: https://launchpad.net/bugs/630247
2010-09-07 17:12:47 +01:00
Raoul Snyman f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman 63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
Raoul Snyman f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson 53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson 2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman 5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Raoul Snyman 035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Jonathan Corwin aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin 3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Raoul Snyman a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman 2901c79ed6 Start work on the openlp.org 1.x importer.
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
2010-09-04 19:51:41 +02:00