refs bug #429

[enigma2.git] / lib / python / Components / SetupDevices.py

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
old mode 100644 (file)
new mode 100755 (executable)
index bdbdcf0..b037ea7
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -1,18 +1,23 @@
-from config import config, ConfigSlider, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText
+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.value)
+               timezones.activateTimezone(configElement.index)
                
        config.timezone = ConfigSubsection();
        config.timezone.val = ConfigSelection(default = timezones.getDefaultTimezone(), choices = timezones.getTimezoneList())
        config.timezone.val.addNotifier(timezoneNotifier)
 
+       def keyboardNotifier(configElement):
+               keyboard.activateKeyboardMap(configElement.index)
+
        config.keyboard = ConfigSubsection();
-       config.keyboard.keymap = ConfigSelection(choices = [("en", _("English")), ("de",_("German"))])
+       config.keyboard.keymap = ConfigSelection(default = keyboard.getDefaultKeyboardMap(), choices = keyboard.getKeyboardMaplist())
+       config.keyboard.keymap.addNotifier(keyboardNotifier)
 
        def languageNotifier(configElement):
                language.activateLanguage(configElement.value)