Merge from lp:~j-corwin/openlp/presentations

bzr-revno: 569
This commit is contained in:
Jonathan Corwin 2009-09-24 21:34:38 +02:00 committed by Raoul Snyman
commit cda41d8403
1 changed files with 8 additions and 4 deletions

View File

@ -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');