forked from openlp/openlp
Fix Bible plugin to handle themes correctly when changed and removed.
This commit is contained in:
parent
37b755affe
commit
d5b2a1e496
@ -190,7 +190,7 @@ class BiblesTab(SettingsTab):
|
|||||||
self.paragraph_style = convertStringToBoolean(self.config.get_config(u'paragraph style', u'True'))
|
self.paragraph_style = convertStringToBoolean(self.config.get_config(u'paragraph style', u'True'))
|
||||||
self.show_new_chapters = convertStringToBoolean(self.config.get_config(u'display new chapter', u"False"))
|
self.show_new_chapters = convertStringToBoolean(self.config.get_config(u'display new chapter', u"False"))
|
||||||
self.display_style = int(self.config.get_config(u'display brackets', u'0'))
|
self.display_style = int(self.config.get_config(u'display brackets', u'0'))
|
||||||
self.bible_theme = int(self.config.get_config(u'bible theme', u'0'))
|
self.bible_theme = self.config.get_config(u'bible theme', u'0')
|
||||||
self.bible_search = convertStringToBoolean(self.config.get_config(u'search as type', u'True'))
|
self.bible_search = convertStringToBoolean(self.config.get_config(u'search as type', u'True'))
|
||||||
if self.paragraph_style:
|
if self.paragraph_style:
|
||||||
self.ParagraphRadioButton.setChecked(True)
|
self.ParagraphRadioButton.setChecked(True)
|
||||||
@ -218,4 +218,5 @@ class BiblesTab(SettingsTab):
|
|||||||
id = self.BibleThemeComboBox.findText(str(self.bible_theme), QtCore.Qt.MatchExactly)
|
id = self.BibleThemeComboBox.findText(str(self.bible_theme), QtCore.Qt.MatchExactly)
|
||||||
if id == -1:
|
if id == -1:
|
||||||
id = 0 # Not Found
|
id = 0 # Not Found
|
||||||
|
self.bible_theme = u''
|
||||||
self.BibleThemeComboBox.setCurrentIndex(id)
|
self.BibleThemeComboBox.setCurrentIndex(id)
|
||||||
|
@ -398,7 +398,10 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
if len(raw_footer) <= 1:
|
if len(raw_footer) <= 1:
|
||||||
raw_footer.append(book)
|
raw_footer.append(book)
|
||||||
|
|
||||||
service_item.theme = self.parent.bibles_tab.bible_theme
|
if len(self.parent.bibles_tab.bible_theme) == 0:
|
||||||
|
service_item.theme = None
|
||||||
|
else:
|
||||||
|
service_item.theme = self.parent.bibles_tab.bible_theme
|
||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
service_item.raw_slides = raw_slides
|
service_item.raw_slides = raw_slides
|
||||||
service_item.raw_footer = raw_footer
|
service_item.raw_footer = raw_footer
|
||||||
|
Loading…
Reference in New Issue
Block a user