X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9ee52e4f0fbe9a1ae00d0e66f9e6f0a07fa319f..208747f6553a9cf68b26860d8c3c4999d180f5fb:/skin.py

diff --git a/skin.py b/skin.py
index 687d8085..db4812ab 100644
--- a/skin.py
+++ b/skin.py
@@ -23,12 +23,22 @@ dom = xml.dom.minidom.parseString(
 			<widget name="title" position="10,120" size="280,50" />
 			<widget name="theClock" position="10,60" size="280,50" />
 		</screen>
-		<screen name="infoBar" position="100,100" size="500,400" title="InfoBar">
-			<widget name="channelSwitcher" position="10,190" size="280,50" />
+		<screen name="infoBar" position="80,350" size="540,150" title="InfoBar">
+			<widget name="CurrentTime" position="10,10" size="40,30" />
+			<widget name="ServiceName" position="50,20" size="200,30" />
+			<widget name="Event_Now" position="100,40" size="300,30" />
+			<widget name="Event_Next" position="100,90" size="300,30" />
+			<widget name="Event_Now_Duration" position="440,40" size="80,30" />
+			<widget name="Event_Next_Duration" position="440,90" size="80,30" />
 		</screen>
-		<screen name="channelSelection" position="300,100" size="300,300" title="Channel Selection">
-			<widget name="okbutton" position="10,190" size="280,50" />
-			<widget name="list" position="10,30" size="280,140" />
+		<screen name="channelSelection" position="100,80" size="500,240" title="Channel Selection">
+			<widget name="list" position="20,50" size="300,150" />
+			<widget name="okbutton" position="340,50" size="140,30" />
+		</screen>
+		<screen name="serviceScan" position="150,100" size="300,200" title="Service Scan">
+			<widget name="scan_progress" position="10,10" size="280,50" />
+			<widget name="scan_state" position="10,60" size="280,30" />
+			<widget name="okbutton" position="10,100" size="280,40" />
 		</screen>
 	</skin>
 """)
@@ -89,7 +99,7 @@ def applyGUIskin(screen, parent, skin, name):
 		
 		# get corresponding gui object
 		try:
-			guiObject = screen.data[wname]["instance"]
+			guiObject = screen[wname].instance
 		except:
 			raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")