add some skin fixes/extensions made by Nemesis (thanks for this)

diff --git a/data/arrowdown.png b/data/arrowdown.png
index 02b5573..e69de29 100755 (executable)
Binary files a/data/arrowdown.png and b/data/arrowdown.png differ

diff --git a/data/arrowup.png b/data/arrowup.png
index c0883b4..e69de29 100644 (file)
Binary files a/data/arrowup.png and b/data/arrowup.png differ

diff --git a/data/cancel.png b/data/cancel.png
index baeefd0..e69de29 100644 (file)
Binary files a/data/cancel.png and b/data/cancel.png differ

diff --git a/data/dvr-buttons-small-fs8.png b/data/dvr-buttons-small-fs8.png
index 90cae68..e69de29 100644 (file)
Binary files a/data/dvr-buttons-small-fs8.png and b/data/dvr-buttons-small-fs8.png differ

diff --git a/data/error.png b/data/error.png
index 01b777b..e69de29 100644 (file)
Binary files a/data/error.png and b/data/error.png differ

diff --git a/data/expandable-plugins.png b/data/expandable-plugins.png
index 2076d55..e69de29 100644 (file)
Binary files a/data/expandable-plugins.png and b/data/expandable-plugins.png differ

diff --git a/data/expanded-plugins.png b/data/expanded-plugins.png
index ec355fe..e69de29 100644 (file)
Binary files a/data/expanded-plugins.png and b/data/expanded-plugins.png differ

diff --git a/data/extensions/directory.png b/data/extensions/directory.png
index eb561c7..e7d2bc3 100644 (file)
Binary files a/data/extensions/directory.png and b/data/extensions/directory.png differ

diff --git a/data/extensions/movie.png b/data/extensions/movie.png
index 532c232..2ffaaf9 100644 (file)
Binary files a/data/extensions/movie.png and b/data/extensions/movie.png differ

diff --git a/data/extensions/music.png b/data/extensions/music.png
index 0f630eb..17ce017 100644 (file)
Binary files a/data/extensions/music.png and b/data/extensions/music.png differ

diff --git a/data/extensions/picture.png b/data/extensions/picture.png
index 9eb05a5..035fbd7 100644 (file)
Binary files a/data/extensions/picture.png and b/data/extensions/picture.png differ

diff --git a/data/folder.png b/data/folder.png
index 7342726..e69de29 100644 (file)
Binary files a/data/folder.png and b/data/folder.png differ

diff --git a/data/info.png b/data/info.png
index 3a429fa..e69de29 100644 (file)
Binary files a/data/info.png and b/data/info.png differ

diff --git a/data/init.png b/data/init.png
index 1522cc5..e69de29 100644 (file)
Binary files a/data/init.png and b/data/init.png differ

diff --git a/data/key_0-fs8.png b/data/key_0-fs8.png
index ea5485e..e69de29 100644 (file)
Binary files a/data/key_0-fs8.png and b/data/key_0-fs8.png differ

diff --git a/data/key_1-fs8.png b/data/key_1-fs8.png
index dbce1fa..e69de29 100644 (file)
Binary files a/data/key_1-fs8.png and b/data/key_1-fs8.png differ

diff --git a/data/key_2-fs8.png b/data/key_2-fs8.png
index 1a7bf90..e69de29 100644 (file)
Binary files a/data/key_2-fs8.png and b/data/key_2-fs8.png differ

diff --git a/data/key_3-fs8.png b/data/key_3-fs8.png
index 5c280d3..e69de29 100644 (file)
Binary files a/data/key_3-fs8.png and b/data/key_3-fs8.png differ

diff --git a/data/key_4-fs8.png b/data/key_4-fs8.png
index 9509f0e..e69de29 100644 (file)
Binary files a/data/key_4-fs8.png and b/data/key_4-fs8.png differ

diff --git a/data/key_5-fs8.png b/data/key_5-fs8.png
index 18e2990..e69de29 100644 (file)
Binary files a/data/key_5-fs8.png and b/data/key_5-fs8.png differ

