Commit Graph

1737 Commits

Author SHA1 Message Date
Tim Bentley
0628d84d34 Display updates, Song Usage fixes, Theme display fixes
bzr-revno: 698
2010-01-29 07:15:51 +00:00
Tim Bentley
dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley
dc7148b76e Fix screen display setup when returning from presentations 2010-01-28 11:46:25 +00:00
Tim Bentley
3baf2f2f7b Import the startup showing the update screen 2010-01-28 07:39:34 +00:00
Tim Bentley
2059c4e95e Head697 2010-01-28 07:16:11 +00:00
Tim Bentley
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Raoul Snyman
9fa8e9f0f1 New version 1 -> 2 Bible converter script.
bzr-revno: 697
2010-01-27 22:25:20 +02:00
Raoul Snyman
262ff55953 Added bible conversion script. 2010-01-27 14:35:42 +02:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Tim Bentley
9beb6c7db5 Add Image layer and rename text layer 2010-01-25 20:34:47 +00:00
Tim Bentley
8a42d3c7f2 More Fixes for Presentations
Fix screen blanking so resets for Video
Fix screen blanking so it does not remember at start up if set by presentations and video.
Fix Pop ups so they display on correct monitor

bzr-revno: 696
2010-01-24 17:35:08 +00:00
Tim Bentley
dd18a4da76 Fix spacing of media items 2010-01-24 16:30:48 +00:00
Tim Bentley
d6912adbf8 Make display blanking work correctly 2010-01-24 16:28:18 +00:00
Tim Bentley
e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley
ad40020169 Fix logging to single file
Fix QMessage to displays on correct screen.
2010-01-24 13:58:39 +00:00
Raoul Snyman
4a9a8149c4 Fixed up web Bibles.
Renamed "csv.py" to "csvbible.py" to resolve a namespace conflict with the Python csv module.
2010-01-24 09:08:14 +02:00
Tim Bentley
c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley
a3c694870c Changes to:
Alerts so they wait before being displayed
 Presentations so they work correctly
 Themes so the blank line is removed
 Rendering so the correct size is used 
 Themes are cached so theme manager loads quicker

Various other fixes

bzr-revno: 695
2010-01-22 19:17:21 +00:00
Tim Bentley
2d7c9dd402 Fixes from the merge 2010-01-22 18:59:36 +00:00
Tim Bentley
56275fbc21 Remove prints for merge 2010-01-22 17:54:08 +00:00
Tim Bentley
af3f69afce Finish off Theme thumbnail performance improvements 2010-01-21 19:41:17 +00:00
Tim Bentley
a69ba0a151 Fix themes loading performance by storing small icons. 2010-01-18 19:56:02 +00:00
Raoul Snyman
a976d6b59a A few fixes after renaming some functions. 2010-01-17 18:48:45 +02:00
Tim Bentley
9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Raoul Snyman
a523d127bd Merge from trunk. 2010-01-11 17:07:53 +02:00
Raoul Snyman
027d6d3e4e Moved the stop import out of the base class, since Qt doesn't like it. 2010-01-11 17:03:16 +02:00
Tim Bentley
85bada91ba Move towards sorting out renderer text sizes 2010-01-10 19:03:52 +00:00
Tim Bentley
ee8a92b77f fix screen lines calcs so they are correct.
Prints added for rendering size diagnostics.
2010-01-10 11:49:04 +00:00
Tim Bentley
6ef3f6aadc Lots of fixes:
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
2010-01-09 09:34:06 +00:00
Raoul Snyman
99994d0b2a Updated the copyright.
bzr-revno: 694
2009-12-31 16:07:36 +02:00
Raoul Snyman
2a3b2fc355 Updated copyright 2009-12-31 14:52:31 +02:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Raoul Snyman
0374233db6 Lots of changes here, I think.
- Pluggable import system
- The enumeration class provides the correct importer class
- Reworked Bible verse parsing, using regular expressions
- Reworked verse query method to accept multiple verse ranges
- Renamed lots of methods, which is probably gonna break lots of stuff
2009-12-30 19:29:08 +02:00
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
34ab7ea901 Started moving Bible formats to a generic system. 2009-12-28 01:54:00 +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