Review comments

openlp/core/lib/mediamanageritem.py

@@ -380,7 +380,7 @@ class MediaManagerItem(QtGui.QWidget):
             log.debug(self.PluginNameShort + u' Preview requested')
             service_item = self.buildServiceItem()
             if service_item:
-                service_item.fromPlugin = True
+                service_item.from_plugin = True
                 self.parent.preview_controller.addServiceItem(service_item)
 
     def onLiveClick(self):
@@ -392,7 +392,7 @@ class MediaManagerItem(QtGui.QWidget):
             log.debug(self.PluginNameShort + u' Live requested')
             service_item = self.buildServiceItem()
             if service_item:
-                service_item.fromPlugin = True
+                service_item.from_plugin = True
                 self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):
@@ -404,7 +404,7 @@ class MediaManagerItem(QtGui.QWidget):
             log.debug(self.PluginNameShort + u' Add requested')
             service_item = self.buildServiceItem()
             if service_item:
-                service_item.fromPlugin = False
+                service_item.from_plugin = False
                 self.parent.service_manager.addServiceItem(service_item)
 
     def onAddEditClick(self):
@@ -417,8 +417,8 @@ class MediaManagerItem(QtGui.QWidget):
             service_item = self.parent.service_manager.getServiceItem()
             if not service_item:
                 QtGui.QMessageBox.information(self,
-                    self.trUtf8('No Servive item selected'),
+                    self.trUtf8('No Service Item Selected'),
-                    self.trUtf8('You must select a existing Service Item to add to.'))
+                    self.trUtf8('You must select a existing service item to add to.'))
             elif self.title == service_item.name:
                 self.generateSlideData(service_item)
                 self.parent.service_manager.addServiceItem(service_item)
@@ -442,4 +442,4 @@ class MediaManagerItem(QtGui.QWidget):
         if self.generateSlideData(service_item):
             return service_item
         else:
-            return None
+            return None

openlp/core/lib/serviceitem.py

@@ -72,9 +72,9 @@ class ServiceItem(object):
         self._raw_frames = []
         self._display_frames = []
         self._uuid = unicode(uuid.uuid1())
-        self.autoPreviewAllowed = False
+        self.auto_preview_allowed = False
         self.notes = u''
-        self.fromPlugin = False
+        self.from_plugin = False
 
     def addIcon(self, icon):
         """
@@ -207,10 +207,10 @@ class ServiceItem(object):
             u'type':self.service_item_type,
             u'audit':self.audit,
             u'notes':self.notes,
-            u'preview':self.autoPreviewAllowed,
+            u'preview':self.auto_preview_allowed,
             u'edit':self.edit_enabled,
             u'maintain':self.maintain_allowed,
-            u'fromPlugin':self.fromPlugin
+            u'from_plugin':self.from_plugin
         }
         service_data = []
         if self.service_item_type == ServiceItemType.Text:
@@ -244,11 +244,11 @@ class ServiceItem(object):
         self.addIcon(header[u'icon'])
         self.raw_footer = header[u'footer']
         self.audit = header[u'audit']
-        self.autoPreviewAllowed = header[u'preview']
+        self.auto_preview_allowed = header[u'preview']
         self.notes = header[u'notes']
         self.edit_enabled = header[u'edit']
         self.maintain_allowed = header[u'maintain']
-        self.fromPlugin = header[u'fromPlugin']
+        self.from_plugin = header[u'from_plugin']
         if self.service_item_type == ServiceItemType.Text:
             for slide in serviceitem[u'serviceitem'][u'data']:
                 self._raw_frames.append(slide)
@@ -327,4 +327,4 @@ class ServiceItem(object):
 
     def request_audit(self):
         if self.audit:
-            Receiver.send_message(u'songusage_live', self.audit)
+            Receiver.send_message(u'songusage_live', self.audit)

openlp/core/ui/__init__.py

@@ -23,7 +23,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from slidecontroller import DisplayHideMode
+from slidecontroller import HideMode
 from servicenoteform import ServiceNoteForm
 from serviceitemeditform import ServiceItemEditForm
 from screen import ScreenList
@@ -43,4 +43,4 @@ from mainwindow import MainWindow
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
     'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
-    'AmendThemeForm', 'MediaDockManager', 'ServiceItemNoteForm']
+    'AmendThemeForm', 'MediaDockManager', 'ServiceItemNoteForm']

openlp/core/ui/maindisplay.py

@@ -30,7 +30,7 @@ from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
 
 from openlp.core.lib import Receiver, resize_image
-from openlp.core.ui import DisplayHideMode
+from openlp.core.ui import HideMode
 
 log = logging.getLogger(__name__)
 
@@ -254,13 +254,13 @@ class MainDisplay(DisplayWidget):
             self.waitingFrame = frame
             self.waitingFrameTrans = transition
 
-    def blankDisplay(self, blankType=DisplayHideMode.Blank, blanked=True):
+    def blankDisplay(self, blankType=HideMode.Blank, blanked=True):
         log.debug(u'Blank main Display %d' % blanked)
         if blanked:
             self.displayBlank = True
-            if blankType == DisplayHideMode.Blank:
+            if blankType == HideMode.Blank:
                 self.display_text.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
-            elif blankType == DisplayHideMode.Theme:
+            elif blankType == HideMode.Theme:
                 theme = self.parent.RenderManager.renderer.bg_frame
                 if not theme:
                     theme = self.blankFrame
@@ -320,4 +320,4 @@ class MainDisplay(DisplayWidget):
         self.video.setVisible(False)
         self.display_text.show()
         self.display_image.show()
-        self.blankDisplay(False, False)
+        self.blankDisplay(False, False)

openlp/core/ui/servicemanager.py

@@ -34,7 +34,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
     contextMenuAction, Receiver, str_to_bool, build_icon
-from openlp.core.ui import ServiceNoteForm,  ServiceItemEditForm
+from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
 
 class ServiceManagerList(QtGui.QTreeWidget):
 
@@ -713,7 +713,7 @@ class ServiceManager(QtGui.QWidget):
                         get_config(u'auto preview', u'False')):
             item += 1
             if self.serviceItems and item < len(self.serviceItems) and \
-                self.serviceItems[item][u'service_item'].autoPreviewAllowed:
+                self.serviceItems[item][u'service_item'].auto_preview_allowed:
                     self.parent.PreviewController.addServiceManagerItem(
                         self.serviceItems[item][u'service_item'], 0)
 

openlp/core/ui/slidecontroller.py

@@ -30,7 +30,7 @@ import os
 from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
 
-class DisplayHideMode(object):
+class HideMode(object):
     """
     This is basically an enumeration class which specifies the mode of a Bible.
     Mode refers to whether or not a Bible in OpenLP is a full Bible or needs to
