X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/044fe5e29a9a4fbe50541b67efceeabe5c0d45f5..4c1d3d2f5cf39f72bf85041a6ba6665350ea742e:/lib/python/Components/SetupDevices.py

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
old mode 100644
new mode 100755
index 5ced8451..b037ea77
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -1,34 +1,38 @@
-#import os
-from config import config				#global config instance
-from config import configElement
-from config import ConfigSubsection
-from config import ConfigSlider
-from config import configSelection
+from config import config, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText
+from Components.Timezones import timezones
+from Components.Language import language
+from Components.Keyboard import keyboard
 
 def InitSetupDevices():
+	
+	def timezoneNotifier(configElement):
+		timezones.activateTimezone(configElement.index)
+		
 	config.timezone = ConfigSubsection();
-	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.timezone.val = ConfigSelection(default = timezones.getDefaultTimezone(), choices = timezones.getTimezoneList())
+	config.timezone.val.addNotifier(timezoneNotifier)
 
-	config.rc = ConfigSubsection();
-	config.rc.map = configElement("config.rc.map", configSelection, 0, ("Default", "Classic") );
+	def keyboardNotifier(configElement):
+		keyboard.activateKeyboardMap(configElement.index)
 
 	config.keyboard = ConfigSubsection();
-	config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, ("English", "German") );
+	config.keyboard.keymap = ConfigSelection(default = keyboard.getDefaultKeyboardMap(), choices = keyboard.getKeyboardMaplist())
+	config.keyboard.keymap.addNotifier(keyboardNotifier)
 
-	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", configSelection, 0, ("English", "English US") );
+	def languageNotifier(configElement):
+		language.activateLanguage(configElement.value)
+	
+	config.osd = ConfigSubsection()
+	config.osd.language = ConfigText(default = "en_EN");
+	config.osd.language.addNotifier(languageNotifier)
 
 	config.parental = ConfigSubsection();
-	config.parental.lock = configElement("config.parental.lock", configSelection, 1, ("Enable", "Disable") );
-	config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, ("Enable", "Disable") );
+	config.parental.lock = ConfigOnOff(default = False)
+	config.parental.setuplock = ConfigOnOff(default = False)
 
 	config.expert = ConfigSubsection();
-	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.expert.satpos = ConfigOnOff(default = True)
+	config.expert.fastzap = ConfigOnOff(default = True)
+	config.expert.skipconfirm = ConfigOnOff(default = False)
+	config.expert.hideerrors = ConfigOnOff(default = False)
+	config.expert.autoinfo = ConfigOnOff(default = True)