X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/301bab11f8453a6899153b7be338a352803b22cb..9bca94aa8cb237f134d4dc5707ce9df229fdbfd3:/lib/python/Screens/Setup.py
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index a694ab16..2981e25a 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,10 +1,10 @@
from Screen import Screen
-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
from Components.config import config #global config instance
-from Components.config import configEntry
-from Components.config import configBoolean
+from Components.config import configSelection
from Components.ConfigList import ConfigList
from Components.Label import Label
+from Components.Pixmap import Pixmap
import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
@@ -12,69 +12,16 @@ from skin import elementsWithTag
from Tools import XMLTools
-setupdom = xml.dom.minidom.parseString(
- """
-
-
- - config.inputDevices.repeat
- - config.inputDevices.delay
- - config.rc.map
-
-
- - config.timezone.val
-
-
- - config.av.colorformat
- - config.av.aspectratio
- - config.av.tvsystem
- - config.av.wss
- - config.av.defaultac3
- - config.av.vcrswitch
-
-
- - config.rfmod.enable
- - config.rfmod.test
- - config.rfmod.sound
- - config.rfmod.soundcarrier
- - config.rfmod.channel
- - config.rfmod.finetune
-
-
- - config.keyboard.keymap
-
-
- - config.osd.alpha
- - config.osd.bright
- - config.osd.contrast
- - config.osd.language
-
-
- - config.lcd.bright
- - config.lcd.standby
- - config.lcd.invert
-
-
- - config.parental.lock
- - config.parental.setuplock
-
-
- - config.expert.splitsize
- - config.expert.satpos
- - config.expert.fastzap
- - config.expert.skipconfirm
- - config.expert.hideerrors
- - config.expert.autoinfo
-
-
- - config.sat.diseqcA
- - config.sat.posA
- - config.sat.satA
- - config.sat.diseqcB
- - config.sat.posB
- - config.sat.satB
-
-
- """)
+# FIXME: use resolveFile!
+# read the setupmenu
+try:
+ # first we search in the current path
+ setupfile = file('data/setup.xml', 'r')
+except:
+ # if not found in the current path, we use the global datadir-path
+ setupfile = file('/usr/share/enigma2/setup.xml', 'r')
+setupdom = xml.dom.minidom.parseString(setupfile.read())
+setupfile.close()
def getValbyAttr(x, attr):
for p in range(x.attributes.length):
@@ -86,14 +33,43 @@ def getValbyAttr(x, attr):
return ""
-class Setup(Screen):
+class SetupSummary(Screen):
+ skin = """
+
+
+
+
+ """
+
+ def __init__(self, session, parent):
+ Screen.__init__(self, session)
+ self["SetupTitle"] = Label(_(parent.setup_title))
+ self["SetupEntry"] = Label("")
+ self["SetupValue"] = Label("")
+ self.parent = parent
+ self.onShow.append(self.addWatcher)
+ self.onHide.append(self.removeWatcher)
+
+ def addWatcher(self):
+ self.parent.onChangedEntry.append(self.selectionChanged)
+ self.parent["config"].onSelectionChanged.append(self.selectionChanged)
+ self.selectionChanged()
+
+ def removeWatcher(self):
+ self.parent.onChangedEntry.remove(self.selectionChanged)
+ self.parent["config"].onSelectionChanged.remove(self.selectionChanged)
+ def selectionChanged(self):
+ self["SetupEntry"].text = self.parent.getCurrentEntry()
+ self["SetupValue"].text = self.parent.getCurrentValue()
+
+class Setup(Screen):
def addItems(self, list, childNode):
for x in childNode:
if x.nodeType != xml.dom.minidom.Element.nodeType:
continue
elif x.tagName == 'item':
- ItemText = getValbyAttr(x, "text")
+ ItemText = _(getValbyAttr(x, "text"))
b = eval(XMLTools.mergeText(x.childNodes));
print "item " + ItemText + " " + b.configPath
if b == "":
@@ -105,28 +81,45 @@ class Setup(Screen):
# the second one is converted to string.
list.append( (ItemText, item) )
+ def handleKey(self, key):
+ # ignore keys when not enabled
+ if self["config"].getCurrent()[1].parent.enabled:
+ self["config"].handleKey(config.key[key])
+ print self["config"].getCurrent()
+ self.changedEntry()
+
def keyOk(self):
- self["config"].handleKey(0)
+ self.handleKey("choseElement")
+
def keyLeft(self):
- self["config"].handleKey(1)
+ self.handleKey("prevElement")
+
def keyRight(self):
- self["config"].handleKey(2)
+ self.handleKey("nextElement")
def keySave(self):
print "save requested"
- for x in self["config"]:
- selection = self["config"].getCurrent()
- selection.save()
+ for x in self["config"].list:
+ x[1].save()
+ self.close()
+
+ def keyCancel(self):
+ print "cancel requested"
+ for x in self["config"].list:
+ x[1].cancel()
+ self.close()
+
+ def keyNumberGlobal(self, number):
+ self.handleKey(str(number))
def __init__(self, session, setup):
Screen.__init__(self, session)
- print "request setup for " + setup
-
xmldata = setupdom.childNodes[0]
entries = xmldata.childNodes
+ self.onChangedEntry = [ ]
list = []
for x in entries: #walk through the actual nodelist
@@ -137,19 +130,51 @@ class Setup(Screen):
if ItemText != setup:
continue
self.addItems(list, x.childNodes);
+ myTitle = getValbyAttr(x, "title")
#check for list.entries > 0 else self.close
self["config"] = ConfigList(list)
- self["ok"] = Label("OK")
- self["cancel"] = Label("Cancel")
+ self.setup_title = myTitle
+ self["title"] = Label(_(self.setup_title))
- self["actions"] = ActionMap(["SetupActions"],
+ self["oktext"] = Label(_("OK"))
+ self["canceltext"] = Label(_("Cancel"))
+ self["ok"] = Pixmap()
+ self["cancel"] = Pixmap()
+
+ self["actions"] = NumberActionMap(["SetupActions"],
{
- "cancel": self.close,
+ "cancel": self.keyCancel,
"ok": self.keyOk,
"left": self.keyLeft,
"right": self.keyRight,
- "save": self.keySave
- })
+ "save": self.keySave,
+ "1": self.keyNumberGlobal,
+ "2": self.keyNumberGlobal,
+ "3": self.keyNumberGlobal,
+ "4": self.keyNumberGlobal,
+ "5": self.keyNumberGlobal,
+ "6": self.keyNumberGlobal,
+ "7": self.keyNumberGlobal,
+ "8": self.keyNumberGlobal,
+ "9": self.keyNumberGlobal,
+ "0": self.keyNumberGlobal
+ }, -1)
+
+ self.changedEntry()
+
+ # for summary:
+ def changedEntry(self):
+ for x in self.onChangedEntry:
+ x()
+
+ def getCurrentEntry(self):
+ return self["config"].getCurrent()[0]
+
+ def getCurrentValue(self):
+ return str(self["config"].getCurrent()[1].parent.value)
+
+ def createSummary(self):
+ return SetupSummary