fill configlist with correct entries

2 files changed, 13 insertions, 3 deletions

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index c7421842..f8e8fd13 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -30,9 +30,17 @@ def configEntry(obj):
 class Config:
 	def __init__(self):
 		pass
-	def Slider(self):		 # ok???
+	def Slider(self,reg):		 # ok???
 		pass	
+	def getControlType(self, reg):
+		print "getControlType " + reg
 
+		#find the correct type in class-members
+		if reg == "blasel":
+			return configBoolean(reg)
+
+		return configBoolean(reg)
+		
 config = Config();
 
 class ConfigSubsection:
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 3df44a30..15cd7c66 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,6 +1,8 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
+from Components.config import config				#global config instance
 from Components.config import configEntry
+from Components.config import configBoolean
 from Components.ConfigList import ConfigList
 
 import xml.dom.minidom
@@ -38,7 +40,7 @@ class Setup(Screen):
 				b = XMLTools.mergeText(x.childNodes);
 				print "item " + ItemText + " " + b
 				#add to configlist
-				list.append(configEntry(ItemText))
+				list.append( (ItemText, config.getControlType(b) ) )
 				
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
@@ -63,6 +65,6 @@ class Setup(Screen):
 
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{
-				#"ok": self.inc,
+				"ok": self["config"].toggle,
 				"cancel": self.close
 			})