From d90dc5a86e764b466487c5da3ff53cacd04fdbf4 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 26 Nov 2007 23:39:52 +0000
Subject: [PATCH] Always show ip address/gateway/netmask in network settings
 dialog

---
 data/skin_default.xml              | 13 ++++++++++--
 lib/python/Screens/NetworkSetup.py |  9 ++++++++
 po/de.po                           | 34 +++++++++++++++++++++++++-----
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 78c9d3f9..8370a5e5 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -23,8 +23,17 @@
 	<!-- Adapter setup -->
 	<screen name="AdapterSetup" position="130,140" size="460,330" title="Network Setup" >
 		<widget name="iface" position="10,10" size="440,30" zPosition="1" font="Regular;20" />
-		<widget name="config" position="10,50" size="440,175" scrollbarMode="showOnDemand" />
-		<widget name="introduction" position="10,300" size="440,20" font="Regular;21" halign="center" />
+		<widget name="config" position="10,50" size="440,130" scrollbarMode="showOnDemand" />
+		<widget name="introduction" position="10,180" size="440,20" font="Regular;21" halign="center" />
+		<widget name="introduction2" position="10,210" size="440,20" font="Regular;21" halign="center" />
+		
+		<widget name="IPtext" position="10,240" size="190,21" zPosition="1" font="Regular;21" />
+		<widget name="Netmasktext" position="10,265" size="190,21" zPosition="1" font="Regular;21" />
+		<widget name="Gatewaytext" position="10,290" size="190,21" zPosition="1" font="Regular;21" />
+		
+		<widget name="IP" position="200,240" size="440,21" zPosition="1" font="Regular;21" />
+		<widget name="Mask" position="200,265" size="440,21" zPosition="1" font="Regular;21" />
+		<widget name="Gateway" position="200,290" size="440,21" zPosition="1" font="Regular;21" />
 	</screen>
 	<!-- Audio selection -->
 	<screen name="AudioSelection" position="210,203" size="300,170" title="Audio" >
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 939e317a..8a3dadb5 100644
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -128,6 +128,15 @@ class AdapterSetup(Screen, ConfigListScreen):
 		self.createSetup()
 
 		self["introduction"] = Label(_("Press OK to activate the settings."))
+		self["introduction2"] = Label(_("Current settings:"))
+		
+		self["IPtext"] = Label(_("IP Address"))
+		self["Netmasktext"] = Label(_("Netmask"))
+		self["Gatewaytext"] = Label(_("Gateway"))
+		
+		self["IP"] = Label(self.ipConfigEntry.getText())
+		self["Mask"] = Label(self.netmaskConfigEntry.getText())
+		self["Gateway"] = Label(self.gatewayConfigEntry.getText())
 
 	def createSetup(self):
 		self.list = []
diff --git a/po/de.po b/po/de.po
index 9413b755..5943fafe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-08 13:00+0100\n"
-"PO-Revision-Date: 2007-10-28 11:25+0100\n"
+"POT-Creation-Date: 2007-11-27 00:35+0100\n"
+"PO-Revision-Date: 2007-11-27 00:34-0000\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -267,6 +267,9 @@ msgstr "Über"
 msgid "About..."
 msgstr "Über ..."
 
+msgid "Action on long powerbutton press"
+msgstr ""
+
 msgid "Activate Picture in Picture"
 msgstr "Bild in Bild aktivieren"
 
@@ -317,6 +320,9 @@ msgstr "Transparenz"
 msgid "Alternative radio mode"
 msgstr "Alternativer Radio Modus"
 
+msgid "Alternative services tuner priority"
+msgstr ""
+
 msgid "Arabic"
 msgstr "Arabisch"
 
@@ -546,6 +552,9 @@ msgstr "Kroatisch"
 msgid "Current Transponder"
 msgstr "Aktueller Transponder"
 
+msgid "Current settings:"
+msgstr "Aktuelle Einstellungen:"
+
 msgid "Current version:"
 msgstr "Aktuelle Version:"
 
@@ -937,9 +946,6 @@ msgstr "Festplatten-Einstellungen"
 msgid "Harddisk standby after"
 msgstr "Festplatten-Standby nach"
 
-msgid "Hello!"
-msgstr ""
-
 msgid "Hierarchy Information"
 msgstr "Hierarchieinformationen"
 
@@ -1854,6 +1860,9 @@ msgstr "Einstellungen"
 msgid "Setup Mode"
 msgstr "Benutzermodus"
 
+msgid "Show blinking clock in display during recording"
+msgstr ""
+
 msgid "Show infobar on channel change"
 msgstr "Zeige Infobar beim Kanalwechsel"
 
@@ -2173,6 +2182,12 @@ msgstr "Toneburst"
 msgid "Toneburst A/B"
 msgstr "Toneburst A/B"
 
+msgid "Translation"
+msgstr ""
+
+msgid "Translation:"
+msgstr ""
+
 msgid "Transmission Mode"
 msgstr "Übertragungsmodus"
 
@@ -2752,6 +2767,9 @@ msgstr "Stunde"
 msgid "hours"
 msgstr "Stunden"
 
+msgid "immediate shutdown"
+msgstr ""
+
 #, python-format
 msgid ""
 "incoming call!\n"
@@ -3014,6 +3032,9 @@ msgstr "Zeige erstes tag"
 msgid "show second tag"
 msgstr "Zeige zweites tag"
 
+msgid "show shutdown menu"
+msgstr ""
+
 msgid "show single service EPG..."
 msgstr "Zeige einfaches Sender-EPG"
 
@@ -3122,6 +3143,9 @@ msgstr "Aufnahmen anzeigen"
 msgid "wait for ci..."
 msgstr "warte auf CI ..."
 
+msgid "wait for mmi..."
+msgstr ""
+
 msgid "waiting"
 msgstr "wartend"
 
-- 
2.30.2