diff --git a/data/key_6-fs8.png b/data/key_6-fs8.png
index 42f6f58..e69de29 100644 (file)
Binary files a/data/key_6-fs8.png and b/data/key_6-fs8.png differ

diff --git a/data/key_7-fs8.png b/data/key_7-fs8.png
index a98d711..e69de29 100644 (file)
Binary files a/data/key_7-fs8.png and b/data/key_7-fs8.png differ

diff --git a/data/key_8-fs8.png b/data/key_8-fs8.png
index 4e154b9..e69de29 100644 (file)
Binary files a/data/key_8-fs8.png and b/data/key_8-fs8.png differ

diff --git a/data/key_9-fs8.png b/data/key_9-fs8.png
index 46e3a31..e69de29 100644 (file)
Binary files a/data/key_9-fs8.png and b/data/key_9-fs8.png differ

diff --git a/data/plugin.png b/data/plugin.png
index 8809152..e69de29 100644 (file)
Binary files a/data/plugin.png and b/data/plugin.png differ

diff --git a/data/position_pointer.png b/data/position_pointer.png
index bf8c42d..e69de29 100644 (file)
Binary files a/data/position_pointer.png and b/data/position_pointer.png differ

diff --git a/data/question.png b/data/question.png
index 8b4551d..e69de29 100644 (file)
Binary files a/data/question.png and b/data/question.png differ

diff --git a/data/rc.png b/data/rc.png
index 5293a3c..e69de29 100755 (executable)
Binary files a/data/rc.png and b/data/rc.png differ

diff --git a/data/record.png b/data/record.png
index 601fd49..e69de29 100755 (executable)
Binary files a/data/record.png and b/data/record.png differ

diff --git a/data/redx.png b/data/redx.png
index e2fcfac..e69de29 100644 (file)
Binary files a/data/redx.png and b/data/redx.png differ

diff --git a/data/rewind-small-fs8.png b/data/rewind-small-fs8.png
index 286b411..e69de29 100644 (file)
Binary files a/data/rewind-small-fs8.png and b/data/rewind-small-fs8.png differ

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 3a094a5..72f3467 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -14,53 +14,57 @@
        </screen>
        <screen name="Scart" position="0,0" size="720,576">
        </screen>
