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

Minor adjustments

This commit is contained in:
Jonathan Corwin 2009-09-24 08:35:30 +01:00
parent 4ca4fa8f23
commit 6421f1d493
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -23,14 +23,12 @@
###############################################################################
import logging
import os , subprocess
import os, subprocess
import time
import sys
if os.name == u'nt':
import win32api
from ctypes import *
from ctypes.wintypes import RECT
import win32api
from ctypes import *
from ctypes.wintypes import RECT
from PyQt4 import QtCore

48
openlp/plugins/presentations/presentationplugin.py
View File

@ -31,11 +31,12 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import Plugin, MediaManagerItem
from openlp.plugins.presentations.lib import PresentationMediaItem, \
PresentationTab, ImpressController
try:
from openlp.plugins.presentations.lib import PowerpointController
except:
pass
from openlp.plugins.presentations.lib import PptviewController
if os.name == u'nt':
try:
from openlp.plugins.presentations.lib import PowerpointController
except:
pass
from openlp.plugins.presentations.lib import PptviewController
class PresentationPlugin(Plugin):
@ -92,24 +93,25 @@ class PresentationPlugin(Plugin):
self.registerControllers(u'Impress', openoffice)
except:
log.exception(u'Failed to set up plugin for Impress')
#Lets see if Powerpoint is required (Default is Not wanted)
if int(self.config.get_config(
u'Powerpoint', QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
try:
#Check to see if we are Win32
from win32com.client import Dispatch
powerpoint = PowerpointController()
self.registerControllers(u'Powerpoint', powerpoint)
except:
log.exception(u'Failed to set up plugin for Powerpoint')
#Lets see if Powerpoint Viewer is required (Default is Not wanted)
if int(self.config.get_config(
u'Powerpoint Viewer', QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
try:
pptview = PptviewController()
self.registerControllers(u'Powerpoint Viewer', pptview)
except:
log.exception(u'Failed to set up plugin for Powerpoint Viewer')
if os.name == u'nt':
#Lets see if Powerpoint is required (Default is Not wanted)
if int(self.config.get_config(
u'Powerpoint', QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
try:
#Check to see if we are Win32
from win32com.client import Dispatch
powerpoint = PowerpointController()
self.registerControllers(u'Powerpoint', powerpoint)
except:
log.exception(u'Failed to set up plugin for Powerpoint')
#Lets see if Powerpoint Viewer is required (Default is Not wanted)
if int(self.config.get_config(
u'Powerpoint Viewer', QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
try:
pptview = PptviewController()
self.registerControllers(u'Powerpoint Viewer', pptview)
except:
log.exception(u'Failed to set up plugin for Powerpoint Viewer')
#If we have no available controllers disable plugin
if len(self.controllers) > 0:
return True