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

Added the little progress bar back in.

Browse Source
This commit is contained in:
Raoul Snyman 2010-01-29 23:26:24 +02:00
parent 965902544f
commit 0cbb079aa3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/bibles/lib/http.py
View File

@ -28,6 +28,7 @@ import urllib2
from BeautifulSoup import BeautifulSoup
from openlp.core.lib import Receiver
from common import BibleCommon, SearchResults
from db import BibleDB
from openlp.plugins.bibles.lib.models import Book
@ -208,12 +209,17 @@ class HTTPBible(BibleDB):
[(u'Genesis', 1, 1, 1), (u'Genesis', 2, 2, 3)]
"""
Receiver.send_message(u'bible_showprogress')
Receiver.send_message(u'process_events')
for reference in reference_list:
log.debug('Reference: %s', reference)
book = reference[0]
db_book = self.get_book(book)
if not db_book:
book_details = self.lookup_book(book)
if not book_details:
Receiver.send_message(u'bible_hideprogress')
Receiver.send_message(u'bible_nobook')
return []
db_book = self.create_book(book_details[u'name'],
book_details[u'abbr'], book_details[u'test'])
book = db_book.name
@ -266,7 +272,7 @@ class HTTPBible(BibleDB):
return self.books[book]
else:
for details in self.books:
if details[u'abbr'] == book:
return details
if self.books[details][u'abbr'] == book:
return self.books[details]
return None

10
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -250,6 +250,8 @@ class BibleMediaItem(MediaManagerItem):
QtCore.SIGNAL(u'bible_showprogress'), self.onSearchProgressShow)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'bible_hideprogress'), self.onSearchProgressHide)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'bible_nobook'), self.onNoBookFound)
def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self)
@ -351,6 +353,14 @@ class BibleMediaItem(MediaManagerItem):
def onSearchProgressHide(self):
self.SearchProgress.setVisible(False)
def onNoBookFound(self):
QtGui.QMessageBox.critical(self,
self.trUtf8('No Book Found'),
self.trUtf8('No matching Book could be found in this Bible.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok
)
def onAdvancedVersionComboBox(self):
self.initialiseBible(
unicode(self.AdvancedVersionComboBox.currentText()))