Removed unused enumeration class.

Fixed a bug (Clicking the advanced "Search" button will cause a traceback when no bible is present)
Cosmetic cleanups.

bzr-revno: 1336
This commit is contained in:
Andreas Preikschat 2011-02-26 00:03:19 +02:00 committed by Raoul Snyman
commit 43f6eb2b4c
2 changed files with 2 additions and 16 deletions

View File

@ -46,16 +46,6 @@ except ImportError:
log = logging.getLogger(__name__)
class BibleMode(object):
"""
This is basically an enumeration class which specifies the mode of a Bible.
Mode refers to whether or not a Bible in OpenLP is a full Bible or needs to
be downloaded from the Internet on an as-needed basis.
"""
Full = 1
Partial = 2
class BibleFormat(object):
"""
This is a special enumeration class that holds the various types of Bibles,

View File

@ -482,7 +482,7 @@ class BibleMediaItem(MediaManagerItem):
self.listView.clear()
if self.listView.count() != 0:
self.__checkSecondBible(bible, second_bible)
else:
elif self.search_results:
self.displayResults(bible, second_bible)
Receiver.send_message(u'cursor_normal')
self.advancedSearchButton.setEnabled(True)
@ -698,11 +698,7 @@ class BibleMediaItem(MediaManagerItem):
service_item.add_capability(ItemCapabilities.AllowsPreview)
service_item.add_capability(ItemCapabilities.AllowsLoop)
# Service Item: Title
for title in raw_title:
if not service_item.title:
service_item.title = title
else:
service_item.title += u', ' + title
service_item.title = u', '.join(raw_title)
# Service Item: Theme
if len(self.settings.bible_theme) == 0:
service_item.theme = None