From 356027768432a016a317a9ac7aadb7ac544481e7 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Tue, 20 Jul 2010 21:43:42 +0100
Subject: [PATCH] Cleanups

---
 openlp/core/ui/generaltab.py                 | 21 +++++++++++---------
 openlp/plugins/songs/forms/editsongdialog.py |  3 ++-
 openlp/plugins/songs/lib/opensongimport.py   | 10 ++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 72718bb2c..1392992d3 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -287,16 +287,16 @@ class GeneralTab(SettingsTab):
         Translate the general settings tab to the currently selected language
         """
         self.MonitorGroupBox.setTitle(translate('GeneralTab', 'Monitors'))
-        self.MonitorLabel.setText(
-            translate('OpenLP.GeneralTab', 'Select monitor for output display:'))
+        self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
+            'Select monitor for output display:'))
         self.DisplayOnMonitorCheck.setText(
             translate('OpenLP.GeneralTab', 'Display if a single screen'))
         self.StartupGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Application Startup'))
         self.WarningCheckBox.setText(
             translate('OpenLP.GeneralTab', 'Show blank screen warning'))
-        self.AutoOpenCheckBox.setText(
-            translate('OpenLP.GeneralTab', 'Automatically open the last service'))
+        self.AutoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
+            'Automatically open the last service'))
         self.ShowSplashCheckBox.setText(
             translate('OpenLP.GeneralTab', 'Show the splash screen'))
         self.SettingsGroupBox.setTitle(translate('OpenLP.GeneralTab',
@@ -318,7 +318,8 @@ class GeneralTab(SettingsTab):
         self.currentXValueLabel.setText(u'0')
         self.currentYLabel.setText(translate('OpenLP.GeneralTab', 'Y'))
         self.currentYValueLabel.setText(u'0')
-        self.currentHeightLabel.setText(translate('OpenLP.GeneralTab', 'Height'))
+        self.currentHeightLabel.setText(
+            translate('OpenLP.GeneralTab', 'Height'))
         self.currentHeightValueLabel.setText(u'0')
         self.currentWidthLabel.setText(translate('OpenLP.GeneralTab', 'Width'))
         self.currentWidthValueLabel.setText(u'0')
@@ -375,10 +376,12 @@ class GeneralTab(SettingsTab):
                 QtCore.QVariant(self.screens.current[u'size'].x())).toString())
             self.customYValueEdit.setText(settings.value(u'y position',
                 QtCore.QVariant(self.screens.current[u'size'].y())).toString())
-            self.customHeightValueEdit.setText(settings.value(u'height',
-                QtCore.QVariant(self.screens.current[u'size'].height())).toString())
-            self.customWidthValueEdit.setText(settings.value(u'width',
-                QtCore.QVariant(self.screens.current[u'size'].width())).toString())
+            self.customHeightValueEdit.setText(
+                settings.value(u'height', QtCore.QVariant(
+                self.screens.current[u'size'].height())).toString())
+            self.customWidthValueEdit.setText(
+                settings.value(u'width', QtCore.QVariant(
+                self.screens.current[u'size'].width())).toString())
         else:
             self.customXValueEdit.setText(
                 unicode(self.screens.current[u'size'].x()))
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 922147628..dccc6d6ba 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -441,7 +441,8 @@ class Ui_EditSongDialog(object):
             translate('SongsPlugin.EditSongForm', 'Song Book'))
         self.SongTabWidget.setTabText(
             self.SongTabWidget.indexOf(self.AuthorsTab),
-            translate('SongsPlugin.EditSongForm', 'Authors, Topics && Song Book'))
+            translate('SongsPlugin.EditSongForm',
+                'Authors, Topics && Song Book'))
         self.ThemeGroupBox.setTitle(
             translate('SongsPlugin.EditSongForm', 'Theme'))
         self.ThemeAddButton.setText(
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index d6a257d71..345b0922f 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -195,11 +195,12 @@ class OpenSongImport(object):
                    versetype is not None:
                 words = thisline
             if versenum is not None:
-                versetag = u'%s%s'%(versetype,versenum)
+                versetag = u'%s%s' % (versetype, versenum)
                 if not verses.has_key(versetype):
                     verses[versetype] = {}
                 if not verses[versetype].has_key(versenum):
-                    verses[versetype][versenum] = [] # storage for lines in this verse
+                    # storage for lines in this verse
+                    verses[versetype][versenum] = []
                 if not verses_seen.has_key(versetag):
                     verses_seen[versetag] = 1
                     our_verse_order.append(versetag)
@@ -216,10 +217,11 @@ class OpenSongImport(object):
             versenums = verses[versetype].keys()
             versenums.sort()
             for num in versenums:
-                versetag = u'%s%s' %(versetype,num)
+                versetag = u'%s%s' % (versetype, num)
                 lines = u'\n'.join(verses[versetype][num])
                 self.song_import.verses.append([versetag, lines])
-                versetags[versetag] = 1 # keep track of what we have for error checking later
+                # Keep track of what we have for error checking later
+                versetags[versetag] = 1
         # now figure out the presentation order
         if u'presentation' in fields and root.presentation != u'':
             order = unicode(root.presentation)