openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02560
[Merge] lp:~trb143/openlp/bugfixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Ok so you want to see an image. Lets hide words then!
--
https://code.launchpad.net/~trb143/openlp/bugfixes/+merge/30171
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-15 18:07:23 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-17 06:18:46 +0000
@@ -264,6 +264,10 @@
(self.screen[u'size'].width() - splash_image.width()) / 2,
(self.screen[u'size'].height() - splash_image.height()) / 2,
splash_image)
+ #build a blank transparent image
+ self.transparent = QtGui.QPixmap(
+ self.screen[u'size'].width(), self.screen[u'size'].height())
+ self.transparent.fill(QtCore.Qt.transparent)
self.displayImage(self.initialFrame)
self.repaint()
#Build a Black screen
@@ -274,12 +278,6 @@
QtGui.QImage.Format_ARGB32_Premultiplied)
painter.begin(self.blankFrame)
painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
- #build a blank transparent image
- self.transparent = QtGui.QPixmap(
- self.screen[u'size'].width(), self.screen[u'size'].height())
- self.transparent.fill(QtCore.Qt.transparent)
-# self.displayText.setPixmap(self.transparent)
- #self.frameView(self.transparent)
# To display or not to display?
if not self.screen[u'primary']:
self.setVisible(True)
@@ -410,6 +408,7 @@
self.imageDisplay.setPixmap(QtGui.QPixmap.fromImage(frame))
else:
self.imageDisplay.setPixmap(frame)
+ self.frameView(self.transparent)
self.videoDisplay.setHtml(u'<html></html>')
def displayVideo(self, path):
Follow ups