-       <screen name="MediaPlayer" position="100,100" size="550,400" title="MediaPlayer" >
-               <widget name="currenttext" position="0,0" size="550,40" font="Regular;18" valign="center" backgroundColor="#101258" />
-               
-               <widget name="filelist" position="0,42" size="265,255" scrollbarMode="showOnDemand" />
-               <widget name="playlist" position="275,42" size="275,255" scrollbarMode="showOnDemand" selectionDisabled="1" />
-                       
-               <ePixmap position="0,365" zPosition="0" size="177,32" pixmap="dvr-buttons-small-fs8.png" />
-               <widget name="PositionGauge" position="0,335" size="177,20" zPosition="2" pointer="position_pointer.png:3,5"/>
-                       
-               <widget name="artisttext" position="185,300" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="artist" position="270,300" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="titletext" position="185,323" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="title" position="270,323" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="albumtext" position="185,346" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="album" position="270,346" size="280,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="yeartext" position="185,369" size="85,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="year" position="270,369" size="70,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="genretext" position="340,369" size="100,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-               <widget name="genre" position="440,369" size="110,23" font="Regular;18" valign="center" backgroundColor="#101258" />
-       </screen>
-       <screen name="ServiceInfo" position="100,120" size="560,370" title="Serviceinfo">
+       <screen name="MediaPlayer" position="104,83" size="512,442" title="MediaPlayer">
+               <eLabel position="11,9" zPosition="1" size="359,78" backgroundColor="#182C40" />                
+               <widget name="artisttext" position="13,11" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+               <widget name="artist" position="78,11" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+               <widget name="albumtext" position="13,30" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+               <widget name="album" position="78,30" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+               <widget name="yeartext" position="13,49" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+               <widget name="year" position="78,49" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+               <widget name="genretext" position="13,68" zPosition="3" size="65,17" font="Regular;16" valign="top" foregroundColor="#cccccc" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-2,-2"/>
+               <widget name="genre" position="78,68" zPosition="3" size="290,17" font="Regular;16" valign="top" foregroundColor="#dddddd" backgroundColor="#33294a6b" />
+               <widget name="titletext" position="0,0" zPosition="3" size="0,0" font="Regular;16" valign="top" backgroundColor="#33294a6b" />
+               <eLabel name="nowPlaying" position="13,97" zPosition="3" size="355,14" text="Now Playing" font="Regular;12" foregroundColor="#00ff66" backgroundColor="#33294a6b" shadowColor="#000000" shadowOffset="-1,-1"/>
+               <widget name="title" position="13,111" zPosition="3" size="355,18" font="Regular;16" valign="top" backgroundColor="#33294a6b" />
+               <eLabel position="383,9" zPosition="1" size="120,120" backgroundColor="#182C40" />                                      
+               <widget name="coverArt" position="385,11" zPosition="3" size="116,116" pixmap="no_coverArt.png" transparent="1" alphatest="on" />       
+               <eLabel position="11,137" zPosition="1" size="491,109" backgroundColor="#182C40" />             
+               <widget name="filelist" position="13,139" zPosition="2" size="487,105" scrollbarMode="showOnDemand" />  
+               <eLabel position="11,251" zPosition="1" size="491,109" backgroundColor="#182C40" />                             
+               <widget name="playlist" position="13,253" zPosition="2" size="487,105" scrollbarMode="showOnDemand" selectionDisabled="1" />
+               <eLabel position="11,365" zPosition="1" size="491,12" backgroundColor="#182C40" />                                                              
+               <widget name="PositionGauge" position="13,367" size="487,8" zPosition="3" pointer="position_pointer.png:3,8" backgroundColor="#33294a6b" />
+               <widget name="currenttext" position="13,383" zPosition="3" size="490,18" font="Regular;16" halign="center" foregroundColor="#dddddd" /> 
+               <ePixmap position="170,406" zPosition="1" size="177,32" pixmap="dvr-buttons-small-fs8.png" transparent="1" alphatest="on" />                                            
+       </screen>                       
+       <screen name="ServiceInfo" position="80,103" size="560,370" title="Serviceinfo">
                <widget name="red" position="0,0" size="140,40" backgroundColor="red" valign="center" halign="center" font="Regular;21" />
                <widget name="green" position="140,0" size="140,40" backgroundColor="green" valign="center" halign="center" font="Regular;21" />
                <widget name="yellow" position="280,0" size="140,40" backgroundColor="yellow" valign="center" halign="center" font="Regular;21" />
                <widget name="blue" position="420,0" size="140,40" backgroundColor="blue" valign="center" halign="center" font="Regular;21" />
                <widget name="infolist" position="20,50" size="560,365" selectionDisabled="1"/>
        </screen>
-       <screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
+       <screen name="AudioSelection" position="210,203" size="300,170" title="Audio">
                <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="SubserviceSelection" position="210,150" size="300,250" title="Subservices">
+       <screen name="SubserviceSelection" position="210,163" size="300,250" title="Subservices">
                <widget name="subservices" position="20,10" size="260,230" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="HarddiskWait" position="140,165" size="360,60">
-               <widget name="wait" position="20,10" size="320,25" font="Regular;23"/>
+               <screen name="HarddiskWait" position="100,150" size="540,60">
+               <widget name="wait" position="20,10" size="500,25" font="Regular;23"/>
        </screen>
-       <screen name="HarddiskSelection" position="140,165" size="360,100" title="Select HDD">
-               <widget name="hddlist" position="20,10" size="320,75" />
+       <screen name="HarddiskSelection" position="100,150" size="540,100" title="Select HDD">
+               <widget name="hddlist" position="20,10" size="500,75" />
        </screen>
