Fixes from the merge

openlp.pyw

@@ -34,7 +34,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, str_to_bool
 from openlp.core.resources import qInitResources
-from openlp.core.ui import MainWindow, SplashScreen, Screen
+from openlp.core.ui import MainWindow, SplashScreen, ScreenList
 from openlp.core.utils import ConfigHelper
 
 log = logging.getLogger()
@@ -117,7 +117,7 @@ class OpenLP(QtGui.QApplication):
             self.splash.show()
         # make sure Qt really display the splash screen
         self.processEvents()
-        screens = Screen()
+        screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
             screens.add_screen({u'number': screen,

openlp/core/lib/__init__.py

@@ -143,11 +143,7 @@ def resize_image(image, width, height):
     ``image``
         The image to resize.
     """
-    if isinstance(image, QtGui.QImage):
     preview = QtGui.QImage(image)
-    else:
-        preview = QtGui.QImage(image)
-
     preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
         QtCore.Qt.SmoothTransformation)
     realw = preview.width();

openlp/core/ui/__init__.py

@@ -23,7 +23,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from screen import Screen
+from screen import ScreenList
 from maindisplay import MainDisplay
 from amendthemeform import AmendThemeForm
 from slidecontroller import SlideController

openlp/core/ui/screen.py

@@ -24,7 +24,7 @@
 ###############################################################################
 import logging
 
-class Screen(object):
+class ScreenList(object):
     """
     Wrapper to handle the parameters of the display screen
     """