Commit Graph

1653 Commits

Author SHA1 Message Date
Raoul Snyman 9be767a388 Merge in changes from lp:~raoul-snyman/openlp/biblesplugin
bzr-revno: 693
2009-12-28 10:44:35 +02:00
Raoul Snyman 6c7939bd71 Implemented canceling of imports and some better handling around the import process. 2009-12-28 00:19:39 +02:00
Raoul Snyman 0d5d6ae436 Merged in OpenSong/Bible importer branch.
bzr-revno: 692
2009-12-24 21:20:55 +02:00
Raoul Snyman 8d04e4cc11 YEEEHAH! Revision 700! 2009-12-24 20:03:49 +02:00
Raoul Snyman 4f09b260db This time had to bribe the Line Length Police! 2009-12-24 20:01:39 +02:00
Raoul Snyman c900ed9b5c Merged from HEAD.
Cleaned up conflict.
Fixed a few other potential breaks.
Paid bail to the Line Length Police.
2009-12-24 19:54:39 +02:00
Raoul Snyman 4500b02824 Moved openlp database upgrade script to scripts directory.
Removed old bible import form.
Removed some debugging in the OSIS and bible db classes.
2009-12-24 17:21:03 +02:00
Raoul Snyman 3e425803e3 Last few fixes for the OSIS importer. 2009-12-24 17:12:09 +02:00
Raoul Snyman b7f224e280 99% of OSIS import now working. 2009-12-24 00:31:14 +02:00
Raoul Snyman 1181152c5a Trying to regexify and make the OSIS importer more robust. 2009-12-23 23:09:07 +02:00
Raoul Snyman dc0f7e7f5a Finishing touches on the Import wizard and the OpenSong bible importer. 2009-12-21 22:58:00 +02:00
Raoul Snyman e29a88e9a3 Final touches to the import Wizard; Fixed a few bugs in the OpenSong implementation. 2009-12-19 00:31:28 +02:00
Raoul Snyman fa93b10b94 A pre-import working Import Wizard. 2009-12-16 22:52:44 +02:00
Tim Bentley 34eebfd22f Fix bug stopping Custom editing
bzr-revno: 691
2009-12-16 18:30:14 +00:00
Tim Bentley 0cdc827a1d Fix up custom plugin issues 2009-12-16 17:54:45 +00:00
Raoul Snyman 77bf9b6f9a Web download bibles now load correctly. 2009-12-16 04:22:16 +02:00
Tim Bentley e4e06dd23b Add Shadow and Outline options to Themes
bzr-revno: 690
2009-12-15 21:02:07 +00:00
Tim Bentley a7833f900f Add Outline and Shadow size options and make editable 2009-12-15 20:36:15 +00:00
Tim Bentley 43a99451a3 Add Outline and Shadow size options 2009-12-15 20:11:52 +00:00
Raoul Snyman 438c5cf00a Added an OpenSong implementation, a new import wizard, and validation for the import wizard. 2009-12-15 21:37:56 +02:00
Tim Bentley 69d818222f Presentation, Custom , bug fixes
bzr-revno: 689
2009-12-14 18:56:29 +00:00
Tim Bentley 1b1b811cb7 Custom display footer if Credit required 2009-12-14 18:10:00 +00:00
Tim Bentley 2f09c70274 Presentation cleanup - finished for now 2009-12-14 17:05:53 +00:00
Tim Bentley 1271eac76e Correct comment 2009-12-14 16:55:58 +00:00
Tim Bentley be3fecac20 Sort out Presentation plugin Handler
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
2009-12-13 22:08:10 +00:00
Tim Bentley fe959f451f Fix up Alert generation (needs to be tested on duel screen) 2009-12-13 14:20:24 +00:00
Tim Bentley d676430ffa Add option to Custom to suppress the footer.
Not always needed for Copyright.
Default Required
2009-12-13 08:57:58 +00:00
Tim Bentley f7f0f18142 Fix bug with Verse Tags being lost when expanding or contracting the verse edit list 2009-12-13 08:28:51 +00:00
Tim Bentley 14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley 812a332182 Fix bibles and themes
bzr-revno: 688
2009-12-11 19:20:49 +00:00
Tim Bentley 231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley c9e1b4747a Fix Theme tab handling
bzr-revno: 687
2009-12-10 17:56:01 +00:00
Tim Bentley 540f63c9de Fix Theme handling so Song level works again
bzr-revno: 686
2009-12-10 17:03:21 +00:00
Tim Bentley 01cce5b4cd Merge from lp:~trb143/openlp/cleanup
bzr-revno: 685
2009-12-09 23:17:41 +02:00
Tim Bentley 3cc63840f4 Fix up theme string issues to False is matched
Remove any Print statements
2009-12-09 17:09:45 +00:00
Tim Bentley 9893a887ab Add slideTransition Flag to theme to allow for transitions to be turned off at theme level 2009-12-08 17:52:45 +00:00
Tim Bentley 4158ae458e Clean up ServiceItem usage in ServiceManager 2009-12-08 17:04:27 +00:00
Tim Bentley 26dd28d083 Remove unneeded code 2009-12-06 19:22:41 +00:00
Tim Bentley 836f7c2ab7 Remove unneeded image 2009-12-06 19:21:58 +00:00
Tim Bentley 18f235c50e Head684 2009-12-06 19:17:29 +00:00
Tim Bentley fa24b21922 Verse Tagging
bzr-revno: 684
2009-12-06 18:46:02 +00:00
Tim Bentley 5d79141cfc Verse tagging - combo complete 2009-12-06 16:50:13 +00:00
Tim Bentley 528004df23 Start to add change in toolbar 2009-12-06 13:55:07 +00:00
Tim Bentley 40523ed0f6 Toolbar fixups 2009-12-06 08:39:56 +00:00
Raoul Snyman 583d96b5d1 Song Verses Toolbar: Phase 1
- Convert verse icons to drop-down verse menu.
2009-12-06 09:14:11 +02:00
Tim Bentley a745d15a98 Remove the media tab correctly 2009-12-05 09:44:44 +00:00
Tim Bentley 480fc4771f Fix up song tagging so case does not matter
Fix bug in transitions when using images
Remove MediaTab as not wanted
2009-12-05 08:05:11 +00:00
Tim Bentley b8149cc826 Fix up Icon code to use isinstance
Fix up code to ignore cases when doing tests.
2009-12-04 20:25:48 +00:00
Tim Bentley 547074d29a Verse tagging verses must be in format of vX 2009-12-04 18:52:44 +00:00