Network.py,NetworkSetup.py,skin_default.xml: * Introduce new unified naming for network interfaces.

* Redesign NetworkadapterSelection Screen.
* small cleanups. Refs #137 , Fixes #418

8 files changed, 19 insertions, 1 deletions

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 0114349b..497d33ac 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -577,7 +577,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 		<widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
 		<widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-		<widget name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/>
+		<widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand">
+			<convert type="TemplatedMultiContent"> <!--  iface, name, description, interfacepng, defaultpng, activepng, divpng  -->
+				{"template": [
+						MultiContentEntryText(pos = (85, 6), size = (440, 28), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_TOP, text = 1), # index 1 is the interfacename
+						MultiContentEntryText(pos = (85, 43), size = (440, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_BOTTOM, text = 2), # index 2 is the description
+						MultiContentEntryPixmapAlphaTest(pos = (2, 8), size = (54, 54), png = 3), # index 3 is the interface pixmap
+						MultiContentEntryPixmapAlphaTest(pos = (63, 46), size = (15, 16), png = 4), # index 4 is the default pixmap
+					],
+				"fonts": [gFont("Regular", 28),gFont("Regular", 20)],
+				"itemHeight": 70
+				}
+			</convert>
+		</widget>
 		<ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
 		<widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
 	</screen>
diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 8e2052b0..088556a6 100644..100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -34,6 +34,12 @@ dist_install_DATA = \
 	lock.png \
 	marker.png \
 	mp_buttons.png \
+	network_wired.png \
+	network_wired-active.png \
+	network_wired-inactive.png \	
+	network_wireless.png \
+	network_wireless-active.png \
+	network_wireless-inactive.png \	
 	plugin.png \
 	rass_logo.png \
 	rass_page1.png \
diff --git a/data/skin_default/icons/network_wired-active.png b/data/skin_default/icons/network_wired-active.png
new file mode 100755
index 00000000..d8efc9c8
--- /dev/null
+++ b/data/skin_default/icons/network_wired-active.png
diff --git a/data/skin_default/icons/network_wired-inactive.png b/data/skin_default/icons/network_wired-inactive.png
new file mode 100755
index 00000000..18f2c70f
--- /dev/null
+++ b/data/skin_default/icons/network_wired-inactive.png
diff --git a/data/skin_default/icons/network_wired.png b/data/skin_default/icons/network_wired.png
new file mode 100755
index 00000000..db695ad5
--- /dev/null
+++ b/data/skin_default/icons/network_wired.png
diff --git a/data/skin_default/icons/network_wireless-active.png b/data/skin_default/icons/network_wireless-active.png
new file mode 100755
index 00000000..07a21874
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-active.png
diff --git a/data/skin_default/icons/network_wireless-inactive.png b/data/skin_default/icons/network_wireless-inactive.png
new file mode 100755
index 00000000..5bd69f9d
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-inactive.png
diff --git a/data/skin_default/icons/network_wireless.png b/data/skin_default/icons/network_wireless.png
new file mode 100755
index 00000000..629a05a6
--- /dev/null
+++ b/data/skin_default/icons/network_wireless.png