X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1bc2bfe02d8c6b79b9202471feb13af7f1379372..7579ae7495f580bfa86f4216ef15811f54588c5a:/data/skin.xml?ds=sidebyside

diff --git a/data/skin.xml b/data/skin.xml
index 44b25dde..8e6445fa 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -56,119 +56,137 @@
 		<ePixmap position="27,73" zPosition="0" size="665,71" pixmap="skin_default/screws.png" alphatest="on" transparent="1" />
 		<!-- Signal Quality -->
 		<eLabel text="SNR" position="205,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" />
-		<widget source="FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
 			<convert type="FrontendInfo">SNRdB</convert>
 		</widget>
 		<!-- Signal Strength -->
 		<eLabel text="AGC" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" />
-		<widget source="FrontendStatus" render="Label" position="355,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.FrontendStatus" render="Label" position="355,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
 			<convert type="FrontendInfo">AGC</convert>
 		</widget>
 		<!-- Bit error rate -->
 		<eLabel text="BER" position="403,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" />
-		<widget source="FrontendStatus" render="Label" position="440,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.FrontendStatus" render="Label" position="440,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" >
 			<convert type="FrontendInfo">BER</convert>
 		</widget>
 		<!-- Signal Icons -->
 		<ePixmap position="487,4" zPosition="1" size="55,15" pixmap="skin_default/led_off.png" alphatest="on" />
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_red.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_red.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
 			<convert type="FrontendInfo">SNR</convert>
 			<convert type="ValueRange">0,39699</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_yellow.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_yellow.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
 			<convert type="FrontendInfo">SNR</convert>
 			<convert type="ValueRange">36700,45875</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_green.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_green.png" position="488,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
 			<convert type="FrontendInfo">SNR</convert>
 			<convert type="ValueRange">45876,65536</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_yellow.png" position="508,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_yellow.png" position="508,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
 			<convert type="FrontendInfo">AGC</convert>
 			<convert type="ValueRange">0,39699</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_green.png" position="508,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_green.png" position="508,4" zPosition="2" size="15,15" transparent="1" alphatest="on">
 			<convert type="FrontendInfo">AGC</convert>
 			<convert type="ValueRange">36700,65536</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<ePixmap pixmap="skin_default/led_green.png" position="528,4" zPosition="2" size="15,15" alphatest="on" />		
-		<widget source="FrontendStatus" render="Pixmap" pixmap="skin_default/led_red.png" position="528,4" zPosition="3" size="15,15" transparent="1" alphatest="on" >
+		<ePixmap pixmap="skin_default/led_green.png" position="528,4" zPosition="2" size="15,15" alphatest="on" />
+		<widget source="session.FrontendStatus" render="Pixmap" pixmap="skin_default/led_red.png" position="528,4" zPosition="3" size="15,15" transparent="1" alphatest="on" >
 			<convert type="FrontendInfo">BER</convert>		
 			<convert type="ConditionalShowHide" />
 		</widget>	
-		<ePixmap position="47,2" zPosition="1" size="74,57" pixmap="skin_default/enigma2.png" alphatest="on" />
-		<!-- Uncomment for Picon use
-		<widget name="picon" position="76,69" zPosition="2" size="70,53" pixmap="skin_default/enigma2.png" />
-		-->
+		<!-- Channellogo (Picon) -->
+		<widget source="session.CurrentService" render="Picon" position="47,2" zPosition="2" size="74,57" >
+			<convert type="ServiceName">Reference</convert>
+		</widget>
 		<!-- Service name -->
-		<widget source="CurrentService" render="Label" position="130,30" size="360,27" font="Regular;21" valign="center" halign="right" noWrap="1" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.CurrentService" render="Label" position="130,30" size="360,27" font="Regular;21" valign="center" halign="right" noWrap="1" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<!-- Time -->
 		<ePixmap pixmap="skin_default/clock.png" position="600,23" zPosition="0" size="14,14" alphatest="on"/>
-		<widget source="CurrentTime" render="Label" position="615,21" size="55,24" font="Regular;21" halign="right" backgroundColor="#4e5a74" transparent="1" >
+		<widget source="global.CurrentTime" render="Label" position="615,21" size="55,24" font="Regular;21" halign="right" backgroundColor="#4e5a74" transparent="1" >
 			<convert type="ClockToText">Default</convert>
 		</widget>
 		<!-- tuners in use? -->
