Commit Graph

924 Commits

Author SHA1 Message Date
Tim Bentley
f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Raoul Snyman
bd4d2daa74 Removed now unnecessary file. 2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b Mis-named variable in QuickSearch click. 2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57 Fixed multi-verse dual bible. 2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49 Last few fixes 2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Raoul Snyman
ce6738a976 Fixed up searching for non-latin characters in Bible book names.
Removed an annoying exception to do with debug logging.
2010-02-04 21:34:12 +02:00
Raoul Snyman
e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Tim Bentley
5838495bb4 Update remote client 2010-02-03 18:53:31 +00:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Tim Bentley
632fae5a76 Remove print statements 2010-02-02 18:16:11 +00:00
Tim Bentley
377f3ad6ea Put the messagelistener back 2010-02-01 20:06:50 +00:00
Tim Bentley
17a08e3847 latest hacking 2010-02-01 19:42:52 +00:00
Raoul Snyman
01ec0f407f Fixed up some of the Bible loading 2010-01-31 22:36:54 +02:00
Raoul Snyman
db534dc2e8 Removed signals while they're still not working. 2010-01-31 21:51:23 +02:00
Raoul Snyman
2b5ddb13a4 An attempt to fix the problems some folks are having. 2010-01-31 21:49:01 +02:00
Raoul Snyman
ab7125c98e Make the progress bar only pop up when we *actually* fetch a verse from the Internet 2010-01-30 10:42:03 +02:00
Raoul Snyman
d45a9733af Fixed a bug in Windows and other versions of PyQt4 where "setProperty" was not available. Changed it to "setValue" which is what it's meant to be anyways. 2010-01-30 00:26:30 +02:00
Raoul Snyman
baabcba290 Changed the value of the progress bar to look a little more "active" 2010-01-29 23:35:02 +02:00
Raoul Snyman
0cbb079aa3 Added the little progress bar back in. 2010-01-29 23:26:24 +02:00
Raoul Snyman
965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman
0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Tim Bentley
1fd98217ab Pass active presentation types to other controllers 2010-01-29 13:06:47 +00:00
Tim Bentley
04d7a9227e Automate Presentation filters 2010-01-29 11:59:13 +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
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley
dd18a4da76 Fix spacing of media items 2010-01-24 16:30:48 +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
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
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
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
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
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
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
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
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
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
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
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
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
Tim Bentley
156a70208b Add new types to verse editing
Clean up dialog so looks better
Add controls around the editor in terms of validation
2009-12-02 08:35:02 +00:00
Michael Gorven
9f5d1956ac Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings.
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

bzr-revno: 683
2009-12-01 09:13:35 +02:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice.
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
2009-11-30 22:29:26 +02:00
Raoul Snyman
47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Raoul Snyman
074b639635 Removed "Video Mode Rendering" as it is no longer relevant (or even related!) 2009-11-30 20:26:37 +02:00
Tim Bentley
6380cc5126 Fix up song verse expansion to handle no verse order
Fix bug in slide controller when no slide and button is pressed
2009-11-30 18:22:43 +00:00
Michael Gorven
ba89e6e1a2 Fix copyright symbol in translation strings. 2009-11-30 08:39:36 +02:00
Tim Bentley
939909fdd8 Remove Timer from transitions not needed
Add Code to use the Verse Order to expand songs
2009-11-29 21:03:24 +00:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
f46cd2c6cb Song validation changes 2009-11-29 18:21:40 +00:00
Tim Bentley
ff8ab8f14f Fix song editing validation 2009-11-29 14:06:41 +00:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Tim Bentley
2247d01d6f Verse Tag editing - Add, Edit, Edit All and save work 2009-11-28 07:50:12 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
2009-11-27 21:54:37 +00:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley
1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Tim Bentley
fe2d35a937 More song tagging changes - fixes 2009-11-23 17:54:47 +00:00
Tim Bentley
5e2beba4ea More song tagging changes 2009-11-23 17:28:21 +00:00
Tim Bentley
50aa143446 Save verse details 2009-11-22 20:51:52 +00:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley
6139f049d4 Refactor Service Item and clean up Slide Controller
bzr-revno: 673
2009-11-15 16:57:11 +00:00
Tim Bentley
365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley
b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley
e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking.
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
2009-11-13 23:24:59 +02:00
Tim Bentley
8da19172a7 Slide Controller cleanups and Media bug fixes
bzr-revno: 669
2009-11-12 19:51:58 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00