From 3202f28c1f383df5374b3618d42cd14d132ca8e0 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 13 Feb 2009 05:43:10 +0000 Subject: [PATCH] Fix Bible Search and start OOS selection bzr-revno: 311 --- openlp/plugins/bibles/bibleplugin.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 553cf0816..a0b992946 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -251,7 +251,15 @@ class BiblePlugin(Plugin, PluginUtils): pass def onBiblePreviewClick(self): - pass + items = self.BibleListView.selectedItems() + for item in items: + print item.text() + print item.isSelected() + text = str(item.text()) + verse = text[:text.find("(")] + bible = text[text.find("(")+1:text.find(")")] + self.translate(bible, verse) + print self.searchresults def onBibleLiveClick(self): pass @@ -367,15 +375,14 @@ class BiblePlugin(Plugin, PluginUtils): self._search_text(bible, text) else: self.translate(bible, text) + if not self.searchresults == None: + self._display_results(bible) def _search_text(self, bible, text): self.log.debug("_search Text %s,%s", bible, text) self.searchresults = self.biblemanager.get_verse_from_text(bible,text) self._display_results(bible) -# def _verse_search(self): -# self._display_results() - def _display_results(self, bible): for book, chap, vse , txt in self.searchresults: c = self.BibleListView.rowCount() @@ -437,7 +444,10 @@ class BiblePlugin(Plugin, PluginUtils): if echapter == "": echapter = schapter if sverse == "": - sverse = 1 + if everse == "": + sverse = 1 + else: + sverse = everse if everse == "": everse = 99 if schapter == "": @@ -448,8 +458,8 @@ class BiblePlugin(Plugin, PluginUtils): # print "verse s =" + str(sverse) # print "verse e =" + str(everse) if message == None: + self.searchresults = None self.searchresults = self.biblemanager.get_verse_text(bible, book,int(schapter), int(echapter), int(sverse), int(everse)) - self._display_results(bible) else: reply = QtGui.QMessageBox.information(self.MediaManagerItem,"Information",message)