-       <screen name="HarddiskSetup" position="140,165" size="420,160" title="Harddisk">
+       <screen name="HarddiskSetup" position="150,150" size="420,160" title="Harddisk">
                <widget name="model" position="20,10" size="380,25" font="Regular;23"  />
                <widget name="capacity" position="20,40" size="380,25" font="Regular;23"  />
                <widget name="bus" position="20,70" size="380,25" font="Regular;23"  />
-               <widget name="initialize" position="40,110" size="120,30" zPosition="1" pixmap="init.png" />
-               <widget name="initializetext" position="40,110" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
+               <widget name="initialize" position="150,120" zPosition="1" size="120,30" pixmap="init.png"  transparent="1" alphatest="on" />
+               <widget name="initializetext" position="150,120" size="120,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
        </screen>
-       <screen name="Setup" position="100,125" size="540,280" title="Setup">
+       <screen name="Setup" position="90,148" size="540,280" title="Setup">
                <widget name="title" position="10,10" size="280,35" font="Regular;23" />
                <widget name="config" position="10,50" size="520,175" scrollbarMode="showOnDemand" />
                <widget name="ok" position="140,240" size="53,30" pixmap="ok.png" />
@@ -68,59 +72,58 @@
                <widget name="cancel" position="240,240" size="100,30" pixmap="cancel.png" />
                <widget name="canceltext" position="240,240" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
        </screen>
-       <screen name="LanguageSelection" position="200,125" size="320,260" title="Language selection">
+       <screen name="LanguageSelection" position="200,158" size="320,260" title="Language selection">
                <widget name="list" position="0,0" size="310,250" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="PluginBrowser" position="170,125" size="400,350" title="Plugin browser">
-               <widget name="red" position="0,0" size="200,40" backgroundColor="red" valign="center" halign="center" font="Regular;20" />
-               <widget name="green" position="200,0" size="200,40" backgroundColor="green" valign="center" halign="center" font="Regular;20" />
-
-               <widget name="list" position="10,50" size="380,280" scrollbarMode="showOnDemand" />
+       <screen name="PluginBrowser" position="150,115" size="420,370" title="Plugin browser">
+               <widget name="red" position="5,0" size="200,40" backgroundColor="red" valign="center" halign="center" font="Regular;20" />
+               <widget name="green" position="215,0" size="200,40" backgroundColor="green" valign="center" halign="center" font="Regular;20" />
+               <widget name="list" position="10,50" size="400,300" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="PluginDownloadBrowser" position="170,125" size="400,350" title="Downloadable plugins">
+       <screen name="PluginDownloadBrowser" position="160,113" size="400,350" title="Downloadable plugins">
                <widget name="text" position="10,00" size="380,330" zPosition="1" font="Regular;20" />
                <widget name="list" position="10,00" size="380,330" zPosition="2" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="NimSelection" position="140,165" size="400,100" title="select Slot">
+       <screen name="NimSelection" position="160,238" size="400,100" title="select Slot">
                <widget name="nimlist" position="20,10" size="360,75" />
        </screen>
-       <screen name="CiWait" position="140,165" size="360,50" title="Common Interface">
+       <screen name="CiWait" position="180,263" size="360,50" title="Common Interface">
                <widget name="message" position="20,10" size="320,25" font="Regular;23" />
        </screen>
-       <screen name="CiSelection" position="140,165" size="360,100" title="Common Interface">
+       <screen name="CiSelection" position="180,238" size="360,100" title="Common Interface">
                <widget name="entries" position="10,10" size="340,75" />
        </screen>
-       <screen name="CiMmi" position="130,165" size="450,270">
+       <screen name="CiMmi" position="135,153" size="450,270">
                <widget name="title" position="10,10" size="430,25" font="Regular;23" />
                <widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
                <widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
                <widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
        </screen>
