now, settings are visible.

diff --git a/webinterface/src/WebComponents/Sources/Settings.py b/webinterface/src/WebComponents/Sources/Settings.py
new file mode 100644 (file)
index 0000000..45ca5d3
--- /dev/null
+++ b/webinterface/src/WebComponents/Sources/Settings.py
@@ -0,0 +1,39 @@
+from enigma import *
+
+from Components.config import config
+
+import os
+import struct
+from struct import *
+
+from Components.Sources.Source import Source
+
+class Settings( Source):
+        
+    def __init__(self,session):
+        self.cmd = []
+        self.session = session
+        Source.__init__(self)
+
+    def handleCommand(self, cmd):
+        self.cmd = cmd
+        
+    def do_func(self):
+        list = []
+        
+        print "Settings wurde aufgerufen ",self.cmd
+        #list.append([config.plugins.Webinterface.enable.value, 'config.plugins.Webinterface.enable'])
+        #list.append([config.plugins.Webinterface.password.value, 'config.plugins.Webinterface.password'])
+        #list.append([config.plugins.Webinterface.includehdd.value, 'config.plugins.Webinterface.includehdd'])
+        list.append([config.recording.margin_before.value, 'config.recording.margin_before'])
+        list.append([config.recording.margin_after.value, 'config.recording.margin_after'])
+        
+        print "Settings was was sent (%s)" % type
+        print list
+        return list
+
+
+    list = property(do_func)
+    lut = {"Value": 0
+           ,"Name": 1           
+           }
\ No newline at end of file

diff --git a/webinterface/src/web-data/objects.js b/webinterface/src/web-data/objects.js
index 2bf67ef..26325e2 100644 (file)
--- a/webinterface/src/web-data/objects.js
+++ b/webinterface/src/web-data/objects.js
@@ -495,3 +495,46 @@ function TimerAddResult(xml){
        }
 }
 // END TimerAddResult
+
+//START class Settings
+function Settings(xml){
+       // parsing values from xml-element
+       //debug('init ServiceList'+xml);
+       try{
+               this.xmlitems = xml.getElementsByTagName("e2settings").item(0).getElementsByTagName("e2setting");
+               debug(this.xmlitems);
+       } catch (e) {
+               //debug("Service parsing Error");
+       }
+       this.getArray = function(){
+               var listxy = new Array();
+               for (var i=0;i<this.xmlitems.length;i++){
+                       var xv = new Setting(this.xmlitems.item(i));
+                       listxy.push(xv);                        
+               }
+               return listxy;
+       }
+}
+//END class Settings
+
+//START class Setting
+function Setting(xml){ 
+       // parsing values from xml-element
+       //debug('init ServiceReference'+xml);
+       try{
+               this.settingvalue = xml.getElementsByTagName('e2settingvalue').item(0).firstChild.data;
+               this.settingname = xml.getElementsByTagName('e2settingname').item(0).firstChild.data;
+               
+       } catch (e) {
+               //debug("Service parsing Error "+e);
+       }
+       
+       this.getSettingValue = function(){
+               return this.settingvalue;
+       }
+               
+       this.getSettingName = function(){
+               return this.settingname;
+       }       
+}      
+//END class Setting

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 7466b18..e9f5e4e 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -1,4 +1,4 @@
-var DBG = false;
+var DBG = true;
 
 var url_getvolume = '/web/vol?set=state'; 
 var url_setvolume = '/web/vol?set=set'; // plus new value eq. set=set15
@@ -16,6 +16,8 @@ var url_updates= "/web/updates.html";
 
 var url_movielist= "/web/movielist";
 
+var url_settings= "/web/settings";
+
 var url_timerlist= "/web/timerlist";
 var url_timeradd= "/web/timeradd"; // plus serviceref,begin,end,name,description,eit,disabled,justplay,afterevent
 var url_timeraddbyeventid= "/web/timeraddbyeventid"; // plus serviceref,eventid
@@ -33,6 +35,10 @@ var bouqet_provider_radio ='1:7:2:0:0:0:0:0:0:0:(type == 2) FROM PROVIDERS ORDER
 
 var windowStyle = "alphacube";
 
+// Get Settings
+var settings;
+getSettings();
+
 // UpdateStreamReader
 var UpdateStreamReaderNextReadPos = 0;
 var UpdateStreamReaderPollTimer;
@@ -421,6 +427,7 @@ function initChannelList(){
        var url = url_fetchchannels+encodeURIComponent(bouqet_provider_radio);
        doRequest(url, incomingProviderRadioBouquetList);
 }
+
 var servicereftoloadepgnow="";
 function loadBouquet(servicereference){ 
        debug("loading bouquet with "+servicereference);
@@ -878,6 +885,8 @@ function loadTimerForm(){
        addTimerEditFormObject["TVList"] = tmp2;
        addTimerEditFormObject["TVListFilled"] = 1;
        addTimerEditFormObject["RadioListFilled"] = 1;
+       
+       getSettings();
 }
 
 function addTimerFormCreateOptions(start,end,number) {
@@ -1002,4 +1011,19 @@ function sendAddTimer() {
        if(Number($('deleteOldOnSave').value) == 1) {
                delTimer($('channelOld').value,$('beginOld').value,$('endOld').value);
        }
+}
+
+function getSettings(){
+       doRequest(url_settings, incomingGetSettings);
+}
+
+function incomingGetSettings(request){
+       if(request.readyState == 4){
+               settings = new Settings(getXML(request)).getArray();
+/*             for ( var i = 0; i <settings.length; i++){
+                       var setting = settings[i];
+                       debug(setting.getSettingValue() +":" + setting.getSettingName());
+               }*/
+               
+       }               
 }
\ No newline at end of file

diff --git a/webinterface/src/web/settings.xml b/webinterface/src/web/settings.xml
new file mode 100644 (file)
index 0000000..cd9f236
--- /dev/null
+++ b/webinterface/src/web/settings.xml
@@ -0,0 +1,13 @@
+<e2:screen name="TestScreen">&lt;?xml version="1.0" encoding="UTF-8"?>
+<e2settings>
+<e2:element source="Settings">                         
+       <e2:convert type="web:ListFiller">
+       &lt;e2setting>
+               &lt;e2settingvalue><e2:item name="Value" filter="xml" />&lt;/e2settingvalue>
+               &lt;e2settingname><e2:item name="Name" filter="xml" />&lt;/e2settingname>
+       &lt;/e2setting>
+       </e2:convert>
+       <e2:convert type="web:TextToHTML" />                    
+</e2:element>
+</e2settings>  
+</e2:screen>
\ No newline at end of file

diff --git a/webinterface/src/webif.py b/webinterface/src/webif.py
index 22305a2..38c4c3c 100644 (file)
--- a/webinterface/src/webif.py
+++ b/webinterface/src/webif.py
@@ -23,6 +23,7 @@ from WebComponents.Sources.Movie import Movie
 from WebComponents.Sources.Message import Message
 from WebComponents.Sources.PowerState import PowerState
 from WebComponents.Sources.RemoteControl import RemoteControl
+from WebComponents.Sources.Settings import Settings
 
 from WebComponents.Sources.RequestData import RequestData
 from Components.Sources.FrontendStatus import FrontendStatus
@@ -73,6 +74,7 @@ class TestScreen(InfoBarServiceName, InfoBarEvent,InfoBarTuner, WebScreen):
                self["Message"] = Message(session)
                self["PowerState"] = PowerState(session)
                self["RemoteControl"] = RemoteControl(session)
+               self["Settings"] = Settings(session)
                
 
        def browseTo(self, reftobrowse):