From 1a6a672968540aee169ef08df2aa287d8f7dabfc Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Thu, 24 Sep 2009 19:46:16 +0100 Subject: [PATCH] Only import powerpoint/pptviewer on Windows --- openlp/plugins/presentations/lib/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/presentations/lib/__init__.py b/openlp/plugins/presentations/lib/__init__.py index de2b19ce1..71c2874f3 100644 --- a/openlp/plugins/presentations/lib/__init__.py +++ b/openlp/plugins/presentations/lib/__init__.py @@ -21,14 +21,18 @@ # with this program; if not, write to the Free Software Foundation, Inc., 59 # # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### +import os from impresscontroller import ImpressController -#from powerpointcontroller import PowerpointController -from pptviewcontroller import PptviewController +if os.name == u'nt': + #from powerpointcontroller import PowerpointController + from pptviewcontroller import PptviewController from messagelistener import MessageListener from mediaitem import PresentationMediaItem from presentationtab import PresentationTab - __all__ = ['PresentationMediaItem', 'PresentationTab', - 'ImpressController', 'ImpressController', 'PowerpointController', 'MessageListener'] + 'ImpressController', 'MessageListener'] +if os.name == u'nt': + __all__.append('PptviewController') + #__all__.append('PowerpointController');