raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix song usage 

Fix 598407

bzr-revno: 986
Fixes: https://launchpad.net/bugs/598407
This commit is contained in:
Tim Bentley 2010-08-02 20:32:40 +01:00
parent 3ce079240f 9bdc7db801
commit 197fe4cb08
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/lib/serviceitem.py
View File

@ -86,7 +86,7 @@ class ServiceItem(object):
self.service_item_type = None self.service_item_type = None
self._raw_frames = [] self._raw_frames = []
self._display_frames = [] self._display_frames = []
self._uuid = unicode(uuid.uuid1()) self._uuid = 0
self.notes = u'' self.notes = u''
self.from_plugin = False self.from_plugin = False
self.capabilities = [] self.capabilities = []
@ -94,6 +94,9 @@ class ServiceItem(object):
self.cache = {} self.cache = {}
self.icon = None self.icon = None
def _new_item(self):
self._uuid = unicode(uuid.uuid1())
def add_capability(self, capability): def add_capability(self, capability):
""" """
Add an ItemCapability to a ServiceItem Add an ItemCapability to a ServiceItem
@ -200,6 +203,7 @@ class ServiceItem(object):
self.service_item_type = ServiceItemType.Image self.service_item_type = ServiceItemType.Image
self._raw_frames.append( self._raw_frames.append(
{u'title': title, u'image': image, u'path': path}) {u'title': title, u'image': image, u'path': path})
self._new_item()
def add_from_text(self, title, raw_slide, verse_tag=None): def add_from_text(self, title, raw_slide, verse_tag=None):
""" """
@ -215,6 +219,7 @@ class ServiceItem(object):
title = title.split(u'\n')[0] title = title.split(u'\n')[0]
self._raw_frames.append( self._raw_frames.append(
{u'title': title, u'raw_slide': raw_slide, u'verseTag':verse_tag}) {u'title': title, u'raw_slide': raw_slide, u'verseTag':verse_tag})
self._new_item()
def add_from_command(self, path, file_name, image): def add_from_command(self, path, file_name, image):
""" """
@ -232,6 +237,7 @@ class ServiceItem(object):
self.service_item_type = ServiceItemType.Command self.service_item_type = ServiceItemType.Command
self._raw_frames.append( self._raw_frames.append(
{u'title': file_name, u'image': image, u'path': path}) {u'title': file_name, u'image': image, u'path': path})
self._new_item()
def get_service_repr(self): def get_service_repr(self):
""" """

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -370,6 +370,6 @@ class SongMediaItem(MediaManagerItem):
translate('SongsPlugin.MediaItem', 'CCLI Licence: ') + ccli)) translate('SongsPlugin.MediaItem', 'CCLI Licence: ') + ccli))
service_item.raw_footer = raw_footer service_item.raw_footer = raw_footer
service_item.audit = [ service_item.audit = [
song.title, author_audit, song.copyright, song.ccli_number song.title, author_audit, song.copyright, unicode(song.ccli_number)
] ]
return True return True

8
openlp/plugins/songusage/songusageplugin.py
View File

@ -109,7 +109,7 @@ class SongUsagePlugin(Plugin):
log.info(u'SongUsage Initialising') log.info(u'SongUsage Initialising')
Plugin.initialise(self) Plugin.initialise(self)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'songs_live_started'), QtCore.SIGNAL(u'slidecontroller_live_started'),
self.onReceiveSongUsage) self.onReceiveSongUsage)
self.SongUsageActive = QtCore.QSettings().value( self.SongUsageActive = QtCore.QSettings().value(
self.settingsSection + u'/active', self.settingsSection + u'/active',
@ -133,11 +133,11 @@ class SongUsagePlugin(Plugin):
QtCore.QSettings().setValue(self.settingsSection + u'/active', QtCore.QSettings().setValue(self.settingsSection + u'/active',
QtCore.QVariant(self.SongUsageActive)) QtCore.QVariant(self.SongUsageActive))
def onReceiveSongUsage(self, items): def onReceiveSongUsage(self, item):
""" """
SongUsage a live song from SlideController Song Usage for live song from SlideController
""" """
audit = items[0].audit audit = item[0].audit
if self.SongUsageActive and audit: if self.SongUsageActive and audit:
song_usage_item = SongUsageItem() song_usage_item = SongUsageItem()
song_usage_item.usagedate = datetime.today() song_usage_item.usagedate = datetime.today()