Merge lp:~phill-ridout/openlp/1012110_2.0 into lp:openlp/2.0

[Phill]

Fixes bug #1012110 by encoding the file name with the file system encoding

[Raoul Snyman (raoul-snyman)]

I can't test this (as I don't have Windows), but there are a few things you need to change:

On line 17 you should use os.path.normpath(), don't do a manual find and replace. See http://docs.python.org/2/library/os.path.html#os.path.normpath

On line 22 you should use os.path.join().

review: Needs Fixing

[lp:~phill-ridout/openlp/1012110_2.0]

2171. By Phill on 2013-10-06

Refactored to use os.path.normpath and os.path.join

2172. By Phill on 2013-10-15

Unicodified the pptview dll.

2173. By Phill on 2013-10-15

fixes to ppttest.py

2174. By Phill on 2013-10-15

tided up pptviewcontroller and ppttest

2175. By Phill on 2013-10-17

Final touches

Unmerged revisions

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2013-08-20 18:30:15 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2013-10-06 08:29:05 +0000
@@ -29,6 +29,7 @@
 
 import os
 import logging
+import sys
 
 if os.name == u'nt':
     from ctypes import cdll
@@ -125,11 +126,13 @@
         renderer = self.controller.plugin.renderer
         rect = renderer.screens.current[u'size']
         rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
-        filepath = str(self.filepath.replace(u'/', u'\\'))
+        filepath = os.path.normpath(self.filepath)
+        preview_path = os.path.join(self.get_temp_folder(), u'slide')
         if not os.path.isdir(self.get_temp_folder()):
             os.makedirs(self.get_temp_folder())
-        self.pptid = self.controller.process.OpenPPT(filepath, None, rect,
-            str(self.get_temp_folder()) + '\\slide')
+        file_system_encoding = sys.getfilesystemencoding()
+        self.pptid = self.controller.process.OpenPPT(filepath.encode(file_system_encoding), None, rect,
+            preview_path.encode(file_system_encoding))
         if self.pptid >= 0:
             self.create_thumbnails()
             self.stop_presentation()