From 7729ba3ced6a2ab0b81187ae2435290dd5943cdb Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 29 Jul 2010 16:04:09 +0100 Subject: [PATCH] Bible reference error message --- openlp/plugins/bibles/lib/manager.py | 26 +++++++++++++++++++++++--- openlp/plugins/bibles/lib/mediaitem.py | 8 ++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index ebca8ca97..45c39f72b 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -26,9 +26,9 @@ import logging -from PyQt4 import QtCore +from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsManager +from openlp.core.lib import SettingsManager, translate from openlp.core.utils import AppLocation from openlp.plugins.bibles.lib import parse_reference from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta @@ -229,13 +229,33 @@ class BibleManager(object): ``versetext`` Unicode. The scripture reference. Valid scripture references are: + - Genesis 1 + - Genesis 1-2 - Genesis 1:1 - Genesis 1:1-10 + - Genesis 1:1-10,15-20 - Genesis 1:1-2:10 + - Genesis 1:1-10,2:1-10 """ log.debug(u'BibleManager.get_verses("%s", "%s")', bible, versetext) reflist = parse_reference(versetext) - return self.db_cache[bible].get_verses(reflist) + if reflist: + return self.db_cache[bible].get_verses(reflist) + else: + QtGui.QMessageBox.information(self.parent.mediaitem, + translate('BiblesPlugin.BibleManager', + 'Scripture Reference Error'), + translate('BiblesPlugin.BibleManager', 'Your scripture ' + 'reference is either not supported by OpenLP or invalid. ' + 'Please make sure your reference conforms to one of the ' + 'following patterns:\n\n' + 'Book Chapter\n' + 'Book Chapter-Chapter\n' + 'Book Chapter:Verse-Verse\n' + 'Book Chapter:Verse-Verse,Verse-Verse\n' + 'Book Chapter:Verse-Verse,Chapter:Verse-Verse\n' + 'Book Chapter:Verse-Chapter:Verse\n')) + return None def save_meta_data(self, bible, version, copyright, permissions): """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 5d6984231..bc9c6d1c5 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -431,8 +431,8 @@ class BibleMediaItem(MediaManagerItem): chapter_to = int(self.AdvancedToChapter.currentText()) verse_from = int(self.AdvancedFromVerse.currentText()) verse_to = int(self.AdvancedToVerse.currentText()) - versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, \ - chapter_to, verse_to) + versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from, + chapter_to, verse_to) self.search_results = self.parent.manager.get_verses(bible, versetext) if self.ClearAdvancedSearchComboBox.currentIndex() == 0: self.listView.clear() @@ -656,7 +656,3 @@ class BibleMediaItem(MediaManagerItem): row = self.listView.setCurrentRow(count) if row: row.setSelected(True) - - def searchByReference(self, bible, search): - log.debug(u'searchByReference %s, %s', bible, search) - self.search_results = self.parent.manager.get_verses(bible, search)