-       <screen name="NimSetup" position="90,98" size="560,410" title="Satconfig">
+       <screen name="NimSetup" position="80,83" size="560,410" title="Satconfig">
                <widget name="config" position="0,0" size="560,402" scrollbarMode="showOnDemand" />
        </screen>
-       <screen name="ScanSetup" position="90,100" size="520,400" title="Service scan">
+       <screen name="ScanSetup" position="100,88" size="520,400" title="Service scan">
                <widget name="config" position="20,10" size="460,350" scrollbarMode="showOnDemand" />
                <widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
        </screen>
-       <screen name="ScanSimple" position="150,100" size="400,300" title="Service scan">
+       <screen name="ScanSimple" position="160,138" size="400,300" title="Service scan">
                <widget name="header" position="20,10" size="280,25" font="Regular;23"/>
                <widget name="config" position="20,45" size="360,200" scrollbarMode="showOnDemand" />
                <widget name="footer" position="20,250" size="360,25" font="Regular;23"/>
                <!--<widget name="introduction" position="20,360" size="280,30" font="Regular;23" />-->
        </screen>
-       <screen name="TimerEntry" position="100,100" size="500,400" title="Timer entry">
+       <screen name="TimerEntry" position="110,188" size="500,400" title="Timer entry">
                <widget name="config" position="5,10" size="480,350" />
                <widget name="ok" position="140,365" size="53,30" pixmap="ok.png" />
                <widget name="oktext" position="140,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
                <widget name="cancel" position="240,365" size="100,30" pixmap="cancel.png" />
                <widget name="canceltext" position="240,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
        </screen>
-       <screen name="NetworkSetup" position="140,125" size="460,280" title="Network Setup">
+       <screen name="NetworkSetup" position="130,148" size="460,280" title="Network Setup">
                <widget name="config" position="10,50" size="420,175" scrollbarMode="showOnDemand" />
                <widget name="introduction" position="10,230" size="400,30" font="Regular;23" />
        </screen>
-       <screen name="About" position="140,125" size="360,250" title="About">
+       <screen name="About" position="180,163" size="360,250" title="About">
                <widget name="text" position="10,30" size="420,20" font="Regular;18"/>
                <widget name="fpVersion" position="10,50" size="420,20" font="Regular;18"/>
                <widget name="tuner" position="10,80" size="420,20" font="Regular;18"/>
@@ -129,7 +132,7 @@
                <widget name="hdd" position="10,170" size="420,20" font="Regular;18"/>
                <widget name="hddA" position="10,190" size="420,40" font="Regular;18"/>
        </screen>
-       <screen name="configOSD" position="140,125" size="460,350" title="OSD Settings">
+       <screen name="configOSD" position="130,113" size="460,350" title="OSD Settings">
                <widget name="okbutton" position="20,270" size="205,40" />
                <widget name="txt_alpha" position="20,20" size="110,20" />
                <widget name="sld_alpha" position="150,20" size="290,20" />
@@ -173,10 +176,9 @@
                <widget name="title" position="10,120" size="280,50" />
                <widget name="theClock" position="10,60" size="280,50" />
        </screen>
-
-       <screen name="NumberZap" position="200,140" size="280,60" title="Channel">
-               <widget name="channel" position="50,15" size="110,25" font="Regular;23" />
-               <widget name="number" position="160,15" size="80,25" halign="right" font="Regular;23" />
+       <screen name="NumberZap" position="235,255" size="250,60" title="Channel">
+               <widget name="channel" position="35,15" size="110,25" font="Regular;23" />
+               <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
        </screen>
        <screen name="MinuteInput" position="200,140" size="280,60" title="Seek">
                <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
@@ -270,7 +272,7 @@
        <screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
                <widget name="waitingtext" position="0,0" size="500,335" zPosition="2" font="Regular;22" />
                <widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
-               <widget name="freeDiskSpace" position="10,380" size="540,30" font="Regular;25" />
+               <widget name="freeDiskSpace" position="10,380" size="540,30" font="Regular;22" />
        </screen>
        <screen name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
                <widget name="pass" position="10,10" size="280,30" font="Regular;20" />
