some minor renaming and reformating of GUI stuff

diff --git a/webinterface/src/WebIfConfig.py b/webinterface/src/WebIfConfig.py
index 61323b0..ef65d4c 100644 (file)
--- a/webinterface/src/WebIfConfig.py
+++ b/webinterface/src/WebIfConfig.py
@@ -31,11 +31,11 @@ class WebIfConfigScreen(ConfigListScreen,Screen):
         self.session = session
         Screen.__init__(self, session)
         self.list = []
-        self.list.append(getConfigListEntry(_("start Webinterface"), config.plugins.Webinterface.enable))
-        self.list.append(getConfigListEntry(_("enable /hdd"), config.plugins.Webinterface.includehdd))
-        self.list.append(getConfigListEntry(_("allow zapping via webif"), config.plugins.Webinterface.allowzapping))
-        self.list.append(getConfigListEntry(_("autowrite timer"), config.plugins.Webinterface.autowritetimer))
-        self.list.append(getConfigListEntry(_("load movie-length"), config.plugins.Webinterface.loadmovielength))
+        self.list.append(getConfigListEntry(_("Start Webinterface"), config.plugins.Webinterface.enable))
+        self.list.append(getConfigListEntry(_("Enable /hdd"), config.plugins.Webinterface.includehdd))
+        self.list.append(getConfigListEntry(_("Allow zapping via Webinterface"), config.plugins.Webinterface.allowzapping))
+        self.list.append(getConfigListEntry(_("Autowrite timer"), config.plugins.Webinterface.autowritetimer))
+        self.list.append(getConfigListEntry(_("Load movie-length"), config.plugins.Webinterface.loadmovielength))
         
         for i in range(0, config.plugins.Webinterface.interfacecount.value):
             c = config.plugins.Webinterface.interfaces[i]
@@ -73,41 +73,40 @@ class WebIfConfigScreen(ConfigListScreen,Screen):
 class WebIfInterfaceListConfigScreen(Screen):
     skin = """
         <screen position="100,100" size="550,400" title="Webinterface: list of configured Interfaces" >
-            <widget name="adress" position="5,0" size="150,50"   font="Regular;20" halign="left"/>
-            <widget name="port" position="120,0" size="50,50"   font="Regular;20" halign="left"/>
-            <widget name="ssl" position="170,0" size="50,50"   font="Regular;20" halign="left"/>
-            <widget name="auth" position="230,0" size="200,50"   font="Regular;20" halign="left"/>
-            <widget name="disabled" position="430,0" size="130,50"   font="Regular;20" halign="left"/>
-            <widget name="ifacelist" position="0,50" size="550,300"  scrollbarMode="showOnDemand"/>
+            <widget name="address" position="5,0" size="150,50" font="Regular;20" halign="left"/>
+            <widget name="port" position="120,0" size="50,50" font="Regular;20" halign="left"/>
+            <widget name="ssl" position="170,0" size="50,50" font="Regular;20" halign="left"/>
+            <widget name="auth" position="230,0" size="170,50" font="Regular;20" halign="left"/>
+            <widget name="disabled" position="400,0" size="160,50" font="Regular;20" halign="left"/>
+            <widget name="ifacelist" position="0,50" size="550,300" scrollbarMode="showOnDemand"/>
             
             <widget name="key_red" position="0,350" size="140,40" zPosition="5" valign="center" halign="center" backgroundColor="red" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-               <widget name="key_yellow" position="280,350" size="140,40"  zPosition="5" valign="center" halign="center" backgroundColor="yellow" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
-           
-            <ePixmap name="red"    position="0,350"   zPosition="4" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+               <widget name="key_yellow" position="280,350" size="140,40" zPosition="5" valign="center" halign="center" backgroundColor="yellow" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />             
+            <ePixmap name="red" position="0,350" zPosition="4" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
            <ePixmap name="yellow" position="280,350" zPosition="4" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />    
         </screen>"""
-    def __init__(self, session):
         
+    def __init__(self, session):
         Screen.__init__(self, session)
-        self["adress"] = Button(_("Adress"))
+        self["address"] = Button(_("Address"))
         self["port"] = Button(_("Port"))
-        self["auth"] = Button(_("use Authorization"))
-        self["ssl"] = Button(_("use SSL"))
-        self["disabled"] = Button(_("disabled"))
-        self["key_red"] = Button(_("add"))
-        self["key_yellow"] = Button(_("change"))
+        self["auth"] = Button(_("Authorization"))
+        self["ssl"] = Button(_("SSL"))
+        self["disabled"] = Button(_("Disabled"))
+        self["key_red"] = Button(_("Add"))
+        self["key_yellow"] = Button(_("Change"))
         self["ifacelist"] = WebIfInterfaceList([])
         self["actions"] = ActionMap(["WizardActions","MenuActions","ShortcutActions"],
             {
              "ok"      :       self.keyGreen,
              "back"    :       self.close,
              "red"     :       self.keyRed,
-             "green"   :       self.keyGreen,
-             "yellow"  :       self.keyYellow,
+             "green":  self.keyGreen,
+             "yellow": self.keyYellow,
              "up"      :       self.up,
              "down"    :       self.down,
              "left"    :       self.left,
-             "right"   :       self.right,
+             "right":  self.right,
              }, -1)
         self.updateList()
         
