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/53350

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

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2011-03-14 06:54:18 +0000
+++ openlp/core/ui/firsttimeform.py	2011-03-15 01:45:13 +0000
@@ -33,8 +33,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, PluginStatus, check_directory_exists, \
-    Receiver, build_icon
+from openlp.core.lib import translate, PluginStatus, Receiver, build_icon
 from openlp.core.utils import get_web_page, AppLocation
 from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
 
@@ -95,7 +94,7 @@
                 language = unicode(self.config.get(
                     u'bibles_%s' % lang, u'title'), u'utf8')
                 langItem = QtGui.QTreeWidgetItem(
-                   self.biblesTreeWidget, QtCore.QStringList(language))
+                    self.biblesTreeWidget, QtCore.QStringList(language))
                 bibles = self.config.get(u'bibles_%s' % lang, u'translations')
                 bibles = bibles.split(u',')
                 for bible in bibles:
@@ -104,8 +103,9 @@
                     filename = unicode(self.config.get(
                         u'bible_%s' % bible, u'filename'))
                     item = QtGui.QTreeWidgetItem(
-                       langItem, QtCore.QStringList(title))
-                    item.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(filename))
+                        langItem, QtCore.QStringList(title))
+                    item.setData(0, QtCore.Qt.UserRole,
+                        QtCore.QVariant(filename))
                     item.setCheckState(0, QtCore.Qt.Unchecked)
                     item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
             self.biblesTreeWidget.expandAll()
@@ -224,7 +224,8 @@
             'Enabling selected plugins...'))
         self._setPluginStatus(self.songsCheckBox, u'songs/status')
         self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
-        self._setPluginStatus(self.presentationCheckBox, u'presentations/status')
+        self._setPluginStatus(self.presentationCheckBox,
+            u'presentations/status')
         self._setPluginStatus(self.imageCheckBox, u'images/status')
         self._setPluginStatus(self.mediaCheckBox, u'media/status')
         self._setPluginStatus(self.remoteCheckBox, u'remotes/status')
@@ -276,4 +277,3 @@
         status = PluginStatus.Active if field.checkState() \
             == QtCore.Qt.Checked else PluginStatus.Inactive
         QtCore.QSettings().setValue(tag, QtCore.QVariant(status))
-

=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
--- openlp/core/ui/firsttimelanguagedialog.py	2011-03-09 16:16:40 +0000
+++ openlp/core/ui/firsttimelanguagedialog.py	2011-03-15 01:45:13 +0000
@@ -46,7 +46,8 @@
         self.languageLabel.setObjectName(u'languageLabel')
         self.languageLayout.addWidget(self.languageLabel)
         self.languageComboBox = QtGui.QComboBox(languageDialog)
-        self.languageComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.languageComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToContents)
         self.languageComboBox.setObjectName("languageComboBox")
         self.languageLayout.addWidget(self.languageComboBox)
         self.dialogLayout.addLayout(self.languageLayout)

=== modified file 'openlp/core/ui/firsttimelanguageform.py'
--- openlp/core/ui/firsttimelanguageform.py	2011-03-09 16:16:40 +0000
+++ openlp/core/ui/firsttimelanguageform.py	2011-03-15 01:45:13 +0000
@@ -26,7 +26,6 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
 from openlp.core.utils import LanguageManager
 from firsttimelanguagedialog import Ui_FirstTimeLanguageDialog
 

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-03-14 10:10:10 +0000
+++ openlp/core/ui/maindisplay.py	2011-03-15 01:45:13 +0000
@@ -426,7 +426,7 @@
             if self.hideMode:
                 self.hideDisplay(self.hideMode)
             else:
-               self.setVisible(True)
+                self.setVisible(True)
         preview = QtGui.QImage(self.screen[u'size'].width(),
             self.screen[u'size'].height(),
             QtGui.QImage.Format_ARGB32_Premultiplied)

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2011-03-11 08:46:21 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2011-03-15 01:45:13 +0000
@@ -33,7 +33,6 @@
 import os
 import re
 
-from songimport import SongImport
 from oooimport import OooImport
 
 if os.name == u'nt':