diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index a7223e938..e3618c7a1 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -26,11 +26,13 @@ The :mod:`lib` module contains most of the components and libraries that make OpenLP work. """ - +import logging import types from PyQt4 import QtCore, QtGui +log = logging.getLogger(__name__) + def translate(context, text): """ A special shortcut method to wrap around the Qt4 translation functions. @@ -60,7 +62,9 @@ def file_to_xml(xmlfile): file = open(xmlfile, u'r') xml = file.read() except IOError: - log.exception(u'Failed to open XML file') + #This may not be an error as this is also used to check + #that a file exist + log.error(u'Failed to open XML file %s' % xmlfile) 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/mainwindow.py b/openlp/core/ui/mainwindow.py index 6e24cbdb9..81ac48fe3 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -300,8 +300,14 @@ class Ui_MainWindow(object): # Connect up some signals and slots QtCore.QObject.connect(self.FileExitItem, QtCore.SIGNAL(u'triggered()'), MainWindow.close) + QtCore.QObject.connect(self.ControlSplitter, + QtCore.SIGNAL(u'splitterMoved(int, int)'), self.trackSplitter) QtCore.QMetaObject.connectSlotsByName(MainWindow) + def trackSplitter(self, tab, pos): + #print tab, pos + pass + def retranslateUi(self, MainWindow): """ Set up the translation system 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') diff --git a/version.txt b/version.txt index fce790b57..2f5e065fd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9.0-663 +1.9.0-664