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

Fixed up a few things, including updating theme when reactivating the current song.

Browse Source
This commit is contained in:
Raoul Snyman 2011-08-31 23:17:10 +02:00
parent abc2f3e89f
commit 2a02167646
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openlp/core/ui/slidecontroller.py
View File

@ -582,7 +582,7 @@ class SlideController(QtGui.QWidget):
"""
Replacement item following a remote edit
"""
if item.__eq__(self.serviceItem):
if item == self.serviceItem:
self._processItem(item, self.previewListWidget.currentRow())
def addServiceManagerItem(self, item, slideno):
@ -592,15 +592,17 @@ class SlideController(QtGui.QWidget):
Called by ServiceManager
"""
log.debug(u'addServiceManagerItem live = %s' % self.isLive)
# If no valid slide number is specified we take the first one.
# If no valid slide number is specified we take the first one, but we
# remember the initial value to see if we should reload the song or not
slidenum = slideno
if slideno == -1:
slideno = 0
# If service item is the same as the current on only change slide
if item.__eq__(self.serviceItem):
self.__checkUpdateSelectedSlide(slideno)
slidenum = 0
# If service item is the same as the current one, only change slide
if slideno >= 0 and item == self.serviceItem:
self.__checkUpdateSelectedSlide(slidenum)
self.slideSelected()
return
self._processItem(item, slideno)
else:
self._processItem(item, slidenum)
def _processItem(self, serviceItem, slideno):
"""

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

@ -354,7 +354,7 @@ class SongMediaItem(MediaManagerItem):
if valid:
self.remoteSong = song_id
self.remoteTriggered = remote_type
self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
self.edit_song_form.loadSong(song_id, remote_type == u'P')
self.edit_song_form.exec_()
self.auto_select_id = -1
self.onSongListLoad()