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

More fixes for bibles

Browse Source
This commit is contained in:
Tim Bentley 2009-12-11 19:02:45 +00:00
parent aaba983805
commit 231a2fa933
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/slidecontroller.py
View File

@ -289,6 +289,7 @@ class SlideController(QtGui.QWidget):
width = self.parent.ControlSplitter.sizes()[self.split] width = self.parent.ControlSplitter.sizes()[self.split]
height = width * self.parent.RenderManager.screen_ratio height = width * self.parent.RenderManager.screen_ratio
self.PreviewListWidget.setColumnWidth(0, width) self.PreviewListWidget.setColumnWidth(0, width)
#Sort out image hights (Songs , bibles excluded)
if self.serviceItem and not self.serviceItem.is_text(): if self.serviceItem and not self.serviceItem.is_text():
for framenumber, frame in enumerate(self.serviceItem.get_frames()): for framenumber, frame in enumerate(self.serviceItem.get_frames()):
self.PreviewListWidget.setRowHeight(framenumber, height) self.PreviewListWidget.setRowHeight(framenumber, height)
@ -301,7 +302,6 @@ class SlideController(QtGui.QWidget):
def onSongBarHandler(self): def onSongBarHandler(self):
request = unicode(self.sender().text()) request = unicode(self.sender().text())
#Remember list is 1 out!
slideno = self.slideList[request] slideno = self.slideList[request]
if slideno > self.PreviewListWidget.rowCount(): if slideno > self.PreviewListWidget.rowCount():
self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount()) self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
@ -428,6 +428,7 @@ class SlideController(QtGui.QWidget):
#only load the slot once #only load the slot once
bits = frame[u'verseTag'].split(u':') bits = frame[u'verseTag'].split(u':')
tag = None tag = None
#If verse handle verse number else tag only
if bits[0] == self.trUtf8('Verse'): if bits[0] == self.trUtf8('Verse'):
tag = u'%s%s' % (bits[0][0], bits[1][0] ) tag = u'%s%s' % (bits[0][0], bits[1][0] )
else: else:

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

@ -232,7 +232,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
def incrementProgressBar(self, text ): def incrementProgressBar(self, text ):
log.debug(u'IncrementBar %s', text) log.debug(u'IncrementBar %s', text)
self.MessageLabel.setText(self.trUtf8(unicode(u'Import processing - %s' % text))) self.MessageLabel.setText(unicode(self.trUtf8('Import processing')) + ' - %s' % text)
self.ProgressBar.setValue(self.ProgressBar.value() + 1) self.ProgressBar.setValue(self.ProgressBar.value() + 1)
def importBible(self): def importBible(self):

3
openlp/plugins/bibles/lib/bibleOSISimpl.py
View File

@ -106,7 +106,6 @@ class BibleOSISImpl():
if detect_file: if detect_file:
detect_file.close() detect_file.close()
osis = None osis = None
x = 0
try: try:
osis = codecs.open(osisfile_record, u'r', details['encoding']) osis = codecs.open(osisfile_record, u'r', details['encoding'])
book_ptr = None book_ptr = None
@ -117,7 +116,6 @@ class BibleOSISImpl():
# cancel pressed on UI # cancel pressed on UI
if not self.loadbible: if not self.loadbible:
break break
x += 1
pos = file_record.find(verseText) pos = file_record.find(verseText)
# we have a verse # we have a verse
if pos > -1: if pos > -1:
@ -176,7 +174,6 @@ class BibleOSISImpl():
testament) testament)
dialogobject.incrementProgressBar( dialogobject.incrementProgressBar(
self.booksOfBible[p[0]]) self.booksOfBible[p[0]])
Receiver.send_message(u'process_events')
count = 0 count = 0
self.bibledb.add_verse(book.id, p[1], p[2], text) self.bibledb.add_verse(book.id, p[1], p[2], text)
count += 1 count += 1