frodovdr
/
vdr-plugin-skindesigner
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
1
0
Fork 0
Code Issues Releases Wiki Activity

added isEncrypted Token to displaymenuchannels

This commit is contained in:
louis 2016-02-14 15:54:36 +01:00
parent 210dc8d8cc
commit 2a9b9bb8fa
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreengine/definitions.h
View File

@ -803,6 +803,7 @@ enum class eLeMenuChannelsIT {
isCable,
isSat,
isTerr,
isEncrypted,
count
};
@ -845,6 +846,7 @@ enum class eCeMenuChannelsIT {
isCable,
isSat,
isTerr,
isEncrypted,
presenteventduration,
presenteventdurationhours,
presenteventelapsed,

4
coreengine/listelements.c
View File

@ -819,6 +819,7 @@ void cLeMenuChannels::SetTokenContainer(void) {
tokenContainer->DefineIntToken("{isCable}", (int)eLeMenuChannelsIT::isCable);
tokenContainer->DefineIntToken("{isSat}", (int)eLeMenuChannelsIT::isSat);
tokenContainer->DefineIntToken("{isTerr}", (int)eLeMenuChannelsIT::isTerr);
tokenContainer->DefineIntToken("{isEncrypted}", (int)eLeMenuChannelsIT::isEncrypted);
InheritTokenContainer();
}
@ -845,6 +846,7 @@ bool cLeMenuChannels::Parse(bool forced) {
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::number, channel->Number());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::transponder, channel->Transponder());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::frequency, channel->Frequency());
tokenContainer->AddIntToken((int)eLeMenuChannelsIT::isEncrypted, channel->Ca());
tokenContainer->AddStringToken((int)eLeMenuChannelsST::name, channel->Name());
cString channelID = channel->GetChannelID().ToString();
@ -934,6 +936,7 @@ void cCeMenuChannels::SetTokenContainer(void) {
tokenContainer->DefineIntToken("{isCable}", (int)eCeMenuChannelsIT::isCable);
tokenContainer->DefineIntToken("{isSat}", (int)eCeMenuChannelsIT::isSat);
tokenContainer->DefineIntToken("{isTerr}", (int)eCeMenuChannelsIT::isTerr);
tokenContainer->DefineIntToken("{isEncrypted}", (int)eCeMenuChannelsIT::isEncrypted);
tokenContainer->DefineIntToken("{presenteventelapsed}", (int)eCeMenuChannelsIT::presenteventelapsed);
tokenContainer->DefineIntToken("{presenteventduration}", (int)eCeMenuChannelsIT::presenteventduration);
tokenContainer->DefineIntToken("{presenteventdurationhours}", (int)eCeMenuChannelsIT::presenteventdurationhours);
@ -969,6 +972,7 @@ bool cCeMenuChannels::Parse(bool forced) {
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::number, channel->Number());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::transponder, channel->Transponder());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::frequency, channel->Frequency());
tokenContainer->AddIntToken((int)eCeMenuChannelsIT::isEncrypted, channel->Ca());
tokenContainer->AddStringToken((int)eCeMenuChannelsST::name, channel->Name());
cString channelID = channel->GetChannelID().ToString();

8
skins/metrixhd/xmlfiles/displaymenuchannels.xml
View File

@ -2,7 +2,7 @@
<menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="16">
<listelement>
<!-- Background -->
<area x="1%" width="58%" layer="2">
<area x="1%" width="59%" layer="2">
<fill condition="not{current}" color="{clrTransparent}" />
<fill condition="{current}" color="{clrTransBlueLight}" />
<fill condition="{separator}" color="{clrSemiTransBlack}" />
@ -10,9 +10,13 @@
<area condition="not{separator}" x="1%" width="6%" layer="3">
<drawimage name="logo" imagetype="channellogo" path="{channelid}" x="0" width="100%" height="100%" valign="center" />
</area>
<areascroll condition="not{separator}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="7%" width="52%" layer="3">
<areascroll condition="not{separator}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="7%" width="47%" layer="3">
<drawtext name="menutext" x="20" valign="center" font="{light}" fontsize="95%" color="{clrWhite}" text="{number} {name} - {sourcedescription}, Transp. {transponder}" />
</areascroll>
<area condition="not{separator}" x="55%" width="5%" layer="3">
<drawimage condition="{isEncrypted}" imagetype="icon" path="ico_crypt_on" x="0" valign="center" width="{areaheight}*0.8*1.76" height="{areaheight}*0.8"/>
<drawimage condition="not{isEncrypted}" imagetype="icon" path="ico_crypt_off" x="0" valign="center" width="{areaheight}*0.8*1.76" height="{areaheight}*0.8"/>
</area>
<area condition="{separator}" x="7%" width="52%" layer="3">
<drawtext x="20" valign="center" font="{light}" fontsize="95%" color="{clrWhite}" text="{name}" />
</area>

2
skinskeleton/xmlfiles/displaymenuchannels.xml
View File

@ -15,6 +15,7 @@
{isCable} true if channel is cable channel
{isSat} true if channel is a satellite channel
{isTerr} true if channel is terrestrical
{isEncrypted} true if channel is encrypted
{presenteventtitle} title of present event on this channel
{presenteventstart} present event start time in hh::mm
{presenteventstop} present event event stop time in hh::mm
@ -42,6 +43,7 @@
{isCable} true if channel is cable channel
{isSat} true if channel is a satellite channel
{isTerr} true if channel is terrestrical
{isEncrypted} true if channel is encrypted
{presenteventtitle} title of present event on this channel
{presenteventstart} present event start time in hh::mm
{presenteventstop} present event stop time in hh::mm