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

Quick fix to handle Bible config gets confused and returns None

This commit is contained in:
Martin Thompson 2010-05-07 21:29:21 +01:00
parent d04d75ad41
commit efa1e8c2d9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp.pyw
View File

@ -169,7 +169,7 @@ def main():
filename = os.path.join(log_path, u'openlp.log') filename = os.path.join(log_path, u'openlp.log')
logfile = FileHandler(filename, u'w') logfile = FileHandler(filename, u'w')
logfile.setFormatter(logging.Formatter( logfile.setFormatter(logging.Formatter(
u'%(asctime)s %(name)-20s %(levelname)-8s %(message)s')) u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
log.addHandler(logfile) log.addHandler(logfile)
logging.addLevelName(15, u'Timer') logging.addLevelName(15, u'Timer')
# Parse command line options and deal with them. # Parse command line options and deal with them.

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

@ -337,13 +337,14 @@ class BibleMediaItem(MediaManagerItem):
# load bibles into the combo boxes # load bibles into the combo boxes
first = True first = True
for bible in bibles: for bible in bibles:
self.QuickVersionComboBox.addItem(bible) if bible is not None:
self.QuickSecondBibleComboBox.addItem(bible) self.QuickVersionComboBox.addItem(bible)
self.AdvancedVersionComboBox.addItem(bible) self.QuickSecondBibleComboBox.addItem(bible)
self.AdvancedSecondBibleComboBox.addItem(bible) self.AdvancedVersionComboBox.addItem(bible)
if first: self.AdvancedSecondBibleComboBox.addItem(bible)
first = False if first:
self.initialiseBible(bible) first = False
self.initialiseBible(bible)
def onListViewResize(self, width, height): def onListViewResize(self, width, height):
self.SearchProgress.setGeometry(self.ListView.geometry().x(), self.SearchProgress.setGeometry(self.ListView.geometry().x(),