@@ -116,7 +115,7 @@ class WebIfInterfaceListConfigScreen(Screen):
         for i in range(0, config.plugins.Webinterface.interfacecount.value):
             c= config.plugins.Webinterface.interfaces[i]
             res = [ i ] #550,400
-            res.append(MultiContentEntryText(pos=(5, 0), size=(150, 25), font=0, text=c.adress.value))
+            res.append(MultiContentEntryText(pos=(5, 0), size=(150, 25), font=0, text=c.address.value))
             res.append(MultiContentEntryText(pos=(120, 0),size=(50, 25), font=0,text=str(c.port.value)))
             
             if c.usessl.value:
@@ -125,14 +124,14 @@ class WebIfInterfaceListConfigScreen(Screen):
                 res.append(MultiContentEntryText(pos=(170, 0),size=(200, 25), font=0,text=_("no"),color=0x00FF0000))
             
             if c.useauth.value:
-                res.append(MultiContentEntryText(pos=(230, 0),size=(200, 25), font=0,text=_("yes"),color=0x0000FF00))
+                res.append(MultiContentEntryText(pos=(230, 0),size=(170, 25), font=0,text=_("yes"),color=0x0000FF00))
             else:
-                res.append(MultiContentEntryText(pos=(230, 0),size=(200, 25), font=0,text=_("no"),color=0x00FF0000))
+                res.append(MultiContentEntryText(pos=(230, 0),size=(170, 25), font=0,text=_("no"),color=0x00FF0000))
                 
             if c.disabled.value:
-                res.append(MultiContentEntryText(pos=(430, 0),size=(130, 25), font=0,text=_("yes"),color=0x0000FF00))
+                res.append(MultiContentEntryText(pos=(400, 0),size=(160, 25), font=0,text=_("yes"),color=0x0000FF00))
             else:
-                res.append(MultiContentEntryText(pos=(430, 0),size=(130, 25), font=0,text=_("no"),color=0x00FF0000))
+                res.append(MultiContentEntryText(pos=(400, 0),size=(160, 25), font=0,text=_("no"),color=0x00FF0000))
             ifaceguilist.append(res)
         ifaceguilist.sort()
         self["ifacelist"].l.setList(ifaceguilist)
@@ -215,13 +214,13 @@ class WebIfInterfaceConfigScreen(Screen, ConfigListScreen):
             current = config.plugins.Webinterface.interfaces[ifacenum]
         
         #reloading current network devices
-        current.adress = ConfigSelection(getCofiguredAndSpecialNetworkinterfaces(),default=current.adress.value)
+        current.address = ConfigSelection(getCofiguredAndSpecialNetworkinterfaces(),default=current.address.value)
         
-        cfglist.append(getConfigListEntry(_("disabled"), current.disabled))
-        cfglist.append(getConfigListEntry(_("Adress"), current.adress))
+        cfglist.append(getConfigListEntry(_("Disabled"), current.disabled))
+        cfglist.append(getConfigListEntry(_("Address"), current.address))
         cfglist.append(getConfigListEntry(_("Port"), current.port))
-        cfglist.append(getConfigListEntry(_("use Authorization"), current.useauth))
-        cfglist.append(getConfigListEntry(_("use SSL Encryption"), current.usessl))
+        cfglist.append(getConfigListEntry(_("Require Authorization"), current.useauth))
+        cfglist.append(getConfigListEntry(_("SSL Encryption"), current.usessl))
         ConfigListScreen.__init__(self, cfglist, session)
         self.ifacenum = i
 

diff --git a/webinterface/src/__init__.py b/webinterface/src/__init__.py
index ee2b979..43e4fa0 100644 (file)
--- a/webinterface/src/__init__.py
+++ b/webinterface/src/__init__.py
@@ -10,7 +10,7 @@ from Components.config import configfile
 from Components.config import ConfigYesNo
 from Components.Network import iNetwork
 
-__version__ = "1.5beta"
+__version__ = "1.5beta2"
 
 config.plugins.Webinterface = ConfigSubsection()
 config.plugins.Webinterface.enable = ConfigYesNo(default = True)
