Show Splash screen option now works

This commit is contained in:
Tim Bentley 2009-10-17 14:29:01 +01:00
parent 7ae0e045d3
commit 1082428926
2 changed files with 15 additions and 14 deletions

View File

@ -25,7 +25,7 @@
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import Receiver from openlp.core.lib import Receiver, str_to_bool
class MainDisplay(QtGui.QWidget): class MainDisplay(QtGui.QWidget):
""" """
@ -87,18 +87,19 @@ class MainDisplay(QtGui.QWidget):
else: else:
self.showMinimized() self.showMinimized()
#Build a custom splash screen #Build a custom splash screen
self.InitialFrame = QtGui.QImage( if str_to_bool(self.parent.generalConfig.get_config(u'show splash', u'True')):
screen[u'size'].width(), screen[u'size'].height(), self.InitialFrame = QtGui.QImage(
QtGui.QImage.Format_ARGB32_Premultiplied) screen[u'size'].width(), screen[u'size'].height(),
splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png') QtGui.QImage.Format_ARGB32_Premultiplied)
painter_image = QtGui.QPainter() splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
painter_image.begin(self.InitialFrame) painter_image = QtGui.QPainter()
painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white) painter_image.begin(self.InitialFrame)
painter_image.drawImage( painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
(screen[u'size'].width() - splash_image.width()) / 2, painter_image.drawImage(
(screen[u'size'].height() - splash_image.height()) / 2, (screen[u'size'].width() - splash_image.width()) / 2,
splash_image) (screen[u'size'].height() - splash_image.height()) / 2,
self.frameView(self.InitialFrame) splash_image)
self.frameView(self.InitialFrame)
#Build a Black screen #Build a Black screen
painter = QtGui.QPainter() painter = QtGui.QPainter()
self.blankFrame = QtGui.QImage( self.blankFrame = QtGui.QImage(

View File

@ -418,8 +418,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.screenList = screens self.screenList = screens
self.serviceNotSaved = False self.serviceNotSaved = False
self.settingsmanager = SettingsManager(screens) self.settingsmanager = SettingsManager(screens)
self.mainDisplay = MainDisplay(self, screens)
self.generalConfig = PluginConfig(u'General') self.generalConfig = PluginConfig(u'General')
self.mainDisplay = MainDisplay(self, screens)
self.alertForm = AlertForm(self) self.alertForm = AlertForm(self)
self.aboutForm = AboutForm(self) self.aboutForm = AboutForm(self)
self.settingsForm = SettingsForm(self.screenList, self) self.settingsForm = SettingsForm(self.screenList, self)