forked from openlp/openlp
Fix theme import colours
This commit is contained in:
parent
962f1364e4
commit
45c7fad1d6
|
@ -136,7 +136,7 @@ class Theme(object):
|
||||||
if (element.tag.find(u'Color') > 0 or
|
if (element.tag.find(u'Color') > 0 or
|
||||||
(element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
|
(element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
|
||||||
# convert to a wx.Colour
|
# convert to a wx.Colour
|
||||||
val = QtGui.QColor((val>>16) & 0xFF, (val>>8)&0xFF, val&0xFF)
|
val = QtGui.QColor(val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF)
|
||||||
setattr(self, element.tag, val)
|
setattr(self, element.tag, val)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
@ -390,7 +390,6 @@ class ThemeManager(QtGui.QWidget):
|
||||||
unicode(theme.BackgroundParameter2.name()), direction)
|
unicode(theme.BackgroundParameter2.name()), direction)
|
||||||
else:
|
else:
|
||||||
newtheme.add_background_image(unicode(theme.BackgroundParameter1))
|
newtheme.add_background_image(unicode(theme.BackgroundParameter1))
|
||||||
|
|
||||||
newtheme.add_font(unicode(theme.FontName),
|
newtheme.add_font(unicode(theme.FontName),
|
||||||
unicode(theme.FontColor.name()),
|
unicode(theme.FontColor.name()),
|
||||||
unicode(theme.FontProportion * 3), u'False')
|
unicode(theme.FontProportion * 3), u'False')
|
||||||
|
|
Loading…
Reference in New Issue