- Changed one pair of " to '

- Changed the code for checking Bible meta exists
- Changed the default value for the new setting to "True"

openlp/plugins/bibles/forms/bibleimportform.py

@@ -725,7 +725,7 @@ class BibleImportForm(OpenLPWizard):
         self.license_details_page.registerField('license_version', self.version_name_edit)
         self.license_details_page.registerField('license_copyright', self.copyright_edit)
         self.license_details_page.registerField('license_permissions', self.permissions_edit)
-        self.license_details_page.registerField("license_full_license", self.full_license_edit, "plainText")
+        self.license_details_page.registerField("license_full_license", self.full_license_edit, 'plainText')
 
     def set_defaults(self):
         """

openlp/plugins/bibles/forms/editbibleform.py

@@ -66,22 +66,18 @@ class EditBibleForm(QtWidgets.QDialog, Ui_EditBibleDialog, RegistryProperties):
         Try loading the metadata, if the field does not exist in the metadata, continue executing the code,
         missing fields will be created on "self.accept" (save).
         """
-        try:
-            self.version_name_edit.setText(self.manager.get_meta_data(self.bible, 'name').value)
-        except AttributeError:
-            pass
-        try:
-            self.copyright_edit.setText(self.manager.get_meta_data(self.bible, 'copyright').value)
-        except AttributeError:
-            pass
-        try:
-            self.permissions_edit.setText(self.manager.get_meta_data(self.bible, 'permissions').value)
-        except AttributeError:
-            pass
-        try:
-            self.full_license_edit.setPlainText(self.manager.get_meta_data(self.bible, 'full_license').value)
-        except AttributeError:
-            pass
+        meta = self.manager.get_meta_data(self.bible, 'name')
+        copyright = self.manager.get_meta_data(self.bible, 'copyright')
+        permission = self.manager.get_meta_data(self.bible, 'permissions')
+        full_license = self.manager.get_meta_data(self.bible, 'full_license')
+        if meta:
+            self.version_name_edit.setText(meta.value)
+        if copyright:
+            self.copyright_edit.setText(copyright.value)
+        if permission:
+            self.permissions_edit.setText(permission.value)
+        if full_license:
+            self.full_license_edit.setPlainText(full_license.value)
         # Set placeholder texts for the fields.
         self.version_name_edit.setPlaceholderText(UiStrings().RequiredShowInFooter)
         self.copyright_edit.setPlaceholderText(UiStrings().RequiredShowInFooter)

openlp/plugins/songs/songsplugin.py

@@ -60,7 +60,7 @@ __default_settings__ = {
     'songs/add song from service': True,
     'songs/display songbar': True,
     'songs/display songbook': False,
-    'songs/display written by': False,
+    'songs/display written by': True,
     'songs/display copyright symbol': False,
     'songs/last directory import': '',
     'songs/last directory export': '',