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

Fix bugs in previous merges with icons and themes

Browse Source
This commit is contained in:
Tim Bentley 2009-11-08 13:56:25 +00:00
parent f3f3906ca0
commit 5b154b5941
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ def file_to_xml(xmlfile):
file = open(xmlfile, u'r') file = open(xmlfile, u'r')
xml = file.read() xml = file.read()
except IOError: except IOError:
log.exception(u'Failed to open XML file') print(u'Failed to open XML file')
finally: finally:
if file: if file:
file.close() file.close()

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

@ -253,7 +253,7 @@ class RenderManager(object):
newImage = QtGui.QImage(w, h, QtGui.QImage.Format_ARGB32_Premultiplied) newImage = QtGui.QImage(w, h, QtGui.QImage.Format_ARGB32_Premultiplied)
newImage.fill(QtCore.Qt.black) newImage.fill(QtCore.Qt.black)
painter = QtGui.QPainter(newImage) painter = QtGui.QPainter(newImage)
painter.drawImage((w-realw) / 2, (h-realh) / 2, preview) painter.drawImage((w - realw) / 2, (h - realh) / 2, preview)
return newImage return newImage
def calculate_default(self, screen): def calculate_default(self, screen):

4
openlp/core/ui/slidecontroller.py
View File

@ -219,7 +219,7 @@ class SlideController(QtGui.QWidget):
self.PreviewFrame = QtGui.QFrame(self.Splitter) self.PreviewFrame = QtGui.QFrame(self.Splitter)
self.PreviewFrame.setGeometry(QtCore.QRect(0, 0, 300, 225)) self.PreviewFrame.setGeometry(QtCore.QRect(0, 0, 300, 225))
self.PreviewFrame.setSizePolicy(QtGui.QSizePolicy( self.PreviewFrame.setSizePolicy(QtGui.QSizePolicy(
QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum)) QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Label))
self.PreviewFrame.setFrameShape(QtGui.QFrame.StyledPanel) self.PreviewFrame.setFrameShape(QtGui.QFrame.StyledPanel)
self.PreviewFrame.setFrameShadow(QtGui.QFrame.Sunken) self.PreviewFrame.setFrameShadow(QtGui.QFrame.Sunken)
self.PreviewFrame.setObjectName(u'PreviewFrame') self.PreviewFrame.setObjectName(u'PreviewFrame')
@ -319,7 +319,7 @@ class SlideController(QtGui.QWidget):
if item.verse_order: if item.verse_order:
verses = item.verse_order.split(u' ') verses = item.verse_order.split(u' ')
for verse in verses: for verse in verses:
if int(verse) > 12: if not verse or int(verse) > 12:
break break
try: try:
self.Songbar.actions[verse].setVisible(True) self.Songbar.actions[verse].setVisible(True)

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

@ -271,7 +271,6 @@ class ThemeManager(QtGui.QWidget):
return self.themelist return self.themelist
def getThemeData(self, themename): def getThemeData(self, themename):
assert(themename)
log.debug(u'getthemedata for theme %s', themename) log.debug(u'getthemedata for theme %s', themename)
xml_file = os.path.join(self.path, unicode(themename), xml_file = os.path.join(self.path, unicode(themename),
unicode(themename) + u'.xml') unicode(themename) + u'.xml')