openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/render into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Disable scrollbars on main display.
Use full screen size rather than the available size for display dimension.

-- 
https://code.launchpad.net/~j-corwin/openlp/render/+merge/34625
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/render into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2010-08-25 17:08:36 +0000
+++ openlp.pyw	2010-09-04 20:13:44 +0000
@@ -129,11 +129,11 @@
         screens = ScreenList()
         # Decide how many screens we have and their size
         for screen in xrange(0, self.desktop().numScreens()):
+            size = self.desktop().screenGeometry(screen);
             screens.add_screen({u'number': screen,
-                u'size': self.desktop().availableGeometry(screen),
+                u'size': size,
                 u'primary': (self.desktop().primaryScreen() == screen)})
-            log.info(u'Screen %d found with resolution %s',
-                screen, self.desktop().availableGeometry(screen))
+            log.info(u'Screen %d found with resolution %s', screen, size)
         # start the main app window
         self.mainWindow = MainWindow(screens, app_version)
         self.mainWindow.show()

=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2010-09-04 14:23:20 +0000
+++ openlp/core/lib/htmlbuilder.py	2010-09-04 20:13:44 +0000
@@ -40,6 +40,7 @@
     margin: 0;
     padding: 0;
     border: 0;
+    overflow: hidden;
 }
 body {
     %s;

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-09-04 07:48:58 +0000
+++ openlp/core/ui/maindisplay.py	2010-09-04 20:13:44 +0000
@@ -125,6 +125,8 @@
         self.frame = self.page.mainFrame()
         QtCore.QObject.connect(self.webView,
             QtCore.SIGNAL(u'loadFinished(bool)'), self.isLoaded)
+        self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Vertical,
             QtCore.Qt.ScrollBarAlwaysOff)
         self.frame.setScrollBarPolicy(QtCore.Qt.Horizontal,