openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/OpenLyrics into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/OpenLyrics/+merge/76843

Hello,

- Fixed not working formatting tags when opening a not imported song from a service file

Bug description:
Formatting tags do not work, when you open a service file with a song whose formatting tags do not exist in your configuration. But when you re-open the service file, the formatting tags work. The problem is, that we add (which includes rendering) the song before processing the OpenLyrics xml (where formatting tags are imported from).

Service file: https://spideroak.com/share/M5XW6Z3PNQ/OpenLP/home/andreas/SpiderOak/OpenLP/service_file.osz
-- 
https://code.launchpad.net/~googol/openlp/OpenLyrics/+merge/76843
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/OpenLyrics into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-09-21 20:47:30 +0000
+++ openlp/core/ui/servicemanager.py	2011-09-24 09:46:25 +0000
@@ -641,10 +641,10 @@
                     serviceItem.renderer = self.mainwindow.renderer
                     serviceItem.set_from_service(item, self.servicePath)
                     self.validateItem(serviceItem)
-                    self.addServiceItem(serviceItem, repaint=False)
                     if serviceItem.is_capable(ItemCapabilities.OnLoadUpdate):
                         Receiver.send_message(u'%s_service_load' %
                             serviceItem.name.lower(), serviceItem)
+                    self.addServiceItem(serviceItem, repaint=False)
                 delete_file(p_file)
                 self.setFileName(fileName)
                 self.mainwindow.addRecentFile(fileName)