Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bibles into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/51304
Hello
- removed unused enumeration class
- fixed a bug (Clicking the advanced "Search" button will cause a traceback
when no bible is present)
- cosmetic
--
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/51304
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/bibles into lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2011-02-24 15:54:21 +0000
+++ openlp/plugins/bibles/lib/manager.py 2011-02-25 14:47:49 +0000
@@ -46,16 +46,6 @@
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,
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-02-24 05:47:38 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-02-25 14:47:49 +0000
@@ -482,7 +482,7 @@
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 @@
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
_______________________________________________
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
