Commit Graph

338 Commits

Author SHA1 Message Date
Armin Köhler fbd5349c2f small bugfixes
hide entry in tools menu if there are no bibles to upgrade
2011-05-15 20:42:08 +02:00
Armin Köhler 4ffa5c59d7 change some strings to better english
small fixes
2011-05-12 22:04:33 +02:00
Armin Köhler 4ee247c8b1 code cleanup
small fixes
2011-05-03 22:34:39 +02:00
Armin Köhler 368987bb67 code cleanup 2011-05-03 19:09:30 +02:00
Armin Köhler d44b42aaff improve BookNameForm (add possibility to reduce the books in the ComboBox and try to autodetect if a bible only contains only parts of a bible, so that only a part of the bible books are displayed at startup) 2011-05-03 13:44:23 +02:00
Armin Köhler 4bee8ca5f6 add a dialog at startup which inform the user that the bible format has changed and provide a possibility to upgrade
small cleanup
2011-05-03 09:41:03 +02:00
Armin Köhler 3eca8f6b50 updated bibles_resources.sqlite with some additional apocryph books
comparing books with lower()
display only which are not added to a bible in BookNameForm
small fixes
2011-05-02 15:45:30 +02:00
Armin Köhler 3b99f531f3 small fixes 2011-04-26 20:39:08 +02:00
Armin Köhler d7dc4def53 change name from reimport to upgrade
fix speed problem while changing the advanced bible
change some "for" loops
2011-04-26 20:18:13 +02:00
Armin Köhler 8e1ef8c890 little bug fix
add check if openlp/bibles/resources directory exists and mkdir if not
2011-04-21 16:32:04 +02:00
Armin Köhler b0b127022c bug fixes
add some additional Apocrypha books
2011-04-20 11:00:29 +02:00
Armin Köhler 81fe6f13e3 add attention picture 2011-04-20 09:25:16 +02:00
Armin Köhler e8c2d7e805 add reimportwizard for older bible databases 2011-04-19 22:25:27 +02:00
Armin Köhler dabc4415d2 HEAD r1469 2011-04-16 14:29:49 +02:00
Raoul Snyman 8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Armin Köhler e8202924f7 delete unused testament stuff 2011-04-14 22:33:02 +02:00
Armin Köhler a1c5ece681 HEAD r1456 2011-04-11 22:57:27 +02:00
Andreas Preikschat 53660fe23f enable/disable next button if bible importer is not available 2011-04-11 17:01:42 +02:00
Armin Köhler a9c87798eb moved get_book_ref_id_by_name() from BibleManager to BibleDB
moved content from BookNameDialog() from bibleimport.py in BibleDB.get_book_ref_id_by_name().
2011-04-03 22:09:18 +02:00
Armin Köhler 3d184f89a4 moved languageDialog() into BIBLEDB.get_language() 2011-04-03 20:44:08 +02:00
Armin Köhler 9de33cf194 moved Dialog from mediaitem.py to bibleimportform.py
some fixes
2011-04-02 21:17:48 +02:00
Armin Köhler c04a76e12d split BibleImportRequest in BookNameForm and LanugageForm 2011-04-01 22:26:25 +02:00
Armin Köhler 1923faf18a HEAD r1441 2011-04-01 19:56:11 +02:00
Armin Köhler 9d1c1b1fbb mark and comment out some unused code in csv import form
bug fix
2011-04-01 19:54:12 +02:00
Raoul Snyman efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Armin Köhler 7a15251ffc Clean up
changed create_book in cscbible, openlp1, opensong and osis
2011-03-17 20:40:01 +01:00
Armin Köhler 1c59fd656f add download of all books a webbible contains
add dialog while the import of a webbible if the book could not be assign to a reference_book
add dialog while tho import of a webbible if the language is unknown
change the bible database
2011-03-17 19:36:54 +01:00
Armin Köhler e52a80c9c3 rename httpbooks.sqlite to bibles_resources.sqlite and change database scheme
moved the content of biblegateway.csv, bibleserver.csv and crosswalkbooks.csv into bibles_resources.sqlite
adapt loadWebBibles() process according to the changes above
remove class HTTPBible from http.py and add the functions to a new class BiblesResourcesDB in db.py which now handels the reading of bibles_resources.sqlite
2011-03-12 11:23:42 +01:00
Jon Tibble 8df9a5a18e Head r1353 2011-03-05 17:14:13 +00:00
Raoul Snyman 95e951c758 Updated translations. 2011-03-04 23:09:08 +02:00
Raoul Snyman 5f48a38769 Removed the need for the extra variable. 2011-02-25 08:24:35 +02:00
Raoul Snyman 6bcbd3526e Fixed bug #700859: Bible importers do not clean up properly after a failed import. 2011-02-25 08:16:32 +02:00
Raoul Snyman 780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble dc41ce5ab4 Enumerations and magic numbers 2011-02-18 03:15:09 +00:00
Jon Tibble 032c48df60 Finish grammar corrections, more strings and cleanups 2011-02-16 17:54:31 +00:00
Jon Tibble a8d2d3661d Sort grammar breakers 2011-02-16 03:06:34 +00:00
Jon Tibble d5596583ff Fixes, cleanups, strings 2011-02-14 16:08:17 +00:00
Jon Tibble 321269b11b Fixes and cleanups 2011-02-13 01:24:47 +00:00
Jon Tibble 323ab52848 Strings and magic numbers 2011-02-13 01:09:04 +00:00
Jon Tibble bffa44a1cb Wizards and applications 2011-02-12 20:25:40 +00:00
Jon Tibble 34cf16fd06 WizardStrings 2011-02-12 15:37:02 +00:00
Jon Tibble 0988158c56 Import fixes 2011-02-12 04:20:53 +00:00
Jon Tibble a8f16262fc More string refactoring 2011-02-12 04:09:03 +00:00
Jon Tibble 8d18a51f09 WizardStrings 2011-02-12 02:43:13 +00:00
Jon Tibble 9366155924 UiStrings and SongStrings 2011-02-11 21:17:56 +00:00
Jon Tibble a7f8d5ca84 Fixes 2011-02-10 21:07:28 +00:00
Jon Tibble 79d93c515a Another wizard refactor 2011-02-10 19:37:02 +00:00
Jon Tibble 5607b09f0d Dedupe translations 2011-02-09 05:04:12 +00:00
Jon Tibble 1ecaab4fa9 Cleanup import wizard spacers 2011-02-03 20:12:06 +00:00
Jon Tibble 842e4ba5f3 Cleanup bible import form 2011-02-03 19:44:03 +00:00
Jon Tibble f4d25560e9 UI library - critical_error_message_box 2011-02-02 23:12:31 +00:00
Jon Tibble c3699b294f Fix CSV bible imports part 2 2011-01-27 16:45:23 +00:00
Jon Tibble 284402b7b2 Refactor in existing error framework 2011-01-15 19:24:50 +00:00
Jon Tibble 7490928190 Refactor wizards 2011-01-13 17:55:29 +00:00
Andreas Preikschat 98f0b30014 - added OpenLyrics importer
- continued to implement OpenLyrics features
- split class
- fix wrong use of "theme"
- and other thinks

