From 38977e81ea22394af4572dfd72b1e2e4bcf654f1 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 8 Jul 2010 09:14:10 +0100 Subject: [PATCH] Cleanups --- openlp/core/theme/theme.py | 2 +- openlp/core/ui/maindisplay.py | 4 ++-- openlp/core/ui/servicemanager.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py index 82e7ac2cc..66cc0d848 100644 --- a/openlp/core/theme/theme.py +++ b/openlp/core/theme/theme.py @@ -203,7 +203,7 @@ class Theme(object): val = element_text if (element.tag.find(u'Color') > 0 or (element.tag.find(u'BackgroundParameter') == 0 and - type(val) == type(0))): + isinstance(int, val))): # convert to a wx.Colour if not delphi_color_change: val = QtGui.QColor( diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 0a05982db..b0ef8eaf4 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -538,7 +538,7 @@ class VideoDisplay(Phonon.VideoWidget): """ self.onMediaStop() for path in self.outputPaths(): - disconnected = path.disconnect() + path.disconnect() # def onMediaBackground(self, message=None): # """ @@ -664,7 +664,7 @@ class AudioPlayer(QtCore.QObject): """ self.onMediaStop() for path in self.mediaObject.outputPaths(): - disconnected = path.disconnect() + path.disconnect() def onMediaQueue(self, message): """ diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 837415921..5da6deb8a 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -33,7 +33,8 @@ log = logging.getLogger(__name__) from PyQt4 import QtCore, QtGui from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \ - Receiver, build_icon, ItemCapabilities, SettingsManager, translate, ThemeLevel + Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \ + ThemeLevel from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm from openlp.core.utils import AppLocation