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

Fix for theme copy/creation on windows, fixes bug 1390917

Browse Source 
Fixes: https://launchpad.net/bugs/1390917
This commit is contained in:
Tomas Groth 2014-11-10 11:24:44 +01:00
parent 0a500eeb8d
commit 6b538995f4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/ui/thememanager.py
View File

@ -37,7 +37,7 @@ from xml.etree.ElementTree import ElementTree, XML
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, OpenLPMixin, RegistryMixin, \ from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, OpenLPMixin, RegistryMixin, \
check_directory_exists, UiStrings, translate check_directory_exists, UiStrings, translate, is_win
from openlp.core.lib import FileDialog, ImageSource, OpenLPToolbar, get_text_file_string, build_icon, \ from openlp.core.lib import FileDialog, ImageSource, OpenLPToolbar, get_text_file_string, build_icon, \
check_item_selected, create_thumb, validate_thumb check_item_selected, create_thumb, validate_thumb
from openlp.core.lib.theme import ThemeXML, BackgroundType from openlp.core.lib.theme import ThemeXML, BackgroundType
@ -662,8 +662,12 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager, R
out_file.close() out_file.close()
if image_from and os.path.abspath(image_from) != os.path.abspath(image_to): if image_from and os.path.abspath(image_from) != os.path.abspath(image_to):
try: try:
encoding = get_filesystem_encoding() # Windows is always unicode, so no need to encode filenames
shutil.copyfile(str(image_from).encode(encoding), str(image_to).encode(encoding)) if is_win():
shutil.copyfile(image_from, image_to)
else:
encoding = get_filesystem_encoding()
shutil.copyfile(image_from.encode(encoding), image_to.encode(encoding))
except IOError as xxx_todo_changeme: except IOError as xxx_todo_changeme:
shutil.Error = xxx_todo_changeme shutil.Error = xxx_todo_changeme
self.log_exception('Failed to save theme image') self.log_exception('Failed to save theme image')