@@ -29,7 +29,7 @@ def addInterfaceConfig():
     i = len(config.plugins.Webinterface.interfaces)
     config.plugins.Webinterface.interfaces.append(ConfigSubsection())
     config.plugins.Webinterface.interfaces[i].disabled = ConfigYesNo(default = False)
-    config.plugins.Webinterface.interfaces[i].adress = ConfigSelection(choices,default=choices[0])
+    config.plugins.Webinterface.interfaces[i].address = ConfigSelection(choices,default=choices[0])
     config.plugins.Webinterface.interfaces[i].port = ConfigInteger(80, (0,65535))
     config.plugins.Webinterface.interfaces[i].useauth = ConfigYesNo(default = False)
     config.plugins.Webinterface.interfaces[i].usessl = ConfigYesNo(default = False)
@@ -55,7 +55,7 @@ if config.plugins.Webinterface.interfacecount.value == 0:
     config.plugins.Webinterface.interfaces[0].disabled = ConfigYesNo(default = False)
     
     #needs to be refreshed before each call, because ifaces can be changed since e2 boot 
-    config.plugins.Webinterface.interfaces[0].adress = ConfigSelection(getCofiguredAndSpecialNetworkinterfaces(),default='0.0.0.0')
+    config.plugins.Webinterface.interfaces[0].address = ConfigSelection(getCofiguredAndSpecialNetworkinterfaces(),default='0.0.0.0')
     
     config.plugins.Webinterface.interfaces[0].port = ConfigInteger(80, (0,65535))
     config.plugins.Webinterface.interfaces[0].useauth = ConfigYesNo(default = False)

diff --git a/webinterface/src/plugin.py b/webinterface/src/plugin.py
index cc8155d..30ea482 100644 (file)
--- a/webinterface/src/plugin.py
+++ b/webinterface/src/plugin.py
@@ -81,11 +81,11 @@ def startWebserver(session):
        for i in range(0, config.plugins.Webinterface.interfacecount.value):
                c = config.plugins.Webinterface.interfaces[i]
                if c.disabled.value is False:
-                       startServerInstance(session,c.adress.value,c.port.value,c.useauth.value,c.usessl.value)
+                       startServerInstance(session,c.address.value,c.port.value,c.useauth.value,c.usessl.value)
                else:
-                       print "[Webinterface] not starting disabled interface on %s:%i"%(c.adress.value,c.port.value)
+                       print "[Webinterface] not starting disabled interface on %s:%i"%(c.address.value,c.port.value)
                        
-def startServerInstance(session,ipadress,port,useauth=False,usessl=False):
+def startServerInstance(session,ipaddress,port,useauth=False,usessl=False):
        try:
                toplevel = Toplevel(session)
                if useauth:
@@ -98,17 +98,17 @@ def startServerInstance(session,ipadress,port,useauth=False,usessl=False):
                try:
                        if usessl:                              
                                ctx = ssl.DefaultOpenSSLContextFactory('/etc/enigma2/server.pem','/etc/enigma2/cacert.pem',sslmethod=SSL.SSLv23_METHOD)
-                               d = reactor.listenSSL(port, channel.HTTPFactory(site),ctx,interface=ipadress)
+                               d = reactor.listenSSL(port, channel.HTTPFactory(site),ctx,interface=ipaddress)
                        else:
-                               d = reactor.listenTCP(port, channel.HTTPFactory(site),interface=ipadress)
+                               d = reactor.listenTCP(port, channel.HTTPFactory(site),interface=ipaddress)
                        running_defered.append(d)
-                       print "[Webinterface] started on %s:%i"%(ipadress,port),"auth=",useauth,"ssl=",usessl
+                       print "[Webinterface] started on %s:%i"%(ipaddress,port),"auth=",useauth,"ssl=",usessl
                except CannotListenError, e:
-                       print "[Webinterface] Could not Listen on %s:%i!"%(ipadress,port)
-                       session.open(MessageBox,'Could not Listen on %s:%i!\n\n%s'%(ipadress,port,str(e)), MessageBox.TYPE_ERROR)
+                       print "[Webinterface] Could not Listen on %s:%i!"%(ipaddress,port)
+                       session.open(MessageBox,'Could not Listen on %s:%i!\n\n%s'%(ipaddress,port,str(e)), MessageBox.TYPE_ERROR)
        except Exception,e:
-               print "[Webinterface] starting FAILED on %s:%i!"%(ipadress,port),e
-               session.open(MessageBox,'starting FAILED on %s:%i!\n\n%s'%(ipadress,port,str(e)), MessageBox.TYPE_ERROR)
+               print "[Webinterface] starting FAILED on %s:%i!"%(ipaddress,port),e
+               session.open(MessageBox,'starting FAILED on %s:%i!\n\n%s'%(ipaddress,port,str(e)), MessageBox.TYPE_ERROR)
 
 def autostart(reason, **kwargs):
        if "session" in kwargs: