entering numbers into networksetup is possible now

diff --git a/data/keymap.xml b/data/keymap.xml
index d9e65ae60d8b425d1150b9e4915dec362ae72932..c0d011856bc9e2fd8d65796f653bd8044fe3bec3 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -36,6 +36,16 @@
                <key id="KEY_RIGHT" mapto="right" flags="mr" />
                <key id="KEY_RED" mapto="cancel" flags="m" />
                <key id="KEY_GREEN" mapto="save" flags="m" />
                <key id="KEY_RIGHT" mapto="right" flags="mr" />
                <key id="KEY_RED" mapto="cancel" flags="m" />
                <key id="KEY_GREEN" mapto="save" flags="m" />

+               <key id="KEY_1" mapto="1" flags="m" />
+               <key id="KEY_2" mapto="2" flags="m" />
+               <key id="KEY_3" mapto="3" flags="m" />
+               <key id="KEY_4" mapto="4" flags="m" />
+               <key id="KEY_5" mapto="5" flags="m" />
+               <key id="KEY_6" mapto="6" flags="m" />
+               <key id="KEY_7" mapto="7" flags="m" />
+               <key id="KEY_8" mapto="8" flags="m" />
+               <key id="KEY_9" mapto="9" flags="m" />
+               <key id="KEY_0" mapto="0" flags="m" />

        </map>
 
        <map context="InfobarActions">
        </map>
 
        <map context="InfobarActions">

diff --git a/data/setup.xml b/data/setup.xml
index 770227121c585dd823eb380f63e73e373c83b4f3..e4b1db91d35d9e7b3364ecf122246ee180bcb405 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -21,7 +21,8 @@
                        <item text="Netmask">config.network.netmask</item>                      
                        <item text="Gateway">config.network.gateway</item>
                        <item text="Nameserver">config.network.dns</item>
                        <item text="Netmask">config.network.netmask</item>                      
                        <item text="Gateway">config.network.gateway</item>
                        <item text="Nameserver">config.network.dns</item>

-                       <item text="MAC Address">config.network.mac</item>
+<!--                   <item text="MAC Address">config.network.mac</item>-->
+                       <item text="Activate network settings">config.network.activate</item>

                </setup>
                <setup key="rfmod" title="UHF Modulator">
                        <item text="Modulator">config.rfmod.enable</item>
                </setup>
                <setup key="rfmod" title="UHF Modulator">
                        <item text="Modulator">config.rfmod.enable</item>

diff --git a/data/skin.xml b/data/skin.xml
index af871ce62bd96061b3c1a63e4355ac2eeea8bb4d..480accdd86e908a742dfb25acc57225d52477feb 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -59,16 +59,8 @@
                        <widget name="hdd" position="10,150" size="420,20"/>
                        <widget name="hddA" position="10,170" size="420,20"/>
                </screen>
                        <widget name="hdd" position="10,150" size="420,20"/>
                        <widget name="hddA" position="10,170" size="420,20"/>
                </screen>

-               <screen name="Network" position="140,125" size="360,200" title="Network">
-                       <widget name="textip" position="10,30" size="150,20" font="Arial;18"/>
-                       <widget name="textgateway" position="10,50" size="150,20" font="Arial;18"/>
-                       <widget name="textnameserver" position="10,70" size="150,20" font="Arial;18"/>
-                       <widget name="ip" position="160,30" size="200,20" font="Arial;18"/>
-                       <widget name="gateway" position="160,50" size="200,20" font="Arial;18"/>
-                       <widget name="nameserver" position="160,70" size="200,20" font="Arial;18"/>
-               </screen>

                <screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
                <screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">

-                       <widget name="okbutton" position="20,245" size="205,40" />
+                       <widget name="okbutton" position="20,270" size="205,40" />

                        <widget name="txt_alpha" position="20,20" size="110,20" />
                        <widget name="sld_alpha" position="150,20" size="290,20" />
                        <widget name="txt_brightness" position="20,60" size="120,20" />
                        <widget name="txt_alpha" position="20,20" size="110,20" />
                        <widget name="sld_alpha" position="150,20" size="290,20" />
                        <widget name="txt_brightness" position="20,60" size="120,20" />

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index e56e5c8476daf634349f27cc4e5f06871a080802..cc6ed26a455c0f136ae67eb3590c1cbba2ab058d 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -6,7 +6,7 @@ class Network:
        def __init__(self):
                pass
                
        def __init__(self):
                pass
                

