r1161

openlp/core/lib/mailto/__init__.py

@@ -123,7 +123,7 @@ if sys.platform[:3] == u'win':
 
 # Platform support for MacOS
 elif sys.platform == u'darwin':
-    _controllers[u'open']= Controller(u'open')
+    _controllers[u'open'] = Controller(u'open')
     _open = _controllers[u'open'].open
 
 

openlp/core/ui/exceptionform.py

@@ -23,7 +23,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-
+import logging
 import re
 import os
 import platform
@@ -59,6 +59,8 @@ from openlp.core.lib.mailto import mailto
 
 from exceptiondialog import Ui_ExceptionDialog
 
+log = logging.getLogger(__name__)
+
 class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
     """
     The exception dialog
@@ -103,7 +105,8 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
         filename = QtGui.QFileDialog.getSaveFileName(self,
             translate('OpenLP.ExceptionForm', 'Save Crash Report'),
             SettingsManager.get_last_dir(self.settingsSection),
-            translate('OpenLP.ExceptionForm', 'Text files (*.txt *.log *.text)'))
+            translate('OpenLP.ExceptionForm',
+            'Text files (*.txt *.log *.text)'))
         if filename:
             filename = unicode(QtCore.QDir.toNativeSeparators(filename))
             SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
@@ -140,4 +143,5 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
             if u':' in line:
                 exception = line.split(u'\n')[-1].split(u':')[0]
         subject = u'Bug report: %s in %s' % (exception, source)
-        mailto(address=u'bugs@openlp.org', subject=subject, body=body % content)
+        mailto(address=u'bugs@openlp.org', subject=subject,
+            body=body % content)

openlp/core/ui/slidecontroller.py

@@ -332,11 +332,12 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
         if not self.isLive:
             QtCore.QObject.connect(self.PreviewListWidget,
-                QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onGoLiveClick)
+                QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
+                self.onGoLiveClick)
         if isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
                 QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
-                    self.receiveSpinDelay)
+                self.receiveSpinDelay)
         if isLive:
             self.Toolbar.makeWidgetsInvisible(self.loopList)
             self.Toolbar.actions[u'Stop Loop'].setVisible(False)

openlp/core/ui/themewizard.py

@@ -555,7 +555,8 @@ class Ui_ThemeWizard(object):
             u'footerDefaultPositionCheckBox')
         self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
             self.footerDefaultPositionCheckBox)
-        self.areaPositionLayout.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1)
+        self.areaPositionLayout.addWidget(
+            self.footerPositionGroupBox, 1, 1, 1, 1)
         ThemeWizard.addPage(self.areaPositionPage)
         self.previewPage = QtGui.QWizardPage()
         self.previewPage.setObjectName(u'previewPage')
@@ -720,8 +721,8 @@ class Ui_ThemeWizard(object):
         self.areaPositionPage.setTitle(
             translate('OpenLP.ThemeWizard', 'Output Area Locations'))
         self.areaPositionPage.setSubTitle(
-            translate('OpenLP.ThemeWizard', 'Allows you to change and move the '
+            translate('OpenLP.ThemeWizard', 'Allows you to change and move the'
-                'main and footer areas.'))
+                ' main and footer areas.'))
         self.mainPositionGroupBox.setTitle(
             translate('OpenLP.ThemeWizard', '&Main Area'))
         self.mainDefaultPositionCheckBox.setText(
@@ -733,18 +734,24 @@ class Ui_ThemeWizard(object):
         self.mainWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
         self.mainWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
         self.mainHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
-        self.mainHeightLabel.setText(translate('OpenLP.ThemeWizard', 'Height:'))
+        self.mainHeightLabel.setText(
+            translate('OpenLP.ThemeWizard', 'Height:'))
         self.footerPositionGroupBox.setTitle(
             translate('OpenLP.ThemeWizard', 'Footer Area'))
-        self.footerXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:'))
+        self.footerXLabel.setText(
+            translate('OpenLP.ThemeWizard', 'X position:'))
         self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
-        self.footerYLabel.setText(translate('OpenLP.ThemeWizard', 'Y position:'))
+        self.footerYLabel.setText(
+            translate('OpenLP.ThemeWizard', 'Y position:'))
         self.footerYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
-        self.footerWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
+        self.footerWidthLabel.setText(
-        self.footerWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
+            translate('OpenLP.ThemeWizard', 'Width:'))
+        self.footerWidthSpinBox.setSuffix(
+            translate('OpenLP.ThemeWizard', 'px'))
         self.footerHeightLabel.setText(
             translate('OpenLP.ThemeWizard', 'Height:'))
-        self.footerHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
+        self.footerHeightSpinBox.setSuffix(
+            translate('OpenLP.ThemeWizard', 'px'))
         self.footerDefaultPositionCheckBox.setText(
             translate('OpenLP.ThemeWizard', 'Use default location'))
         self.previewPage.setTitle(

openlp/plugins/alerts/forms/alertform.py

@@ -171,24 +171,23 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
             # We found '<>' in the alert text, but the ParameterEdit field is
             # empty.
             if text.find(u'<>') != -1 and not self.ParameterEdit.text() and \
-                QtGui.QMessageBox.question(self, translate(
+                QtGui.QMessageBox.question(self,
-                    'AlertPlugin.AlertForm', 'No Parameter found'),
+                translate('AlertPlugin.AlertForm', 'No Parameter found'),
-                    translate('AlertPlugin.AlertForm', 'You have not entered a '
+                translate('AlertPlugin.AlertForm', 'You have not entered a '
-                    'parameter to be replaced.\nDo you want to continue '
+                'parameter to be replaced.\nDo you want to continue anyway?'),
-                    'anyway?'),
+                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
+                QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
                     self.ParameterEdit.setFocus()
                     return False
             # The ParameterEdit field is not empty, but we have not found '<>'
             # in the alert text.
             elif text.find(u'<>') == -1 and self.ParameterEdit.text() and \
-                QtGui.QMessageBox.question(self, translate(
+                QtGui.QMessageBox.question(self,
-                    'AlertPlugin.AlertForm', 'No Placeholder found'),
+                translate('AlertPlugin.AlertForm', 'No Placeholder found'),
-                    translate('AlertPlugin.AlertForm', 'The alert text does not'
+                translate('AlertPlugin.AlertForm', 'The alert text does not'
-                    ' contain \'<>\'.\nDo want to continue anyway?'),
+                ' contain \'<>\'.\nDo want to continue anyway?'),
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
+                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
-                    QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
+                QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
                     self.ParameterEdit.setFocus()
                     return False
             text = text.replace(u'<>', unicode(self.ParameterEdit.text()))

openlp/plugins/bibles/lib/http.py

@@ -244,7 +244,7 @@ class BSExtract(object):
     """
     Extract verses from Bibleserver.com
     """
-    def __init__(self,proxyurl=None):
+    def __init__(self, proxyurl=None):
         log.debug(u'init %s', proxyurl)
         self.proxyurl = proxyurl
 

openlp/plugins/custom/customplugin.py

@@ -109,7 +109,7 @@ class CustomPlugin(Plugin):
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('CustomsPlugin', 'Customs')
+            u'title': translate('CustomsPlugin', 'Custom')
         }
         # Middle Header Bar
         ## Import Button ##

openlp/plugins/songs/forms/editsongform.py

@@ -736,7 +736,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
                 bits = verseId.split(u':')
                 sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
-                text = text + whitespace.sub(u' ',
+                text = text + self.whitespace.sub(u' ',
                     unicode(self.VerseListWidget.item(i, 0).text())) + u' '
                 if (bits[1] > u'1') and (bits[0][0] not in multiple):
                     multiple.append(bits[0][0])

openlp/plugins/songs/lib/__init__.py

@@ -71,7 +71,8 @@ class VerseType(object):
             The string to return a VerseType for
         """
         verse_type = verse_type.lower()
-        if verse_type == unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
+        if verse_type == \
+            unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
             return translate('SongsPlugin.VerseType', 'Verse')
         elif verse_type == \
             unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]: