adapted to changed ratuil api and removed healthfull and healthempty in charmaps
This commit is contained in:
parent
081acd9002
commit
83331175c5
|
@ -43,10 +43,7 @@ class Display:
|
|||
self.messageColours = charMap.get("msgcolours", {})
|
||||
|
||||
fname = os.path.join(os.path.dirname(__file__), "layout.xml")
|
||||
with open(fname) as f:
|
||||
layouttext = f.read()
|
||||
|
||||
self.layout = Layout(layouttext)
|
||||
self.layout = Layout.from_xml_file(fname)
|
||||
self.layout.get("field").set_char_size(charMap.get("charwidth", 1))
|
||||
|
||||
self.screen = Screen()
|
||||
|
|
|
@ -61,8 +61,6 @@ def loadCharmap(name):
|
|||
writable = {}
|
||||
default = None
|
||||
charwidth = 1
|
||||
healthfull = None
|
||||
healthempty = None
|
||||
alphabet = ""
|
||||
msgcolours = {}
|
||||
|
||||
|
@ -71,8 +69,6 @@ def loadCharmap(name):
|
|||
writable.update(template.get("writable", {}))
|
||||
default = template.get("default", default)
|
||||
charwidth = template.get("charwidth", charwidth)
|
||||
healthfull = template.get("healthfull", healthfull)
|
||||
healthempty = template.get("healthempty", healthempty)
|
||||
alphabet = template.get("alphabet", alphabet)
|
||||
msgcolours.update(template.get("msgcolours", {}))
|
||||
return {
|
||||
|
@ -80,8 +76,6 @@ def loadCharmap(name):
|
|||
"writable": writable,
|
||||
"default": default,
|
||||
"charwidth": charwidth,
|
||||
"healthfull": healthfull,
|
||||
"healthempty": healthempty,
|
||||
"alphabet": alphabet,
|
||||
"msgcolours": msgcolours
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue