From 57bab854641a64db58d85becf5d3116fc268da42 Mon Sep 17 00:00:00 2001
From: Oliver Wieland <oli@team-wieland.de>
Date: Fri, 9 Aug 2013 21:31:59 +0200
Subject: [PATCH] fixes bug #1051699  'Bibles add option to not display chapter
 and verse numbers'

Fixes: https://launchpad.net/bugs/1051699
---
 openlp/plugins/bibles/lib/__init__.py  | 1 +
 openlp/plugins/bibles/lib/biblestab.py | 4 +++-
 openlp/plugins/bibles/lib/mediaitem.py | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py
index 371632d41..1935b53f2 100644
--- a/openlp/plugins/bibles/lib/__init__.py
+++ b/openlp/plugins/bibles/lib/__init__.py
@@ -60,6 +60,7 @@ class DisplayStyle(object):
     Round = 1
     Curly = 2
     Square = 3
+    NoDisplay = 4
 
 
 class LanguageSelection(object):
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index 17182d7e2..6dc831602 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -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'))
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index b67bb99b2..ba7129a99 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -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):