openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/testing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~meths/openlp/testing/+merge/52301

Cleanups
-- 
https://code.launchpad.net/~meths/openlp/testing/+merge/52301
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/testing into lp:openlp.

=== modified file 'openlp/core/ui/screen.py'
--- openlp/core/ui/screen.py	2011-03-02 18:07:07 +0000
+++ openlp/core/ui/screen.py	2011-03-05 17:20:15 +0000
@@ -123,7 +123,7 @@
 
             [u'Screen 1 (primary)', u'Screen 2']
         """
-        screen_list= []
+        screen_list = []
         for screen in self.screen_list:
             screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'),
                 screen[u'number'] + 1)

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2011-03-04 21:09:08 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2011-03-05 17:20:15 +0000
@@ -568,7 +568,8 @@
         """
         self.getFileName(WizardStrings.OpenTypeFile % UiStrings.OLPV1,
             self.openlp1FileEdit, u'%s (*.bible)' %
-            translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x Bible Files'))
+            translate('BiblesPlugin.ImportWizardForm',
+            'openlp.org 1.x Bible Files'))
 
     def registerFields(self):
         """

=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py	2011-02-24 20:06:19 +0000
+++ openlp/plugins/bibles/lib/csvbible.py	2011-03-05 17:20:15 +0000
@@ -69,8 +69,6 @@
 import chardet
 import csv
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver, translate
 from openlp.plugins.bibles.lib.db import BibleDB, Testament
 

=== modified file 'openlp/plugins/bibles/lib/openlp1.py'
--- openlp/plugins/bibles/lib/openlp1.py	2011-02-24 20:06:19 +0000
+++ openlp/plugins/bibles/lib/openlp1.py	2011-03-05 17:20:15 +0000
@@ -27,8 +27,6 @@
 import logging
 import sqlite
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver
 from openlp.core.ui.wizard import WizardStrings
 from openlp.plugins.bibles.lib.db import BibleDB

=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py	2011-02-24 20:06:19 +0000
+++ openlp/plugins/bibles/lib/opensong.py	2011-03-05 17:20:15 +0000
@@ -25,9 +25,7 @@
 ###############################################################################
 
 import logging
-
 from lxml import objectify
-from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver, translate
 from openlp.plugins.bibles.lib.db import BibleDB

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2011-02-24 20:06:19 +0000
+++ openlp/plugins/bibles/lib/osis.py	2011-03-05 17:20:15 +0000
@@ -31,8 +31,6 @@
 import codecs
 import re
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver, translate
 from openlp.core.utils import AppLocation
 from openlp.plugins.bibles.lib.db import BibleDB

=== modified file 'openlp/plugins/songs/forms/songexportform.py'
--- openlp/plugins/songs/forms/songexportform.py	2011-03-03 06:34:17 +0000
+++ openlp/plugins/songs/forms/songexportform.py	2011-03-05 17:20:15 +0000
@@ -355,7 +355,8 @@
         the path to *directoryLineEdit*.
         """
         path = unicode(QtGui.QFileDialog.getExistingDirectory(self,
-            translate('SongsPlugin.ExportWizardForm', 'Select Destination Folder'),
+            translate('SongsPlugin.ExportWizardForm',
+            'Select Destination Folder'),
             SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
             options=QtGui.QFileDialog.ShowDirsOnly))
         SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)