-		<widget name="NimA_Active" position="129,6" zPosition="1" size="9,9" pixmap="skin_default/nim_a.png" alphatest="on" />
-		<widget name="NimB_Active" position="129,20" zPosition="1" size="9,9" pixmap="skin_default/nim_b.png" alphatest="on" />
-		<widget name="NimA" position="142,6" zPosition="1" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on" />
-		<widget name="NimB" position="142,20" zPosition="1" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on" />		
+		<widget source="session.FrontendInfo" render="Pixmap" position="129,6" zPosition="1" size="9,9" pixmap="skin_default/nim_a.png" alphatest="on" >
+			<convert type="FrontendInfo">NUMBER</convert>
+			<convert type="ValueRange">0,0</convert>
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="session.FrontendInfo" render="Pixmap" position="129,20" zPosition="1" size="9,9" pixmap="skin_default/nim_b.png" alphatest="on" >
+			<convert type="FrontendInfo">NUMBER</convert>
+			<convert type="ValueRange">1,1</convert>
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="session.TunerInfo" render="Pixmap" position="142,6" zPosition="1" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on" >
+			<convert type="TunerInfo">TunerUseMask</convert>
+			<convert type="ValueBitTest">1</convert>
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="session.TunerInfo" render="Pixmap" position="142,20" zPosition="1" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on" >
+			<convert type="TunerInfo">TunerUseMask</convert>
+			<convert type="ValueBitTest">2</convert>
+			<convert type="ConditionalShowHide" />
+		</widget>
 		<!-- Crypt icon (encrypted service?) -->
 		<ePixmap position="563,48" zPosition="0" size="107,15" pixmap="skin_default/icons_off.png" alphatest="off"/>
-		<widget source="CurrentService" render="Pixmap" pixmap="skin_default/icon_crypt.png" position="563,48" zPosition="1" size="12,16" alphatest="on" >
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icon_crypt.png" position="563,48" zPosition="1" size="12,16" alphatest="on" >
 			<convert type="ServiceInfo">IsCrypted</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<!-- Teletext icon (is teletext available?) -->
-		<widget source="CurrentService" render="Pixmap" pixmap="skin_default/icon_txt.png" position="580,48" zPosition="1" size="26,16" alphatest="on" >
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icon_txt.png" position="580,48" zPosition="1" size="26,16" alphatest="on" >
 			<convert type="ServiceInfo">HasTelext</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<!-- Videoformat icon (16:9?) -->
-		<widget source="CurrentService" render="Pixmap" pixmap="skin_default/icon_format.png" position="611,48" zPosition="1" size="29,16" alphatest="on" >
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icon_format.png" position="611,48" zPosition="1" size="29,16" alphatest="on" >
 			<convert type="ServiceInfo">IsWidescreen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<!-- Audio icon (is there multichannel audio?) -->
-		<widget source="CurrentService" render="Pixmap" pixmap="skin_default/icon_dolby.png" position="645,48" zPosition="1" size="26,16" alphatest="on" >
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icon_dolby.png" position="645,48" zPosition="1" size="26,16" alphatest="on" >
 			<convert type="ServiceInfo">IsMultichannel</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<!-- Progressbar (current event duration)-->
 		<ePixmap pixmap="skin_default/progress_bg.png" position="48,77" zPosition="0" size="84,7" transparent="1" alphatest="on" />
-		<widget source="Event_Now" render="Progress" pixmap="skin_default/progress_small.png" position="50,78" zPosition="1" size="80,5" transparent="1" >
+		<widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_small.png" position="50,78" zPosition="1" size="80,5" transparent="1" >
 			<convert type="EventTime">Progress</convert>
 		</widget>
 		<!-- Blinking pixmap (recording in progress?) -->
-		<widget name="BlinkingPoint" pixmap="skin_default/icon_rec.png" position="561,21" zPosition="2" size="34,21" alphatest="off" />
+		<widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icon_rec.png" position="561,21" zPosition="2" size="34,21" alphatest="off">
+			<convert type="ConditionalShowHide">Blink</convert>
+		</widget>
 		<!-- Event (now) -->
 		<ePixmap pixmap="skin_default/icon_event.png" position="182,78" zPosition="1" size="15,10" alphatest="on" />
-		<widget source="Event_Now" render="Label" position="205,73" size="60,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.Event_Now" render="Label" position="205,73" size="60,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="EventTime">StartTime</convert>
 			<convert type="ClockToText">Default</convert>
 		</widget>
-		<widget source="Event_Now" render="Label" position="265,73" size="310,24" font="Regular;20" noWrap="1" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.Event_Now" render="Label" position="265,73" size="310,24" font="Regular;20" noWrap="1" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="EventName">Name</convert>
 		</widget>
-		<widget source="Event_Now" render="Label" position="580,73" size="90,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" halign="right" transparent="1" >
+		<widget source="session.Event_Now" render="Label" position="580,73" size="90,24" font="Regular;20" backgroundColor="#34406f" shadowColor="#1d354c" shadowOffset="-1,-1" halign="right" transparent="1" >
 			<convert type="EventTime">Remaining</convert>
 			<convert type="RemainingToText">InMinutes</convert>
 		</widget>
 		<!-- Event (next) -->
