openlp-core team mailing list archive

[googol <googol@xxxxxxxx>]

googol has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


A few (small) coding standard fixes.
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/29403
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-07-06 21:59:52 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-07 15:51:43 +0000
@@ -240,7 +240,8 @@
         #Sort out screen locations and sizes
         self.setGeometry(self.screen[u'size'])
         self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
-        self.webView.setGeometry(0, 0, self.size().width(), self.size().height())
+        self.webView.setGeometry(0, 0, self.size().width(),
+            self.size().height())
         #Build a custom splash screen
         self.InitialFrame = QtGui.QImage(
             self.screen[u'size'].width(),
@@ -287,11 +288,14 @@
         self.webView = QtWebKit.QWebView()
         self.page = self.webView.page()
         self.videoDisplay = self.page.mainFrame()
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
-        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Vertical,
+            QtCore.Qt.ScrollBarAlwaysOff)
+        self.videoDisplay.setScrollBarPolicy(QtCore.Qt.Horizontal,
+            QtCore.Qt.ScrollBarAlwaysOff)
         self.proxy = QtGui.QGraphicsProxyWidget()
         self.proxy.setWidget(self.webView)
-        self.proxy.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
+        self.proxy.setWindowFlags(
+            QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
         self.proxy.setZValue(1)
         self.scene.addItem(self.proxy)
 
@@ -412,7 +416,8 @@
         log.debug(u'adddisplayVideo')
         self.displayImage(self.transparent)
         self.videoDisplay.setHtml(HTMLVIDEO %
-            (path, self.screen[u'size'].width(), self.screen[u'size'].height()))
+            (path, self.screen[u'size'].width(),
+            self.screen[u'size'].height()))
 
     def frameView(self, frame, transition=False):
         """
@@ -513,7 +518,7 @@
         Sets up the screen on a particular screen.
         """
         log.debug(u'VideoDisplay Setup %s for %s ' % (self.screens,
-             self.screens.monitor_number))
+            self.screens.monitor_number))
         self.screen = self.screens.current
         #Sort out screen locations and sizes
         self.setGeometry(self.screen[u'size'])