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

Minor fixes

This commit is contained in:
Tim Bentley 2009-10-29 15:57:58 +00:00
parent 61aeb43240
commit 81de929460
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/lib/eventreceiver.py
View File

@ -53,6 +53,9 @@ class EventReceiver(QtCore.QObject):
``load_song_list`` ``load_song_list``
Tells the the song plugin to reload the song list Tells the the song plugin to reload the song list
``load_custom_list``
Tells the the custom plugin to reload the custom list
``update_spin_delay`` ``update_spin_delay``
Pushes out the Image loop delay Pushes out the Image loop delay
@ -100,8 +103,7 @@ class EventReceiver(QtCore.QObject):
``slidecontroller_change`` ``slidecontroller_change``
Informs the slidecontroller that a slide change has occurred Informs the slidecontroller that a slide change has occurred
``remote_edit_clear``
``remote_edite_clear``
Informs all components that remote edit has been aborted. Informs all components that remote edit has been aborted.
""" """

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

@ -276,19 +276,17 @@ class SlideController(QtGui.QWidget):
""" """
Allows the live toolbar to be customised Allows the live toolbar to be customised
""" """
self.Songbar.setVisible(False)
self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.service_item_type == ServiceType.Text: if item.service_item_type == ServiceType.Text:
self.Toolbar.makeWidgetsInvisible(self.image_list) self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.name == u'Songs' and \ if item.name == u'Songs' and \
str_to_bool(self.songsconfig.get_config(u'display songbar', True)): str_to_bool(self.songsconfig.get_config(u'display songbar', True)):
self.Songbar.setVisible(True) self.Songbar.setVisible(True)
else:
self.Songbar.setVisible(False)
elif item.service_item_type == ServiceType.Image: elif item.service_item_type == ServiceType.Image:
#Not sensible to allow loops with 1 frame #Not sensible to allow loops with 1 frame
if len(item.frames) > 1: if len(item.frames) > 1:
self.Toolbar.makeWidgetsVisible(self.image_list) self.Toolbar.makeWidgetsVisible(self.image_list)
else:
self.Toolbar.makeWidgetsInvisible(self.image_list)
def enablePreviewToolBar(self, item): def enablePreviewToolBar(self, item):
""" """

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

@ -281,7 +281,9 @@ class SongMediaItem(MediaManagerItem):
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
else: else:
item_id = self.fromServiceManager item_id = self.fromServiceManager
self.fromServiceManager = -1 #if we are in preview mode do not reset the servicemanage id
if self.fromPreview != -1:
self.fromServiceManager = -1
song = self.parent.songmanager.get_song(item_id) song = self.parent.songmanager.get_song(item_id)
service_item.theme = song.theme_name service_item.theme = song.theme_name
service_item.editEnabled = True service_item.editEnabled = True