From e465264630ee51eb5d04ddf8e9d9d1908a71340e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 4 Feb 2010 19:38:21 +0200 Subject: [PATCH] Standardised manager name to "manager" --- openlp/plugins/bibles/bibleplugin.py | 7 ++-- .../plugins/bibles/forms/importwizardform.py | 22 +++++----- openlp/plugins/bibles/lib/manager.py | 4 +- openlp/plugins/bibles/lib/mediaitem.py | 42 +++++++++---------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 5fafac65b..d560b0bce 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -40,12 +40,12 @@ class BiblePlugin(Plugin): self.weight = -9 self.icon = build_icon(u':/media/media_bible.png') #Register the bible Manager - self.biblemanager = None + self.manager = None def initialise(self): log.info(u'bibles Initialising') - if self.biblemanager is None: - self.biblemanager = BibleManager(self, self.config) + if self.manager is None: + self.manager = BibleManager(self, self.config) Plugin.initialise(self) self.insert_toolbox_item() self.ImportBibleItem.setVisible(True) @@ -91,3 +91,4 @@ class BiblePlugin(Plugin): 'plugin allows bible verses from different sources to be ' 'displayed on the screen during the service.') return about_text + diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index c490e960e..a684c01a3 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -60,7 +60,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): log = logging.getLogger(u'BibleImportForm') log.info(u'BibleImportForm loaded') - def __init__(self, parent, config, biblemanager, bibleplugin): + def __init__(self, parent, config, manager, bibleplugin): ''' Constructor ''' @@ -69,10 +69,10 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): self.registerFields() self.finishButton = self.button(QtGui.QWizard.FinishButton) self.cancelButton = self.button(QtGui.QWizard.CancelButton) - self.biblemanager = biblemanager + self.manager = manager self.config = config self.bibleplugin = bibleplugin - self.biblemanager.set_process_dialog(self) + self.manager.set_process_dialog(self) self.web_bible_list = {} self.loadWebBibles() QtCore.QObject.connect(self.LocationComboBox, @@ -162,7 +162,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CopyrightEdit.setFocus() return False - elif self.biblemanager.exists( + elif self.manager.exists( self.field(u'license_version').toString()): QtGui.QMessageBox.critical(self, self.trUtf8('Bible Exists'), @@ -320,20 +320,20 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): success = False if bible_type == BibleFormat.OSIS: # Import an OSIS bible - success = self.biblemanager.import_bible(BibleFormat.OSIS, + success = self.manager.import_bible(BibleFormat.OSIS, name=unicode(self.field(u'license_version').toString()), filename=unicode(self.field(u'osis_location').toString()) ) elif bible_type == BibleFormat.CSV: # Import a CSV bible - success = self.biblemanager.import_bible(BibleFormat.CSV, + success = self.manager.import_bible(BibleFormat.CSV, name=unicode(self.field(u'license_version').toString()), booksfile=self.field(u'csv_booksfile').toString(), versefile=self.field(u'csv_versefile').toString() ) elif bible_type == BibleFormat.OpenSong: # Import an OpenSong bible - success = self.biblemanager.import_bible(BibleFormat.OpenSong, + success = self.manager.import_bible(BibleFormat.OpenSong, name=unicode(self.field(u'license_version').toString()), filename=self.field(u'opensong_file').toString() ) @@ -347,7 +347,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): elif download_location == DownloadLocation.BibleGateway: bible = self.web_bible_list[DownloadLocation.BibleGateway][ unicode(self.BibleComboBox.currentText())] - success = self.biblemanager.import_bible(BibleFormat.WebDownload, + success = self.manager.import_bible(BibleFormat.WebDownload, name=unicode(self.field(u'license_version').toString()), download_source=unicode(DownloadLocation.get_name(download_location)), download_name=unicode(bible), @@ -356,13 +356,13 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): proxy_password=unicode(self.field(u'proxy_password').toString()) ) if success: - self.biblemanager.save_meta_data( + self.manager.save_meta_data( unicode(self.field(u'license_version').toString()), unicode(self.field(u'license_version').toString()), unicode(self.field(u'license_copyright').toString()), unicode(self.field(u'license_permission').toString()) ) - self.biblemanager.reload_bibles() + self.manager.reload_bibles() self.ImportProgressLabel.setText(self.trUtf8('Finished import.')) else: self.ImportProgressLabel.setText( @@ -372,4 +372,4 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): self.ImportProgressBar.setValue(self.ImportProgressBar.maximum()) self.finishButton.setVisible(True) self.cancelButton.setVisible(False) - Receiver.send_message(u'process_events') + Receiver.send_message(u'process_events') \ No newline at end of file diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 4c67dc289..7ac99530c 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -383,11 +383,11 @@ class BibleManager(object): Check cache to see if new bible """ if not isinstance(name, unicode): - name = unicode(name, u'utf8') + name = unicode(name) for bible, db_object in self.db_cache.iteritems(): log.debug(u'Bible from cache in is_new_bible %s', bible) if not isinstance(bible, unicode): - bible = unicode(bible, u'utf8') + bible = unicode(bible) if bible == name: return True return False diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 213c79c54..fb6b2eafa 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -303,7 +303,7 @@ class BibleMediaItem(MediaManagerItem): def initialise(self): log.debug(u'bible manager initialise') - self.parent.biblemanager.media = self + self.parent.manager.media = self self.loadBibles() self.configUpdated() log.debug(u'bible manager initialise complete') @@ -323,13 +323,13 @@ class BibleMediaItem(MediaManagerItem): self.AdvancedSecondBibleComboBox.clear() self.QuickSecondBibleComboBox.addItem(u'') self.AdvancedSecondBibleComboBox.addItem(u'') - bibles = self.parent.biblemanager.get_bibles(BibleMode.Full) + bibles = self.parent.manager.get_bibles(BibleMode.Full) # load bibles into the combo boxes for bible in bibles: self.QuickVersionComboBox.addItem(bible) self.QuickSecondBibleComboBox.addItem(bible) # Without HTTP - #bibles = self.parent.biblemanager.get_bibles(BibleMode.Partial) + #bibles = self.parent.manager.get_bibles(BibleMode.Partial) first = True # load bibles into the combo boxes for bible in bibles: @@ -375,10 +375,10 @@ class BibleMediaItem(MediaManagerItem): def onNewClick(self): #self.bibleimportform = BibleImportForm( - # self.parent.config, self.parent.biblemanager, self) + # self.parent.config, self.parent.manager, self) #self.bibleimportform.exec_() self.bibleimportform = ImportWizardForm(self, self.parent.config, - self.parent.biblemanager, self.parent) + self.parent.manager, self.parent) self.bibleimportform.exec_() self.reloadBibles() @@ -393,7 +393,7 @@ class BibleMediaItem(MediaManagerItem): bible = unicode(self.AdvancedVersionComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText()) # get the verse count for new chapter - verses = self.parent.biblemanager.get_book_verse_count( + verses = self.parent.manager.get_book_verse_count( bible, book, int(text2)) self.adjustComboBox(1, verses, self.AdvancedToVerse) @@ -418,7 +418,7 @@ class BibleMediaItem(MediaManagerItem): cf = int(self.AdvancedFromChapter.currentText()) self.adjustComboBox(cf, self.chapters_from, self.AdvancedToChapter) # get the verse count for new chapter - vse = self.parent.biblemanager.get_book_verse_count(bible, book, cf) + vse = self.parent.manager.get_book_verse_count(bible, book, cf) self.adjustComboBox(1, vse, self.AdvancedFromVerse) self.adjustComboBox(1, vse, self.AdvancedToVerse) @@ -430,10 +430,10 @@ class BibleMediaItem(MediaManagerItem): self.ListView.clear() #if self.QuickSearchComboBox.currentIndex() == 1: # self.search_results = \ - # self.parent.biblemanager.get_verses(bible, text) + # self.parent.manager.get_verses(bible, text) #else: # self.searchByReference(bible, text) - self.search_results = self.parent.biblemanager.get_verses(bible, text) + self.search_results = self.parent.manager.get_verses(bible, text) if self.search_results: self.displayResults(bible) @@ -524,12 +524,12 @@ class BibleMediaItem(MediaManagerItem): def reloadBibles(self): log.debug(u'Reloading Bibles') - self.parent.biblemanager.reload_bibles() + self.parent.manager.reload_bibles() self.loadBibles() def initialiseBible(self, bible): log.debug(u'initialiseBible %s', bible) - book_data = self.parent.biblemanager.get_bible_books(bible) + book_data = self.parent.manager.get_bible_books(bible) self.AdvancedBookComboBox.clear() first = True for book in book_data: @@ -545,7 +545,7 @@ class BibleMediaItem(MediaManagerItem): def initialiseChapterVerse(self, bible, book, chapters): log.debug(u'initialiseChapterVerse %s, %s', bible, book) self.chapters_from = chapters - self.verses = self.parent.biblemanager.get_book_verse_count(bible, + self.verses = self.parent.manager.get_book_verse_count(bible, book, 1) if self.verses == 0: self.AdvancedSearchButton.setEnabled(False) @@ -578,12 +578,12 @@ class BibleMediaItem(MediaManagerItem): def searchByReference(self, bible, search): log.debug(u'searchByReference %s, %s', bible, search) - self.search_results = self.parent.biblemanager.get_verses(bible, search) - self.copyright = unicode(self.parent.biblemanager.get_meta_data( + self.search_results = self.parent.manager.get_verses(bible, search) + self.copyright = unicode(self.parent.manager.get_meta_data( bible, u'Copyright').value) - self.permissions = unicode(self.parent.biblemanager.get_meta_data( + self.permissions = unicode(self.parent.manager.get_meta_data( bible, u'Permissions').value) - self.version = unicode(self.parent.biblemanager.get_meta_data( + self.version = unicode(self.parent.manager.get_meta_data( bible, u'Version').value) # def searchByReference(self, bible, search): @@ -658,15 +658,15 @@ class BibleMediaItem(MediaManagerItem): # unicode(start_verse), unicode(end_verse))) # if message is None: # self.search_results = None -# self.search_results = self.parent.biblemanager.get_verse_text( +# self.search_results = self.parent.manager.get_verse_text( # bible, book, int(start_chapter), int(end_chapter), # int(start_verse), int(end_verse)) -# self.copyright = unicode(self.parent.biblemanager.get_meta_data( +# self.copyright = unicode(self.parent.manager.get_meta_data( # bible, u'Copyright').value) -# self.permissions = unicode(self.parent.biblemanager.get_meta_data( +# self.permissions = unicode(self.parent.manager.get_meta_data( # bible, u'Permissions').value) -# self.version = unicode(self.parent.biblemanager.get_meta_data( +# self.version = unicode(self.parent.manager.get_meta_data( # bible, u'Version').value) # else: # QtGui.QMessageBox.information( -# self, self.trUtf8('Information'), message) +# self, self.trUtf8('Information'), message) \ No newline at end of file