Importing songs with multiple languages has not been considered (yet). (One song with all languages is imported.)

bzr-revno: 1203
2011-01-10 12:21:39 +02:00
M2j 6e8a371da7 wrong parentship caused theme and servicemanager to disapear in a floating dock
more intelligent resizing of item list in PluginForm and SongMaintenanceForm
Fix in BS web bible parser
2011-01-09 01:27:46 +01:00
Andreas Preikschat f2784fc4dd removed whitespaces 2011-01-08 21:59:46 +01:00
M2j 557a66db9d ThemeWizard: Show theme name in title and hide themeNameEdit if wizard is in editing mode.
ThemeWizard: Changed transitionsComboBox to align with the FormLayout.
(change some log.debug() arguments to avoid UnicodeError exceptions)
2010-12-28 12:18:56 +01:00
M2j 7c68265f4b remove two consecutive spaces from python code of the whole OpenLP sources
replaced double quotes for string in python code of the whole OpenLP sources
2010-12-27 23:57:35 +01:00
M2j 9212399ad7 renamed slots to common naming scheme
renamed objects to conform British English
(reverted some experimental edit of themewizard.ui)
2010-12-27 22:53:02 +01:00
M2j 914827c023 same as before for SongImportWidget
(removing unneccesary format instructions and FormLayout alignment)
2010-12-27 19:23:46 +01:00
M2j 68e33c658a Head 1169 2010-12-27 17:05:56 +01:00
M2j 6815ac3146 - Finishes and tested rewrite of themewizard and bibleimportwizard
- Added exceptions to OpenSong and CSV bible import wich occur for invalid files
2010-12-27 16:31:53 +01:00
Tim Bentley e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
M2j b0a53020f6 bible wizard without manual design tweaks 2010-12-24 01:44:41 +01:00
Andreas Preikschat 8f99aa4c96 fixed doc 2010-12-21 15:31:18 +01:00
Andreas Preikschat 87e7cb6242 translate file description 2010-12-21 15:26:20 +01:00
Andreas Preikschat 44427b5c04 file extension filter 2010-12-21 15:00:36 +01:00
M2j fc2569cf83 missed some fixes 2010-12-18 03:12:41 +01:00
M2j c226979f24 Format fixes, comment fixes and biblegateway.csv updated 2010-12-17 23:10:29 +01:00
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