raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

changed olp1 to OpenLP1

Browse Source
This commit is contained in:
Andreas Preikschat 2010-12-08 18:46:22 +01:00
parent b044226332
commit aca56b78b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -165,7 +165,7 @@ class BibleImportForm(QtGui.QWizard, uiBibleImportWizard):
'file to import.')) 'file to import.'))
self.openSongFileEdit.setFocus() self.openSongFileEdit.setFocus()
return False return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.OLP1: elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenLP1:
if not self.field(u'OLP1_location').toString(): if not self.field(u'OLP1_location').toString():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate('BiblesPlugin.ImportWizardForm', translate('BiblesPlugin.ImportWizardForm',
@ -472,9 +472,9 @@ class BibleImportForm(QtGui.QWizard, uiBibleImportWizard):
unicode(self.field(u'proxy_username').toString()), unicode(self.field(u'proxy_username').toString()),
proxy_password=unicode(self.field(u'proxy_password').toString()) proxy_password=unicode(self.field(u'proxy_password').toString())
) )
elif bible_type == BibleFormat.OLP1: elif bible_type == BibleFormat.OpenLP1:
# Import an openlp.org 1.x bible. # Import an openlp.org 1.x bible.
importer = self.manager.import_bible(BibleFormat.OLP1, importer = self.manager.import_bible(BibleFormat.OpenLP1,
name=license_version, name=license_version,
filename=unicode(self.field(u'OLP1_location').toString()) filename=unicode(self.field(u'OLP1_location').toString())
) )

6
openlp/plugins/bibles/lib/manager.py
View File

@ -62,7 +62,7 @@ class BibleFormat(object):
CSV = 1 CSV = 1
OpenSong = 2 OpenSong = 2
WebDownload = 3 WebDownload = 3
OLP1 = 4 OpenLP1 = 4
@staticmethod @staticmethod
def get_class(format): def get_class(format):
@ -80,7 +80,7 @@ class BibleFormat(object):
return OpenSongBible return OpenSongBible
elif format == BibleFormat.WebDownload: elif format == BibleFormat.WebDownload:
return HTTPBible return HTTPBible
elif format == BibleFormat.OLP1: elif format == BibleFormat.OpenLP1:
return OpenLP1Bible return OpenLP1Bible
else: else:
return None return None
@ -95,7 +95,7 @@ class BibleFormat(object):
BibleFormat.CSV, BibleFormat.CSV,
BibleFormat.OpenSong, BibleFormat.OpenSong,
BibleFormat.WebDownload, BibleFormat.WebDownload,
BibleFormat.OLP1 BibleFormat.OpenLP1
] ]