-       def updateNetworkConfig(self):
+       def writeNetworkConfig(self):

                # fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/
                # fixme using interfaces.tmp instead of interfaces for now
                fp = file('/etc/network/interfaces.tmp', 'w')
                # fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/
                # fixme using interfaces.tmp instead of interfaces for now
                fp = file('/etc/network/interfaces.tmp', 'w')


@@ -20,6 +20,7 @@ class Network:
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 

+       def activateNetworkConfig(self):

                import os
                os.system("/etc/init.d/networking restart")
                
                import os
                os.system("/etc/init.d/networking restart")
                


@@ -45,19 +46,43 @@ class Network:
        def setMACAddress(self, mac):
                os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
                
        def setMACAddress(self, mac):
                os.system("echo ifconfig eth0 ether %02x:%02x:%02x:%02x:%02x:%02x" % tuple(mac))
                

+       def setIPAddress(self, ip):
+               os.system("echo ifconfig eth0 %d.%d.%d.%d" % tuple(ip))
+               self.writeNetworkConfig()
+
+       def setGateway(self, ip):
+               os.system("echo route add default gw %d.%d.%d.%d" % tuple(ip))
+               self.writeNetworkConfig()
+               
+       def setNetmask(self, ip):
+               os.system("echo ifconfig eth0 netmask %d.%d.%d.%d" % tuple(ip))         
+               self.writeNetworkConfig()               
+

 def InitNetwork():
        config.network = ConfigSubsection()
        config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes"))
 def InitNetwork():
        config.network = ConfigSubsection()
        config.network.dhcp = configElement("config.network.dhcp", configSelection, 0, ("no", "yes"))

-       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), 3))
-       config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), 3))   
-       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), 3))
-       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), 3))
-       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), 2))
+       config.network.ip = configElement("config.network.ip", configSequence, [192,168,1,45], (("."), (1,255)))
+       config.network.netmask = configElement("config.network.netmask", configSequence, [255,255,255,0], (("."), (1,255)))
+       config.network.gateway = configElement("config.network.gateway", configSequence, [192,168,1,3], (("."), (1,255)))
+       config.network.dns = configElement("config.network.dns", configSequence, [192,168,1,3], (("."), (1,255)))
+       config.network.mac = configElement("config.network.mac", configSequence, [00,11,22,33,44,55], ((":"), (1,255)))
+       
+       #FIXME using this till other concept for this is implemented
+       config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes, sir", "you are my hero"))

 
        iNetwork = Network()
 
 
        iNetwork = Network()
 

-       def updateNetworkConfig(configElement):
-               iNetwork.updateNetworkConfig()
+       def writeNetworkConfig(configElement):
+               iNetwork.writeNetworkConfig()
+               
+       def setIPAddress(configElement):
+               iNetwork.setIPAddress(configElement.value)
+
+       def setGateway(configElement):
+               iNetwork.setGateway(configElement.value)
+
+       def setNetmask(configElement):
+               iNetwork.setNetmask(configElement.value)                

 
        def setDHCP(configElement):
                iNetwork.setDHCP(configElement.value)
 
        def setDHCP(configElement):
                iNetwork.setDHCP(configElement.value)


@@ -68,10 +93,15 @@ def InitNetwork():
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 
        def setMACAddress(configElement):
                iNetwork.setMACAddress(configElement.value)
 

+       def activateNetworkConfig(configElement):
+               iNetwork.activateNetworkConfig()
+
+

        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)
        # this will call the "setup-val" initial
        config.network.dhcp.addNotifier(setDHCP)

