forked from openlp/openlp
A unicode fix for themes
This commit is contained in:
parent
b100731dc4
commit
a821179a63
@ -30,7 +30,7 @@ from xml.etree.ElementTree import ElementTree, XML
|
|||||||
from openlp.core.lib import str_to_bool
|
from openlp.core.lib import str_to_bool
|
||||||
|
|
||||||
blankthemexml=\
|
blankthemexml=\
|
||||||
'''<?xml version="1.0" encoding="iso-8859-1"?>
|
'''<?xml version="1.0" encoding="utf-8"?>
|
||||||
<theme version="1.0">
|
<theme version="1.0">
|
||||||
<name>BlankStyle</name>
|
<name>BlankStyle</name>
|
||||||
<background mode="transparent"/>
|
<background mode="transparent"/>
|
||||||
@ -348,6 +348,7 @@ class ThemeXML(object):
|
|||||||
iter = theme_xml.getiterator()
|
iter = theme_xml.getiterator()
|
||||||
master = u''
|
master = u''
|
||||||
for element in iter:
|
for element in iter:
|
||||||
|
element.text = unicode(element.text).decode('unicode-escape')
|
||||||
if len(element.getchildren()) > 0:
|
if len(element.getchildren()) > 0:
|
||||||
master = element.tag + u'_'
|
master = element.tag + u'_'
|
||||||
else:
|
else:
|
||||||
|
@ -126,7 +126,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
|
|||||||
def accept(self):
|
def accept(self):
|
||||||
new_theme = ThemeXML()
|
new_theme = ThemeXML()
|
||||||
theme_name = unicode(self.ThemeNameEdit.displayText())
|
theme_name = unicode(self.ThemeNameEdit.displayText())
|
||||||
new_theme.new_document(theme_name)
|
new_theme.new_document(theme_name.encode('unicode-escape'))
|
||||||
save_from = None
|
save_from = None
|
||||||
save_to = None
|
save_to = None
|
||||||
if self.theme.background_mode == u'transparent':
|
if self.theme.background_mode == u'transparent':
|
||||||
|
@ -676,7 +676,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.setWindowTitle(title)
|
self.setWindowTitle(title)
|
||||||
|
|
||||||
def defaultThemeChanged(self, theme):
|
def defaultThemeChanged(self, theme):
|
||||||
self.DefaultThemeLabel.setText(self.defaultThemeText + theme)
|
self.DefaultThemeLabel.setText(
|
||||||
|
u'%s %s' % (self.defaultThemeText, theme))
|
||||||
|
|
||||||
def toggleMediaManager(self, visible):
|
def toggleMediaManager(self, visible):
|
||||||
if self.MediaManagerDock.isVisible() != visible:
|
if self.MediaManagerDock.isVisible() != visible:
|
||||||
|
Loading…
Reference in New Issue
Block a user