X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5be5939082cfcef843e668bc1cbfb67f5451ef55..8e25f9be28536bf4bfde187ad7a257ae463b749a:/data/skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 8b3f2e9a..88cf8b40 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -158,6 +158,9 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
 
 		</applet>
 	</screen>
+	<screen name="ChoiceBox_summary" position="0,0" size="132,64">
+		<widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Regular;11" />
+	</screen>	
 	<!-- Common interface -->
 	<screen name="MMIDialog" position="135,153" size="450,270">
 		<widget name="title" position="10,10" size="430,25" font="Regular;23" />
@@ -433,19 +436,20 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 	<!-- Mediaplayer -->
 	<screen name="MediaPlayer" position="70,70" size="580,475" title="MediaPlayer">
 		<ePixmap pixmap="skin_default/mediaplayer_bg.png" position="13,9" zPosition="-1" size="554,460" alphatest="on" />
-		<widget name="artisttext" position="20,11" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-		<widget name="artist" position="80,11" size="353,17" font="Regular;16" valign="top" transparent="1" />
-		<widget name="albumtext" position="20,29" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-		<widget name="album" position="80,29" size="353,17" font="Regular;16" valign="top" transparent="1" />
-		<widget name="yeartext" position="20,47" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-		<widget name="year" position="80,47" size="353,17" font="Regular;16" valign="top" transparent="1" />
-		<widget name="genretext" position="20,65" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-		<widget name="genre" position="80,65" size="353,17" font="Regular;16" valign="top" transparent="1" />
+		<widget name="artisttext" position="20,11" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+		<widget name="artist" position="94,11" size="339,17" font="Regular;16" valign="top" transparent="1" />
+		<widget name="albumtext" position="20,29" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+		<widget name="album" position="94,29" size="339,17" font="Regular;16" valign="top" transparent="1" />
+		<widget name="yeartext" position="20,47" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+		<widget name="year" position="94,47" size="339,17" font="Regular;16" valign="top" transparent="1" />
+		<widget name="genretext" position="20,65" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+		<widget name="genre" position="94,65" size="339,17" font="Regular;16" valign="top" transparent="1" />
 		<eLabel name="nowPlaying" position="20,92" size="413,16" text="Now Playing" font="Regular;14" foregroundColor="#ffc435" transparent="1" />
 		<widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1" />
 		<widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend" />
 		<ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on" />
-		<widget name="PositionGauge" position="15,138" size="418,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
+		<widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
+		<widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/>
 		<widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" />
 		<widget name="playlist" position="15,314" size="550,154" scrollbarMode="showOnDemand" selectionDisabled="1" />
 		<widget name="currenttext" position="0,0" size="0,0" />
@@ -502,13 +506,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</applet>
 	</screen>
 	<screen name="MessageBox_summary" position="0,0" size="132,64">
-		 <widget source="parent.Text" render="Label" position="6,0" size="120,32" font="Regular;12" halign="center" valign="center" />
-		 <widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
-			  <convert type="ClockToText">Format:%H:%M</convert>
-		 </widget>
-		 <widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
-			  <convert type="ClockToText">Format:%S</convert>
-		 </widget>
+		<widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" />
+		<widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" />
 	</screen>
 	<!-- Minute input -->
 	<screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
@@ -998,18 +997,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="logentry" position="0,300" size="560,130" font="Regular;20" />
 	</screen>
 	<!-- Timer sanity conflict -->
-	<screen name="TimerSanityConflict" position="70,95" size="600,430" title="Timer sanity error">
-		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-		<widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-		<widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-		<widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-		<widget name="timer1" position="10,45" size="280,220" scrollbarMode="showOnDemand" />
-		<widget name="timer2" position="310,45" size="280,220" scrollbarMode="showOnDemand" />
-		<widget name="list" position="0,280" size="500,290" scrollbarMode="showOnDemand" />
+	<screen name="TimerSanityConflict" position="90,95" size="560,430" title="Timer sanity error">
+		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" zPosition="0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" zPosition="0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/yellow.png" position="0,120" zPosition="0" size="140,40" transparent="1" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/blue.png" position="140,120" zPosition="0" size="140,40" transparent="1" alphatest="on" />
+		<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" />
+		<widget name="key_yellow" position="0,120" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#a08500" transparent="1" />
+		<widget name="key_blue" position="140,120" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#18188b" transparent="1" />
+		<widget name="timer1" position="0,45" size="560,75" scrollbarMode="showNever" />
+		<widget name="timer2" position="0,165" size="560,75" scrollbarMode="showNever" />
+		<widget name="list" position="0,260" size="560,144" scrollbarMode="showOnDemand" />
 	</screen>
 	<!-- Timer Selection -->
 	<screen name="TimerSelection" position="90,95" size="560,430" title="Timer selection">
@@ -1079,7 +1078,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
-	<!-- LCD screen (menu's) -->
+	<!-- LCD screen (menus) -->
 	<screen name="MenuSummary" position="0,0" size="132,64">
 		<widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/>
 		<widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center">
@@ -1122,19 +1121,40 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
-	<screen name="JobView" position="84,122" size="522,324" title="Job View">
-		<widget source="job_progress" render="Progress" position="130,184" size="362,28" borderWidth="1" />
-		<widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;28" />
-		<widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;28" />
-		<widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;28" />
-		<widget source="job_progress" render="Label" position="18,182" size="106,65" font="Regular;32">
+	<screen name="JobView" position="84,122" size="520,350" title="Job View">
+		<widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
+		<widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
+		<widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" />
+		<widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1"  >
 			<convert type="ProgressToText" />
 		</widget>
-		<widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="339,251" size="140,40" alphatest="on" >
+		<widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" />
+		<widget name="config" position="20,254" size="480,20" />
+		<widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="339,251" size="140,40" transparent="1" backgroundColor="#1f771f" >
+		<widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" >
 			<convert type="ConditionalShowHide" />
 		</widget>
+		<widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+	</screen>
+	<screen name="JobView_summary" position="0,0" size="132,64">
+		<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" />
+		<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" />
+		<widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" />
+		<widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Regular;12" zPosition="2" halign="center" transparent="1"  >
+			<convert type="ProgressToText" />
+		</widget>
 	</screen>
 </skin>