Tim Bentley has proposed merging lp:~trb143/openlp/fixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Minor fixes to improve usage
--
https://code.launchpad.net/~trb143/openlp/fixes/+merge/14178
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/eventreceiver.py'
--- openlp/core/lib/eventreceiver.py 2009-10-29 09:18:26 +0000
+++ openlp/core/lib/eventreceiver.py 2009-10-29 16:05:20 +0000
@@ -53,6 +53,9 @@
``load_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``
Pushes out the Image loop delay
@@ -100,8 +103,7 @@
``slidecontroller_change``
Informs the slidecontroller that a slide change has occurred
-
- ``remote_edite_clear``
+ ``remote_edit_clear``
Informs all components that remote edit has been aborted.
"""
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2009-10-27 08:38:02 +0000
+++ openlp/core/ui/slidecontroller.py 2009-10-29 16:05:20 +0000
@@ -276,19 +276,17 @@
"""
Allows the live toolbar to be customised
"""
+ self.Songbar.setVisible(False)
+ self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.service_item_type == ServiceType.Text:
self.Toolbar.makeWidgetsInvisible(self.image_list)
if item.name == u'Songs' and \
str_to_bool(self.songsconfig.get_config(u'display songbar', True)):
self.Songbar.setVisible(True)
- else:
- self.Songbar.setVisible(False)
elif item.service_item_type == ServiceType.Image:
#Not sensible to allow loops with 1 frame
if len(item.frames) > 1:
self.Toolbar.makeWidgetsVisible(self.image_list)
- else:
- self.Toolbar.makeWidgetsInvisible(self.image_list)
def enablePreviewToolBar(self, item):
"""
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2009-10-29 15:20:28 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2009-10-29 16:05:20 +0000
@@ -281,7 +281,9 @@
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
else:
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)
service_item.theme = song.theme_name
service_item.editEnabled = True
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
