improve, now sending all configured values

diff --git a/webinterface/src/WebComponents/Sources/Settings.py b/webinterface/src/WebComponents/Sources/Settings.py
index 1ec8f97..196700c 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Settings.py
+++ b/webinterface/src/WebComponents/Sources/Settings.py
@@ -1,5 +1,5 @@
 from enigma import *
-
+from Components import config as config_mod
 from Components.config import config
 
 import os
@@ -19,23 +19,21 @@ class Settings( Source):
         self.cmd = cmd
         
     def do_func(self):
-        list = []
-        
-        list.append([config.recording.margin_before.value, 'config.recording.margin_before'])
-        list.append([config.recording.margin_after.value, 'config.recording.margin_after'])
-        
-        list.append([config.ParentalControl.servicepinactive.value, 'config.ParentalControl.servicepinactive'])
-        list.append([config.ParentalControl.setuppin.value, 'config.ParentalControl.setuppin'])
-        list.append([config.ParentalControl.servicepin[0].value, 'config.ParentalControl.servicepin.0'])
-        list.append([config.ParentalControl.configured.value, 'config.ParentalControl.configured'])
-        list.append([config.ParentalControl.setuppinactive.value, 'config.ParentalControl.setuppinactive'])
-        list.append([config.ParentalControl.type.value, 'config.ParentalControl.type'])
-
-        print "Settings was was sent (%s)" % type
-        return list
-
+        result=[]
+        self.pickle_this("config", config.saved_value, result)
+        return result
+ 
+    def pickle_this(self, prefix, topickle, result):
+        for (key, val) in topickle.items():
+            name = prefix + "." + key
+            if isinstance(val, dict):
+                self.pickle_this(name, val, result)
+            elif isinstance(val, tuple):
+                result.append([name,val[0]])
+            else:
+                result.append([name,val])
 
     list = property(do_func)
-    lut = {"Value": 0
-           ,"Name": 1           
+    lut = {"Name": 0           
+           ,"Value": 1
            }
\ No newline at end of file