head

openlp/core/lib/rendermanager.py

@@ -63,7 +63,7 @@ class RenderManager(object):
         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''

openlp/core/ui/slidecontroller.py

@@ -254,7 +254,7 @@ class SlideController(QtGui.QWidget):
         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 @@ class SlideController(QtGui.QWidget):
         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)
 

openlp/plugins/presentations/lib/impresscontroller.py

@@ -29,9 +29,14 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 import logging
 import os ,  subprocess
 import time
-import uno
 import sys
 
+if os.name == u'nt':
+    from win32com.client import Dispatch
+else:
+    import uno
+
+
 from PyQt4 import QtCore
 
 class ImpressController(object):
@@ -57,11 +62,12 @@ class ImpressController(object):
         when required.
         """
         log.debug(u'start Openoffice')
-        # -headless
+        if os.name != u'nt':
-        cmd = u'openoffice.org -nologo -norestore -minimized -invisible ' + u'"' + u'-accept=socket,host=localhost,port=2002;urp;'+ u'"'
+            # -headless
-        self.process = QtCore.QProcess()
+            cmd = u'openoffice.org -nologo -norestore -minimized -invisible ' + u'"' + u'-accept=socket,host=localhost,port=2002;urp;'+ u'"'
-        self.process.startDetached(cmd)
+            self.process = QtCore.QProcess()
-        self.process.waitForStarted()
+            self.process.startDetached(cmd)
+            self.process.waitForStarted()
 
     def kill(self):
         """
@@ -81,6 +87,26 @@ class ImpressController(object):
         The file name of the presentatios to the run.
         """
         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')
+        else:
+            desktop = self.getUNODesktop()
+            url = uno.systemPathToFileUrl(presentation)
+        if desktop==None:
+            return
+        try:
+            properties = []
+            properties = tuple(properties)
+            self.document = desktop.loadComponentFromURL(url, "_blank", 0, properties)
+            self.presentation = self.document.getPresentation()
+            self.presentation.start()
+            self.xSlideShowController =  desktop.getCurrentComponent().Presentation.getController()
+        except:
+            log.error(u'Failed reason %s' % sys.exc_info())
+
+    def getUNODesktop(self):
+        log.debug(u'getUNODesktop')
         ctx = None
         loop = 0
         context = uno.getComponentContext()
@@ -94,15 +120,20 @@ class ImpressController(object):
         try:
             smgr = ctx.ServiceManager
             desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop", ctx )
-            url = uno.systemPathToFileUrl(presentation)
+            return desktop
-            properties = []
-            properties = tuple(properties)
-            self.document = desktop.loadComponentFromURL(url, "_blank", 0, properties)
-            self.presentation = self.document.getPresentation()
-            self.presentation.start()
-            self.xSlideShowController =  desktop.getCurrentComponent().Presentation.getController()
         except:
             log.error(u'Failed reason %s' % sys.exc_info())
+            return None
+
+    def getCOMDesktop(self):
+        log.debug(u'getCOMDesktop')
+        try:
+            smgr = Dispatch("com.sun.star.ServiceManager")
+            desktop = smgr.createInstance( "com.sun.star.frame.Desktop")
+            return desktop
+        except:
+            log.error(u'Failed reason %s' % sys.exc_info())
+            return None
 
     def closePresentation(self):
         """

openlp/plugins/presentations/lib/messagelistener.py

@@ -83,6 +83,5 @@ class MessageListener(object):
         ``message``
         Message containing Presentaion handler name and file to be presented.
         """
-        bits = message.split(u':')
+        file = os.path.join(message[1], message[2])
-        file = os.path.join(bits[1], bits[2])
+        return message[0], file
-        return bits[0], file

openlp/plugins/presentations/presentationplugin.py

@@ -79,8 +79,12 @@ class PresentationPlugin(Plugin):
         #Lets see if Impress is required (Default is Not wanted)
         if int(self.config.get_config(u'Impress', QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
             try:
-                #Check to see if we have uno installed
+                if os.name == u'nt':
-                import uno
+                    #Check to see if we are Win32
+                    from win32com.client import Dispatch
+                else:
+                    #Check to see if we have uno installed
+                    import uno
                 openoffice = ImpressController()
                 self.registerControllers(u'Impress', openoffice)
             except: