diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2007-03-19 18:06:13 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2007-03-19 18:06:13 +0000 |
| commit | 936a62a34cdd093d417e1b398e277166cd176db1 (patch) | |
| tree | dce011a5efbf5c4de68d302e5c8339ac0d925c60 /data | |
| parent | 4f040bee9421efc497d0bfadadcaa957695c3a7b (diff) | |
| download | enigma2-936a62a34cdd093d417e1b398e277166cd176db1.tar.gz enigma2-936a62a34cdd093d417e1b398e277166cd176db1.zip | |
network setup rewrite... adds support for multiple devices and an extended setup via plugins
Diffstat (limited to 'data')
| -rw-r--r-- | data/menu.xml | 6 | ||||
| -rw-r--r-- | data/skin_default.xml | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/data/menu.xml b/data/menu.xml index caa33aba..d562ab3b 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -62,7 +62,11 @@ <!--<item text="Keyboard"><setup id="keyboard" /></item>--> <!--<item text="OSD"><setup id="osd" /></item>--> <item><setup id="lcd" /></item> - <item text="Network..."><screen module="NetworkSetup" screen="NetworkSetup" /></item> + <menu text="Network..."> + <id val="network" /> + <item text="Device Setup..."><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item> + <item text="Nameserver Setup..."><screen module="NetworkSetup" screen="NameserverSetup"/></item> + </menu> </menu> <item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item> <item text="Parental control"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item> diff --git a/data/skin_default.xml b/data/skin_default.xml index 0813609e..4bdc5c16 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -142,10 +142,22 @@ <widget name="cancel" position="240,365" size="100,30" pixmap="cancel.png" /> <widget name="canceltext" position="240,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" /> </screen> - <screen name="NetworkSetup" position="130,148" size="460,280" title="Network Setup"> + <screen name="NetworkSetup" position="100,150" size="540,100" title="Network Setup"> + <widget name="menu" position="20,10" size="500,75" /> + </screen> + <screen name="AdapterSetup" position="130,148" size="460,280" title="Network Setup"> + <widget name="iface" position="10,10" size="380,30" zPosition="1" font="Regular;20" /> <widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" /> <widget name="introduction" position="10,230" size="400,30" font="Regular;23" /> </screen> + <screen name="NameserverSetup" position="130,148" size="460,280" title="Nameserver Setup"> + <widget name="red" position="0,0" size="230,40" backgroundColor="red" halign="center" valign="center" font="Regular;21" /> + <widget name="green" position="230,0" size="230,40" backgroundColor="green" halign="center" valign="center" font="Regular;21" /> + <widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" /> + </screen> + <screen name="NetworkAdapterSelection" position="100,150" size="540,100" title="Select Network Adapter"> + <widget name="adapterlist" position="20,10" size="500,75" /> + </screen> <screen name="About" position="180,163" size="360,250" title="About"> <widget name="text" position="10,30" size="420,20" font="Regular;18"/> <widget name="fpVersion" position="10,50" size="420,20" font="Regular;18"/> |