openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/futures into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix bugs in last merge and clean up comments
-- 
https://code.launchpad.net/~trb143/openlp/futures/+merge/20264
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-02-09 16:09:57 +0000
+++ openlp/core/ui/slidecontroller.py	2010-02-27 09:25:23 +0000
@@ -144,6 +144,7 @@
         self.PreviewListWidget.setEditTriggers(
             QtGui.QAbstractItemView.NoEditTriggers)
         self.PreviewListWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.PreviewListWidget.setAlternatingRowColors(True)
         self.ControllerLayout.addWidget(self.PreviewListWidget)
         # Build the full toolbar
         self.Toolbar = OpenLPToolbar(self)

=== modified file 'openlp/plugins/bibles/lib/common.py'
--- openlp/plugins/bibles/lib/common.py	2010-02-06 16:23:47 +0000
+++ openlp/plugins/bibles/lib/common.py	2010-02-27 09:25:23 +0000
@@ -166,8 +166,6 @@
     """
     A common ancestor for bible download sites.
     """
-    global log
-    log = logging.getLogger(u'BibleCommon')
     log.info(u'BibleCommon')
 
     def _get_web_text(self, urlstring, proxyurl):

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2010-02-06 15:33:23 +0000
+++ openlp/plugins/bibles/lib/db.py	2010-02-27 09:25:23 +0000
@@ -59,7 +59,7 @@
         ``config``
             The configuration object, passed in from the plugin.
         """
-        log.info(u'BibleDBimpl loaded')
+        log.info(u'BibleDB loaded')
         QtCore.QObject.__init__(self)
         if u'path' not in kwargs:
             raise KeyError(u'Missing keyword argument "path".')

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2010-02-06 10:42:47 +0000
+++ openlp/plugins/bibles/lib/http.py	2010-02-27 09:25:23 +0000
@@ -35,6 +35,8 @@
 from db import BibleDB
 from openlp.plugins.bibles.lib.models import Book
 
+log = logging.getLogger(__name__)
+
 class HTTPBooks(object):
     cursor = None
 
@@ -119,9 +121,7 @@
 
 
 class BGExtract(BibleCommon):
-    global log
-    log = logging.getLogger(u'BibleHTTPMgr(BG_extract)')
-    log.info(u'BG_extract loaded')
+    log.info(u'%s BGExtract loaded', __name__)
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
@@ -184,7 +184,7 @@
         return SearchResults(bookname, chapter, bible)
 
 class CWExtract(BibleCommon):
-    log.info(u'%s loaded', __name__)
+    log.info(u'%s CWExtract loaded', __name__)
 
     def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
@@ -229,7 +229,7 @@
 
 
 class HTTPBible(BibleDB):
-    log.info(u'%s loaded', __name__)
+    log.info(u'%s HTTPBible loaded' , __name__)
 
     def __init__(self, parent, **kwargs):
         """

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2010-02-26 12:18:01 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2010-02-27 09:25:23 +0000
@@ -43,7 +43,6 @@
     def resizeEvent(self, event):
         self.parent.onListViewResize(event.size().width(), event.size().width())
 
-
 class BibleMediaItem(MediaManagerItem):
     """
     This is the custom media manager item for Bibles.
@@ -435,7 +434,7 @@
         raw_slides = []
         raw_footer = []
         bible_text = u''
-        self.service_item.autoPreviewAllowed = True
+        service_item.autoPreviewAllowed = True
         #If we want to use a 2nd translation / version
         bible2 = u''
         if self.SearchTabWidget.currentIndex() == 0:
@@ -471,12 +470,12 @@
                 verse_text = self.formatVerse(old_chapter, chapter, verse, u'', u'')
             old_chapter = chapter
             footer = u'%s (%s %s)' % (book, version, copyright)
-            #If not found throws and error so add.s
+            #If not found add to footer
             if footer not in raw_footer:
                 raw_footer.append(footer)
             if bible2:
                 footer = u'%s (%s %s)' % (book, version, copyright)
-                #If not found throws and error so add.s
+                #If not found add to footer
                 if footer not in raw_footer:
                     raw_footer.append(footer)
                 bible_text = u'%s %s \n\n %s %s' % \

=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py	2010-02-26 12:18:01 +0000
+++ openlp/plugins/custom/lib/mediaitem.py	2010-02-27 09:25:23 +0000
@@ -144,7 +144,7 @@
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
         else:
             item_id = self.remoteCustom
-        self.service_item.autoPreviewAllowed = True
+        service_item.autoPreviewAllowed = True
         customSlide = self.parent.custommanager.get_custom(item_id)
         title = customSlide.title
         credit = customSlide.credits

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2010-02-26 12:18:01 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2010-02-27 09:25:23 +0000
@@ -144,7 +144,7 @@
         items = self.ListView.selectedIndexes()
         if items:
             service_item.title = self.trUtf8('Image(s)')
-            self.service_item.autoPreviewAllowed = True
+            service_item.autoPreviewAllowed = True
             for item in items:
                 bitem = self.ListView.item(item.row())
                 filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2010-02-06 10:33:33 +0000
+++ openlp/plugins/media/mediaplugin.py	2010-02-27 09:25:23 +0000
@@ -27,6 +27,7 @@
 
 from openlp.core.lib import Plugin, build_icon, PluginStatus
 from openlp.plugins.media.lib import MediaMediaItem
+from PyQt4.phonon import Phonon
 
 class MediaPlugin(Plugin):
     global log