Merge branch 'master' of /home/tmbinc/enigma2-git

[enigma2.git] / data / skin.xml

diff --git a/data/skin.xml b/data/skin.xml
old mode 100644 (file)
new mode 100755 (executable)
index 472994d..ca1e97d
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -79,14 +79,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 +103,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">
@@ -295,7 +310,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 -->