Fixes from the merge

This commit is contained in:
Tim Bentley 2010-01-22 18:59:36 +00:00
parent 56275fbc21
commit 2d7c9dd402
4 changed files with 5 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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