forked from openlp/openlp
For Jon
Fix themes bzr-revno: 534
This commit is contained in:
commit
3b67251f8f
@ -33,9 +33,8 @@ from PyQt4 import QtCore, QtGui
|
|||||||
|
|
||||||
from openlp.core.ui import AmendThemeForm, ServiceManager
|
from openlp.core.ui import AmendThemeForm, ServiceManager
|
||||||
from openlp.core.theme import Theme
|
from openlp.core.theme import Theme
|
||||||
from openlp.core.lib import PluginConfig, \
|
from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, Renderer, \
|
||||||
OpenLPToolbar, ThemeXML, Renderer, translate, \
|
translate, str_to_bool, file_to_xml, buildIcon, Receiver
|
||||||
file_to_xml, buildIcon, Receiver
|
|
||||||
from openlp.core.utils import ConfigHelper
|
from openlp.core.utils import ConfigHelper
|
||||||
|
|
||||||
class ThemeManager(QtGui.QWidget):
|
class ThemeManager(QtGui.QWidget):
|
||||||
@ -230,21 +229,25 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
|
|
||||||
def getThemeData(self, themename):
|
def getThemeData(self, themename):
|
||||||
log.debug(u'getthemedata for theme %s', themename)
|
log.debug(u'getthemedata for theme %s', themename)
|
||||||
xml_file = os.path.join(self.path, unicode(themename), unicode(themename) + u'.xml')
|
xml_file = os.path.join(self.path, unicode(themename),
|
||||||
|
unicode(themename) + u'.xml')
|
||||||
try:
|
try:
|
||||||
xml = file_to_xml(xml_file)
|
xml = file_to_xml(xml_file)
|
||||||
except:
|
except:
|
||||||
newtheme = ThemeXML()
|
newtheme = ThemeXML()
|
||||||
newtheme.new_document(u'New Theme')
|
newtheme.new_document(u'New Theme')
|
||||||
newtheme.add_background_solid(unicode(u'#000000'))
|
newtheme.add_background_solid(unicode(u'#000000'))
|
||||||
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'), unicode(30), u'False')
|
newtheme.add_font(unicode(QtGui.QFont().family()),
|
||||||
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'), unicode(12), u'False', u'footer')
|
unicode(u'#FFFFFF'), unicode(30), u'False')
|
||||||
newtheme.add_display(u'False', unicode(u'#FFFFFF'), u'False', unicode(u'#FFFFFF'),
|
newtheme.add_font(unicode(QtGui.QFont().family()),
|
||||||
unicode(0), unicode(0), unicode(0))
|
unicode(u'#FFFFFF'), unicode(12), u'False', u'footer')
|
||||||
|
newtheme.add_display(u'False', unicode(u'#FFFFFF'), u'False',
|
||||||
|
unicode(u'#FFFFFF'), unicode(0), unicode(0), unicode(0))
|
||||||
xml = newtheme.extract_xml()
|
xml = newtheme.extract_xml()
|
||||||
theme = ThemeXML()
|
theme = ThemeXML()
|
||||||
theme.parse(xml)
|
theme.parse(xml)
|
||||||
theme.extend_image_filename(self.path)
|
theme.extend_image_filename(self.path)
|
||||||
|
self.cleanTheme(theme)
|
||||||
return theme
|
return theme
|
||||||
|
|
||||||
def checkThemesExists(self, dir):
|
def checkThemesExists(self, dir):
|
||||||
|
Loading…
Reference in New Issue
Block a user