network setup stuff

diff --git a/data/menu.xml b/data/menu.xml
index d08d0166f6a63ab9f95a8ec02ad4332aaacd805d..0fa83dba70359845a36f6361e83c17f474e0c674 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -23,6 +23,7 @@
                                <item text="Keyboard">self.openSetup("keyboard")</item>
                                <item text="OSD">self.openSetup("osd")</item>
                                <item text="LCD">self.openSetup("lcd")</item>
+                               <item text="Networksetup">self.openDialog(Network)</item>
                        </menu>
                        <item text="Common Interface"></item>
                        <item text="Parental Control">self.openSetup("parental")</item>

diff --git a/data/skin.xml b/data/skin.xml
index c62734a49d4172e820001ecc5abfef2806d81423..af871ce62bd96061b3c1a63e4355ac2eeea8bb4d 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -60,12 +60,12 @@
                        <widget name="hddA" position="10,170" size="420,20"/>
                </screen>
                <screen name="Network" position="140,125" size="360,200" title="Network">
-                       <widget name="text" position="10,30" size="420,40" font="Arial;20"/>
-                       <widget name="tuner" position="10,80" size="420,20"/>
-                       <widget name="tunerA" position="10,100" size="420,20"/>
-                       <widget name="tunerB" position="10,120" size="420,20"/>
-                       <widget name="hdd" position="10,150" size="420,20"/>
-                       <widget name="hddA" position="10,170" size="420,20"/>
+                       <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">
                        <widget name="okbutton" position="20,245" size="205,40" />

diff --git a/lib/python/Components/IPAddress.py b/lib/python/Components/IPAddress.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lib/python/Components/IPGateway.py b/lib/python/Components/IPGateway.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lib/python/Components/IPNameserver.py b/lib/python/Components/IPNameserver.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index 05b7c0d44017a43d441da7bb0eac0e89a4c6bca6..546d3e148ccf9d899058c11cbd0f666746a4abf1 100644 (file)
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -8,4 +8,4 @@ install_DATA = \
        EventInfo.py Label.py ServiceScan.py VolumeBar.py                       \
        GUIComponent.py MenuList.py TextInput.py __init__.py MovieList.py                               \
        InputDevice.py ServicePosition.py SetupDevices.py Harddisk.py                                           \
-       AVSwitch.py
+       AVSwitch.py VariableIP.py IPAddress.py IPNameserver.py IPGateway.py

diff --git a/lib/python/Components/VariableIP.py b/lib/python/Components/VariableIP.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lib/python/Components/__init__.py b/lib/python/Components/__init__.py
index fb9eeaa41dbb86e7a3f2a89179d18111f8d995f9..a6191e04eef1307838835a95356db5037d39739b 100644 (file)
--- a/lib/python/Components/__init__.py
+++ b/lib/python/Components/__init__.py
@@ -4,5 +4,6 @@ __all__ = ["ActionMap", "Button", "Clock", "ConfigList", "EventInfo",
        "Label", "MenuList", "PerServiceDisplay", "ProgressBar", "ServiceList",
        "ServiceName", "ServiceScan", "VariableText", "VariableValue", "VolumeBar",
        "components", "config", "TimerList", "TimeInput", "MovieList", 
-       "InputDevice",  "ServicePosition" ]
+       "InputDevice",  "ServicePosition", "IPAddress", "VariableIP", "IPGateway",
+       "IPNameserver" ]
 

diff --git a/lib/python/Screens/Network.py b/lib/python/Screens/Network.py
index b71ac32800e14da44de76719562c9cfe7886b754..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/lib/python/Screens/Network.py
+++ b/lib/python/Screens/Network.py
@@ -1,23 +0,0 @@
-from Screen import Screen
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-
-
-class Network(Screen):
-       def __init__(self, session):
-               Screen.__init__(self, session)
-               
-               self["text"] = Label("Enigma v2.0a")
-
-               self["tuner"] = Label("Detected NIMs:")
-               self["tunerA"] = Label("   Tuner A: Fujitsu QST (DVB-S)")
-               self["tunerB"] = Label("   Tuner B: Fujitsu QST (DVB-S)")
-
-               self["hdd"] = Label("Detected HDD:")
-               self["hddA"] = Label("   not found")
-
-               self["actions"] = ActionMap(["SetupActions"], 
-                       {
-                               "cancel": self.close,
-                               "ok": self.close,
-                       })