forked from openlp/openlp
HEAD r1936
This commit is contained in:
commit
33dcda419a
|
@ -69,7 +69,7 @@ class Ui_ExceptionDialog(object):
|
|||
self.saveReportButton = create_button(exceptionDialog,
|
||||
u'saveReportButton', icon=u':/general/general_save.png',
|
||||
click=self.onSaveReportButtonClicked)
|
||||
self.attachFileButton = create_icon(exceptionDialog,
|
||||
self.attachFileButton = create_button(exceptionDialog,
|
||||
u'attachFileButton', icon=u':/general/general_open.png',
|
||||
click=self.onAttachFileButtonClicked)
|
||||
self.buttonBox = create_button_box(exceptionDialog, u'buttonBox',
|
||||
|
|
|
@ -245,9 +245,9 @@ class BibleMediaItem(MediaManagerItem):
|
|||
self.addSearchFields(u'advanced', UiStrings().Advanced)
|
||||
# Combo Boxes
|
||||
QtCore.QObject.connect(self.quickVersionComboBox,
|
||||
QtCore.SIGNAL(u'activated(int)'), self.onQuickVersionComboBox)
|
||||
QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
|
||||
QtCore.QObject.connect(self.quickSecondComboBox,
|
||||
QtCore.SIGNAL(u'activated(int)'), self.onQuickSecondComboBox)
|
||||
QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
|
||||
QtCore.QObject.connect(self.advancedVersionComboBox,
|
||||
QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox)
|
||||
QtCore.QObject.connect(self.advancedSecondComboBox,
|
||||
|
@ -376,14 +376,13 @@ class BibleMediaItem(MediaManagerItem):
|
|||
self.advancedSecondComboBox.addItem(u'')
|
||||
# Get all bibles and sort the list.
|
||||
bibles = self.plugin.manager.get_bibles().keys()
|
||||
bibles = filter(None, bibles)
|
||||
bibles.sort(cmp=locale.strcoll)
|
||||
# Load the bibles into the combo boxes.
|
||||
for bible in bibles:
|
||||
if bible:
|
||||
self.quickVersionComboBox.addItem(bible)
|
||||
self.quickSecondComboBox.addItem(bible)
|
||||
self.advancedVersionComboBox.addItem(bible)
|
||||
self.advancedSecondComboBox.addItem(bible)
|
||||
self.quickVersionComboBox.addItems(bibles)
|
||||
self.quickSecondComboBox.addItems(bibles)
|
||||
self.advancedVersionComboBox.addItems(bibles)
|
||||
self.advancedSecondComboBox.addItems(bibles)
|
||||
# set the default value
|
||||
bible = QtCore.QSettings().value(
|
||||
self.settingsSection + u'/advanced bible',
|
||||
|
@ -535,12 +534,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||
books.sort(cmp=locale.strcoll)
|
||||
set_case_insensitive_completer(books, self.quickSearchEdit)
|
||||
|
||||
def onQuickVersionComboBox(self):
|
||||
self.updateAutoCompleter()
|
||||
|
||||
def onQuickSecondComboBox(self):
|
||||
self.updateAutoCompleter()
|
||||
|
||||
def onImportClick(self):
|
||||
if not hasattr(self, u'import_wizard'):
|
||||
self.import_wizard = BibleImportForm(self, self.plugin.manager,
|
||||
|
@ -1055,8 +1048,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||
# last verse of the chapter or the current verse is not the
|
||||
# first one of the chapter.
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
return False
|
||||
|
||||
def formatVerse(self, old_chapter, chapter, verse):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue