X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f8481a5d09665738b34052f4d935cd87dbe78967..97b016f395168b9d1d3290d0c4998b3ad8a1b7ce:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 559b42d3..f80e6374 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -25,11 +25,11 @@
 	</screen>
 	<!-- Bouquet selector -->
 	<screen name="BouquetSelector" position="210,160" size="300,240" title="Choose bouquet">
-		<widget name="menu" position="10,10" size="225,225" scrollbarMode="showOnDemand" />
+		<widget name="menu" position="10,10" size="290,225" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Channel context menu -->
 	<screen name="ChannelContextMenu" position="210,150" size="300,250" title="Channellist menu" >
-		<widget name="menu" position="10,10" size="300,230" scrollbarMode="showOnDemand" />
+		<widget name="menu" position="10,10" size="290,230" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Channel selection - TV -->
 	<screen name="ChannelSelection" position="90,95" size="560,425" title="Channel Selection" >
@@ -47,7 +47,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 +159,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 +216,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 +315,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 +503,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 +787,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>