configBoolean is now configSelection

7 files changed, 38 insertions, 38 deletions

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index fea27a65..938f88ea 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -21,12 +21,12 @@ class AVSwitch:
 
 def InitAVSwitch():
 	config.av = ConfigSubsection();
-	config.av.colorformat = configElement("config.av.colorformat", configBoolean, 1, ("CVBS", "RGB", "S-Video") );
-	config.av.aspectratio = configElement("config.av.aspectratio", configBoolean, 0, ("4:3 Letterbox", "4:3 PanScan", "16:9", "16:9 always") );
-	config.av.tvsystem = configElement("config.av.tvsystem", configBoolean, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") );
-	config.av.wss = configElement("config.av.wss", configBoolean, 0, ("Enable", "Disable") );
-	config.av.defaultac3 = configElement("config.av.defaultac3", configBoolean, 1, ("Enable", "Disable") );
-	config.av.vcrswitch = configElement("config.av.vcrswitch", configBoolean, 0, ("Enable", "Disable") );
+	config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, ("CVBS", "RGB", "S-Video") );
+	config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, ("4:3 Letterbox", "4:3 PanScan", "16:9", "16:9 always") );
+	config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") );
+	config.av.wss = configElement("config.av.wss", configSelection, 0, ("Enable", "Disable") );
+	config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, ("Enable", "Disable") );
+	config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 0, ("Enable", "Disable") );
 
 	iAVSwitch = AVSwitch()
 
diff --git a/lib/python/Components/InputDevice.py b/lib/python/Components/InputDevice.py
index e6d5a882..f800f302 100644
--- a/lib/python/Components/InputDevice.py
+++ b/lib/python/Components/InputDevice.py
@@ -3,7 +3,7 @@ from config import config				#global config instance
 from config import configElement
 from config import ConfigSubsection
 from config import ConfigSlider
-from config import configBoolean
+from config import configSelection
 
 class inputDevices:
 	def __init__(self):
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index d53bf00e..b74521cd 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -35,7 +35,7 @@ class Network:
 		
 def InitNetwork():
 	config.network = ConfigSubsection()
-	config.network.dhcp = configElement("config.network.dhcp", configBoolean, 0, ("no", "yes"))
+	config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes"))
 	config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), 3))
 	config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), 3))
 	config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), 3))
diff --git a/lib/python/Components/RFmod.py b/lib/python/Components/RFmod.py
index 64b21867..e061a170 100644
--- a/lib/python/Components/RFmod.py
+++ b/lib/python/Components/RFmod.py
@@ -21,11 +21,11 @@ class RFmod:
 def InitRFmod():
 
 	config.rfmod = ConfigSubsection();
-	config.rfmod.enable = configElement("config.rfmod.enable", configBoolean, 1, ("Enable", "Disable") );
-	config.rfmod.test = configElement("config.rfmod.test", configBoolean, 1, ("Enable", "Disable") );
-	config.rfmod.sound = configElement("config.rfmod.sound", configBoolean, 0, ("Enable", "Disable") );
-	config.rfmod.soundcarrier = configElement("config.rfmod.soundcarrier", configBoolean, 1, ("4.5 MHz", "5.5 MHz", "6.0 MHz", "6.5 MHz") );
-	config.rfmod.channel = configElement("config.rfmod.channel", configBoolean, 6, ("30", "31", "32", "33", "34", "35", "36", "37", "38", "39") );
+	config.rfmod.enable = configElement("config.rfmod.enable", configSelection, 1, ("Enable", "Disable") );
+	config.rfmod.test = configElement("config.rfmod.test", configSelection, 1, ("Enable", "Disable") );
+	config.rfmod.sound = configElement("config.rfmod.sound", configSelection, 0, ("Enable", "Disable") );
+	config.rfmod.soundcarrier = configElement("config.rfmod.soundcarrier", configSelection, 1, ("4.5 MHz", "5.5 MHz", "6.0 MHz", "6.5 MHz") );
+	config.rfmod.channel = configElement("config.rfmod.channel", configSelection, 6, ("30", "31", "32", "33", "34", "35", "36", "37", "38", "39") );
 	config.rfmod.finetune = configElement("config.rfmod.finetune", ConfigSlider, 5, "");
 
 	iRFmod = RFmod()
diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
index 962102b7..fa7cd756 100644
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -5,7 +5,7 @@ from config import config				#global config instance
 from config import configElement
 from config import ConfigSubsection
 from config import ConfigSlider
-from config import configBoolean
+from config import configSelection
 
 #temp. class for exhibition
 
@@ -21,25 +21,25 @@ class LCD:
 
 def InitSetupDevices():
 	config.timezone = ConfigSubsection();
-	config.timezone.val = configElement("config.timezone.val", configBoolean, 1, ("GMT", "GMT+1", "GMT+2", "GMT+3", "GMT+4", "GMT+5", "GMT+6", "GMT+7", "GMT+8", "GMT+9") );
+	config.timezone.val = configElement("config.timezone.val", configSelection, 1, ("GMT", "GMT+1", "GMT+2", "GMT+3", "GMT+4", "GMT+5", "GMT+6", "GMT+7", "GMT+8", "GMT+9") );
 
 	config.rc = ConfigSubsection();
-	config.rc.map = configElement("config.rc.map", configBoolean, 0, ("Default", "Classic") );
+	config.rc.map = configElement("config.rc.map", configSelection, 0, ("Default", "Classic") );
 
 	config.keyboard = ConfigSubsection();
-	config.keyboard.keymap = configElement("config.keyboard.keymap", configBoolean, 1, ("English", "German") );
+	config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, ("English", "German") );
 
 	config.osd = ConfigSubsection();
 	config.osd.alpha = configElement("config.osd.alpha", ConfigSlider, 0, "");
 	config.osd.bright = configElement("config.osd.bright", ConfigSlider, 5, "");
 	config.osd.contrast = configElement("config.osd.contrast", ConfigSlider, 5, "");
-	config.osd.language = configElement("config.osd.language", configBoolean, 0, ("English", "English US") );
+	config.osd.language = configElement("config.osd.language", configSelection, 0, ("English", "English US") );
 
 	config.lcd = ConfigSubsection();
 	config.lcd.bright = configElement("config.lcd.bright", ConfigSlider, 7, "");
 	config.lcd.contrast = configElement("config.lcd.contrast", ConfigSlider, 2, "");
 	config.lcd.standby = configElement("config.lcd.standby", ConfigSlider, 1, "");
-	config.lcd.invert = configElement("config.lcd.invert", configBoolean, 1, ("Enable", "Disable") );
+	config.lcd.invert = configElement("config.lcd.invert", configSelection, 1, ("Enable", "Disable") );
 
 	ilcd = LCD()
 
@@ -53,27 +53,27 @@ def InitSetupDevices():
 	config.lcd.contrast.addNotifier(setLCDcontrast);
 
 	config.parental = ConfigSubsection();
-	config.parental.lock = configElement("config.parental.lock", configBoolean, 1, ("Enable", "Disable") );
-	config.parental.setuplock = configElement("config.parental.setuplock", configBoolean, 1, ("Enable", "Disable") );
+	config.parental.lock = configElement("config.parental.lock", configSelection, 1, ("Enable", "Disable") );
+	config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, ("Enable", "Disable") );
 
 	config.expert = ConfigSubsection();
-	config.expert.splitsize = configElement("config.expert.splitsize", configBoolean, 1, ("0.5Gbyte", "1.0 GByte", "1.5 GByte", "2.0 GByte") );
-	config.expert.satpos = configElement("config.expert.satpos", configBoolean, 1, ("Enable", "Disable") );
-	config.expert.fastzap = configElement("config.expert.fastzap", configBoolean, 0, ("Enable", "Disable") );
-	config.expert.skipconfirm = configElement("config.expert.skipconfirm", configBoolean, 1, ("Enable", "Disable") );
-	config.expert.hideerrors = configElement("config.expert.hideerrors", configBoolean, 1, ("Enable", "Disable") );
-	config.expert.autoinfo = configElement("config.expert.autoinfo", configBoolean, 1, ("Enable", "Disable") );
+	config.expert.splitsize = configElement("config.expert.splitsize", configSelection, 1, ("0.5Gbyte", "1.0 GByte", "1.5 GByte", "2.0 GByte") );
+	config.expert.satpos = configElement("config.expert.satpos", configSelection, 1, ("Enable", "Disable") );
+	config.expert.fastzap = configElement("config.expert.fastzap", configSelection, 0, ("Enable", "Disable") );
+	config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, ("Enable", "Disable") );
+	config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, ("Enable", "Disable") );
+	config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, ("Enable", "Disable") );
 
 	config.sat = ConfigSubsection();
