diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | graphlcd/skins/reelbox/reelbox.skin | 6 | ||||
| -rw-r--r-- | skinconfig.c | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -2,8 +2,8 @@ VDR Plugin 'graphlcd' Revision History ------------------------------------- 2021-02-04: -- [pbiering] add support for new feature: NumRecordings and ArrayRecordings -- [pbiering] extend reelbox.skin for using NumRecordings and ArrayRecordings (up to 3) +- [pbiering] add support for new feature: NumRecordings and ListRecordings +- [pbiering] extend reelbox.skin for using NumRecordings and ListRecordings (up to 3) - [pbiering] fix Wformat-truncation Wliteral-suffix. log levels 2021-01-24: Version 1.0.3 diff --git a/graphlcd/skins/reelbox/reelbox.skin b/graphlcd/skins/reelbox/reelbox.skin index 7d9b7a2..6b90de2 100644 --- a/graphlcd/skins/reelbox/reelbox.skin +++ b/graphlcd/skins/reelbox/reelbox.skin @@ -267,17 +267,17 @@ <block condition="ge({NumRecordings},1)"> <image x="0" y="#FollowingTitleY" color="#ColSymbol" path="#SymbolRecording"/> - <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,1)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ArrayRecordings:1}</text> + <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,1)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ListRecordings:1}</text> </block> <block condition="ge({NumRecordings},2)"> <image x="0" y="add(#FollowingTitleY,FontLineHeight('FontInfoSmall2'),1)" color="#ColSymbol" path="#SymbolRecording"/> - <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,FontLineHeight('FontInfoSmall2'),2)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ArrayRecordings:2}</text> + <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,FontLineHeight('FontInfoSmall2'),2)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ListRecordings:2}</text> </block> <block condition="ge({NumRecordings},3)"> <image x="0" y="add(#FollowingTitleY,mul(FontLineHeight('FontInfoSmall2'),2),2)" color="#ColSymbol" path="#SymbolRecording"/> - <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,mul(FontLineHeight('FontInfoSmall2'),2),3)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ArrayRecordings:3}</text> + <text x1="add(#SymbolW,2)" x2="-1" y="add(#FollowingTitleY,mul(FontLineHeight('FontInfoSmall2'),2),3)" height="FontLineHeight('FontInfoSmall2')" color="#ColRecText" align="left" font="FontInfoSmall2">{ListRecordings:3}</text> </block> </display> diff --git a/skinconfig.c b/skinconfig.c index d9fee5d..c0bb222 100644 --- a/skinconfig.c +++ b/skinconfig.c @@ -56,7 +56,7 @@ typedef enum _eTokenId tokPrivateRecordingStart, tokIsRecording, tokRecordings, - tokArrayRecordings, + tokListRecordings, tokNumRecordings, tokPrivateRecordingEnd, @@ -211,7 +211,7 @@ static const std::string Tokens[tokCountToken] = "privateRecordingStart", "IsRecording", "Recordings", - "ArrayRecordings", + "ListRecordings", "NumRecordings", "privateRecordingEnd", @@ -479,7 +479,7 @@ GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token) return mState->Recordings(Token.Attrib.Number, 0); return mState->Recordings(-1, 0); } - case tokArrayRecordings: + case tokListRecordings: { if (Token.Attrib.Type == GLCD::aNumber) return mState->Recordings(-1, Token.Attrib.Number); |