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

fix editing theme load and save

Browse Source
This commit is contained in:
Tim Bentley 2017-05-13 09:37:38 +01:00
parent 3d1be586fe
commit 08a58844c6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,11 +513,12 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ThemeManage
""" """
self.log_debug('get theme data for theme {name}'.format(name=theme_name)) self.log_debug('get theme data for theme {name}'.format(name=theme_name))
theme_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.json') theme_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.json')
jsn = True
if not theme_file:
theme_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.xml')
jsn = False
theme_data = get_text_file_string(theme_file) theme_data = get_text_file_string(theme_file)
jsn = True
if not theme_data:
theme_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.xml')
theme_data = get_text_file_string(theme_file)
jsn = False
if not theme_data: if not theme_data:
self.log_debug('No theme data - using default theme') self.log_debug('No theme data - using default theme')
return Theme() return Theme()