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

fixes

Browse Source
This commit is contained in:
Tim Bentley 2010-04-23 17:03:12 +01:00
parent e6d6541ca2
commit 460964c371
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp.pyw
View File

@ -193,7 +193,13 @@ def main():
qInitResources() qInitResources()
# Now create and actually run the application. # Now create and actually run the application.
app = OpenLP(qt_args) app = OpenLP(qt_args)
sys.exit(app.run()) try:
a = app.run()
print a
except:
log.exception(u'it went bang')
sys.exit(a)
if __name__ == u'__main__': if __name__ == u'__main__':
""" """

2
openlp/core/lib/mediamanageritem.py
View File

@ -425,7 +425,7 @@ class MediaManagerItem(QtGui.QWidget):
else: else:
#Is it posssible to process multiple list items to generate multiple #Is it posssible to process multiple list items to generate multiple
#service items? #service items?
if self.singleServiceItem: if self.singleServiceItem or self.remoteTriggered:
log.debug(self.PluginNameShort + u' Add requested') log.debug(self.PluginNameShort + u' Add requested')
service_item = self.buildServiceItem() service_item = self.buildServiceItem()
if service_item: if service_item:

3
openlp/core/lib/renderer.py
View File

@ -244,7 +244,8 @@ class Renderer(object):
bbox1 = self._render_lines_unaligned(footer_lines, True) bbox1 = self._render_lines_unaligned(footer_lines, True)
# reset the frame. first time do not worry about what you paint on. # reset the frame. first time do not worry about what you paint on.
self._frame = QtGui.QImage(self.bg_frame) self._frame = QtGui.QImage(self.bg_frame)
self._frameOp = QtGui.QImage(self.bg_frame) if self._theme.display_slideTransition:
self._frameOp = QtGui.QImage(self.bg_frame)
x, y = self._correctAlignment(self._rect, bbox) x, y = self._correctAlignment(self._rect, bbox)
bbox = self._render_lines_unaligned(lines, False, (x, y), True) bbox = self._render_lines_unaligned(lines, False, (x, y), True)
if footer_lines: if footer_lines:

1
openlp/core/ui/servicemanager.py
View File

@ -653,6 +653,7 @@ class ServiceManager(QtGui.QWidget):
""" """
sitem, count = self.findServiceItem() sitem, count = self.findServiceItem()
item.render() item.render()
print self.remoteEditTriggered
if self.remoteEditTriggered: if self.remoteEditTriggered:
item.merge(self.serviceItems[sitem][u'service_item']) item.merge(self.serviceItems[sitem][u'service_item'])
self.serviceItems[sitem][u'service_item'] = item self.serviceItems[sitem][u'service_item'] = item