X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0af48c266741db09f550dd513b5220b188dbb17f..659ef8a77944cddba769370af38069b4e5e8722e:/data/skin_default.xml?ds=inline

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 088bf05a..0288337e 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -23,8 +23,17 @@
 	<!-- 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" >
@@ -75,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" />
@@ -130,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" />
@@ -141,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" />
@@ -498,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" >
@@ -506,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="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>
@@ -667,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">