From e6f3650bfde16c341e02f8ceb599e50b039797c8 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 21 Dec 2010 19:39:35 +0000 Subject: [PATCH] Cleanups --- openlp/core/lib/mailto/__init__.py | 2 +- openlp/core/ui/exceptionform.py | 10 +++++++--- openlp/core/ui/slidecontroller.py | 5 +++-- openlp/core/ui/themewizard.py | 25 +++++++++++++++--------- openlp/plugins/alerts/forms/alertform.py | 25 ++++++++++++------------ openlp/plugins/bibles/lib/http.py | 2 +- openlp/plugins/songs/lib/__init__.py | 3 ++- 7 files changed, 42 insertions(+), 30 deletions(-) diff --git a/openlp/core/lib/mailto/__init__.py b/openlp/core/lib/mailto/__init__.py index 9cfc319a8..f0e23f1b5 100644 --- a/openlp/core/lib/mailto/__init__.py +++ b/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 diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index cc66f21d7..3e05ad73a 100644 --- a/openlp/core/ui/exceptionform.py +++ b/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) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 4f75a3ce0..8cf0752e2 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/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) diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index 234c9de5e..d86792af4 100644 --- a/openlp/core/ui/themewizard.py +++ b/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 ' - 'main and footer areas.')) + translate('OpenLP.ThemeWizard', 'Allows you to change and move the' + ' 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.footerWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px')) + self.footerWidthLabel.setText( + 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( diff --git a/openlp/plugins/alerts/forms/alertform.py b/openlp/plugins/alerts/forms/alertform.py index ff5072560..cf9c86c27 100644 --- a/openlp/plugins/alerts/forms/alertform.py +++ b/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( - 'AlertPlugin.AlertForm', 'No Parameter found'), - translate('AlertPlugin.AlertForm', 'You have not entered a ' - 'parameter to be replaced.\nDo you want to continue ' - 'anyway?'), - QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | - QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No: + QtGui.QMessageBox.question(self, + translate('AlertPlugin.AlertForm', 'No Parameter found'), + translate('AlertPlugin.AlertForm', 'You have not entered a ' + 'parameter to be replaced.\nDo you want to continue anyway?'), + QtGui.QMessageBox.StandardButtons(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( - 'AlertPlugin.AlertForm', 'No Placeholder found'), - translate('AlertPlugin.AlertForm', 'The alert text does not' - ' contain \'<>\'.\nDo want to continue anyway?'), - QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | - QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No: + QtGui.QMessageBox.question(self, + translate('AlertPlugin.AlertForm', 'No Placeholder found'), + translate('AlertPlugin.AlertForm', 'The alert text does not' + ' contain \'<>\'.\nDo want to continue anyway?'), + QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | + QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No: self.ParameterEdit.setFocus() return False text = text.replace(u'<>', unicode(self.ParameterEdit.text())) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 218f7212e..d3b14661b 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/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 diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index 795116b4e..5ca5d5a0f 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/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]: