openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/ticket-729 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094

Hello,

- fixed ticket 729 (http://support.openlp.org/issues/729)
- changed some variables to camelCase
-- 
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/ticket-729 into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2012-06-09 23:14:28 +0000
+++ openlp/core/ui/maindisplay.py	2012-06-13 15:49:28 +0000
@@ -130,6 +130,7 @@
         else:
             self.audioPlayer = None
         self.firstTime = True
+        self.webLoaded = True
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
         windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
                 QtCore.Qt.WindowStaysOnTopHint
@@ -194,27 +195,27 @@
         Display.setup(self)
         if self.isLive:
             # Build the initial frame.
-            image_file = Settings().value(u'advanced/default image',
+            backgroundColor = QtGui.QColor()
+            backgroundColor.setNamedColor(Settings().value(
+                u'advanced/default color',
+                QtCore.QVariant(u'#ffffff')).toString())
+            if not backgroundColor.isValid():
+                backgroundColor = QtCore.Qt.white
+            imageFile = Settings().value(u'advanced/default image',
                 QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
                 .toString()
-            background_color = QtGui.QColor()
-            background_color.setNamedColor(Settings().value(
-                u'advanced/default color',
-                QtCore.QVariant(u'#ffffff')).toString())
-            if not background_color.isValid():
-                background_color = QtCore.Qt.white
-            splash_image = QtGui.QImage(image_file)
+            splashImage = QtGui.QImage(imageFile)
             self.initialFrame = QtGui.QImage(
                 self.screen[u'size'].width(),
                 self.screen[u'size'].height(),
                 QtGui.QImage.Format_ARGB32_Premultiplied)
-            painter_image = QtGui.QPainter()
-            painter_image.begin(self.initialFrame)
-            painter_image.fillRect(self.initialFrame.rect(), background_color)
-            painter_image.drawImage(
-                (self.screen[u'size'].width() - splash_image.width()) / 2,
-                (self.screen[u'size'].height() - splash_image.height()) / 2,
-                splash_image)
+            painterImage = QtGui.QPainter()
+            painterImage.begin(self.initialFrame)
+            painterImage.fillRect(self.initialFrame.rect(), backgroundColor)
+            painterImage.drawImage(
+                (self.screen[u'size'].width() - splashImage.width()) / 2,
+                (self.screen[u'size'].height() - splashImage.height()) / 2,
+                splashImage)
             serviceItem = ServiceItem()
             serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
             self.webView.setHtml(build_html(serviceItem, self.screen,
@@ -247,27 +248,27 @@
         log.debug(u'alert to display')
         # First we convert <>& marks to html variants, then apply
         # formattingtags, finally we double all backslashes for JavaScript.
-        text_prepared = expand_tags(
+        textPrepared = expand_tags(
             cgi.escape(text)).replace(u'\\', u'\\\\').replace(u'\"', u'\\\"')
         if self.height() != self.screen[u'size'].height() or not \
             self.isVisible():
             shrink = True
-            js = u'show_alert("%s", "%s")' % (text_prepared, u'top')
+            js = u'show_alert("%s", "%s")' % (textPrepared, u'top')
         else:
             shrink = False
-            js = u'show_alert("%s", "")' % text_prepared
+            js = u'show_alert("%s", "")' % textPrepared
         height = self.frame.evaluateJavaScript(js)
         if shrink:
             if text:
-                alert_height = int(height.toString())
-                self.resize(self.width(), alert_height)
+                alertHeight = int(height.toString())
+                self.resize(self.width(), alertHeight)
                 self.setVisible(True)
                 if location == AlertLocation.Middle:
                     self.move(self.screen[u'size'].left(),
-                    (self.screen[u'size'].height() - alert_height) / 2)
+                        (self.screen[u'size'].height() - alertHeight) / 2)
                 elif location == AlertLocation.Bottom:
                     self.move(self.screen[u'size'].left(),
-                        self.screen[u'size'].height() - alert_height)
+                        self.screen[u'size'].height() - alertHeight)
             else:
                 self.setVisible(False)
                 self.setGeometry(self.screen[u'size'])
@@ -360,8 +361,8 @@
 
     def buildHtml(self, serviceItem, image=None):
         """
-        Store the serviceItem and build the new HTML from it. Add the
-        HTML to the display
+        Store the serviceItem and build the new HTML from it. Add the HTML to
+        the display.
         """
         log.debug(u'buildHtml')
         self.webLoaded = False
@@ -388,11 +389,11 @@
             self.serviceItem.bg_image_bytes = self.imageManager. \
                 getImageBytes(self.serviceItem.themedata.theme_name)
         if image:
-            image_bytes = self.imageManager.getImageBytes(image)
+            imageBytes = self.imageManager.getImageBytes(image)
         else:
-            image_bytes = None
+            imageBytes = None
         html = build_html(self.serviceItem, self.screen, self.isLive,
-            background, image_bytes, self.plugins)
+            background, imageBytes, self.plugins)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)
         log.debug(u'buildHtml - post setHtml')