@@ -395,7 +395,7 @@ class SlideController(QtGui.QWidget):
         self.Toolbar.setVisible(True)
         self.Mediabar.setVisible(False)
         self.Toolbar.makeWidgetsInvisible(self.song_edit_list)
-        if item.edit_enabled and item.fromPlugin:
+        if item.edit_enabled and item.from_plugin:
             self.Toolbar.makeWidgetsVisible(self.song_edit_list)
         elif item.is_media():
             self.Toolbar.setVisible(False)
@@ -560,7 +560,7 @@ class SlideController(QtGui.QWidget):
         log.debug(u'onBlankDisplay %d' % force)
         if force:
             self.blankButton.setChecked(True)
-        self.blankScreen(DisplayHideMode.Blank, self.blankButton.isChecked())
+        self.blankScreen(HideMode.Blank, self.blankButton.isChecked())
         self.parent.generalConfig.set_config(u'screen blank',
                                             self.blankButton.isChecked())
 
@@ -571,7 +571,7 @@ class SlideController(QtGui.QWidget):
         log.debug(u'onThemeDisplay %d' % force)
         if force:
             self.themeButton.setChecked(True)
-        self.blankScreen(DisplayHideMode.Theme, self.themeButton.isChecked())
+        self.blankScreen(HideMode.Theme, self.themeButton.isChecked())
 
     def onHideDisplay(self, force=False):
         """
@@ -585,7 +585,7 @@ class SlideController(QtGui.QWidget):
         else:
             self.parent.mainDisplay.showDisplay()
 
-    def blankScreen(self, blankType,  blanked=False):
+    def blankScreen(self, blankType, blanked=False):
         """
         Blank the display screen.
         """

openlp/plugins/bibles/lib/mediaitem.py

@@ -449,7 +449,7 @@ class BibleMediaItem(MediaManagerItem):
         raw_slides = []
         raw_footer = []
         bible_text = u''
-        service_item.autoPreviewAllowed = True
+        service_item.auto_preview_allowed = True
         #If we want to use a 2nd translation / version
         bible2 = u''
         if self.SearchTabWidget.currentIndex() == 0:
@@ -608,4 +608,4 @@ class BibleMediaItem(MediaManagerItem):
 
     def searchByReference(self, bible, search):
         log.debug(u'searchByReference %s, %s', bible, search)
-        self.search_results = self.parent.manager.get_verses(bible, search)
+        self.search_results = self.parent.manager.get_verses(bible, search)

openlp/plugins/custom/lib/mediaitem.py

@@ -144,7 +144,7 @@ class CustomMediaItem(MediaManagerItem):
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
         else:
             item_id = self.remoteCustom
-        service_item.autoPreviewAllowed = True
+        service_item.auto_preview_allowed = True
         customSlide = self.parent.custommanager.get_custom(item_id)
         title = customSlide.title
         credit = customSlide.credits
@@ -166,4 +166,4 @@ class CustomMediaItem(MediaManagerItem):
         else:
             raw_footer.append(u'')
         service_item.raw_footer = raw_footer
-        return True
+        return True

openlp/plugins/images/lib/mediaitem.py

@@ -140,7 +140,7 @@ class ImageMediaItem(MediaManagerItem):
         items = self.ListView.selectedIndexes()
         if items:
             service_item.title = self.trUtf8('Image(s)')
-            service_item.autoPreviewAllowed = True
+            service_item.auto_preview_allowed = True
             service_item.maintain_allowed = True
             for item in items:
                 bitem = self.ListView.item(item.row())
@@ -165,4 +165,4 @@ class ImageMediaItem(MediaManagerItem):
             self.parent.maindisplay.addImageWithText(frame)
 
     def onPreviewClick(self):
-        MediaManagerItem.onPreviewClick(self)
+        MediaManagerItem.onPreviewClick(self)

openlp/plugins/songs/lib/mediaitem.py

@@ -290,7 +290,7 @@ class SongMediaItem(MediaManagerItem):
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
         else:
             item_id = self.remoteSong
-        service_item.autoPreviewAllowed = True
+        service_item.auto_preview_allowed = True
         song = self.parent.songmanager.get_song(item_id)
         service_item.theme = song.theme_name
         service_item.edit_enabled = True
@@ -345,4 +345,4 @@ class SongMediaItem(MediaManagerItem):
         service_item.audit = [
             song.title, author_audit, song.copyright, song.ccli_number
         ]
-        return True
+        return True