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

549 Commits

Author SHA1 Message Date
Jon Tibble 37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Jon Tibble 5ae5a5d63f Fix showing screen after black and cleanups 
bzr-revno: 972
 2010-07-27 07:58:35 +01:00
Raoul Snyman 6abb0c7cc3 Fixed a small bug where there was a "u" in the verse label with () brackets. 
bzr-revno: 971
 2010-07-27 07:31:35 +02:00
Jon Tibble 16924808bd Fixes and cleanups 2010-07-26 21:31:05 +01:00
Tim Bentley 271a5f598f Head970 2010-07-26 17:42:36 +01:00
Raoul Snyman 2ef095dd98 Fixed a small bug where there was a "u" in the verse label with () brackets. 2010-07-26 08:06:17 +02:00
Jon Tibble 96033624aa Head r968 2010-07-25 12:47:53 +01:00
Tim Bentley fbe647b896 Head968 2010-07-25 10:03:01 +01:00
Tim Bentley 9efad8da66 Head966 - and fix mediaitem 2010-07-25 07:21:29 +01:00
Jon Tibble 69ffb9124e Fix some pesky bits 2010-07-25 00:12:36 +01:00
Raoul Snyman 2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Jon Tibble 6e6d44710f Head r965 2010-07-24 22:03:58 +01:00
Jon Tibble 7df342ff1a Fix bible search strictness for web bibles 2010-07-24 21:52:37 +01:00
Raoul Snyman d29ffb72c5 Going through all the strings and making them decent, user-friendly English. 
bzr-revno: 965
 2010-07-24 22:34:16 +02:00