@@ -355,11 +357,11 @@ newwidth = wsize[0]
                <widget name="canceltext" position="210,165" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
        </screen>
 
-       <screen name="MessageBox" position="60,300" size="600,10" title="Message">
-               <widget name="text" position="60,10" size="520,0" font="Regular;22" />
-               <widget name="ErrorPixmap" pixmap="error.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
-               <widget name="QuestionPixmap" pixmap="question.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
-               <widget name="InfoPixmap" pixmap="info.png" position="0,0" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+       <screen name="MessageBox" position="60,245" size="600,10" title="Message">
+               <widget name="text" position="65,8" size="520,0" font="Regular;22" />
+               <widget name="ErrorPixmap" pixmap="error.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+               <widget name="QuestionPixmap" pixmap="question.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
+               <widget name="InfoPixmap" pixmap="info.png" position="5,5" zPosition="3" size="53,53" alphatest="on" transparent="1" />
                <widget name="list" position="100,100" size="480,375" />
                <applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
@@ -397,4 +399,4 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                </applet>
        </screen>
-</skin>
\ No newline at end of file
+</skin>

diff --git a/data/stop-small-fs8.png b/data/stop-small-fs8.png
index ba2e14d..e69de29 100644 (file)
Binary files a/data/stop-small-fs8.png and b/data/stop-small-fs8.png differ

diff --git a/data/verticalline-plugins.png b/data/verticalline-plugins.png
index a692cf1..e69de29 100644 (file)
Binary files a/data/verticalline-plugins.png and b/data/verticalline-plugins.png differ

diff --git a/data/volumeslider-fs8.png b/data/volumeslider-fs8.png
index 20c55ee..e69de29 100644 (file)
Binary files a/data/volumeslider-fs8.png and b/data/volumeslider-fs8.png differ

diff --git a/data/wizard.png b/data/wizard.png
index 1377998..e69de29 100644 (file)
Binary files a/data/wizard.png and b/data/wizard.png differ

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 0d8245c..7411730 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -32,7 +32,7 @@ EXTENSIONS = {
 
 def FileEntryComponent(name, absolute = None, isDir = False):
        res = [ (absolute, isDir) ]
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT, name))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name))
        if isDir:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
        else:

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index c271c3c..45551cc 100644 (file)
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -24,15 +24,15 @@ STATE_REWIND = 3
 STATE_FORWARD = 4
 STATE_NONE = 5
 
-PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "play-small-fs8.png"))
-PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "pause-small-fs8.png"))
-StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "stop-small-fs8.png"))
-RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "rewind-small-fs8.png"))
-ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "forward-small-fs8.png"))
+PlayIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_play.png"))
+PauseIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_pause.png"))
+StopIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_stop.png"))
+RewindIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_rewind.png"))
+ForwardIcon = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_mp_forward.png"))
 
 def PlaylistEntryComponent(serviceref, state):
        res = [ serviceref ]
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 0, 250, 32, 0, RT_VALIGN_CENTER, os.path.split(serviceref.getPath().split('/')[-1])[1]))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT,25, 0, 470, 32, 0, RT_VALIGN_CENTER, os.path.split(serviceref.getPath().split('/')[-1])[1]))
        png = None
        if state == STATE_PLAY:
                png = PlayIcon
@@ -46,7 +46,7 @@ def PlaylistEntryComponent(serviceref, state):
                png = ForwardIcon
 
        if png is not None:
-               res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 0, 0, 33, 32, png))
+               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 5, 0, 16, 16, png))
     
        return res
 
@@ -70,7 +70,7 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 
        def postWidgetCreate(self, instance):
                instance.setContent(self.l)
-               instance.setItemHeight(32)
+               instance.setItemHeight(22)
 
        def getSelection(self):
                return self.l.getCurrentSelection()[0]

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 7220f0a..9b9cfea 100644 (file)
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -11,36 +11,36 @@ from enigma import *
 def PluginEntryComponent(plugin):
        res = [ plugin ]
        
