openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bibles into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/bibles/+merge/77967

Hello,

The version name of a web bible will now be suggested as the bible name.

Image you register the bible version x. Why type in the version name yourself?
-- 
https://code.launchpad.net/~googol/openlp/bibles/+merge/77967
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bibles into lp:openlp.

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2011-07-07 18:03:12 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2011-10-03 15:45:55 +0000
@@ -461,6 +461,11 @@
                         WizardStrings.YouSpecifyFile % WizardStrings.OS)
                     self.openSongFileEdit.setFocus()
                     return False
+            elif self.field(u'source_format').toInt()[0] == \
+                BibleFormat.WebDownload:
+                self.versionNameEdit.setText(
+                    self.webTranslationComboBox.currentText())
+                return True
             elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1:
                 if not self.field(u'openlp1_location').toString():
                     critical_error_message_box(UiStrings().NFSs,
@@ -674,7 +679,7 @@
         elif bible_type == BibleFormat.CSV:
             # Import a CSV bible.
             importer = self.manager.import_bible(BibleFormat.CSV,
-                name=license_version, 
+                name=license_version,
                 booksfile=unicode(self.field(u'csv_booksfile').toString()),
                 versefile=unicode(self.field(u'csv_versefile').toString())
             )