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

fix editing themes

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

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

@ -512,13 +512,20 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ThemeManage
:return: The theme object. :return: The theme object.
""" """
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))
xml_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.xml') theme_file = os.path.join(self.path, str(theme_name), str(theme_name) + '.json')
xml = get_text_file_string(xml_file) jsn = True
if not xml: 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)
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()
else: else:
return self._create_theme_from_xml(xml, self.path) if jsn:
return self._create_theme_from_json(theme_data, self.path)
else:
return self._create_theme_from_xml(theme_data, self.path)
def over_write_message_box(self, theme_name): def over_write_message_box(self, theme_name):
""" """