raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,776 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

218 Commits

Author SHA1 Message Date
M2j fb80a09120 HEAD 1147 2010-12-16 21:03:07 +01:00
M2j f119a4afa5 further work on parse_reference and other things 2010-12-16 21:00:01 +01:00
M2j b5075ccddf Bible web import from Bibleserver.com - first version 2010-12-12 00:54:07 +01:00
Andreas Preikschat 2de4edfe56 disable olp import if importError, songbeamer tweaks 2010-12-11 13:07:38 +01:00
Andreas Preikschat a268bd9536 Add OpenLP1 bible importer 
bzr-revno: 1140
 2010-12-10 17:25:40 +00:00
Andreas Preikschat 5d33376740 again changed olp to openlp 2010-12-09 19:01:04 +01:00
Andreas Preikschat a15aebcc32 latest changes for merge 2010-12-09 17:53:48 +01:00
M2j 20b1c33a4b making 'cancel bible import' work 2010-12-09 00:40:28 +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
Andreas Preikschat d5e0643b45 attempt to clean up bible importers 2010-12-06 20:30:04 +01:00
Andreas Preikschat 9db57568b0 started olp1 bible import 2010-12-05 17:11:21 +01:00
Andreas Preikschat a66a77bdec completed work 2010-12-05 16:44:51 +01:00
Andreas Preikschat 38397f07a2 changed texts again 2010-11-12 23:27:57 +01:00
Andreas Preikschat 46321741ad make sure, that the bible list in the importer is sorted 2010-11-12 22:34:06 +01:00
Andreas Preikschat 06cf6dcc20 changed bible importer finish message, clean ups 2010-11-09 17:56:16 +01:00
Raoul Snyman baaa7e0508 Updated documentation. 
Renamed the import wizards to match the general form naming convention.
Removed an unnecessary class.
 2010-10-16 21:38:23 +02:00
Andreas Preikschat 59b387b9d0 replaced 'permission' with permissions since the db uses permissions 2010-10-06 16:57:38 +02:00
Andreas Preikschat 7b47d52eca This fixes the following bugs and issues: 
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783

bzr-revno: 1053
 2010-09-22 22:11:51 +02:00
Raoul Snyman c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Andreas Preikschat bd5f82096f head + resolved conflicts 2010-09-19 07:59:38 +02:00
Jonathan Corwin 93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Andreas Preikschat 6654a7993a started to rework bibles (dual/single verses) 2010-09-11 21:36:47 +02:00
Jon Tibble c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble 2bd442ff4f More naming cleanup 2010-07-28 14:15:39 +01:00
Jon Tibble db87a9e7dd Exception handling fixes in bible import 2010-07-27 16:07:00 +01:00
Jon Tibble 37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Raoul Snyman 2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman 35bcb8eabd HEAD 2010-07-20 06:58:01 +02:00
Jon Tibble f1f5a61ef6 build_icon fixes 2010-07-09 12:26:31 +01:00
Jon Tibble 1b9830429b Use build_icon 2010-07-08 12:46:03 +01:00
Jon Tibble cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
Raoul Snyman 9a46ebca56 More string fixes 2010-07-06 17:44:15 +02:00
Jon Tibble 43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Tim Bentley a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman 6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Jon Tibble 7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble 814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Jon Tibble 37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Jon Tibble 554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
M2j 69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
M2j 8296b8dc84 Additional translatable strings 
Removed string_to_unicode and variant_to_unicode
 2010-06-09 23:15:37 +02:00
Jon Tibble 559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
Frode Woldsund 2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
Frode Woldsund 23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
Frode Woldsund 0788937721 Fixed translate() function in BiblesPlugin 2010-06-06 13:49:39 +02:00
Jon Tibble 08f0c1ff49 Cleanup including diff check fixes 2010-06-01 18:13:54 +01:00
Frode Woldsund 3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Jon Tibble fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble 871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Raoul Snyman 09bcb066eb HEAD+fixes 2010-05-17 22:48:16 +02:00
rimach 850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
rimach 4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Jon Tibble 5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
rimach b74dec5446 update 2010-04-30 21:23:02 +02:00
Jon Tibble bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
rimach 181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Jon Tibble 9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Jonathan Corwin bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Raoul Snyman f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Raoul Snyman 20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Jon Tibble d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Raoul Snyman d2670b1cb0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
 2010-03-27 21:59:35 +02:00
Raoul Snyman 0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman 2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
Raoul Snyman 2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Raoul Snyman 19c5c07c54 Add Christian and Phill to the credits 
bzr-revno: 755
 2010-03-22 10:37:18 +02:00
Raoul Snyman ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Raoul Snyman be598da4f9 Fixed a number of issues in the Bibles: 
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
 2010-03-22 00:16:43 +02:00
Raoul Snyman 12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Raoul Snyman 253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Raoul Snyman eddd112811 Failed Bibles are deleted. 2010-03-20 00:08:06 +02:00
Tim Bentley 601abab854 Text string fixes 
bzr-revno: 739
 2010-03-13 13:02:50 +00:00
Raoul Snyman 881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Tim Bentley db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Raoul Snyman 250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley 325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Raoul Snyman 2766081522 Merged from trunk. 
Fixed a conflict.
 2010-02-24 21:02:39 +02:00
Raoul Snyman 0ddaa2bf4a Some more visual tweaks. 
Fixes for older versions of PyQt4.
 2010-02-24 20:39:12 +02:00
Jon Tibble f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Raoul Snyman e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Raoul Snyman 01ec0f407f Fixed up some of the Bible loading 2010-01-31 22:36:54 +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 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
Jon Tibble 9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Raoul Snyman a523d127bd Merge from trunk. 2010-01-11 17:07:53 +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 6c7939bd71 Implemented canceling of imports and some better handling around the import process. 2009-12-28 00:19:39 +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 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
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 231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00