More fixes for bibles

openlp/core/ui/slidecontroller.py

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

openlp/plugins/bibles/forms/bibleimportform.py

@@ -232,7 +232,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
 
     def incrementProgressBar(self, 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)
 
     def importBible(self):

openlp/plugins/bibles/lib/bibleOSISimpl.py

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