Merge lp:~trb143/openlp/bugfixes into lp:openlp

[Tim Bentley]

[Tim Bentley (trb143)]

Fix presentation messaging : issue by using an array

[Raoul Snyman (raoul-snyman)]

50 + if desktop==None:
51 + return

Change that to "if desktop is None:" next time please.

review: Approve

[lp:~trb143/openlp/bugfixes]

548. By Tim Bentley on 2009-09-18

presentation fixes

=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py	2009-09-08 19:58:05 +0000
+++ openlp/core/lib/rendermanager.py	2009-09-16 19:00:17 +0000
@@ -63,7 +63,7 @@
         else:
             self.current_display = screen_number
         self.renderer = Renderer()
-        #self.calculate_default(self.screen_list[self.current_display][u'size'])
+        self.calculate_default(self.screen_list[self.current_display][u'size'])
         self.theme = u''
         self.service_theme = u''
         self.global_style = u''
 
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-09-15 20:06:39 +0000
+++ openlp/core/ui/slidecontroller.py	2009-09-18 06:07:10 +0000
@@ -254,7 +254,7 @@
         self.enableToolBar(item)
         if item.service_item_type == ServiceType.Command:
             Receiver().send_message(u'%s_start'%item.name.lower(), \
-                u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title']))
+                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
         else:
             self.displayServiceManagerItems(item, 0)
 
@@ -272,7 +272,7 @@
         self.enableToolBar(item)
         if item.service_item_type == ServiceType.Command:
             Receiver().send_message(u'%s_start'%item.name.lower(), \
-                u'%s:%s:%s' % (item.shortname, item.service_item_path, item.service_frames[0][u'title']))
+                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
         else:
             self.displayServiceManagerItems(item, slideno)
 
 
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2009-09-17 07:28:47 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2009-09-18 06:07:10 +0000
@@ -89,12 +89,12 @@
         log.debug(u'LoadPresentation')
         if os.name == u'nt':
             desktop = self.getCOMDesktop()
-            url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20')            
+            url = u'file:///' + presentation.replace(u'\\', u'/').replace(u':', u'|').replace(u' ', u'%20')
         else:
             desktop = self.getUNODesktop()
             url = uno.systemPathToFileUrl(presentation)
-        if(desktop==None):
-            return            
+        if desktop==None:
+            return
         try:
             properties = []
             properties = tuple(properties)
 
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2009-09-07 05:13:39 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2009-09-18 06:07:10 +0000
@@ -83,6 +83,5 @@
         ``message``
         Message containing Presentaion handler name and file to be presented.
         """
-        bits = message.split(u':')
-        file = os.path.join(bits[1], bits[2])
-        return bits[0], file
+        file = os.path.join(message[1], message[2])
+        return message[0], file