Tim Bentley has proposed merging lp:~trb143/openlp/cleanups into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
--
https://code.launchpad.net/~trb143/openlp/cleanups/+merge/16053
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2009-12-06 16:50:13 +0000
+++ openlp/core/ui/slidecontroller.py 2009-12-11 19:08:13 +0000
@@ -289,6 +289,7 @@
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 @@
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 @@
#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:
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2009-12-08 17:52:45 +0000
+++ openlp/core/ui/thememanager.py 2009-12-11 19:08:13 +0000
@@ -473,7 +473,7 @@
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'),
unicode(12), u'False', u'footer')
newtheme.add_display(u'False', unicode(u'#FFFFFF'), u'False',
- unicode(u'#FFFFFF'), unicode(0), unicode(0), unicode(0))
+ unicode(u'#FFFFFF'), unicode(0), unicode(0), unicode(0), u'False')
return newtheme.extract_xml()
def createThemeFromXml(self, theme_xml, path):
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2009-11-30 20:29:26 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2009-12-11 19:08:13 +0000
@@ -232,11 +232,11 @@
def incrementProgressBar(self, text ):
log.debug(u'IncrementBar %s', text)
- self.MessageLabel.setText(self.trUtf8('Import processing %s') % text)
+ self.MessageLabel.setText(unicode(self.trUtf8('Import processing')) + ' - %s' % text)
self.ProgressBar.setValue(self.ProgressBar.value() + 1)
def importBible(self):
- log.debug(u'Import Bible')
+ log.debug(u'Import Bible %s' % self.bible_type)
message = None
if self.bible_type == u'OSIS':
loaded = self.biblemanager.register_osis_file_bible(
@@ -269,7 +269,7 @@
unicode(self.CopyrightEdit.displayText()),
unicode(self.PermisionEdit.displayText()))
else:
- message = self.trUtf8('Bible import failed')
+ message = self.trUtf8('Bible import failed as name is already in use')
self.bible_type = None
# free the screen state restrictions
self.resetScreenFieldStates()
=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
--- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-11-30 20:29:26 +0000
+++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-12-11 19:08:13 +0000
@@ -62,17 +62,16 @@
filepath = os.path.abspath(os.path.join(
filepath, u'..', u'resources',u'osisbooks.csv'))
fbibles = None
+ self.loadbible = True
try:
fbibles = open(filepath, u'r')
for line in fbibles:
p = line.split(u',')
self.booksOfBible[p[0]] = p[1].replace(u'\n', u'')
self.abbrevOfBible[p[0]] = p[2].replace(u'\n', u'')
- self.loadbible = True
except:
log.exception(u'OSIS bible import failed')
finally:
- self.loadbible = False
if fbibles:
fbibles.close()
QtCore.QObject.connect(Receiver.get_receiver(),
@@ -95,6 +94,7 @@
The Import dialog, so that we can increase the counter on
the progress bar.
"""
+ log.info(u'Load data for %s' % osisfile_record)
detect_file = None
try:
detect_file = open(osisfile_record, u'r')
@@ -174,7 +174,6 @@
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
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