-       config.network.ip.addNotifier(updateNetworkConfig)
-       config.network.netmask.addNotifier(updateNetworkConfig) 
-       config.network.gateway.addNotifier(updateNetworkConfig)
+       config.network.ip.addNotifier(setIPAddress)
+       config.network.netmask.addNotifier(setNetmask)  
+       config.network.gateway.addNotifier(setGateway)

        config.network.dns.addNotifier(setIPNameserver)
        config.network.dns.addNotifier(setIPNameserver)

-       config.network.mac.addNotifier(setMACAddress)
\ No newline at end of file
+       config.network.mac.addNotifier(setMACAddress)
+       config.network.activate.addNotifier(activateNetworkConfig)
\ No newline at end of file

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 494d1d882a3e86cd3fb3e1f456a7dbe7e4cb63bc..7bd8175a612ab35a0b837c4583fe76f4632367be 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -65,9 +65,9 @@ class configSelection:
                self.parent.save()
 
        def handleKey(self, key):
                self.parent.save()
 
        def handleKey(self, key):

-               if key == config.prevElement:
+               if key == config.key["prevElement"]:

                        self.parent.value = self.parent.value - 1
                        self.parent.value = self.parent.value - 1

-               if key == config.nextElement:
+               if key == config.key["nextElement"]:

                        self.parent.value = self.parent.value + 1
                
                self.checkValues()                      
                        self.parent.value = self.parent.value + 1
                
                self.checkValues()                      


@@ -101,9 +101,27 @@ class configSequence:
        def handleKey(self, key):
                #this will no change anything on the value itself
                #so we can handle it here in gui element
        def handleKey(self, key):
                #this will no change anything on the value itself
                #so we can handle it here in gui element

-               if key == config.prevElement:
+               if key == config.key["prevElement"]:

                        self.markedPos -= 1
                        self.markedPos -= 1

-               if key == config.nextElement:
+               if key == config.key["nextElement"]:
+                       self.markedPos += 1
+               
+               if key >= config.key["0"] and key <= config.key["9"]:
+                       number = 9 - config.key["9"] + key
+                       # length of numberblock
+                       numberLen = len(str(self.parent.vals[1][1]))
+                       # position in the block
+                       posinblock = self.markedPos % numberLen
+                       # blocknumber
+                       blocknumber = self.markedPos / numberLen
+                       
+                       oldvalue = self.parent.value[blocknumber]
+                       olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
+                       newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
+                       
+                       print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
+                       print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
+                       self.parent.value[blocknumber] = newvalue

                        self.markedPos += 1
                
                self.checkValues()                      
                        self.markedPos += 1
                
                self.checkValues()                      


@@ -117,18 +135,19 @@ class configSequence:
        def __call__(self, selected):                   #needed by configlist
                value = ""
                mPos = self.markedPos
        def __call__(self, selected):                   #needed by configlist
                value = ""
                mPos = self.markedPos

-               print mPos
+               print "Positon: " + str(mPos)

                for i in self.parent.value:
                        if len(value):  #fixme no heading separator possible
                                value += self.parent.vals[0]
                                if mPos >= len(value) - 1:
                                        mPos += 1
                                
                for i in self.parent.value:
                        if len(value):  #fixme no heading separator possible
                                value += self.parent.vals[0]
                                if mPos >= len(value) - 1:
                                        mPos += 1
                                

