From 665fc82c9480a6f32026eb64885ba0363bab742d Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 27 May 2011 21:25:03 +0200 Subject: [PATCH 1/2] Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. --- openlp/core/lib/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index 5b03e5fa4..351d79e3e 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -32,7 +32,7 @@ import os from PyQt4 import QtCore from sqlalchemy import create_engine, MetaData -from sqlalchemy.exceptions import InvalidRequestError +from sqlalchemy.exc import InvalidRequestError from sqlalchemy.orm import scoped_session, sessionmaker from openlp.core.utils import AppLocation, delete_file From 7ed1be6612956e7402a0cfe7988d8a574c9a3168 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Sat, 28 May 2011 00:05:33 -0400 Subject: [PATCH 2/2] Fixed bug #788335 - Changed slidecontroller to correctly blank screen --- openlp/core/ui/slidecontroller.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 08e1c0366..98046ba2a 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -841,6 +841,11 @@ class SlideController(QtGui.QWidget): Receiver.send_message(u'%s_unblank' % self.serviceItem.name.lower(), [self.serviceItem, self.isLive]) + else: + if hide_mode: + Receiver.send_message(u'maindisplay_hide', hide_mode) + else: + Receiver.send_message(u'maindisplay_show') def hidePlugin(self, hide): """ @@ -859,6 +864,11 @@ class SlideController(QtGui.QWidget): Receiver.send_message(u'%s_unblank' % self.serviceItem.name.lower(), [self.serviceItem, self.isLive]) + else: + if hide: + Receiver.send_message(u'maindisplay_hide', HideMode.Screen) + else: + Receiver.send_message(u'maindisplay_show') def onSlideSelected(self, start=False): """