From fa99ba64b1353853163928066ded394c6cc4922d Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 7 May 2010 19:29:17 +0100
Subject: [PATCH] Fix names

---
 openlp/core/lib/serviceitem.py   |  3 +--
 openlp/core/ui/servicemanager.py | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 764875f4f..a283885b2 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -81,7 +81,7 @@ class ServiceItem(object):
         self.notes = u''
         self.from_plugin = False
         self.capabilities = []
-        self.isValid = True
+        self.is_valid = True
 
     def add_capability(self, capability):
         self.capabilities.append(capability)
@@ -336,4 +336,3 @@ class ServiceItem(object):
         Returns the title of the raw frame
         """
         return self._raw_frames[row][u'path']
-
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 3a35a7a58..c5fa0b73c 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -499,7 +499,7 @@ class ServiceManager(QtGui.QWidget):
         for itemcount, item in enumerate(self.serviceItems):
             serviceitem = item[u'service_item']
             treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
-            if serviceitem.isValid:
+            if serviceitem.is_valid:
                 if serviceitem.notes:
                     icon = QtGui.QImage(serviceitem.icon)
                     icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
@@ -685,7 +685,7 @@ class ServiceManager(QtGui.QWidget):
         if serviceItem.is_command():
             type = serviceItem._raw_frames[0][u'title'].split(u'.')[1]
             if type not in self.suffixes:
-                serviceItem.isValid = False
+                serviceItem.is_valid = False
 
     def cleanUp(self):
         """
@@ -769,7 +769,7 @@ class ServiceManager(QtGui.QWidget):
         Send the current item to the Preview slide controller
         """
         item, count = self.findServiceItem()
-        if self.serviceItems[item][u'service_item'].isValid:
+        if self.serviceItems[item][u'service_item'].is_valid:
             self.parent.PreviewController.addServiceManagerItem(
                 self.serviceItems[item][u'service_item'], count)
         else:
@@ -796,7 +796,7 @@ class ServiceManager(QtGui.QWidget):
         Send the current item to the Live slide controller
         """
         item, count = self.findServiceItem()
-        if self.serviceItems[item][u'service_item'].isValid:
+        if self.serviceItems[item][u'service_item'].is_valid:
             self.parent.LiveController.addServiceManagerItem(
                 self.serviceItems[item][u'service_item'], count)
             if QtCore.QSettings().value(
@@ -963,4 +963,4 @@ class ServiceManager(QtGui.QWidget):
             data_item[u'notes'] = unicode(service_item.notes)
             data_item[u'selected'] = (item == curitem)
             data.append(data_item)
-        Receiver.send_message(u'servicemanager_list_response', data)
+        Receiver.send_message(u'servicemanager_list_response', data)
\ No newline at end of file