-       res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=plugin.name))
-       res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description))
+       res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=plugin.name))
+       res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description))
 
        if plugin.icon is None:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
        else:
                png = plugin.icon
-       res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(60, 40), png = png))
+       res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 5), size=(100, 40), png = png))
        
        return res
 
 def PluginCategoryComponent(name, png):
        res = [ name ]
        
-       res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name))
-       res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png))
+       res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name))
+       res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
        
        return res
 
 def PluginDownloadComponent(plugin, name):
        res = [ plugin ]
        
-       res.append(MultiContentEntryText(pos=(80, 5), size=(300, 25), font=0, text=name))
-       res.append(MultiContentEntryText(pos=(80, 26), size=(300, 17), font=1, text=plugin.description))
+       res.append(MultiContentEntryText(pos=(120, 5), size=(320, 25), font=0, text=name))
+       res.append(MultiContentEntryText(pos=(120, 26), size=(320, 17), font=1, text=plugin.description))
 
        if plugin.icon is None:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "plugin.png"))
        else:
                png = plugin.icon
-       res.append(MultiContentEntryPixmapAlphaTest(pos=(0, 0), size=(60, 50), png = png))
+       res.append(MultiContentEntryPixmapAlphaTest(pos=(10, 0), size=(100, 50), png = png))
        
        return res
 

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png
index bb219a4..4962a05 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/backup.png differ

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png
index f75db7a..a392bbe 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/blue.png differ

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png
index 118c3f4..f168e4d 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/green.png differ

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
index 5bffb71..f47886c 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
@@ -34,16 +34,16 @@ MountPoints = {
 
 class BackupSetup(Screen):
        skin = """
-               <screen position="100,100" size="400,400" title="Backup and Restore" >
-                       <widget name="config" position="5,10" size="380,350" />
-                       <widget name="ok" position="10,365" size="53,30" pixmap="~/green.png" />
-                       <widget name="oktext" position="10,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
-                       <widget name="cancel" position="73,365" size="100,30" pixmap="~/red.png" />
-                       <widget name="canceltext" position="73,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" foregroundColor="black" />
-                       <widget name="restore" position="183,365" size="100,30" pixmap="~/yellow.png" />
-                       <widget name="restoretext" position="183,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
-                       <widget name="backup" position="293,365" size="100,30" pixmap="~/blue.png" />
-                       <widget name="backuptext" position="293,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
+               <screen position="135,144" size="450,300" title="Backup and Restore" >
+                       <widget name="config" position="10,10" size="430,240" />
+                       <widget name="ok" position="10,255" size="100,40" pixmap="~/green.png" transparent="1" alphatest="on" />
+                       <widget name="oktext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
+                       <widget name="cancel" position="120,255" size="100,40" pixmap="~/red.png" transparent="1" alphatest="on" />
+                       <widget name="canceltext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" foregroundColor="black" />
+                       <widget name="restore" position="230,255" size="100,40" pixmap="~/yellow.png" transparent="1" alphatest="on" />
+                       <widget name="restoretext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
+                       <widget name="backup" position="340,255" size="100,40" pixmap="~/blue.png" transparent="1" alphatest="on" />
+                       <widget name="backuptext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
                </screen>"""
                
        def keyLeft(self):
@@ -150,12 +150,12 @@ class BackupSetup(Screen):
 
 class RestoreMenu(Screen):
        skin = """
-               <screen position="100,100" size="400,400" title="Restore Backups" >
-               <widget name="filelist" position="5,10" size="380,350" scrollbarMode="showOnDemand" />
-               <widget name="cancel" position="73,365" size="100,30" pixmap="~/red.png" />
-               <widget name="canceltext" position="73,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" foregroundColor="black" />
-               <widget name="restore" position="183,365" size="100,30" pixmap="~/yellow.png" />
-               <widget name="restoretext" position="183,365" size="100,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
+               <screen position="135,144" size="450,300" title="Restore Backups" >
+               <widget name="filelist" position="10,10" size="430,240" scrollbarMode="showOnDemand" />
+               <widget name="cancel" position="120,255" size="100,40" pixmap="~/red.png" transparent="1" alphatest="on" />             
+               <widget name="canceltext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" foregroundColor="black" />
+               <widget name="restore" position="230,255" size="100,40" pixmap="~/yellow.png" transparent="1" alphatest="on" />
+               <widget name="restoretext" position="0,0" size="0,0" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1"  foregroundColor="black" />
                </screen>"""
 
        def __init__(self, session, args = None):

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png
index 4f7e97f..8096045 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/red.png differ

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png
index 48b3e68..dacb80e 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png and b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/yellow.png differ

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png
index 6bc17b1..0ece6c7 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png and b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/update.png differ

diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py
index 3e238e0..32296b6 100644 (file)
--- a/lib/python/Screens/MediaPlayer.py
+++ b/lib/python/Screens/MediaPlayer.py
@@ -10,7 +10,7 @@ from Components.Label import Label
 from Components.FileList import FileEntryComponent, FileList
 from Components.MediaPlayer import PlayList, PlaylistEntryComponent
 from Plugins.Plugin import PluginDescriptor
-from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG
+from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG, SCOPE_SKIN_IMAGE
 from Components.ServicePosition import ServicePositionGauge
 from Screens.ChoiceBox import ChoiceBox
 from Components.ServiceEventTracker import ServiceEventTracker
@@ -32,7 +32,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.addPlaylistParser(PlaylistIOPLS, "pls")
                self.addPlaylistParser(PlaylistIOInternal, "e2pls")
 
-               self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True)
+               self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True)              
                self["filelist"] = self.filelist
 
                self.playlist = PlayList()
