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

more fixes

This commit is contained in:
Andreas Preikschat 2011-04-10 20:44:27 +02:00
parent 5c06b63c5e
commit 9dbd54bf8f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/servicemanager.py
View File

@ -691,9 +691,9 @@ class ServiceManager(QtGui.QWidget):
Called by the SlideController to request a preview item be made live
and allows the next preview to be updated if relevent.
"""
id, row = message.split(u':')
uuid, row = message.split(u':')
for sitem in self.serviceItems:
if sitem[u'service_item']._uuid == id:
if sitem[u'service_item']._uuid == uuid:
item = self.serviceManagerList.topLevelItem(sitem[u'order'] - 1)
self.serviceManagerList.setCurrentItem(item)
self.makeLive(int(row))

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

@ -283,19 +283,20 @@ class SongMediaItem(MediaManagerItem):
self.remoteTriggered = None
self.remoteSong = -1
def onRemoteEdit(self, songid):
def onRemoteEdit(self, message):
"""
Called by ServiceManager or SlideController by event passing
the Song Id in the payload along with an indicator to say which
type of display is required.
"""
log.debug(u'onRemoteEdit %s' % songid)
fields = songid.split(u':')
valid = self.parent.manager.get_object(Song, fields[1])
log.debug(u'onRemoteEdit %s' % message)
remote_type, song_id = message.split(u':')
song_id = int(song_id)
valid = self.parent.manager.get_object(Song, song_id)
if valid:
self.remoteSong = fields[1]
self.remoteTriggered = fields[0]
self.edit_song_form.loadSong(fields[1], (fields[0] == u'P'))
self.remoteSong = song_id
self.remoteTriggered = remote_type
self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
self.edit_song_form.exec_()
def onEditClick(self):