OliWieland has proposed merging lp:~oliwee/openlp/HideBibleVerses into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1051699 in OpenLP: "Bibles add option to not display chapter and verse
numbers"
https://bugs.launchpad.net/openlp/+bug/1051699
For more details, see:
https://code.launchpad.net/~oliwee/openlp/HideBibleVerses/+merge/179526
--
https://code.launchpad.net/~oliwee/openlp/HideBibleVerses/+merge/179526
Your team OpenLP Core is requested to review the proposed merge of
lp:~oliwee/openlp/HideBibleVerses into lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py 2013-04-18 17:45:14 +0000
+++ openlp/plugins/bibles/lib/__init__.py 2013-08-09 19:40:40 +0000
@@ -60,6 +60,7 @@
Round = 1
Curly = 2
Square = 3
+ NoDisplay = 4
class LanguageSelection(object):
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2013-03-25 07:27:54 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2013-08-09 19:40:40 +0000
@@ -64,7 +64,7 @@
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 @@
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'))
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2013-04-20 20:34:46 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2013-08-09 19:40:40 +0000
@@ -949,10 +949,12 @@
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):
_______________________________________________
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
