From 55dd795a453d45ba8ee0d49e8be0dd370847f397 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 27 Apr 2010 22:30:04 +0100 Subject: [PATCH] Unbreak presentations slightly --- .bzrignore | 1 + openlp/plugins/presentations/lib/presentationcontroller.py | 4 ++-- openlp/plugins/presentations/presentationplugin.py | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bzrignore b/.bzrignore index 00884055d..2314d48c5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -14,3 +14,4 @@ dist OpenLP.egg-info build resources/innosetup/Output +_eric4project diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index cbb5c9c00..4b304a516 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -102,8 +102,8 @@ class PresentationController(object): self.name = name self.available = self.check_available() if self.available: - self.enabled = QtCore.QSettings().value( - name, QtCore.Qt.Unchecked).toInt()[0] == QtCore.Qt.Checked + self.enabled = QtCore.QSettings().value(u'presentations/' + name, + QtCore.Qt.Unchecked).toInt()[0] == QtCore.Qt.Checked else: self.enabled = False self.thumbnailroot = os.path.join( diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index da25dcdc3..dd1a5259b 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -96,7 +96,9 @@ class PresentationPlugin(Plugin): try: __import__(modulename, globals(), locals(), []) except ImportError, e: - log.error(u'Failed to import %s on path %s for reason %s', modulename, path, e.args[0]) + log.error( + u'Failed to import %s on path %s for reason %s', + modulename, path, e.args[0]) controller_classes = PresentationController.__subclasses__() for controller_class in controller_classes: controller = controller_class(self)