X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/659560951dce9e327d7ec9dd220138b0c8145b88..5b5fab0065f7b922b03b66d5b40e680a1960d1ca:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 59cd85d6..bdc64a38 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -2,15 +2,16 @@
 	<!-- Screwed Stone II skin (skin_default.xml) /Nemesis -->
 	<!-- About screen -->
 	<screen name="About" position="180,123" size="360,340" title="About" >
-		<widget name="text" position="10,30" size="340,20" font="Regular;18"/>
-		<widget name="fpVersion" position="10,50" size="340,20" font="Regular;18"/>
-		<widget name="tuner" position="10,90" size="340,20" font="Regular;18"/>
-		<widget name="tuner0" position="10,110" size="340,20" font="Regular;18"/>
-		<widget name="tuner1" position="10,130" size="340,20" font="Regular;18"/>
-		<widget name="tuner2" position="10,150" size="340,20" font="Regular;18"/>
-		<widget name="tuner3" position="10,170" size="340,20" font="Regular;18"/>
-		<widget name="hdd" position="10,210" size="340,20" font="Regular;18"/>
-		<widget name="hddA" position="10,230" size="340,40" font="Regular;18"/>
+		<widget source="EnigmaVersion" render="Label" position="10,30" size="340,20" font="Regular;18"/>
+		<widget source="ImageVersion" render="Label" position="10,50" size="340,20" font="Regular;18"/>
+		<widget source="FPVersion" render="Label" position="10,90" size="340,20" font="Regular;18"/>
+		<widget source="TunerHeader" render="Label" position="10,110" size="340,20" font="Regular;18"/>
+		<widget source="Tuner0" render="Label" position="10,130" size="340,20" font="Regular;18"/>
+		<widget source="Tuner1" render="Label" position="10,150" size="340,20" font="Regular;18"/>
+		<widget source="Tuner2" render="Label" position="10,170" size="340,20" font="Regular;18"/>
+		<widget source="Tuner3" render="Label" position="10,190" size="340,20" font="Regular;18"/>
+		<widget source="HDDHeader" render="Label" position="10,210" size="340,20" font="Regular;18"/>
+		<widget source="hddA" render="Label" position="10,230" size="340,40" font="Regular;18"/>
 		<ePixmap pixmap="skin_default/dmm_logo.png" position="250,285" zPosition="1" size="98,53" alphatest="on" />
 	</screen>
 	<!-- Adapter setup -->
@@ -47,7 +48,7 @@
 			<convert type="EventName">Name</convert>
 		</widget>
 		<ePixmap pixmap="skin_default/clock.png" position="483,329" zPosition="1" size="14,14" alphatest="on"/>
-		<widget source="CurrentTime" render="Label" position="500,327" zPosition="1" size="50,20" font="Regular;19" halign="right" >
+		<widget source="global.CurrentTime" render="Label" position="500,327" zPosition="1" size="50,20" font="Regular;19" halign="right" >
 			<convert type="ClockToText"></convert>
 		</widget>
 		<widget source="ServiceEvent" render="Label" position="210,347" zPosition="1" size="340,20" font="Regular;19" halign="right" noWrap="1" >
@@ -159,7 +160,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		<widget name="config" position="10,30" size="420,220" />
 	</screen>
 	<!-- Dish -->
-	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-2" backgroundColor="transparent" >
+	<screen name="Dish" flags="wfNoBorder" position="300,100" size="130,160" title="Dish" zPosition="-1" backgroundColor="transparent" >
 		<widget name="Dishpixmap" pixmap="skin_default/dish.png" position="0,0" size="130,160" alphatest="off" />
 	</screen>
 	<!-- EPG Selection - Single -->
@@ -216,7 +217,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		<widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#9f1313" transparent="1" />
 		<widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
 		<ePixmap pixmap="skin_default/clock.png" position="452,13" zPosition="0" size="14,14" alphatest="on"/>
-		<widget source="Clock" render="Label" position="420,0" size="130,40" font="Regular;21" valign="center" halign="right" >
+		<widget source="global.CurrentTime" render="Label" position="420,0" size="130,40" font="Regular;21" valign="center" halign="right" >
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
 		<widget name="timeline_text" position="0,41" size="560,20" />
@@ -315,7 +316,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 	</screen>
 	<!-- Menu screens -->
 	<screen name="Menu" position="210,150" size="300,285" title="Main menu" >
-		<widget name="title" position="10,10" size="280,35" font="Regular;23" />
+		<widget source="title" render="Label" position="10,10" size="280,35" font="Regular;23" />
 		<widget source="menu" render="Listbox" position="10,55" size="290,225" scrollbarMode="showOnDemand" >
 			<convert type="StringList" />
 		</widget>
@@ -503,7 +504,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget source="Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1" >
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="CurrentTime" render="Label" position="500,1" size="55,28" font="Regular;20" halign="right" transparent="1" >
+		<widget source="global.CurrentTime" render="Label" position="500,1" size="55,28" font="Regular;20" halign="right" transparent="1" >
 			<convert type="ClockToText">Default</convert>
 		</widget>
 		<widget source="Event_Now" render="Label" position="5,25" size="60,22" font="Regular;20" transparent="1" >
@@ -787,7 +788,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<!-- Timeshift state -->
 	<screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
 		<widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />
-		<widget source="CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >
+		<widget source="session.CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >
 			<convert type="ServicePosition">Remaining</convert>
 		</widget>
 	</screen>