-		<widget source="Event_Next" render="Label" position="205,97" size="60,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="205,97" size="60,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1" >
 			<convert type="EventTime">StartTime</convert>
 			<convert type="ClockToText">Default</convert>
 		</widget>
-		<widget source="Event_Next" render="Label" position="265,97" size="310,24" font="Regular;20" noWrap="1" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="265,97" size="310,24" font="Regular;20" noWrap="1" backgroundColor="#071f38" foregroundColor="#c3c3c9" transparent="1" >
 			<convert type="EventName">Name</convert>
 		</widget>
-		<widget source="Event_Next" render="Label" position="580,97" size="90,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" halign="right" transparent="1" >
+		<widget source="session.Event_Next" render="Label" position="580,97" size="90,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" halign="right" transparent="1" >
 			<convert type="EventTime">Duration</convert>
 			<convert type="ClockToText">InMinutes</convert>
 		</widget>
@@ -183,12 +201,12 @@
 		</widget>
 		<!-- Green button (is subservices available?) -->
 		<ePixmap position="315,130" zPosition="1" size="15,16" pixmap="skin_default/button_green_off.png" transparent="1" alphatest="on" />
-		<widget source="CurrentService" render="Pixmap" pixmap="skin_default/button_green.png" position="315,130" zPosition="2" size="15,16" transparent="1" alphatest="on" >
+		<widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/button_green.png" position="315,130" zPosition="2" size="15,16" transparent="1" alphatest="on" >
 			<convert type="ServiceInfo">SubservicesAvailable</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
 		<eLabel text="Subservices" position="335,130" size="100,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
-		<widget source="CurrentService" render="FixedLabel" text="Subservices" position="335,130" zPosition="1" size="100,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.CurrentService" render="FixedLabel" text="Subservices" position="335,130" zPosition="1" size="100,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="ServiceInfo">SubservicesAvailable</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
@@ -213,39 +231,39 @@
 	</screen>
 	<!-- Main menu -->
 	<screen name="menu_mainmenu" position="150,150" size="420,285" title="Main menu" >
-		<widget name="title" position="170,10" size="280,35" font="Regular;23" />
+		<widget source="title" render="Label" position="170,10" size="280,35" font="Regular;23" />
 		<widget source="menu" render="Listbox" position="170,55" size="230,225" scrollbarMode="showOnDemand" >
 			<convert type="StringList" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-8.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/shutdown.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">standby_restart_list</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-7.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/setup.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">setup_selection</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-6.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/plugins.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">plugin_selection</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-5.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/information.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">info_screen</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-4.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/scart.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">scart_switch</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-3.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/timer.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">timer_edit</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-2.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/media_player.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">media_player</convert>
 			<convert type="ConditionalShowHide" />
 		</widget>
-		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/menuIcon-1.png" position="20,20" size="128,128" >
+		<widget source="menu" render="Pixmap" pixmap="skin_default/menu/subtitles.png" position="20,20" size="128,128" >
 			<convert type="MenuEntryCompare">subtitle_selection</convert>
 			<convert type="ConditionalShowHide"/>
 		</widget>
@@ -259,22 +277,23 @@
 		<ePixmap position="48,70" zPosition="0" size="108,13" pixmap="skin_default/mp_buttons.png" alphatest="on" />
 		<!-- Servicename -->
 		<ePixmap pixmap="skin_default/icon_event.png" position="207,78" zPosition="1" size="15,10" alphatest="on" />
-		<widget source="CurrentService" render="Label" position="230,73" size="360,40" font="Regular;20" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.CurrentService" render="Label" position="230,73" size="360,40" font="Regular;20" backgroundColor="#263c59" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
-		<widget source="CurrentService" render="Label" position="590,73" size="90,24" font="Regular;20" halign="right" backgroundColor="#4e5a74" transparent="1" >
+		<!-- movie length -->
+		<widget source="session.CurrentService" render="Label" position="580,73" size="90,24" font="Regular;20" halign="right" backgroundColor="#4e5a74" transparent="1" >
 			<convert type="ServicePosition">Length</convert>
 		</widget>
 		<!-- Elapsed time -->
-		<widget source="CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.CurrentService" render="Label" position="205,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="ServicePosition">Position</convert>
 		</widget>
 		<!-- Progressbar (movie position)-->
-		<widget source="CurrentService" render="PositionGauge" position="300,133" size="270,10" zPosition="2" pointer="skin_default/position_pointer.png:540,0" transparent="1" >
+		<widget source="session.CurrentService" render="PositionGauge" position="300,133" size="270,10" zPosition="2" pointer="skin_default/position_pointer.png:540,0" transparent="1" >
 			<convert type="ServicePosition">Gauge</convert>
 		</widget>
 		<!-- Remaining time -->
-		<widget source="CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+		<widget source="session.CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
 			<convert type="ServicePosition">Remaining</convert>
 		</widget>
 	</screen>