Code fixes from last merge and presentation improvements

openlp/core/ui/servicemanager.py

@@ -722,7 +722,8 @@ class ServiceManager(QtGui.QWidget):
         Posts a remote edit message to a plugin to allow item to be edited.
         """
         item, count = self.findServiceItem()
-        if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit):
+        if self.serviceItems[item][u'service_item'].\
+                            is_capable(ItemCapabilities.AllowsEdit):
             self.remoteEditTriggered = True
             Receiver.send_message(u'%s_edit' %
                 self.serviceItems[item][u'service_item'].name, u'L:%s' %

openlp/core/ui/slidecontroller.py

@@ -30,6 +30,8 @@ import os
 from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
 
+from openlp.core.lib import ItemCapabilities
+
 class HideMode(object):
     """
     This is basically an enumeration class which specifies the mode of a Bible.
@@ -394,8 +396,7 @@ class SlideController(QtGui.QWidget):
         self.Toolbar.setVisible(True)
         self.Mediabar.setVisible(False)
         self.Toolbar.makeWidgetsInvisible(self.song_edit_list)
-        if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit)\
-                            and item.from_plugin:
+        if item.is_capable(ItemCapabilities.AllowsEdit) and item.from_plugin:
             self.Toolbar.makeWidgetsVisible(self.song_edit_list)
         elif item.is_media():
             self.Toolbar.setVisible(False)
@@ -494,16 +495,18 @@ class SlideController(QtGui.QWidget):
                     bits = frame[u'verseTag'].split(u':')
                     tag = None
                     #If verse handle verse number else tag only
-                    if bits[0] == self.trUtf8('Verse'): #or \
-                        #bits[0] == self.trUtf8('Chorus'):
-                        tag = u'%s%s' % (bits[0][0], bits[1][0:] )
-                        row = bits[1][0:]
+                    if bits[0] == self.trUtf8('Verse') or \
+                        bits[0] == self.trUtf8('Chorus'):
+                        tag = u'%s\n%s' % (bits[0][0], bits[1][0:] )
+                        tag1 = u'%s%s' % (bits[0][0], bits[1][0:] )
+                        row = tag
                     else:
                         tag = bits[0]
+                        tag1 = tag
                         row = bits[0][0:1]
-                    if tag not in self.slideList:
-                        self.slideList[tag] = framenumber
-                        self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag),
+                    if tag1 not in self.slideList:
+                        self.slideList[tag1] = framenumber
+                        self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag1),
                             self.onSongBarHandler)
                 else:
                     row += 1
@@ -520,6 +523,7 @@ class SlideController(QtGui.QWidget):
                 slide_height = width * self.parent.RenderManager.screen_ratio
                 row += 1
             rowitem.setText(unicode(row))
+            rowitem.setTextAlignment(QtCore.Qt.AlignVCenter)
             self.PreviewListWidget.setItem(framenumber, 0, rowitem)
             self.PreviewListWidget.setItem(framenumber, 1, item)
             if slide_height != 0:

openlp/plugins/media/lib/mediaitem.py

@@ -83,7 +83,7 @@ class MediaMediaItem(MediaManagerItem):
         if len(items) > 1:
             return False
         service_item.title = unicode(self.trUtf8('Media'))
-        service_item.add_capability(ItemCapabilities.Requires_media)
+        service_item.add_capability(ItemCapabilities.RequiresMedia)
         for item in items:
             bitem = self.ListView.item(item.row())
             filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())