X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1bc2bfe02d8c6b79b9202471feb13af7f1379372..fc16d1a92da577be87d04358b9dd42e34963a4ef:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index f93f09e6..d0eabca0 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -2,22 +2,38 @@
 	<!-- 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>
+	<!-- Translator Info -->
+	<screen name="TranslationInfo" position="180,123" size="360,340" title="Translation" >
+		<eLabel position="10,30" size="100,20" font="Regular;18" text="Translation:" />
+		<widget source="TranslatorName" render="Label" position="110,30" size="350,20" font="Regular;18"/>
+		<widget source="TranslationInfo" render="Label" position="10,60" size="340,140" font="Regular;18"/>
+	</screen>
 	<!-- 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" >
@@ -25,11 +41,11 @@
 	</screen>
 	<!-- Bouquet selector -->
 	<screen name="BouquetSelector" position="210,160" size="300,240" title="Choose bouquet">
-		<widget name="menu" position="10,10" size="225,230" 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 +63,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" >
@@ -68,6 +84,14 @@
 			<convert type="EventName">ExtendedDescription</convert>
 		</widget>
 	</screen>
+  <screen name="ChannelSelection_summary" position="0,0" size="132,64">
+		<widget source="global.CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16">
+			<convert type="ClockToText">WithSeconds</convert>
+		</widget>
+		<widget source="parent.ServiceEvent" render="Label" position="6,4" size="120,42" font="Regular;18" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+  </screen>
 	<!-- Channel selection - Radio -->
 	<screen name="ChannelSelectionRadio" position="85,95" size="560,298" title="Channel Selection" >
 		<ePixmap pixmap="skin_default/key-red.png" position="0,0" zPosition="0" size="140,40" transparent="1" alphatest="on" />
@@ -123,7 +147,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		</applet>
 	</screen>
 	<!-- Common interface -->
-	<screen name="CiMmi" position="135,153" size="450,270" >
+	<screen name="MMIDialog" position="135,153" size="450,270" >
 		<widget name="title" position="10,10" size="430,25" font="Regular;23" />
 		<widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
 		<widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
@@ -134,10 +158,6 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		<widget name="text" position="10,5" size="440,25" font="Regular;23" />
 		<widget name="entries" position="10,45" size="420,100" scrollbarMode="showOnDemand" />
 	</screen>
-	<!-- Common interface - wait -->
-	<screen name="CiWait" position="180,263" size="360,50" title="Common Interface" >
-		<widget name="message" position="20,10" size="320,25" font="Regular;23" />
-	</screen>
 	<!-- Clock display -->
 	<screen name="clockDisplay" position="300,100" size="300,300" >
 		<widget name="okbutton" position="10,10" size="280,40" />
@@ -159,7 +179,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 +236,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 +335,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>
@@ -491,7 +511,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	</screen>
 	<!-- Radio infobar -->
 	<screen name="RadioInfoBar" position="85,408" size="560,120" zPosition="-1" title="Radio" >
-		<widget source="CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1" >
+		<widget source="session.CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="RdsDecoder" render="Pixmap" pixmap="skin_default/rass_logo.png" position="330,1" size="50,21" alphatest="on" >
@@ -499,32 +519,32 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<widget name="BlinkingPoint" pixmap="skin_default/record.png" position="480,3" zPosition="2" size="14,14" alphatest="on" />
-		<ePixmap pixmap="skin_default/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on"/>		
-		<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" >
+		<ePixmap pixmap="skin_default/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on"/>
+		<widget source="session.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" >
+		<widget source="session.Event_Now" render="Label" position="5,25" size="60,22" font="Regular;20" transparent="1" >
 			<convert type="EventTime">StartTime</convert>
 			<convert type="ClockToText">Default</convert>
 		</widget>
-		<widget source="Event_Now" render="Label" position="73,25" size="390,22" font="Regular;20" valign="top" noWrap="1" transparent="1" >
+		<widget source="session.Event_Now" render="Label" position="73,25" size="390,22" font="Regular;20" valign="top" noWrap="1" transparent="1" >
 			<convert type="EventName">Name</convert>
 		</widget>
-		<widget source="Event_Now" render="Label" position="465,25" size="90,22" font="Regular;20" halign="right" transparent="1" >
+		<widget source="session.Event_Now" render="Label" position="465,25" size="90,22" font="Regular;20" halign="right" transparent="1" >
 			<convert type="EventTime">Remaining</convert>
 			<convert type="RemainingToText">InMinutes</convert>
 		</widget>
-		<widget source="Event_Next" render="Label" position="5,47" size="60,22" font="Regular;20" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="5,47" size="60,22" font="Regular;20" transparent="1" >
 			<convert type="EventTime">StartTime</convert>
 			<convert type="ClockToText">Default</convert>
 		</widget>
-		<widget source="Event_Next" render="Label" position="73,47" size="390,22" font="Regular;20" valign="top" noWrap="1" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="73,47" size="390,22" font="Regular;20" valign="top" noWrap="1" transparent="1" >
 			<convert type="EventName">Name</convert>
 		</widget>
-		<widget source="Event_Next" render="Label" position="465,47" size="90,22" font="Regular;20" halign="right" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="465,47" size="90,22" font="Regular;20" halign="right" transparent="1" >
 			<convert type="EventTime">Duration</convert>
 			<convert type="ClockToText">InMinutes</convert>
 		</widget>
@@ -660,8 +680,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="config" position="10,50" size="520,200" scrollbarMode="showOnDemand" />
 		<widget name="cancel" pixmap="skin_default/key-red.png" position="10,265" zPosition="1" size="140,40" transparent="1" alphatest="on" />
 		<widget name="ok" pixmap="skin_default/key-green.png" position="390,265" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="canceltext" position="10,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" />
-		<widget name="oktext" position="390,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" />
+		<widget name="canceltext" position="10,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" backgroundColor="#d21c31" />
+		<widget name="oktext" position="390,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" backgroundColor="#4da539" />
 	</screen>
 	<!-- Simple channelselection -->
 	<screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
@@ -749,9 +769,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<screen name="TimerEntry" position="90,95" size="560,430" title="Timer entry">
 		<widget name="config" position="10,10" size="540,350" scrollbarMode="showOnDemand" />
 		<widget name="cancel" pixmap="skin_default/key-red.png" position="10,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+		<widget name="location" pixmap="skin_default/key-yellow.png" position="260,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
 		<widget name="ok" pixmap="skin_default/key-green.png" position="410,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-		<widget name="canceltext" position="10,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" />
-		<widget name="oktext" position="410,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" />
+		<widget name="canceltext" position="10,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#9f1313" transparent="1" />
+		<widget name="locationtext" position="260,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#a08500" transparent="1" />
+		<widget name="oktext" position="410,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#1f771f" transparent="1" />
 	</screen>
 	<!-- Timer log -->
 	<screen name="TimerLog" position="70,100" size="560,400" title="Timer log">
@@ -787,7 +809,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>