From 5b154b5941a8e2a65256b6df9f6200ce1e5f5a1b Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 8 Nov 2009 13:56:25 +0000
Subject: [PATCH] Fix bugs in previous merges with icons and themes

---
 openlp/core/lib/__init__.py       | 2 +-
 openlp/core/lib/rendermanager.py  | 2 +-
 openlp/core/ui/slidecontroller.py | 4 ++--
 openlp/core/ui/thememanager.py    | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index a7223e938..f2547d966 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -60,7 +60,7 @@ def file_to_xml(xmlfile):
         file = open(xmlfile, u'r')
         xml = file.read()
     except IOError:
-        log.exception(u'Failed to open XML file')
+        print(u'Failed to open XML file')
     finally:
         if file:
             file.close()
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index d4463ea21..d35495dbc 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -253,7 +253,7 @@ class RenderManager(object):
         newImage = QtGui.QImage(w, h, QtGui.QImage.Format_ARGB32_Premultiplied)
         newImage.fill(QtCore.Qt.black)
         painter = QtGui.QPainter(newImage)
-        painter.drawImage((w-realw) / 2, (h-realh) / 2, preview)
+        painter.drawImage((w - realw) / 2, (h - realh) / 2, preview)
         return newImage
 
     def calculate_default(self, screen):
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index f591591f3..bccc85587 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -219,7 +219,7 @@ class SlideController(QtGui.QWidget):
         self.PreviewFrame = QtGui.QFrame(self.Splitter)
         self.PreviewFrame.setGeometry(QtCore.QRect(0, 0, 300, 225))
         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.setFrameShadow(QtGui.QFrame.Sunken)
         self.PreviewFrame.setObjectName(u'PreviewFrame')
@@ -319,7 +319,7 @@ class SlideController(QtGui.QWidget):
                 if item.verse_order:
                     verses = item.verse_order.split(u' ')
                     for verse in verses:
-                        if int(verse) > 12:
+                        if not verse or int(verse) > 12:
                             break
                         try:
                             self.Songbar.actions[verse].setVisible(True)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 8850d880a..51f1f2425 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -271,7 +271,6 @@ class ThemeManager(QtGui.QWidget):
         return self.themelist
 
     def getThemeData(self, themename):
-        assert(themename)
         log.debug(u'getthemedata for theme %s', themename)
         xml_file = os.path.join(self.path, unicode(themename),
             unicode(themename) + u'.xml')