@@ -52,6 +52,7 @@ class MediaPlayer(Screen, InfoBarSeek):
                self["year"] = Label("")
                self["genretext"] = Label(_("Genre:"))
                self["genre"] = Label("")
+               self["coverArt"] = Pixmap()
                
                #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
 
@@ -129,6 +130,8 @@ class MediaPlayer(Screen, InfoBarSeek):
                self.infoTimer.start(500)
                
                self.currList = "filelist"
+
+               self.coverArtFileName = ""
                
                self.playlistIOInternal = PlaylistIOInternal()
                list = self.playlistIOInternal.open(resolveFilename(SCOPE_CONFIG, "playlist.e2pls"))
@@ -169,8 +172,10 @@ class MediaPlayer(Screen, InfoBarSeek):
                                                                                 album = currPlay.info().getInfoString(iServiceInformation.sAlbum),
                                                                                 genre = currPlay.info().getInfoString(iServiceInformation.sGenre),
                                                                                 clear = True)
+                       self.updateCoverArtPixmap( currPlay.info().getName() )
                else:
                        self.updateMusicInformation()
+                       self.updateCoverArtPixmap( "" )
        
        def updateMusicInformation(self, artist = "", title = "", album = "", year = "", genre = "", clear = False):
                self.updateSingleMusicInformation("artist", artist, clear)
@@ -184,6 +189,19 @@ class MediaPlayer(Screen, InfoBarSeek):
                        if self[name].getText() != info:
                                self[name].setText(info)
 
+       def updateCoverArtPixmap(self, currentServiceName):
+               filename = currentServiceName
+               # The "getName" usually adds something like "MP3 File:" infront of filename
+               # Get rid of this...by finding the first "/"
+               filename = filename[filename.find("/"):]
+               path = os.path.dirname(filename)
+               pngname = path + "/" + "folder.png"
+               if not os.path.exists(pngname):
+                       pngname = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png")
+               if self.coverArtFileName != pngname:
+                       self.coverArtFileName = pngname
+                       self["coverArt"].instance.setPixmapFromFile(self.coverArtFileName)
+
        def fwdTimerFire(self):
                self.fwdKeyTimer.stop()
                self.fwdtimer = False