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 3398af7..b037ea7
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -1,47 +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 configText
+from config import config, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText

 from Components.Timezones import timezones
 from Components.Language import language
 from Components.Timezones import timezones
 from Components.Language import language

+from Components.Keyboard import keyboard

 
 def InitSetupDevices():
        
        def timezoneNotifier(configElement):
 
 def InitSetupDevices():
        
        def timezoneNotifier(configElement):

-               timezones.activateTimezone(configElement.value)
+               timezones.activateTimezone(configElement.index)

                
        config.timezone = ConfigSubsection();
                
        config.timezone = ConfigSubsection();

-       config.timezone.val = configElement("config.timezone.val", configSelection, timezones.getDefaultTimezone(), timezones.getTimezoneList());
+       config.timezone.val = ConfigSelection(default = timezones.getDefaultTimezone(), choices = timezones.getTimezoneList())

        config.timezone.val.addNotifier(timezoneNotifier)
 
        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 = 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, (1, 10));
-       config.osd.bright = configElement("config.osd.bright", configSlider, 5, (1, 10));
-       config.osd.contrast = configElement("config.osd.contrast", configSlider, 5, (1, 10));
-       

        def languageNotifier(configElement):
                language.activateLanguage(configElement.value)
        
        def languageNotifier(configElement):
                language.activateLanguage(configElement.value)
        

-       config.osd.language = configElement("config.osd.language", configSelection, 0, language.getLanguageList() );
+       config.osd = ConfigSubsection()
+       config.osd.language = ConfigText(default = "en_EN");

        config.osd.language.addNotifier(languageNotifier)
 
        config.parental = ConfigSubsection();
        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 = 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)