From 9c0391fe733cfd3b54cabf70cfcca2db4e87c4b8 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 4 Sep 2010 18:55:10 +0100 Subject: [PATCH 1/3] Screen size and scrollbar fix? --- openlp.pyw | 9 ++++++--- openlp/core/lib/htmlbuilder.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index c4f062b87..7245541d7 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -129,11 +129,14 @@ class OpenLP(QtGui.QApplication): screens = ScreenList() # Decide how many screens we have and their size for screen in xrange(0, self.desktop().numScreens()): + if self.desktop().isVirtualDesktop(): + size = self.desktop().availableGeometry(screen); + else: + 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() diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index a39c3dac5..9c696526e 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -40,6 +40,7 @@ HTMLSRC = u""" margin: 0; padding: 0; border: 0; + overflow: hidden; } body { %s; From e54340d8f36f88877a567150e95e800ca5325e42 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 4 Sep 2010 20:13:26 +0100 Subject: [PATCH 2/3] scrollbar attempt 2 --- openlp/core/ui/maindisplay.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 2c9472414..e682a3a0f 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -125,6 +125,8 @@ class MainDisplay(DisplayWidget): 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, From 277f5e13807f14ba97c65d9260ae3d7c4011c741 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 4 Sep 2010 21:08:36 +0100 Subject: [PATCH 3/3] Always use screenGeometry --- openlp.pyw | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 7245541d7..dfe973ceb 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -129,10 +129,7 @@ class OpenLP(QtGui.QApplication): screens = ScreenList() # Decide how many screens we have and their size for screen in xrange(0, self.desktop().numScreens()): - if self.desktop().isVirtualDesktop(): - size = self.desktop().availableGeometry(screen); - else: - size = self.desktop().screenGeometry(screen); + size = self.desktop().screenGeometry(screen); screens.add_screen({u'number': screen, u'size': size, u'primary': (self.desktop().primaryScreen() == screen)})