raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

reverted changes

Browse Source
This commit is contained in:
Andreas Preikschat 2012-06-14 17:46:47 +02:00
parent 21fc0f9533
commit 6a23b75b8c
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
openlp/core/ui/maindisplay.py
View File

@ -133,7 +133,7 @@ class MainDisplay(Display):
self.webLoaded = True self.webLoaded = True
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;') self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \ windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
QtCore.Qt.WindowStaysOnTopHint QtCore.Qt.WindowStaysOnTopHint
if Settings().value(u'advanced/x11 bypass wm', if Settings().value(u'advanced/x11 bypass wm',
QtCore.QVariant(True)).toBool(): QtCore.QVariant(True)).toBool():
windowFlags |= QtCore.Qt.X11BypassWindowManagerHint windowFlags |= QtCore.Qt.X11BypassWindowManagerHint
@ -195,27 +195,27 @@ class MainDisplay(Display):
Display.setup(self) Display.setup(self)
if self.isLive: if self.isLive:
# Build the initial frame. # Build the initial frame.
backgroundColor = QtGui.QColor() background_color = QtGui.QColor()
backgroundColor.setNamedColor(Settings().value( background_color.setNamedColor(Settings().value(
u'advanced/default color', u'advanced/default color',
QtCore.QVariant(u'#ffffff')).toString()) QtCore.QVariant(u'#ffffff')).toString())
if not backgroundColor.isValid(): if not background_color.isValid():
backgroundColor = QtCore.Qt.white background_color = QtCore.Qt.white
imageFile = Settings().value(u'advanced/default image', image_file = Settings().value(u'advanced/default image',
QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\ QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
.toString() .toString()
splashImage = QtGui.QImage(imageFile) splash_image = QtGui.QImage(image_file)
self.initialFrame = QtGui.QImage( self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(), self.screen[u'size'].width(),
self.screen[u'size'].height(), self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied) QtGui.QImage.Format_ARGB32_Premultiplied)
painterImage = QtGui.QPainter() painter_image = QtGui.QPainter()
painterImage.begin(self.initialFrame) painter_image.begin(self.initialFrame)
painterImage.fillRect(self.initialFrame.rect(), backgroundColor) painter_image.fillRect(self.initialFrame.rect(), background_color)
painterImage.drawImage( painter_image.drawImage(
(self.screen[u'size'].width() - splashImage.width()) / 2, (self.screen[u'size'].width() - splash_image.width()) / 2,
(self.screen[u'size'].height() - splashImage.height()) / 2, (self.screen[u'size'].height() - splash_image.height()) / 2,
splashImage) splash_image)
serviceItem = ServiceItem() serviceItem = ServiceItem()
serviceItem.bg_image_bytes = image_to_byte(self.initialFrame) serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
self.webView.setHtml(build_html(serviceItem, self.screen, self.webView.setHtml(build_html(serviceItem, self.screen,
@ -248,27 +248,27 @@ class MainDisplay(Display):
log.debug(u'alert to display') log.debug(u'alert to display')
# First we convert <>& marks to html variants, then apply # First we convert <>& marks to html variants, then apply
# formattingtags, finally we double all backslashes for JavaScript. # formattingtags, finally we double all backslashes for JavaScript.
textPrepared = expand_tags( text_prepared = expand_tags(
cgi.escape(text)).replace(u'\\', u'\\\\').replace(u'\"', u'\\\"') cgi.escape(text)).replace(u'\\', u'\\\\').replace(u'\"', u'\\\"')
if self.height() != self.screen[u'size'].height() or not \ if self.height() != self.screen[u'size'].height() or not \
self.isVisible(): self.isVisible():
shrink = True shrink = True
js = u'show_alert("%s", "%s")' % (textPrepared, u'top') js = u'show_alert("%s", "%s")' % (text_prepared, u'top')
else: else:
shrink = False shrink = False
js = u'show_alert("%s", "")' % textPrepared js = u'show_alert("%s", "")' % text_prepared
height = self.frame.evaluateJavaScript(js) height = self.frame.evaluateJavaScript(js)
if shrink: if shrink:
if text: if text:
alertHeight = int(height.toString()) alert_height = int(height.toString())
self.resize(self.width(), alertHeight) self.resize(self.width(), alert_height)
self.setVisible(True) self.setVisible(True)
if location == AlertLocation.Middle: if location == AlertLocation.Middle:
self.move(self.screen[u'size'].left(), self.move(self.screen[u'size'].left(),
(self.screen[u'size'].height() - alertHeight) / 2) (self.screen[u'size'].height() - alert_height) / 2)
elif location == AlertLocation.Bottom: elif location == AlertLocation.Bottom:
self.move(self.screen[u'size'].left(), self.move(self.screen[u'size'].left(),
self.screen[u'size'].height() - alertHeight) self.screen[u'size'].height() - alert_height)
else: else:
self.setVisible(False) self.setVisible(False)
self.setGeometry(self.screen[u'size']) self.setGeometry(self.screen[u'size'])
@ -290,8 +290,8 @@ class MainDisplay(Display):
def image(self, name): def image(self, name):
""" """
Add an image as the background. The image has already been added Add an image as the background. The image has already been added to the
to the cache. cache.
``name`` ``name``
The name of the image to be displayed. The name of the image to be displayed.
@ -361,8 +361,8 @@ class MainDisplay(Display):
def buildHtml(self, serviceItem, image=None): def buildHtml(self, serviceItem, image=None):
""" """
Store the serviceItem and build the new HTML from it. Add the HTML to Store the serviceItem and build the new HTML from it. Add the
the display. HTML to the display
""" """
log.debug(u'buildHtml') log.debug(u'buildHtml')
self.webLoaded = False self.webLoaded = False
@ -389,11 +389,11 @@ class MainDisplay(Display):
self.serviceItem.bg_image_bytes = self.imageManager. \ self.serviceItem.bg_image_bytes = self.imageManager. \
getImageBytes(self.serviceItem.themedata.theme_name) getImageBytes(self.serviceItem.themedata.theme_name)
if image: if image:
imageBytes = self.imageManager.getImageBytes(image) image_bytes = self.imageManager.getImageBytes(image)
else: else:
imageBytes = None image_bytes = None
html = build_html(self.serviceItem, self.screen, self.isLive, html = build_html(self.serviceItem, self.screen, self.isLive,
background, imageBytes, self.plugins) background, image_bytes, self.plugins)
log.debug(u'buildHtml - pre setHtml') log.debug(u'buildHtml - pre setHtml')
self.webView.setHtml(html) self.webView.setHtml(html)
log.debug(u'buildHtml - post setHtml') log.debug(u'buildHtml - post setHtml')