hdd format (initialize) works now

[enigma2.git] / lib / python / Screens / Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 9f65daaa654f5171601e37355971654af5f7133e..a694ab164951437b819fe181ed428b1a8ab1b1c2 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -4,6 +4,7 @@ from Components.config import config                            #global config instance
 from Components.config import configEntry
 from Components.config import configBoolean
 from Components.ConfigList import ConfigList
+from Components.Label import Label
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -13,10 +14,66 @@ from Tools import XMLTools
 
 setupdom = xml.dom.minidom.parseString(
        """
-       <setup key="rc" title="RC Menu">
-               <item text="Repeat Rate">config.inputDevices.repeat</item>
-               <item text="Delay Rate">config.inputDevices.delay</item>
-       </setup>
+       <setupxml>
+               <setup key="rc" title="RC Menu">
+                       <item text="Repeat Rate">config.inputDevices.repeat</item>
+                       <item text="Delay Rate">config.inputDevices.delay</item>
+                       <item text="Keymap">config.rc.map</item>
+               </setup>
+               <setup key="timezone" title="RC Menu">
+                       <item text="Timezone">config.timezone.val</item>
+               </setup>
+               <setup key="avsetup" title="A/V Settings">
+                       <item text="Color Format">config.av.colorformat</item>
+                       <item text="Aspect Ratio">config.av.aspectratio</item>
+                       <item text="TV System">config.av.tvsystem</item>
+                       <item text="WSS">config.av.wss</item>
+                       <item text="AC3 default">config.av.defaultac3</item>
+                       <item text="VCR Switch">config.av.vcrswitch</item>
+               </setup>
+               <setup key="rfmod" title="UHF Modulator">
+                       <item text="Modulator">config.rfmod.enable</item>
+                       <item text="Testmode">config.rfmod.test</item>
+                       <item text="Sound">config.rfmod.sound</item>
+                       <item text="Soundcarrier">config.rfmod.soundcarrier</item>
+                       <item text="Channel">config.rfmod.channel</item>
+                       <item text="Finetune">config.rfmod.finetune</item>
+               </setup>
+               <setup key="keyboard" title="Keyboard Setup">
+                       <item text="Keyboard Map">config.keyboard.keymap</item>
+               </setup>
+               <setup key="osd" title="OSD Settings">
+                       <item text="Alpha">config.osd.alpha</item>
+                       <item text="Brightness">config.osd.bright</item>
+                       <item text="Contrast">config.osd.contrast</item>
+                       <item text="Language">config.osd.language</item>
+               </setup>
+               <setup key="lcd" title="LCD Setup">
+                       <item text="Brightness">config.lcd.bright</item>
+                       <item text="Standby">config.lcd.standby</item>
+                       <item text="Invert">config.lcd.invert</item>
+               </setup>
+               <setup key="parental" title="Parental Control">
+                       <item text="Parental Lock">config.parental.lock</item>
+                       <item text="Setup Lock">config.parental.setuplock</item>
+               </setup>
+               <setup key="expert" title="Expert Setup">
+                       <item text="Record Splitsize">config.expert.splitsize</item>
+                       <item text="Show Satposition">config.expert.satpos</item>
+                       <item text="Fast zapping">config.expert.fastzap</item>
+                       <item text="Skip confirmations">config.expert.skipconfirm</item>
+                       <item text="Hide error windows">config.expert.hideerrors</item>
+                       <item text="Auto show inforbar">config.expert.autoinfo</item>
+               </setup>
+               <setup key="satconfig" title="Sat/Dish Setup">
+                       <item text="Tuner-A Control">config.sat.diseqcA</item>
+                       <item text="Tuner-A Position">config.sat.posA</item>
+                       <item text="Tuner-A Sat">config.sat.satA</item>
+                       <item text="Tuner-B Control">config.sat.diseqcB</item>
+                       <item text="Tuner-A Position">config.sat.posB</item>
+                       <item text="Tuner-B Sat">config.sat.satB</item>
+               </setup>
+       </setupxml>
        """)
 
 def getValbyAttr(x, attr):
@@ -42,7 +99,11 @@ class Setup(Screen):
                                if b == "":
                                        continue
                                #add to configlist
-                               list.append( (ItemText, b.controlType(b) ) )
+                               item = b.controlType(b)
+                               
+                               # the first b is the item itself, ignored by the configList.
+                               # the second one is converted to string.
+                               list.append( (ItemText, item) )
 
        def keyOk(self):
                self["config"].handleKey(0)
@@ -62,7 +123,9 @@ class Setup(Screen):
 
                print "request setup for " + setup
                
-               entries = setupdom.childNodes
+               xmldata = setupdom.childNodes[0]
+               
+               entries = xmldata.childNodes
 
                list = []
                                
@@ -79,6 +142,9 @@ class Setup(Screen):
                
                self["config"] = ConfigList(list)
 
+               self["ok"] = Label("OK")
+               self["cancel"] = Label("Cancel")
+
                self["actions"] = ActionMap(["SetupActions"], 
                        {
                                "cancel": self.close,