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

fixes bug #1051699 'Bibles add option to not display chapter and verse numbers' 

Fixes: https://launchpad.net/bugs/1051699
This commit is contained in:
Oliver Wieland 2013-08-09 21:31:59 +02:00
parent 97de1555fe
commit 57bab85464
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/plugins/bibles/lib/__init__.py
View File

@ -60,6 +60,7 @@ class DisplayStyle(object):
Round = 1
Curly = 2
Square = 3
NoDisplay = 4
class LanguageSelection(object):

4
openlp/plugins/bibles/lib/biblestab.py
View File

@ -64,7 +64,7 @@ class BiblesTab(SettingsTab):
self.display_style_label = QtGui.QLabel(self.verse_display_group_box)
self.display_style_label.setObjectName(u'display_style_label')
self.display_style_combo_box = QtGui.QComboBox(self.verse_display_group_box)
self.display_style_combo_box.addItems([u'', u'', u'', u''])
self.display_style_combo_box.addItems([u'', u'', u'', u'', u''])
self.display_style_combo_box.setObjectName(u'display_style_combo_box')
self.verse_display_layout.addRow(self.display_style_label, self.display_style_combo_box)
self.layout_style_label = QtGui.QLabel(self.verse_display_group_box)
@ -171,6 +171,8 @@ class BiblesTab(SettingsTab):
translate('BiblesPlugin.BiblesTab', '{ And }'))
self.display_style_combo_box.setItemText(DisplayStyle.Square,
translate('BiblesPlugin.BiblesTab', '[ And ]'))
self.display_style_combo_box.setItemText(DisplayStyle.NoDisplay,
translate('BiblesPlugin.BiblesTab', 'Hide verse numbers'))
self.change_note_label.setText(translate('BiblesPlugin.BiblesTab',
'Note:\nChanges do not affect verses already in the service.'))
self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses'))

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

@ -949,10 +949,12 @@ class BibleMediaItem(MediaManagerItem):
verse_text = unicode(verse)
if self.settings.display_style == DisplayStyle.Round:
return u'{su}(%s){/su}' % verse_text
if self.settings.display_style == DisplayStyle.Curly:
elif self.settings.display_style == DisplayStyle.Curly:
return u'{su}{%s}{/su}' % verse_text
if self.settings.display_style == DisplayStyle.Square:
elif self.settings.display_style == DisplayStyle.Square:
return u'{su}[%s]{/su}' % verse_text
else:
return u'{su}{/su}'
return u'{su}%s{/su}' % verse_text
def search(self, string, showError):