openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1088800-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1088800 in OpenLP: "Macro enabled presentations are not shown in OpenLP"
  https://bugs.launchpad.net/openlp/+bug/1088800

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1088800-2.0/+merge/181134

Fix bug #1088800 by adding ".pptm" to the list of acceptable file extensions.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1088800-2.0/+merge/181134
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1088800-2.0 into lp:openlp/2.0.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2012-12-30 19:41:24 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2013-08-20 19:09:34 +0000
@@ -44,6 +44,7 @@
 if os.name == u'nt':
     from win32com.client import Dispatch
     import pywintypes
+
     # Declare an empty exception to match the exception imported from UNO
     class ErrorCodeIOException(Exception):
         pass
@@ -63,6 +64,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class ImpressController(PresentationController):
     """
     Class to control interactions with Impress presentations.
@@ -79,7 +81,7 @@
         PresentationController.__init__(self, plugin, u'Impress',
             ImpressDocument)
         self.supports = [u'odp']
-        self.alsosupports = [u'ppt', u'pps', u'pptx', u'ppsx']
+        self.alsosupports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
         self.process = None
         self.desktop = None
         self.manager = None

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2013-01-05 11:31:02 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2013-08-20 19:09:34 +0000
@@ -45,6 +45,7 @@
 
 ERROR = QtGui.QImage(u':/general/general_delete.png')
 
+
 class PresentationMediaItem(MediaManagerItem):
     """
     This is the Presentation media manager item for Presentation Items.
@@ -88,10 +89,10 @@
             if self.controllers[controller].enabled():
                 types = self.controllers[controller].supports + \
                     self.controllers[controller].alsosupports
-                for type in types:
-                    if fileType.find(type) == -1:
-                        fileType += u'*.%s ' % type
-                        self.plugin.serviceManager.supportedSuffixes(type)
+                for type_ in types:
+                    if fileType.find(type_) == -1:
+                        fileType += u'*.%s ' % type_
+                        self.plugin.serviceManager.supportedSuffixes(type_)
         self.onNewFileMasks = unicode(translate('PresentationPlugin.MediaItem',
             'Presentations (%s)')) % fileType
 

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2012-12-30 19:41:24 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2013-08-20 19:09:34 +0000
@@ -43,6 +43,7 @@
 # PPT API documentation:
 # http://msdn.microsoft.com/en-us/library/aa269321(office.10).aspx
 
+
 class PowerpointController(PresentationController):
     """
     Class to control interactions with PowerPoint Presentations
@@ -58,7 +59,7 @@
         log.debug(u'Initialising')
         PresentationController.__init__(self, plugin, u'Powerpoint',
             PowerpointDocument)
-        self.supports = [u'ppt', u'pps', u'pptx', u'ppsx']
+        self.supports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
         self.process = None
 
     def check_available(self):

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2012-12-30 19:41:24 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2013-08-20 19:09:34 +0000
@@ -38,6 +38,7 @@
 
 log = logging.getLogger(__name__)
 
+
 class PptviewController(PresentationController):
     """
     Class to control interactions with PowerPOint Viewer Presentations
@@ -54,7 +55,7 @@
         self.process = None
         PresentationController.__init__(self, plugin, u'Powerpoint Viewer',
             PptviewDocument)
-        self.supports = [u'ppt', u'pps', u'pptx', u'ppsx']
+        self.supports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
 
     def check_available(self):
         """