From: Christian Weiske Date: Wed, 2 Dec 2009 17:20:14 +0000 (+0100) Subject: update to enigma2-plugin-skins-avalon_3.0_mipsel X-Git-Tag: v3.0-r3~8 X-Git-Url: https://git.cweiske.de/dreambox-avalon_II.git/commitdiff_plain/4a30985b50d2cf2647ccb05d87a42a77db728a36 update to enigma2-plugin-skins-avalon_3.0_mipsel --- diff --git a/CONTROL/control b/CONTROL/control index 158453a..0cc8280 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,11 +1,11 @@ Package: enigma2-plugin-skins-avalon -Version: 2.1-r0 -Description: Avalon II skin by vali +Version: 3.0 +Description: Avalon II skin by Vali Section: extra Priority: optional -Maintainer: vali +Maintainer: vali Architecture: mipsel -OE: avalon-2.1 +OE: avalon_II.3.0 Homepage: www.unknown.at Depends: -Source: ftp://7025/vali/Avalon_II_CVS_100.tar.gz +Source: ftp://7025/vali/Avalon_II_CVS.tar.gz diff --git a/usr/lib/enigma2/python/Components/Renderer/SmartLabel.py b/usr/lib/enigma2/python/Components/Renderer/SmartLabel.py new file mode 100644 index 0000000..2374a49 --- /dev/null +++ b/usr/lib/enigma2/python/Components/Renderer/SmartLabel.py @@ -0,0 +1,71 @@ +from Components.VariableText import VariableText +from enigma import eLabel, iServiceInformation +from Renderer import Renderer + + + +class SmartLabel(Renderer, VariableText): + def __init__(self): + Renderer.__init__(self) + VariableText.__init__(self) + + GUI_WIDGET = eLabel + + def changed(self, what): + service = self.source.service + info = service and service.info() + if info is not None: + if (info.getInfo(iServiceInformation.sIsCrypted) == 1): + decID = "" + decFrom = "" + xresol = 0 + yresol = 0 + try: + f = open("/tmp/ecm.info", "r") + flines = f.readlines() + f.close() + for cell in flines: + if ("caid" in cell)or("CAID" in cell)or("CaID" in cell)or("caID" in cell)or("Caid" in cell): + cellmembers = cell.split() + for x in range(len(cellmembers)): + if ("caid" in cellmembers[x])or("CAID" in cellmembers[x])or("CaID" in cellmembers[x])or("caID" in cellmembers[x])or("Caid" in cellmembers[x]): + if x<(len(cellmembers)-1): + if cellmembers[x+1] != "0x000": + decID = cellmembers[x+1] + decID = decID .lstrip("0x") + decID = decID.strip(",;.:-*_<>()[]{}") + if (len(decID)<4): + decID = decID + "0" + else: + decID = "" + if decID != "": + idnames = ("0100,01FF,SE","0500,05FF,VI","0600,06FF,IR","0900,09FF,NDS","0B00,0BFF,CO","0D00,0DFF,CW","1700,17FF,BC","1800,18FF,NA") + for idline in idnames: + IDlist = idline.split(",") + try: + if (int(decID,16)>=int(IDlist[0],16)) and (int(decID,16)<=int(IDlist[1],16)): + decID = IDlist[2] + " " + decID + break + except: + pass + for cell in flines: + if ("using:" in cell) or ("source:" in cell): + cellmembers = cell.split() + for x in range(len(cellmembers)): + if ("using:" in cellmembers[x]) or ("source:" in cellmembers[x]): + if x<(len(cellmembers)-1): + if cellmembers[x+1] != "fta": + decFrom = cellmembers[x+1] + else: + decFrom = "" + except: + pass + self.text = decFrom + " " + decID + else: + xresol = info.getInfo(iServiceInformation.sVideoWidth) + yresol = info.getInfo(iServiceInformation.sVideoHeight) + if xresol>0: + self.text = str(xresol) + " x " + str(yresol) + + + diff --git a/usr/share/enigma2/Avalon_II/skin.xml b/usr/share/enigma2/Avalon_II/skin.xml index dc31aa5..d7a69f6 100644 --- a/usr/share/enigma2/Avalon_II/skin.xml +++ b/usr/share/enigma2/Avalon_II/skin.xml @@ -34,7 +34,7 @@ - + @@ -157,9 +157,10 @@ <widget source="session.RecordState" render="Pixmap" pixmap="Avalon_II/icons/rec.png" position="187,440" zPosition="3" size="12,12" alphatest="on" transparent="1" > <convert type="ConditionalShowHide">Blink</convert> </widget> - <widget source="session.FrontendStatus" render="Label" position="587,437" zPosition="3" size="75,24" font="Regular;15" halign="right" foregroundColor="clText" transparent="1" backgroundColor="clBack"> + <widget source="session.FrontendStatus" render="Label" position="587,439" zPosition="3" size="75,24" font="Regular;15" halign="right" foregroundColor="clText" transparent="1" backgroundColor="clBack"> <convert type="FrontendInfo">SNRdB</convert> </widget> + <widget source="session.CurrentService" render="SmartLabel" position="572,419" zPosition="4" size="90,20" noWrap="1" halign="right" font="Regular;15" foregroundColor="clText" transparent="1" backgroundColor="clBack" /> </screen> @@ -779,7 +780,7 @@ </screen> <!-- Console --> <screen name="Console" position="80,87" size="560,430" title="Command execution..."> - <widget name="text" position="10,10" size="540,410" font="Regular;18" /> + <widget name="text" position="10,10" size="540,410" font="Console;20" /> </screen> <!-- Harddisk setup --> <screen name="HarddiskSetup" position="140,200" size="420,160" title="Harddisk"> @@ -796,14 +797,6 @@ <widget name="status" position="10,60" size="550,45" font="Regular;18" /> <widget name="slider" position="10,100" size="530,15" pixmap="Avalon_II/window/misc_p_bar_big.png" borderWidth="1" borderColor="#cccccc" /> </screen> - <!-- Nameserver --> - <screen name="NameserverSetup" position="130,140" size="460,330" title="Nameserver Setup"> - <ePixmap pixmap="Avalon_II/buttons/red.png" position="0,0" size="140,40" alphatest="on" /> - <ePixmap pixmap="Avalon_II/buttons/green.png" position="315,0" size="140,40" alphatest="on" /> - <widget name="red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" transparent="1" /> - <widget name="green" position="315,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" transparent="1" /> - <widget name="config" position="10,50" size="440,175" scrollbarMode="showOnDemand" /> - </screen> <!-- Plugin browser --> <screen name="PluginBrowser" position="160,95" size="400,405" title="Plugin browser"> <ePixmap pixmap="Avalon_II/buttons/red-big.png" position="0,0" size="200,40" alphatest="on" /> diff --git a/usr/share/enigma2/Avalon_II/window/ex_label.png b/usr/share/enigma2/Avalon_II/window/ex_label.png new file mode 100644 index 0000000..a74c7d8 Binary files /dev/null and b/usr/share/enigma2/Avalon_II/window/ex_label.png differ diff --git a/usr/share/enigma2/Avalon_II/window/infobar.png b/usr/share/enigma2/Avalon_II/window/infobar.png index ff5e1b4..f625510 100644 Binary files a/usr/share/enigma2/Avalon_II/window/infobar.png and b/usr/share/enigma2/Avalon_II/window/infobar.png differ