experimentally merge audio + subtitle streams selection dialogs into one
[enigma2.git] / data / skin.xml
old mode 100644 (file)
new mode 100755 (executable)
index df8e327..868fbc4
@@ -1,9 +1,12 @@
 <skin>
        <!-- Screwed Stone II skin (skin.xml) /Nemesis -->
+       <output id="0">
+               <resolution xres="720" yres="576" bpp="32" />
+       </output>
        <!-- Colors (#AARRGGBB) -->
        <colors>
-               <color name="white"     value="#ffffff" />
-               <color name="black"     value="#000000" />
+               <color name="white" value="#ffffff" />
+               <color name="black" value="#000000" />
                <color name="dark" value="#25062748" />
                <color name="menu" value="#25062748" />
                <color name="red" value="#f23d21" />
@@ -16,7 +19,7 @@
                <color name="background" value="#25062748" />
                <color name="foreground" value="#ffffff" />
        </colors>
-       <!-- Main screen colors (id=0 for Menu's, id=1 for LCD) -->
+       <!-- Main screen colors (id=0 Framebuffer) -->
        <windowstyle type="skinned" id="0">
                <title offset="33,14" font="Regular;20" />
                <color name="Background" color="#25062748" />
                <color name="WindowTitleBackground" color="#25062748" />
                <!-- Main screen border png's -->
                <borderset name="bsWindow">
-                       <pixmap pos="bpTopLeft" filename="skin_default/b_w_tl.png" />
-                       <pixmap pos="bpTop" filename="skin_default/b_w_t.png"  />
-                       <pixmap pos="bpTopRight" filename="skin_default/b_w_tr.png" />
-                       <pixmap pos="bpLeft" filename="skin_default/b_w_l.png"  />
-                       <pixmap pos="bpRight" filename="skin_default/b_w_r.png"  />
-                       <pixmap pos="bpBottomLeft" filename="skin_default/b_w_bl.png" />
-                       <pixmap pos="bpBottom" filename="skin_default/b_w_b.png"  />
-                       <pixmap pos="bpBottomRight" filename="skin_default/b_w_br.png" />
+                       <pixmap pos="bpTopLeft" filename="skin_default/b_tl.png" />
+                       <pixmap pos="bpTop" filename="skin_default/b_t.png"  />
+                       <pixmap pos="bpTopRight" filename="skin_default/b_tr.png" />
+                       <pixmap pos="bpLeft" filename="skin_default/b_l.png"  />
+                       <pixmap pos="bpRight" filename="skin_default/b_r.png"  />
+                       <pixmap pos="bpBottomLeft" filename="skin_default/b_bl.png" />
+                       <pixmap pos="bpBottom" filename="skin_default/b_b.png"  />
+                       <pixmap pos="bpBottomRight" filename="skin_default/b_br.png" />
                </borderset>
        </windowstyle>
+       <!-- Main screen colors (id=1 LCD) -->
+       <windowstyle type="skinned" id="1">
+               <color name="Background" color="#000000" />
+               <color name="LabelForeground" color="#ffffff" />
+               <color name="ListboxBackground" color="#000000" />
+               <color name="ListboxForeground" color="#ffffff" />
+               <color name="ListboxSelectedBackground" color="#000000" />
+               <color name="ListboxSelectedForeground" color="#ffffff" />
+               <color name="ListboxMarkedBackground" color="#000000" />
+               <color name="ListboxMarkedForeground" color="#ffffff" />
+               <color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+               <color name="WindowTitleForeground" color="#ffffff" />
+               <color name="WindowTitleBackground" color="#000000" />
+       </windowstyle>
+       <windowstyle type="skinned" id="2">
+               <color name="Background" color="#000000" />
+               <color name="LabelForeground" color="#ffffff" />
+               <color name="ListboxBackground" color="#000000" />
+               <color name="ListboxForeground" color="#ffffff" />
+               <color name="ListboxSelectedBackground" color="#000000" />
+               <color name="ListboxSelectedForeground" color="#ffffff" />
+               <color name="ListboxMarkedBackground" color="#000000" />
+               <color name="ListboxMarkedForeground" color="#ffffff" />
+               <color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+               <color name="WindowTitleForeground" color="#ffffff" />
+               <color name="WindowTitleBackground" color="#000000" />
+       </windowstyle>
        <!-- Fonts -->
        <fonts>
+               <!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> -->
                <font filename="nmsbd.ttf" name="Regular" scale="90" />
                <font filename="lcd.ttf" name="LCD" scale="100" />
                <font filename="ae_AlMateen.ttf" name="Replacement" scale="90" replacement="1" />
+               <font filename="tuxtxt.ttf" name="Console" scale="100" />
        </fonts>
+       <!-- Subtitle effects -->
+       <subtitles>
+               <sub name="Subtitle_TTX" font="Regular;30" shadowColor="#40101010" shadowOffset="3,3" />
+               <sub name="Subtitle_Regular" font="Regular;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" />
+               <sub name="Subtitle_Bold" font="Replacement;30" foregroundColor="#DCDCDC" shadowColor="#40101010" shadowOffset="3,3" />
+               <sub name="Subtitle_Italic" font="Regular;30" foregroundColor="#DCAAAA" shadowColor="#40101010" shadowOffset="3,3" />
+               <!-- omitting foregroundColor attribute will enable auto-assignment of color -->
+       </subtitles>
        <!-- Main infobar -->
-       <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent" >
+       <screen name="InfoBar" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent">
                <!-- Background -->
-               <ePixmap position="0,0" zPosition="-1" size="720,160" pixmap="skin_default/info-bg.png" alphatest="off" />
-               <ePixmap position="27,73" zPosition="0" size="665,71" pixmap="skin_default/screws.png" alphatest="on" transparent="1" />
+               <ePixmap position="0,0" zPosition="-1" size="720,160" pixmap="skin_default/info-bg.png" />
+               <ePixmap position="27,73" 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" >
-                       <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" >
+               <eLabel text="BER" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1" />
+               <widget source="session.FrontendStatus" render="Label" position="355,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="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">
-                       <convert type="FrontendInfo">SNR</convert>
-                       <convert type="ValueRange">0,39699</convert>
+               <!-- Channellogo (Picon) -->
+               <widget source="session.CurrentService" render="Picon" position="49,4" zPosition="1" size="70,53" alphatest="on">
+                       <convert type="ServiceName">Reference</convert>
+               </widget>
+               <!-- Service name -->
+               <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/icons/clock.png" position="600,23" size="14,14" alphatest="on" />
+               <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 source="session.FrontendInfo" render="Pixmap" position="142,6" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on">
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">0,0</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">
-                       <convert type="FrontendInfo">SNR</convert>
-                       <convert type="ValueRange">36700,45875</convert>
+               <widget source="session.FrontendInfo" render="Pixmap" position="142,19" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on">
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">1,1</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">
-                       <convert type="FrontendInfo">SNR</convert>
-                       <convert type="ValueRange">45876,65536</convert>
+               <widget source="session.FrontendInfo" render="Pixmap" position="142,32" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on">
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">2,2</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">
-                       <convert type="FrontendInfo">AGC</convert>
-                       <convert type="ValueRange">0,39699</convert>
+               <widget source="session.FrontendInfo" render="Pixmap" position="142,45" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on">
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">3,3</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">
-                       <convert type="FrontendInfo">AGC</convert>
-                       <convert type="ValueRange">36700,65536</convert>
+               <widget source="session.TunerInfo" render="FixedLabel" text="A" position="129,4" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+                       <convert type="TunerInfo">TunerUseMask</convert>
+                       <convert type="ValueBitTest">1</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" >
-                       <convert type="FrontendInfo">BER</convert>              
+               <widget source="session.TunerInfo" render="FixedLabel" text="B" position="129,17" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+                       <convert type="TunerInfo">TunerUseMask</convert>
+                       <convert type="ValueBitTest">2</convert>
                        <convert type="ConditionalShowHide" />
-               </widget>       
-               <!-- Channellogo (Picon) -->
-               <widget source="CurrentService" render="Picon" position="47,2" zPosition="2" size="74,57" >
-                       <convert type="ServiceName">Name</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" >
-                       <convert type="ServiceName">Name</convert>
+               <widget source="session.TunerInfo" render="FixedLabel" text="C" position="129,30" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+                       <convert type="TunerInfo">TunerUseMask</convert>
+                       <convert type="ValueBitTest">4</convert>
+                       <convert type="ConditionalShowHide" />
                </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" >
-                       <convert type="ClockToText">Default</convert>
+               <widget source="session.TunerInfo" render="FixedLabel" text="D" position="129,43" size="15,13" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+                       <convert type="TunerInfo">TunerUseMask</convert>
+                       <convert type="ValueBitTest">8</convert>
+                       <convert type="ConditionalShowHide" />
                </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" />           
                <!-- 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" >
+               <ePixmap position="563,48" zPosition="0" size="107,15" pixmap="skin_default/icons/icons_off.png" />
+               <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/icons/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/icons/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/icons/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/icons/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" >
+               <ePixmap pixmap="skin_default/progress_bg.png" position="48,77" size="84,7" transparent="1" alphatest="on" />
+               <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" />
+               <ePixmap pixmap="skin_default/icons/icon_rec_off.png" position="561,21" size="34,21" />
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/icon_rec.png" position="561,21" zPosition="1" size="34,21">
+                       <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" >
+               <ePixmap pixmap="skin_default/icons/icon_event.png" position="182,78" size="15,10" alphatest="on" />
+               <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="320,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="585,73" size="85,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="320,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="585,97" size="85,24" font="Regular;20" backgroundColor="#071f38" foregroundColor="#c3c3c9" halign="right" transparent="1">
                        <convert type="EventTime">Duration</convert>
                        <convert type="ClockToText">InMinutes</convert>
                </widget>
                <!-- Red button (is recording possible?) -->
-               <ePixmap position="212,130" zPosition="1" size="15,16" pixmap="skin_default/button_red_off.png" transparent="1" alphatest="on" />
-               <widget source="RecordingPossible" render="Pixmap" pixmap="skin_default/button_red.png" position="212,130" zPosition="2" size="15,16" transparent="1" alphatest="on" >
+               <ePixmap pixmap="skin_default/buttons/button_red_off.png" position="212,130" size="15,16" alphatest="on" />
+               <widget source="RecordingPossible" render="Pixmap" pixmap="skin_default/buttons/button_red.png" position="212,130" zPosition="1" size="15,16" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <!--eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" /-->
+               <widget source="ShowRecordOnRed" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1">
                        <convert type="ConditionalShowHide" />
                </widget>
-               <eLabel text="Record" position="232,130" size="80,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
-               <widget source="RecordingPossible" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+               <widget source="RecordingPossible" render="FixedLabel" text="Record" position="232,130" zPosition="1" size="80,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
                        <convert type="ConditionalShowHide" />
                </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" >
+               <ePixmap pixmap="skin_default/buttons/button_green_off.png" position="315,130" size="15,16" alphatest="on" />
+               <widget source="session.CurrentService" render="Pixmap" pixmap="skin_default/buttons/button_green.png" position="315,130" zPosition="1" size="15,16" 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>
                <!-- Yellow button (is timeshift possible?) -->
-               <ePixmap position="440,130" zPosition="1" size="15,16" pixmap="skin_default/button_yellow_off.png" transparent="1" alphatest="on" />
-               <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/button_yellow.png" position="440,130" zPosition="2" size="15,16" transparent="1" alphatest="on" >
+               <ePixmap pixmap="skin_default/buttons/button_yellow_off.png" position="440,130" size="15,16" alphatest="on" />
+               <widget source="TimeshiftPossible" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
                        <convert type="ConditionalShowHide" />
                </widget>
-               <eLabel text="Timeshift" position="460,130" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
-               <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+               <widget source="ShowTimeshiftOnYellow" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" shadowOffset="-1,-1" transparent="1">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="TimeshiftPossible" render="FixedLabel" text="Timeshift" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               
+               <!-- Yellow button (used for audio on boxes with new rc?) -->
+               <widget source="ShowAudioOnYellow" render="Pixmap" pixmap="skin_default/buttons/button_yellow.png" position="440,130" zPosition="1" size="15,16" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="ShowAudioOnYellow" render="FixedLabel" text="Audio" position="460,130" zPosition="1" size="85,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
                        <convert type="ConditionalShowHide" />
                </widget>
                <!-- Blue button (is extensions available?) -->
-               <ePixmap position="545,130" zPosition="1" size="15,16" pixmap="skin_default/button_blue_off.png" transparent="1" alphatest="on" />
-               <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/button_blue.png" position="545,130" zPosition="2" size="15,16" transparent="1" alphatest="on" >
+               <ePixmap pixmap="skin_default/buttons/button_blue_off.png" position="545,130" size="15,16" alphatest="on" />
+               <widget source="ExtensionsAvailable" render="Pixmap" pixmap="skin_default/buttons/button_blue.png" position="545,130" zPosition="1" size="15,16" alphatest="on">
                        <convert type="ConditionalShowHide" />
                </widget>
                <eLabel text="Extensions" position="565,130" size="110,22" font="Regular;16" foregroundColor="#7f848d" backgroundColor="#182946" transparent="1" />
-               <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="565,130" zPosition="1" size="110,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1" >
+               <widget source="ExtensionsAvailable" render="FixedLabel" text="Extensions" position="565,130" zPosition="1" size="110,22" font="Regular;16" backgroundColor="#182946" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
                        <convert type="ConditionalShowHide" />
                </widget>
        </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="menu" render="Listbox" position="170,55" size="230,225" scrollbarMode="showOnDemand" >
+       <screen name="menu_mainmenu" position="center,center" size="380,285" title="Main menu">
+               <widget source="title" render="Label" position="170,10" size="200,35" font="Regular;23" />
+               <widget source="menu" render="Listbox" position="170,55" size="200,225" scrollbarMode="showOnDemand">
                        <convert type="StringList" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/shutdown.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/shutdown.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">standby_restart_list</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/setup.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/setup.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">setup_selection</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/plugins.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/plugins.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">plugin_selection</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/information.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/information.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">info_screen</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/scart.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/scart.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">scart_switch</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/timer.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/timer.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">timer_edit</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/media_player.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" alphatest="on">
                        <convert type="MenuEntryCompare">media_player</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/subtitles.png" position="20,20" size="128,128" >
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/dvd_player.png" position="20,20" size="128,128" alphatest="on">
+                       <convert type="MenuEntryCompare">dvd_player</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="menu" render="Pixmap" pixmap="skin_default/menu/subtitles.png" position="20,20" size="128,128" alphatest="on">
                        <convert type="MenuEntryCompare">subtitle_selection</convert>
                        <convert type="ConditionalShowHide"/>
                </widget>
        </screen>
        <!-- Movieplayer infobar -->
-       <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent" >
+       <screen name="MoviePlayer" flags="wfNoBorder" position="0,380" size="720,160" title="InfoBar" backgroundColor="transparent">
                <!-- Background -->
-               <ePixmap position="0,0" zPosition="-2" size="720,160" pixmap="skin_default/info-bg_mp.png" alphatest="off" />
-               <ePixmap position="29,40" zPosition="0" size="665,104" pixmap="skin_default/screws_mp.png" alphatest="on" transparent="1" />
+               <ePixmap position="0,0" pixmap="skin_default/info-bg_mp.png" zPosition="-1" size="720,160" />
+               <ePixmap position="29,40" pixmap="skin_default/screws_mp.png" size="665,104" alphatest="on" />
                <!-- colorbuttons -->
-               <ePixmap position="48,70" zPosition="0" size="108,13" pixmap="skin_default/mp_buttons.png" alphatest="on" />
+               <ePixmap position="48,70" pixmap="skin_default/icons/mp_buttons.png" size="108,13" 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" >
+               <ePixmap pixmap="skin_default/icons/icon_event.png" position="207,78" size="15,10" alphatest="on" />
+               <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" foregroundColor="#20224f">
                        <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" >
-                       <convert type="ServicePosition">Remaining</convert>
+               <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,Negate</convert>
                </widget>
        </screen>
 </skin>