-                       diff =  self.parent.vals[1] - len(str(i))
-                       if diff > 0:
-                               # if this helps?!
-                               value += " " * diff
-                       value +=        str(i)
+                       #diff =         self.parent.vals[1] - len(str(i))
+                       #if diff > 0:
+                               ## if this helps?!
+                               #value += " " * diff
+                       print (("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i)
+                       value += ("%0" + str(len(str(self.parent.vals[1][1]))) + "d") % i

 
                        # only mark cursor when we are selected
                        # (this code is heavily ink optimized!)
 
                        # only mark cursor when we are selected
                        # (this code is heavily ink optimized!)


@@ -143,10 +162,20 @@ class configValue:
 
 class Config:
        def __init__(self):
 
 class Config:
        def __init__(self):

-               self.choseElement = 0
-               self.prevElement = 1
-               self.nextElement = 2
-                                               
+               self.key = { "choseElement": 0,
+                                        "prevElement": 1,
+                                        "nextElement": 2,
+                                        "0": 10,
+                                        "1": 11,
+                                        "2": 12,
+                                        "3": 13,
+                                        "4": 14,
+                                        "5": 15,
+                                        "6": 16,
+                                        "7": 17,
+                                        "8": 18,
+                                        "9": 19 }
+               

 config = Config();
 configfile = configFile()
 
 config = Config();
 configfile = configFile()
 


@@ -168,9 +197,9 @@ class ConfigSlider:
                        self.parent.value = 10  
 
        def handleKey(self, key):
                        self.parent.value = 10  
 
        def handleKey(self, key):

-               if key == config.prevElement:
+               if key == config.key["prevElement"]:

                        self.parent.value = self.parent.value - 1
                        self.parent.value = self.parent.value - 1

-               if key == config.nextElement:
+               if key == config.key["nextElement"]:

                        self.parent.value = self.parent.value + 1
                                        
                self.checkValues()      
                        self.parent.value = self.parent.value + 1
                                        
                self.checkValues()      

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 589f470cd7a1c57947fa606dff8ac808bf6d50c8..efd10e36ac78040b9c0e6028852c4462cacf8fd2 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -52,13 +52,13 @@ class Setup(Screen):
 
        def keyOk(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):
 
        def keyOk(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):

-                       self["config"].handleKey(config.choseElement)
+                       self["config"].handleKey(config.key["choseElement"])

        def keyLeft(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):
        def keyLeft(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):

-                       self["config"].handleKey(config.prevElement)
+                       self["config"].handleKey(config.key["prevElement"])

        def keyRight(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):
        def keyRight(self):
                if (self["config"].getCurrent()[1].parent.enabled == True):

-                       self["config"].handleKey(config.nextElement)
+                       self["config"].handleKey(config.key["nextElement"])

 
        def keySave(self):
                print "save requested"
 
        def keySave(self):
                print "save requested"


@@ -71,6 +71,36 @@ class Setup(Screen):
                for x in self["config"].list:
                        x[1].cancel()
                self.close()
                for x in self["config"].list:
                        x[1].cancel()
                self.close()

+               
+       def keyNumberGlobal(self, number):
+               print "You pressed number " + str(number)
+               if (self["config"].getCurrent()[1].parent.enabled == True):
+                       self["config"].handleKey(config.key[str(number)])
+
+
+       # TODO ugly as hell. any better ideas?
+       def keyNumber1(self):
+               self.keyNumberGlobal(1)
+       def keyNumber2(self):
+               self.keyNumberGlobal(2)
+       def keyNumber3(self):
+               self.keyNumberGlobal(3)
+       def keyNumber4(self):
+               self.keyNumberGlobal(4)
+       def keyNumber5(self):
+               self.keyNumberGlobal(5)
+       def keyNumber6(self):
+               self.keyNumberGlobal(6)
+       def keyNumber7(self):
+               self.keyNumberGlobal(7)
+       def keyNumber8(self):
+               self.keyNumberGlobal(8)
+       def keyNumber9(self):
+               self.keyNumberGlobal(9)
+       def keyNumber0(self):
+               self.keyNumberGlobal(0)
+
+

 
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
        def __init__(self, session, setup):
                Screen.__init__(self, session)


@@ -105,5 +135,16 @@ class Setup(Screen):
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,
                                "ok": self.keyOk,
                                "left": self.keyLeft,
                                "right": self.keyRight,

-                               "save": self.keySave
+                               "save": self.keySave,
+                               "1": self.keyNumber1,
+                               "2": self.keyNumber2,
+                               "3": self.keyNumber3,
+                               "4": self.keyNumber4,
+                               "5": self.keyNumber5,
+                               "6": self.keyNumber6,
+                               "7": self.keyNumber7,
+                               "8": self.keyNumber8,
+                               "9": self.keyNumber9,
+                               "0": self.keyNumber0
+                               

                        }, -1)
                        }, -1)