Coding style fixes

openlp/core/lib/baselistwithdnd.py

@@ -48,5 +48,4 @@ class BaseListWithDnD(QtGui.QListWidget):
         mimeData = QtCore.QMimeData()
         drag.setMimeData(mimeData)
         mimeData.setText(self.PluginName)
-        dropAction = drag.start(QtCore.Qt.CopyAction)
+        drag.start(QtCore.Qt.CopyAction)
-

openlp/core/lib/renderer.py

@@ -117,8 +117,7 @@ class Renderer(object):
             QtGui.QImage.Format_ARGB32_Premultiplied)
         if self._bg_image_filename and not self.bg_image:
             self.bg_image = resize_image(self._bg_image_filename,
-                                         self._frame.width(),
+                self._frame.width(), self._frame.height())
-                                         self._frame.height())
         if self.bg_frame is None:
             self._generate_background_frame()
 
@@ -268,8 +267,8 @@ class Renderer(object):
                 QtGui.QPixmap(self._frame.width(), self._frame.height())
             self.bg_frame.fill(QtCore.Qt.transparent)
         else:
-            self.bg_frame = QtGui.QImage(self._frame.width(), self._frame.height(),
+            self.bg_frame = QtGui.QImage(self._frame.width(),
-                QtGui.QImage.Format_ARGB32_Premultiplied)
+                self._frame.height(), QtGui.QImage.Format_ARGB32_Premultiplied)
         log.debug(u'render background %s start', self._theme.background_type)
         painter = QtGui.QPainter()
         painter.begin(self.bg_frame)
@@ -550,8 +549,8 @@ class Renderer(object):
                 path = QtGui.QPainterPath()
                 path.addText(QtCore.QPointF(x, rowpos), font, line)
                 self.painter.setBrush(self.painter.pen().brush())
-                self.painter.setPen(QtGui.QPen(
+                self.painter.setPen(QtGui.QPen(QtGui.QColor(
-                        QtGui.QColor(self._theme.display_outline_color), outline_size))
+                    self._theme.display_outline_color), outline_size))
                 self.painter.drawPath(path)
             self.painter.setPen(pen)
             self.painter.drawText(x, rowpos, line)

openlp/core/ui/amendthemeform.py

@@ -133,7 +133,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
             QtCore.SIGNAL(u'editingFinished()'),
             self.onOutlineSpinBoxChanged)
         QtCore.QObject.connect(self.SlideTransitionCheckedBox,
-            QtCore.SIGNAL(u'stateChanged(int)'), self.onSlideTransitionCheckedBoxChanged)
+            QtCore.SIGNAL(u'stateChanged(int)'),
+            self.onSlideTransitionCheckedBoxChanged)
 
     def accept(self):
         new_theme = ThemeXML()
@@ -145,10 +146,10 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
             new_theme.add_background_transparent()
         else:
             if self.theme.background_type == u'solid':
