Merge branch 'master' into experimental

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
old mode 100644 (file)
new mode 100755 (executable)
index f1e2549..d5fe01e
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -69,6 +69,14 @@
                <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">
                <!-- Background -->
@@ -79,14 +87,9 @@
                <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="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="session.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>
                <!-- Channellogo (Picon) -->
@@ -108,21 +111,41 @@
                        <convert type="ValueRange">0,0</convert>
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="session.FrontendInfo" render="Pixmap" position="142,20" size="8,9" pixmap="skin_default/nim_active.png" alphatest="on">
+               <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="session.TunerInfo" render="FixedLabel" text="A" position="129,4" size="15,15" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+               <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="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="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>
-               <widget source="session.TunerInfo" render="FixedLabel" text="B" position="129,19" size="15,15" font="Regular;14" backgroundColor="#4e5a74" transparent="1">
+               <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>
+               <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>
+               <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>
                <!-- Crypt icon (encrypted service?) -->
                <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">
@@ -184,7 +207,10 @@
                <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" />
+               <!--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>
                <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>
@@ -229,7 +255,7 @@
                </widget>
        </screen>
        <!-- Main menu -->
-       <screen name="menu_mainmenu" position="170,150" size="380,285" title="Main menu">
+       <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" />
@@ -292,7 +318,7 @@
                        <convert type="ServicePosition">Position</convert>
                </widget>
                <!-- Progressbar (movie position)-->
-               <widget source="session.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 -->