Tim Bentley ec788f33c9 Head964 2010-07-24 17:56:02 +01:00
Jon Tibble 87fc38fb6f Head r964 and book spelling 2010-07-24 17:54:55 +01:00
Jon Tibble 3ea6ce9520 Use urllib.urlencode() 2010-07-24 15:03:04 +01:00
Jon Tibble 4b5ad13eec Fix numbered book BG bibles 2010-07-24 13:59:02 +01:00
Jon Tibble 8004bc4c18 Import fix for last commit 2010-07-24 03:19:24 +01:00
Jon Tibble 323090e141 Bible search fixes (Bug #608409) 2010-07-24 03:14:08 +01:00
Jon Tibble ccda22a962 Fix BG refactor 2010-07-24 02:10:57 +01:00
Jon Tibble 9b425cb52d Fix BibleGateway refactor 2010-07-23 17:21:27 +01:00
Jon Tibble 1ea37f8d77 Cleanup refactor 2010-07-23 16:25:54 +01:00
Jon Tibble e9edb0c7a4 Refactor BibleGateway retrieval 2010-07-23 03:19:35 +01:00
Jon Tibble b5ceb59e27 Cleanup getters and setters 2010-07-23 01:01:06 +01:00
Raoul Snyman 33fa1541a7 HEAD 2010-07-21 07:20:30 +02:00
Raoul Snyman 7ec7235676 Updated more strings and things. 2010-07-21 07:20:03 +02:00
Tim Bentley 85c40e4e16 Head956 2010-07-20 21:17:12 +01:00
Tim Bentley e31a039568 Head952 and cleanups 2010-07-20 06:16:06 +01:00
Raoul Snyman 71ee0eff8c HEAD 2010-07-20 06:58:20 +02:00
Raoul Snyman 35bcb8eabd HEAD 2010-07-20 06:58:01 +02:00
Jon Tibble 7691418bc3 Head r952 and cleanups 2010-07-19 21:43:02 +01:00
Jon Tibble f71f27c890 Database refactor 2010-07-19 00:37:24 +01:00
andreas 853ae906d3 reverted changed done before we official changed line length from 79 to 80 2010-07-16 11:09:11 +02:00
Tim Bentley 19400843d4 Renderer replacement- text now output and pages 2010-07-11 17:02:20 +01:00
Jon Tibble 520d0ea36f Head r926 2010-07-08 14:50:06 +01:00
andreas 1ef947c4fc name fix 2010-07-08 14:38:48 +02:00
andreas f514bfc1ba coding standard fixes 2010-07-08 14:32:09 +02:00
Jon Tibble a913c47254 Remove initPluginNameVisible hack 2010-07-08 10:14:00 +01:00
Jon Tibble cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
Raoul Snyman 167c60345b Updated translation files. 
Fixed a few more strings.
 2010-07-07 14:58:03 +02:00
Raoul Snyman f1eeaff633 Some more string fixes. 2010-07-06 17:54:15 +02:00
Raoul Snyman 0e53994ca6 String fixes. 2010-07-06 17:41:56 +02:00
Raoul Snyman a167d759a5 String fixes. 2010-07-06 17:40:25 +02:00
Jon Tibble 079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Jon Tibble 3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble 6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Jon Tibble 4d1a7e8b41 Cleanup last few commits 2010-06-25 20:01:03 +01:00
Jon Tibble 585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jon Tibble 95945c622f Fix check_item_selection 
bzr-revno: 879
 2010-06-24 21:05:04 +01:00
Jon Tibble 78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Raoul Snyman aa2d1586ea Fix bug #595676 and improve the OSIS importer. 2010-06-24 20:35:01 +02:00
Jon Tibble d9d976d64b Cleanup and import fix 2010-06-22 16:09:49 +01: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 2d050b07db Head r858 2010-06-19 12:53:20 +01:00
Jon Tibble 226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble 7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble 16ab2da4d6 Fix HTTPBible verse counts 2010-06-17 22:01:30 +01:00
Jon Tibble d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble 4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Jon Tibble 04f2a9797b Bible search fix: 
* Add feedback
* cater for partial file-based bibles
* Prevent an uncaught exception
 2010-06-16 02:48:52 +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 85661fe6e4 RFC: Tweaks 2010-06-15 16:42:52 +01:00
Meinert Jordan 48619f72cc Various i18n fixes. 
bzr-revno: 847
 2010-06-15 17:22:26 +02:00
Jon Tibble 554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
Jon Tibble e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Jon Tibble 7c2c8f26e1 Revert resource location 2010-06-14 18:56:42 +01:00
Jon Tibble f54a423832 Fix bible runtime data location 2010-06-14 03:42:47 +01:00
Jon Tibble 55f6197212 RFC: Refactor database setup code 
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
 2010-06-12 02:52:04 +01:00
Jon Tibble 5868a37018 Small refactorings 2010-06-10 14:28:41 +01:00
M2j 2dac357fa7 HEAD 2010-06-10 15:17:39 +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 0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01: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
Jon Tibble bea44a5124 Fix __init__ calling and imports 2010-06-01 01:05:05 +01:00
Jon Tibble 83354166da Whitespace and unused variable 2010-06-01 00:23:08 +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 4a4bf00140 Head r829 2010-05-30 16:26:45 +01:00
Jon Tibble dcd5b62524 Fix redefinition of init_models() 2010-05-29 22:28:40 +01:00
Jon Tibble fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble bbcfd7729c Refactor BaseModel 2010-05-28 01:26:49 +01:00
andreas 039792104b - again changes done to the bible footer 2010-05-27 18:58:00 +02:00
andreas dfd53e5628 - footer now displays both bible versions/copyright information (dual bible view) 
- small fix
 2010-05-27 18:13:25 +02:00
Jon Tibble 15038a9184 More cleanups 2010-05-26 16:52:33 +01:00
Jon Tibble e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +01:00
Jon Tibble 29cfcee29f Fix undefined variables 2010-05-25 16:04:37 +01:00
Raoul Snyman 09bcb066eb HEAD+fixes 2010-05-17 22:48:16 +02:00
andreas bfb3143cfc fix for empty slide in dual bible view 2010-05-15 21:59:21 +02:00
Martin Thompson a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
Martin Thompson efa1e8c2d9 Quick fix to handle Bible config gets confused and returns None 2010-05-07 21:29:21 +01:00
Raoul Snyman fff2d780eb HEAD 2010-05-01 22:00:01 +02:00
Tim Bentley 4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jon Tibble 5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
Jon Tibble 22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jon Tibble bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble 507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble 5a8cd52acf File list refactor 2010-04-28 00:49:21 +01:00
Jon Tibble c626653092 Fix bible reloading 2010-04-27 23:51:16 +01:00
Jon Tibble 9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Raoul Snyman e22e76e183 HEAD 2010-04-23 21:20:44 +02:00
Jonathan Corwin bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley 5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley 828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Raoul Snyman f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Tim Bentley 8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Tim Bentley b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley 68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Raoul Snyman 85d44554b0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
 2010-03-27 22:19:47 +02: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 abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley 8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Raoul Snyman 8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Tim Bentley 92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley 49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Tim Bentley a091c8f3b6 Fix Quick bible enter 2010-03-24 19:15:25 +00:00
Tim Bentley 33d2de6f9b Heads 2010-03-24 18:59:37 +00: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 1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Tim Bentley fd23dbc030 Head755 2010-03-22 18:33:54 +00: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 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 b011104deb Head747 2010-03-19 08:07:12 +00:00
Raoul Snyman 2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley 44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman 6414330b2c Reworked the BibleGateway Bibles. 
Changed some code to be standards compliant.
 2010-03-18 23:36:30 +02:00
Tim Bentley a71505a10c Bible can add verses to service item 2010-03-17 19:09:09 +00:00
Jon Tibble a81c39ca65 Import fix 2010-03-16 21:13:23 +00:00
Raoul Snyman dc6c6bec31 - Removed commented code (just for you, TRB143!) 
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
 2010-03-16 22:43:41 +02:00
Raoul Snyman 9044ed3a4a Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems. 2010-03-16 21:46:19 +02:00
Raoul Snyman 223393e38b Fix a problem introduced per ongeluk. 2010-03-15 21:23:07 +02:00
Raoul Snyman 90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Raoul Snyman 5d8c1e42ba Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. 2010-03-14 00:35:17 +02:00
Raoul Snyman 7da00bc26f Attempt to get Bibles to work properly. 
Merge from HEAD
 2010-03-13 23:48:04 +02:00
Raoul Snyman 881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Raoul Snyman 04c1db2033 Merge from head. 2010-03-12 17:42:47 +02:00
Raoul Snyman 00b9305a51 Doing the docstring thing! 2010-03-12 17:41:15 +02:00
Raoul Snyman 142f679098 Fix "red letter" versions of Crosswalk Bibles. 2010-03-11 08:15:29 +02:00
Jon Tibble 26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Jon Tibble e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Raoul Snyman 250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley bb0a3f7293 Head 721 2010-03-03 17:51:19 +00:00
Raoul Snyman 024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Raoul Snyman e37ab565ad A fix to the OSIS importer, and added the version file. 2010-02-28 22:50:14 +02:00
Tim Bentley 325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Tim Bentley 4a83e572e9 Fix bugs in last merge and fix comments 2010-02-27 09:18:26 +00:00
Tim Bentley 0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +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 60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Tim Bentley acc97f3c79 Alerts now have history 2010-02-14 13:27:32 +00:00
Jon Tibble 6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley 8992f410a5 Bible fixes part 2 2010-02-06 16:51:18 +00:00
Jon Tibble f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00: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
Raoul Snyman 78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02: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
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 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
Jon Tibble 9239c0cdf3 Cleanups 2010-01-24 23:16:15 +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
Raoul Snyman a976d6b59a A few fixes after renaming some functions. 2010-01-17 18:48:45 +02:00
Raoul Snyman c9e07d3b0c Cleaned up all them docstrings. 2010-01-17 10:56:25 +02: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
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 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