-                new_theme.add_background_solid( \
+                new_theme.add_background_solid(
                     unicode(self.theme.background_color))
             elif self.theme.background_type == u'gradient':
-                new_theme.add_background_gradient( \
+                new_theme.add_background_gradient(
                     unicode(self.theme.background_startColor),
                     unicode(self.theme.background_endColor),
                     self.theme.background_direction)
@@ -158,7 +159,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
                 new_theme.add_background_image(filename)
                 save_to = os.path.join(self.path, theme_name, filename)
                 save_from = self.theme.background_filename
-
         new_theme.add_font(unicode(self.theme.font_main_name),
                 unicode(self.theme.font_main_color),
                 unicode(self.theme.font_main_proportion),

openlp/core/ui/maindisplay.py

@@ -34,7 +34,6 @@ from openlp.core.ui import HideMode
 
 log = logging.getLogger(__name__)
 
-
 class DisplayManager(QtGui.QWidget):
     """
     Wrapper class to hold the display widgets.
@@ -144,16 +143,16 @@ class MainDisplay(DisplayWidget):
         """
         Sets up the screen on a particular screen.
         """
-        log.debug(u'Setup %s for %s ' %(self.screens,
+        log.debug(u'Setup %s for %s ' % (
-                                         self.screens.monitor_number))
+            self.screens, self.screens.monitor_number))
         self.setVisible(False)
         self.screen = self.screens.current
         #Sort out screen locations and sizes
         self.display_alert.setGeometry(self.screen[u'size'])
-        self.display_image.resize(self.screen[u'size'].width(),
+        self.display_image.resize(
-                            self.screen[u'size'].height())
+            self.screen[u'size'].width(), self.screen[u'size'].height())
-        self.display_text.resize(self.screen[u'size'].width(),
+        self.display_text.resize(
-                            self.screen[u'size'].height())
+            self.screen[u'size'].width(), self.screen[u'size'].height())
         self.setGeometry(self.screen[u'size'])
         #Build a custom splash screen
         self.InitialFrame = QtGui.QImage(
@@ -179,8 +178,8 @@ class MainDisplay(DisplayWidget):
         painter.begin(self.blankFrame)
         painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
         #build a blank transparent image
-        self.transparent = QtGui.QPixmap(self.screen[u'size'].width(),
+        self.transparent = QtGui.QPixmap(
-                                         self.screen[u'size'].height())
+            self.screen[u'size'].width(), self.screen[u'size'].height())
         self.transparent.fill(QtCore.Qt.transparent)
         self.display_alert.setPixmap(self.transparent)
         self.display_text.setPixmap(self.transparent)
@@ -220,19 +219,21 @@ class MainDisplay(DisplayWidget):
         if mode == HideMode.Screen:
             self.display_image.setPixmap(self.transparent)
         elif mode == HideMode.Blank:
-            self.display_image.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
+            self.display_image.setPixmap(
+                QtGui.QPixmap.fromImage(self.blankFrame))
         else:
             if self.parent.renderManager.renderer.bg_frame:
-                self.display_image.setPixmap(QtGui.QPixmap.fromImage(\
+                self.display_image.setPixmap(QtGui.QPixmap.fromImage(
                     self.parent.renderManager.renderer.bg_frame))
             else:
-                self.display_image.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
+                self.display_image.setPixmap(
+                    QtGui.QPixmap.fromImage(self.blankFrame))
         self.moveToTop()
 
     def moveToTop(self):
         log.debug(u'moveToTop')
-        self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint \
+        self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint |
-            | QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog)
+            QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog)
         self.show()
 
     def showDisplay(self):
@@ -254,9 +255,8 @@ class MainDisplay(DisplayWidget):
 
     def addImageWithText(self, frame):
         log.debug(u'addImageWithText')
-        frame = resize_image(frame,
+        frame = resize_image(
-                    self.screen[u'size'].width(),
+            frame, self.screen[u'size'].width(), self.screen[u'size'].height())
-                    self.screen[u'size'].height() )
         self.display_image.setPixmap(QtGui.QPixmap.fromImage(frame))
         self.moveToTop()
 
@@ -340,8 +340,8 @@ class VideoDisplay(Phonon.VideoWidget):
         self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)
         Phonon.createPath(self.mediaObject, self)
         Phonon.createPath(self.mediaObject, self.audioObject)
-        self.setWindowFlags(QtCore.Qt.WindowStaysOnBottomHint \
+        self.setWindowFlags(QtCore.Qt.WindowStaysOnBottomHint |
-            | QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog)
+            QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'maindisplay_hide'), self.mediaHide)
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -393,7 +393,7 @@ class VideoDisplay(Phonon.VideoWidget):
         if not message:
             message = self.message
         log.debug(u'VideoDisplay Queue new media message %s' % message)
-        source = self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(message))
         self.message = message
         self.background = True
         self._play()
@@ -402,7 +402,7 @@ class VideoDisplay(Phonon.VideoWidget):
         log.debug(u'VideoDisplay Queue new media message %s' % message)
         file = os.path.join(message[0].get_frame_path(),
             message[0].get_frame_title())
-        source = self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
+        self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
         self._play()
 
     def onMediaPlay(self):
@@ -442,4 +442,3 @@ class VideoDisplay(Phonon.VideoWidget):
         if self.hidden:
             self.hidden = False
             self._play()
-

openlp/core/ui/servicemanager.py

@@ -1,4 +1,3 @@
-import os.path
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
@@ -85,7 +84,7 @@ class ServiceManagerList(QtGui.QTreeWidget):
         mimeData = QtCore.QMimeData()
         drag.setMimeData(mimeData)
         mimeData.setText(u'ServiceManager')
-        dropAction = drag.start(QtCore.Qt.CopyAction)
+        drag.start(QtCore.Qt.CopyAction)
 
 class ServiceManager(QtGui.QWidget):
     """

openlp/core/ui/slidecontroller.py

@@ -636,7 +636,6 @@ class SlideController(QtGui.QWidget):
                     % self.serviceItem.name.lower(),
                     [self.serviceItem, self.isLive])
 
-
     def onSlideSelected(self):
         """
         Generate the preview when you click on a slide.

openlp/plugins/media/lib/mediaitem.py

@@ -113,7 +113,6 @@ class MediaMediaItem(MediaManagerItem):
                 filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
                 Receiver.send_message(u'videodisplay_background', filename)
 
-
     def generateSlideData(self, service_item, item=None):
         if item is None:
             item = self.ListView.currentItem()

openlp/plugins/presentations/lib/powerpointcontroller.py

@@ -62,7 +62,8 @@ class PowerpointController(PresentationController):
         log.debug(u'check_available')
         if os.name == u'nt':
             try:
-                _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, u'PowerPoint.Application').Close()
+                _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT,
+                    u'PowerPoint.Application').Close()
                 return True
             except:
                 pass

openlp/plugins/presentations/lib/pptviewcontroller.py

@@ -82,7 +82,8 @@ class PptviewController(PresentationController):
             if self.process:
                 return
             log.debug(u'start PPTView')
-            self.process = cdll.LoadLibrary(r'openlp\plugins\presentations\lib\pptviewlib\pptviewlib.dll')
+            self.process = cdll.LoadLibrary(
+                r'openlp\plugins\presentations\lib\pptviewlib\pptviewlib.dll')
 
         def kill(self):
             """
@@ -99,7 +100,6 @@ class PptviewController(PresentationController):
             return doc
 
 class PptviewDocument(PresentationDocument):
-
     def __init__(self, controller, presentation):
         log.debug(u'Init Presentation PowerPoint')
         self.presentation = None

openlp/plugins/songs/forms/editsongform.py

@@ -150,8 +150,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     def loadBooks(self):
         books = self.songmanager.get_books()
         booksCompleter = QtGui.QCompleter(
-            [book.name for book in books],
+            [book.name for book in books], self.SongbookCombo)
-            self.SongbookCombo)
         booksCompleter.setCaseSensitivity(QtCore.Qt.CaseInsensitive);
         self.SongbookCombo.setCompleter(booksCompleter);
         self.SongbookCombo.clear()
@@ -351,8 +350,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         if item:
             tempText = item.text()
             verseId = unicode((item.data(QtCore.Qt.UserRole)).toString())
-            self.verse_form.setVerse(tempText, \
+            self.verse_form.setVerse(
-                self.VerseListWidget.count(), True, verseId)
+                tempText, self.VerseListWidget.count(), True, verseId)
             if self.verse_form.exec_():
                 afterText, verse, subVerse = self.verse_form.getVerse()
                 data = u'%s:%s' % (verse, subVerse)