raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Unbreak presentations slightly

Browse Source
This commit is contained in:
Jon Tibble 2010-04-27 22:30:04 +01:00
parent 9605183812
commit 55dd795a45
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -14,3 +14,4 @@ dist
OpenLP.egg-info OpenLP.egg-info
build build
resources/innosetup/Output resources/innosetup/Output
_eric4project

4
openlp/plugins/presentations/lib/presentationcontroller.py
View File

@ -102,8 +102,8 @@ class PresentationController(object):
self.name = name self.name = name
self.available = self.check_available() self.available = self.check_available()
if self.available: if self.available:
self.enabled = QtCore.QSettings().value( self.enabled = QtCore.QSettings().value(u'presentations/' + name,
name, QtCore.Qt.Unchecked).toInt()[0] == QtCore.Qt.Checked QtCore.Qt.Unchecked).toInt()[0] == QtCore.Qt.Checked
else: else:
self.enabled = False self.enabled = False
self.thumbnailroot = os.path.join( self.thumbnailroot = os.path.join(

4
openlp/plugins/presentations/presentationplugin.py
View File

@ -96,7 +96,9 @@ class PresentationPlugin(Plugin):
try: try:
__import__(modulename, globals(), locals(), []) __import__(modulename, globals(), locals(), [])
except ImportError, e: 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__() controller_classes = PresentationController.__subclasses__()
for controller_class in controller_classes: for controller_class in controller_classes:
controller = controller_class(self) controller = controller_class(self)