small blackhole optimizations

3 files changed, 192 insertions, 3 deletions

diff --git a/skins/blackhole/themes/default/icons/ico_rec_on.svg b/skins/blackhole/themes/default/icons/ico_rec_on.svg
index 45eb863..7dc41a6 100644
--- a/skins/blackhole/themes/default/icons/ico_rec_on.svg
+++ b/skins/blackhole/themes/default/icons/ico_rec_on.svg
@@ -103,7 +103,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="10.055058"
-     inkscape:cx="14.02337"
+     inkscape:cx="21.134219"
      inkscape:cy="23.850628"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -132,7 +132,7 @@
      id="layer1"
      transform="translate(0,-1002.3622)">
     <circle
-       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:url(#linearGradient4155);stroke-width:2.046;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#aa0000;fill-opacity:1;stroke:url(#linearGradient4155);stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4196"
        cy="1027.3622"
        cx="25"
diff --git a/skins/blackhole/themes/default/skinparts/displaychannellogoback.svg b/skins/blackhole/themes/default/skinparts/displaychannellogoback.svg
new file mode 100644
index 0000000..02eca0f
--- /dev/null
+++ b/skins/blackhole/themes/default/skinparts/displaychannellogoback.svg
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300"
+   height="200"
+   viewBox="0 0 299.99998 200"
+   id="svg3615"
+   version="1.1"
+   inkscape:version="0.91pre3 r13670"
+   sodipodi:docname="displaychannellogoback.svg">
+  <defs
+     id="defs3617">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4451">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4453" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4455" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4437">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4439" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4441" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4425">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop4427" />
+      <stop
+         style="stop-color:#444444;stop-opacity:1"
+         offset="1"
+         id="stop4429" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4425"
+       id="linearGradient4431"
+       x1="10.741395"
+       y1="1047.0458"
+       x2="296.81735"
+       y2="858.87219"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4437"
+       id="radialGradient4443"
+       cx="0.99998474"
+       cy="952.36224"
+       fx="0.99998474"
+       fy="952.36224"
+       r="0.99999934"
+       gradientTransform="matrix(1,0,0,100.00006,0,-94283.922)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4437"
+       id="radialGradient4447"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,100.00006,298,-94283.922)"
+       cx="0.99998474"
+       cy="952.36224"
+       fx="0.99998474"
+       fy="952.36224"
+       r="0.99999934" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4451"
+       id="radialGradient4457"
+       cx="149.99999"
+       cy="853.36224"
+       fx="149.99999"
+       fy="853.36224"
+       r="150"
+       gradientTransform="matrix(1,0,0,0.00666668,0,847.67315)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4451"
+       id="radialGradient4461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.00666668,0,1045.6732)"
+       cx="149.99999"
+       cy="853.36224"
+       fx="149.99999"
+       fy="853.36224"
+       r="150" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.5136364"
+     inkscape:cx="161.76342"
+     inkscape:cy="98.571429"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1531"
+     inkscape:window-height="878"
+     inkscape:window-x="61"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3620">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-852.36225)">
+    <rect
+       style="opacity:1;fill:url(#linearGradient4431);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:5.69999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3623"
+       width="300"
+       height="199.99998"
+       x="-1.021635e-005"
+       y="852.36224" />
+    <rect
+       style="opacity:1;fill:url(#radialGradient4443);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:5.69999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4435"
+       width="1.9999887"
+       height="199.99998"
+       x="-9.5986316e-006"
+       y="852.36224" />
+    <rect
+       y="852.36224"
+       x="298"
+       height="199.99998"
+       width="1.9999887"
+       id="rect4445"
+       style="opacity:1;fill:url(#radialGradient4447);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:5.69999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:url(#radialGradient4457);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:5.69999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4449"
+       width="300"
+       height="1.999995"
+       x="-1.2490499e-005"
+       y="852.36224" />
+    <rect
+       y="1050.3623"
+       x="-1.2490499e-005"
+       height="1.999995"
+       width="300"
+       id="rect4459"
+       style="opacity:1;fill:url(#radialGradient4461);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:5.69999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/skins/blackhole/xmlfiles/displaychannel.xml b/skins/blackhole/xmlfiles/displaychannel.xml
index 0603b2c..c8fdabe 100644
--- a/skins/blackhole/xmlfiles/displaychannel.xml
+++ b/skins/blackhole/xmlfiles/displaychannel.xml
@@ -12,6 +12,10 @@
         <area x="17%" y="80%" width="67%" height="14%" layer="2">
             <drawimage imagetype="skinpart" path="displaychannelbackepg" x="0" y="0" width="100%" height="100%"/>
         </area>
+        <!-- channel logo background -->
+        <area x="1%" y="77%" width="14%" height="20%" layer="2">
+            <drawimage imagetype="skinpart" path="displaychannellogoback" x="0" y="0" width="100%" height="100%"/>
+        </area>        
         <!-- watch background -->
         <area x="86%" y="77%" width="{areaheight}*0.18" height="{areaheight}*0.18" layer="2">
             <drawimage imagetype="skinpart" path="watchback" x="0" y="0" width="100%" height="100%"/>
@@ -29,7 +33,7 @@
         <area x="17%" y="74%" width="67%" height="6%" layer="2">
             <drawtext x="0" y="0" font="{semibold}" fontsize="100%" color="{clrWhite}" text="{channelnumber}  {channelname}" />
         </area>
-        <area x="2%" y="75%" width="13%" height="25%" layer="2">
+        <area x="2%" y="78%" width="12%" height="18%" layer="3">
             <drawimage cache="true" imagetype="channellogo" path="{channelid}" width="100%" height="100%" align="center" valign="center"/>
         </area>
     </channelinfo>
@@ -106,6 +110,7 @@
             <drawimage condition="{isDolby}" imagetype="icon" path="ico_dolby" x="{areaheight}*6 + 20" y="0" width="{areaheight}*3" height="{areaheight}"/>
             <drawimage condition="{hasVT}" imagetype="icon" path="ico_videotext" x="{areaheight}*9 + 30" y="0" width="{areaheight}" height="{areaheight}"/>
             <drawimage condition="{isEncrypted}" imagetype="icon" path="ico_crypted" x="{areaheight}*10 + 40" y="0" width="{areaheight}*2" height="{areaheight}"/>
+            <drawimage condition="{isRecording}" imagetype="icon" path="ico_rec_on" x="{areaheight}*12 + 50" y="0" width="{areaheight}" height="{areaheight}"/>
         </area>
     </statusinfo>