-	config.sat.satA = configElement("config.sat.satA", configBoolean, 1, ("Disabled" ,"Astra 19.2", "Hotbird 13.0") );
-	config.sat.satB = configElement("config.sat.satB", configBoolean, 0, ("Disabled" ,"Astra 19.2", "Hotbird 13.0") );
-	config.sat.diseqcA = configElement("config.sat.diseqcA", configBoolean, 3, ("no DiSEqC", "DiSEqC 1.0", "DiSEqC 1.1", "DiSEqC 1.2") );
-	config.sat.diseqcB = configElement("config.sat.diseqcB", configBoolean, 0, ("no DiSEqC", "DiSEqC 1.0", "DiSEqC 1.1", "DiSEqC 1.2") );
-	config.sat.posA = configElement("config.sat.posA", configBoolean, 0, ("DiSEqC A", "DiSEqC B", "DiSEqC C", "DiSEqC D") );
-	config.sat.posB = configElement("config.sat.posB", configBoolean, 1, ("DiSEqC A", "DiSEqC B", "DiSEqC C", "DiSEqC D") );
+	config.sat.satA = configElement("config.sat.satA", configSelection, 1, ("Disabled" ,"Astra 19.2", "Hotbird 13.0") );
+	config.sat.satB = configElement("config.sat.satB", configSelection, 0, ("Disabled" ,"Astra 19.2", "Hotbird 13.0") );
+	config.sat.diseqcA = configElement("config.sat.diseqcA", configSelection, 3, ("no DiSEqC", "DiSEqC 1.0", "DiSEqC 1.1", "DiSEqC 1.2") );
+	config.sat.diseqcB = configElement("config.sat.diseqcB", configSelection, 0, ("no DiSEqC", "DiSEqC 1.0", "DiSEqC 1.1", "DiSEqC 1.2") );
+	config.sat.posA = configElement("config.sat.posA", configSelection, 0, ("DiSEqC A", "DiSEqC B", "DiSEqC C", "DiSEqC D") );
+	config.sat.posB = configElement("config.sat.posB", configSelection, 1, ("DiSEqC A", "DiSEqC B", "DiSEqC C", "DiSEqC D") );
 
 	#config.blasel = ConfigSubsection();
-	#config.blasel.val = configElement("", configBoolean, 0, ("bunt", "s/w", "gruen") );
+	#config.blasel.val = configElement("", configSelection, 0, ("bunt", "s/w", "gruen") );
 	#config.inputDevices.delay = configElement("config.inputDevices.delay", ConfigSlider, 3);
 
 	#this instance anywhere else needed?	
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 8cd78712..1795d426 100644
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -47,7 +47,7 @@ class configFile:
 
 		fileHandle.close()		
 
-class configBoolean:
+class configSelection:
 	def __init__(self, parent):
 		self.parent = parent
 		
@@ -186,7 +186,7 @@ class configElement:
 	def datafromFile(self, control, data):
 		if control == ConfigSlider:
 			return int(data);
-		elif control == configBoolean:
+		elif control == configSelection:
 			return int(data);
 		elif control == configSequence:
 			list = [ ]
@@ -200,7 +200,7 @@ class configElement:
 	def datatoFile(self, control, data):
 		if control == ConfigSlider:
 			return str(data);
-		elif control == configBoolean:
+		elif control == configSelection:
 			return str(data);
 		elif control == configSequence:
 			value = ""
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 36b64c1c..589f470c 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,7 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.config import config				#global config instance
-from Components.config import configBoolean
+from Components.config import configSelection
 from Components.ConfigList import ConfigList
 from Components.Label import Label