diff options
author | louis <louis.braun@gmx.de> | 2015-01-16 11:25:20 +0100 |
---|---|---|
committer | louis <louis.braun@gmx.de> | 2015-01-16 11:25:20 +0100 |
commit | c05b8413f02e86436338dee0d5dd3c0e7e36473f (patch) | |
tree | 83c867a4f9de79ac96c3f1a7d356ca9f9d2e0911 | |
parent | 5703aee57bf92781d4669bca6f7bde54ead281f6 (diff) | |
download | vdr-plugin-skindesigner-c05b8413f02e86436338dee0d5dd3c0e7e36473f.tar.gz vdr-plugin-skindesigner-c05b8413f02e86436338dee0d5dd3c0e7e36473f.tar.bz2 |
added {epgname} token for recordings in currentview and detailedview
-rw-r--r-- | HISTORY | 3 | ||||
-rw-r--r-- | skins/blackhole/xmlfiles/displaymenudetailrecording.xml | 17 | ||||
-rw-r--r-- | skins/blackhole/xmlfiles/displaymenurecordings.xml | 7 | ||||
-rw-r--r-- | skins/metrixhd/xmlfiles/displaymenudetailrecording.xml | 8 | ||||
-rw-r--r-- | skins/metrixhd/xmlfiles/displaymenurecordings.xml | 5 | ||||
-rw-r--r-- | skins/nopacity/xmlfiles/displaymenudetailrecording.xml | 8 | ||||
-rw-r--r-- | skins/nopacity/xmlfiles/displaymenurecordings.xml | 5 | ||||
-rw-r--r-- | skinskeleton/xmlfiles/displaymenudetailrecording.xml | 7 | ||||
-rw-r--r-- | skinskeleton/xmlfiles/displaymenurecordings.xml | 6 | ||||
-rw-r--r-- | views/displaymenudetailview.c | 4 | ||||
-rw-r--r-- | views/displaymenuitemcurrentview.c | 1 |
11 files changed, 46 insertions, 25 deletions
@@ -149,4 +149,5 @@ Version 0.1.2 - some fixes for plugins which use skindesigner template interface Version 0.1.3 -
\ No newline at end of file + +- added {epgname} token for recordings in currentview and detailedview.
\ No newline at end of file diff --git a/skins/blackhole/xmlfiles/displaymenudetailrecording.xml b/skins/blackhole/xmlfiles/displaymenudetailrecording.xml index 0c6e3d3..ee663d5 100644 --- a/skins/blackhole/xmlfiles/displaymenudetailrecording.xml +++ b/skins/blackhole/xmlfiles/displaymenudetailrecording.xml @@ -10,7 +10,8 @@ </scrollbar> <!-- Available Variables in detailheader elements: - {name} name of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {date} date of recording in dd.mm.yy {time} time of current recording in hh:mm @@ -45,18 +46,18 @@ </area> <area condition="not{ismovie}++not{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3"> <drawtext x="3%" y="15%" font="{regular}" fontsize="15%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> - <drawtext x="3%" y="30%" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{name}" /> + <drawtext x="3%" y="30%" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{epgname}" /> <drawtext x="3%" y="60%" width="96%" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" /> </area> <area condition="{isseries}" x="55%" y="52%" width="43%" height="20%" layer="3"> <drawimage name="banner" imagetype="image" path="{bannerpath}" align="center" y="1%" width="70%" height="{areawidth} * 0.7 * {bannerheight} / {bannerwidth}"/> <drawtext name="datetime" x="3%" y="{posy(banner)} + {height(banner)}" font="{regular}" fontsize="15%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> - <drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{name} - {shorttext}" /> + <drawtext x="3%" y="{posy(datetime)} + {height(datetime)}" width="96%" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{epgname} - {shorttext}" /> </area> <area condition="{ismovie}" x="55%" y="52%" width="43%" height="20%" layer="3"> <drawimage name="poster" imagetype="image" path="{posterpath}" x="1%" valign="center" width="{areaheight} * {posterwidth} / {posterheight}" height="{areaheight}-20"/> <drawtext x="{posx(poster)} + {width(poster)} + 10" y="15%" font="{regular}" fontsize="15%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> - <drawtext x="{posx(poster)} + {width(poster)} + 10" y="30%" width="{areawidth} - {posx(poster)} - {width(poster)} - 20" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{name}" /> + <drawtext x="{posx(poster)} + {width(poster)} + 10" y="30%" width="{areawidth} - {posx(poster)} - {width(poster)} - 20" font="{semibold}" fontsize="30%" color="{clrWhite}" text="{epgname}" /> <drawtext x="{posx(poster)} + {width(poster)} + 10" y="60%" width="{areawidth} - {posx(poster)} - {width(poster)} - 20" font="{regular}" fontsize="20%" color="{clrWhite}" text="{shorttext}" /> </area> <area x="56%" y="72%" width="41%" height="17%" layer="2"> @@ -64,7 +65,8 @@ </area> </detailheader> <!-- Available Variables in tab elements: - {name} title of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {description} description of recording {date} date of recording in dd.mm.yy @@ -78,6 +80,7 @@ {durationevent} duration of corresponding event in minutes {durationeventhours} event duration, full hours {durationeventminutes} event duration, rest of minutes + {cutted} true if recording is cutted {recordingsize} size of recording (automatically in GB / MB) {recordingsizecutted} size of cutted recording (automatically in GB / MB) @@ -191,8 +194,8 @@ <!-- just define as many tabs as needed --> <tab name="Info" x="2%" y="11%" width="48%" height="78%" layer="3" scrollheight="{areaheight}/4"> <drawtext x="0" y="0" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> - <drawtext x="0" y="6%" font="{semibold}" fontsize="9%" color="{clrWhite}" text="{name}" /> - <drawtext x="0" y="14%" font="{regular}" fontsize="7%" color="{clrWhite}" text="{shorttext}" /> + <drawtext x="0" y="6%" width="100%" font="{semibold}" fontsize="9%" color="{clrWhite}" text="{epgname}" /> + <drawtext x="0" y="14%" width="100%" font="{regular}" fontsize="7%" color="{clrWhite}" text="{shorttext}" /> <drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="24%" width="96%" font="{regular}" fontsize="5%" color="{clrWhite}" text="{description}" /> <drawimage condition="{isseries}" name="seriesposter" imagetype="image" path="{seriesposter1path}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seriesposter1height} / {seriesposter1width}"/> <drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.7" y="20%" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}" /> diff --git a/skins/blackhole/xmlfiles/displaymenurecordings.xml b/skins/blackhole/xmlfiles/displaymenurecordings.xml index ed00f51..16c1bf3 100644 --- a/skins/blackhole/xmlfiles/displaymenurecordings.xml +++ b/skins/blackhole/xmlfiles/displaymenurecordings.xml @@ -67,7 +67,8 @@ {menuitemy} y position of according menu item {menuitemwidth} width of according menu item {menuitemheight} height of according menu item - {name} Name of recording + {name} Real Name of recording (Name of Recording Folder) + {epgname} Name of recording (Name from EPG) {shorttext} Short Text of recording {description} Descrption of recording {date} Date of recording @@ -100,7 +101,7 @@ </area> <areascroll condition="not{folder}++not{hasposter}" orientation="vertical" mode="forthandback" delay="1000" scrollspeed="medium" x="56%" y="53%" width="43%" height="46%" layer="3"> <drawtext x="0" y="0" font="{semibold}" width="100%" fontsize="10%" color="{clrWhite}" text="{date} - {time}, {duration} min" /> - <drawtext x="0" y="10%" font="{semibold}" width="100%" fontsize="12%" color="{clrWhite}" text="{name}" /> + <drawtext x="0" y="10%" font="{semibold}" width="100%" fontsize="12%" color="{clrWhite}" text="{epgname}" /> <drawtextbox name="shorttext" x="0" y="21%" width="100%" font="{regular}" fontsize="9%" color="{clrWhite}" text="{shorttext}" /> <drawtextbox x="0" y="{posy(shorttext)} + {height(shorttext)}" width="100%" font="{regular}" fontsize="8%" color="{clrWhite}" text="{description}" /> </areascroll> @@ -109,7 +110,7 @@ </area> <areascroll condition="not{folder}++{hasposter}" orientation="vertical" mode="forthandback" delay="1000" scrollspeed="medium" x="72%" y="53%" width="27%" height="46%" layer="3"> <drawtext x="0" y="0" font="{semibold}" width="100%" fontsize="10%" color="{clrWhite}" text="{date} - {time}, {duration} min" /> - <drawtext x="0" y="10%" font="{semibold}" width="100%" fontsize="12%" color="{clrWhite}" text="{name}" /> + <drawtext x="0" y="10%" font="{semibold}" width="100%" fontsize="12%" color="{clrWhite}" text="{epgname}" /> <drawtextbox name="shorttext" x="0" y="21%" width="100%" font="{regular}" fontsize="9%" color="{clrWhite}" text="{shorttext}" /> <drawtextbox x="0" y="{posy(shorttext)} + {height(shorttext)}" width="100%" font="{regular}" fontsize="8%" color="{clrWhite}" text="{description}" /> </areascroll> diff --git a/skins/metrixhd/xmlfiles/displaymenudetailrecording.xml b/skins/metrixhd/xmlfiles/displaymenudetailrecording.xml index 815014a..47f096d 100644 --- a/skins/metrixhd/xmlfiles/displaymenudetailrecording.xml +++ b/skins/metrixhd/xmlfiles/displaymenudetailrecording.xml @@ -86,7 +86,8 @@ </area> </colorbuttons> <!-- Available Variables in detailheader elements: - {name} name of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {date} date of recording in dd.mm.yy {time} time of current recording in hh:mm @@ -118,7 +119,7 @@ <drawimage condition="{ismovie}++{posteravailable}++not{recimgavailable}" imagetype="image" path="{posterpath}" x="{areawidth} - {areaheight}*8/10" valign="center" width="{areaheight}*8 / 10 * {posterheight} / {posterwidth}" height="{areaheight}*8 / 10"/> <drawimage condition="{recimgavailable}" imagetype="image" path="{recimgpath}" x="{areawidth} - {areaheight}*8/10 * 174 / 130" valign="center" width="{areaheight}*8/10 * 174 / 130" height="{areaheight}*8 / 10"/> - <drawtext name="title" x="20" valign="center" font="{semibold}" fontsize="35%" color="{clrWhite}" text="{name}" /> + <drawtext name="title" x="20" valign="center" font="{semibold}" fontsize="35%" color="{clrWhite}" text="{epgname}" /> <drawtext name="datetime" x="20" y="{posy(title)} - {height(datetime)}" font="{light}" fontsize="25%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> <drawtext name="shorttext" x="20" y="{posy(title)} + {height(title)}" font="{light}" fontsize="25%" color="{clrWhite}" text="{shorttext}" /> </area> @@ -135,7 +136,8 @@ </area> </scrollbar> <!-- Available Variables in tab elements: - {name} title of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {description} description of recording {date} date of recording in dd.mm.yy diff --git a/skins/metrixhd/xmlfiles/displaymenurecordings.xml b/skins/metrixhd/xmlfiles/displaymenurecordings.xml index 1acad74..f0bf9aa 100644 --- a/skins/metrixhd/xmlfiles/displaymenurecordings.xml +++ b/skins/metrixhd/xmlfiles/displaymenurecordings.xml @@ -48,7 +48,8 @@ </listelement> <!-- additional element which is drawn for current element --> <!-- Available Variables channels menu currentelement: - {name} Name of recording + {name} Real Name of recording (Name of Recording Folder) + {epgname} Name of recording (Name from EPG) {shorttext} Short Text of recording {description} Descrption of recording {date} Date of recording @@ -75,7 +76,7 @@ <currentelement delay="500" fadetime="0"> <area x="63%" y="0" width="36%" height="100%" layer="2"> <!-- header --> - <drawtext name="title" x="1%" y="0" width="98%" font="{semibold}" fontsize="8%" color="{clrWhite}" text="{name}" /> + <drawtext name="title" x="1%" y="0" width="98%" font="{semibold}" fontsize="8%" color="{clrWhite}" text="{epgname}" /> <drawtext name="shorttext" x="1%" y="{height(title)}" width="98%" font="{semibold}" fontsize="6%" color="{clrWhite}" text="{shorttext}" /> <drawtext name="datetime" x="1%" y="{posy(shorttext)} + {height(shorttext)}" font="{light}" fontsize="5%" color="{clrWhite}" text="{date} {time}, {duration} min" /> <!-- scraper poster --> diff --git a/skins/nopacity/xmlfiles/displaymenudetailrecording.xml b/skins/nopacity/xmlfiles/displaymenudetailrecording.xml index 61694d1..9ebf380 100644 --- a/skins/nopacity/xmlfiles/displaymenudetailrecording.xml +++ b/skins/nopacity/xmlfiles/displaymenudetailrecording.xml @@ -16,7 +16,8 @@ </area> </scrollbar> <!-- Available Variables in detailheader elements: - {name} name of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {date} date of recording in dd.mm.yy {time} time of current event in hh:mm @@ -43,13 +44,14 @@ <drawimage condition="{isseries}++{banneravailable}++not{recimgavailable}" imagetype="image" path="{bannerpath}" x="{areawidth} - {areawidth}/3 - 10" valign="center" width="{areawidth}/3" height="{areawidth}/3 * {bannerheight} / {bannerwidth}"/> <drawimage condition="{ismovie}++{posteravailable}++not{recimgavailable}" imagetype="image" path="{posterpath}" x="{areawidth} - {areaheight}*8/10" valign="center" width="{areaheight}*8 / 10 * {posterheight} / {posterwidth}" height="{areaheight}*8 / 10"/> <drawimage condition="{recimgavailable}" imagetype="image" path="{recimgpath}" x="{areawidth} - {areaheight}*8/10 * 174 / 130" valign="center" width="{areaheight}*8/10 * 174 / 130" height="{areaheight}*8 / 10"/> - <drawtext name="title" x="20" valign="center" font="{vdrOsd}" fontsize="35%" color="{clrWhite}" text="{name}" /> + <drawtext name="title" x="20" valign="center" font="{vdrOsd}" fontsize="35%" color="{clrWhite}" text="{epgname}" /> <drawtext name="datetime" x="20" y="{posy(title)} - {height(datetime)}" font="{vdrOsd}" fontsize="25%" color="{clrWhite}" text="{date} {time} ({duration} mins)" /> <drawtext name="shorttext" x="20" y="{posy(title)} + {height(title)}" font="{vdrOsd}" fontsize="25%" color="{clrWhite}" text="{shorttext}" /> </area> </detailheader> <!-- Available Variables in tab elements: - {name} title of recording + {name} full name of recording (including folders) + {epgname} Name of recording (Name from EPG) {shorttext} shorttext of recording {description} description of recording {date} date of recording in dd.mm.yy diff --git a/skins/nopacity/xmlfiles/displaymenurecordings.xml b/skins/nopacity/xmlfiles/displaymenurecordings.xml index 274f909..4998958 100644 --- a/skins/nopacity/xmlfiles/displaymenurecordings.xml +++ b/skins/nopacity/xmlfiles/displaymenurecordings.xml @@ -57,7 +57,8 @@ </listelement> <!-- additional element which is drawn for current element --> <!-- Available Variables channels menu currentelement: - {name} Name of recording + {name} Real Name of recording (Name of Recording Folder) + {epgname} Name of recording (Name from EPG) {shorttext} Short Text of recording {description} Descrption of recording {date} Date of recording @@ -78,7 +79,7 @@ <area x="32%" y="2%" width="67%" height="96%" layer="2"> <fill color="{clrTransBlack}" /> <!-- header --> - <drawtext name="title" x="1%" y="0" width="98%" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{name}" /> + <drawtext name="title" x="1%" y="0" width="98%" font="{vdrOsd}" fontsize="8%" color="{clrWhite}" text="{epgname}" /> <drawtext name="shorttext" x="1%" y="{height(title)}" width="98%" font="{vdrOsd}" fontsize="6%" color="{clrWhite}" text="{shorttext}" /> <drawtext name="datetime" x="1%" y="{posy(shorttext)} + {height(shorttext)}" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{date} {time}, {duration} min" /> <!-- scraper poster --> diff --git a/skinskeleton/xmlfiles/displaymenudetailrecording.xml b/skinskeleton/xmlfiles/displaymenudetailrecording.xml index 23d1417..94f1303 100644 --- a/skinskeleton/xmlfiles/displaymenudetailrecording.xml +++ b/skinskeleton/xmlfiles/displaymenudetailrecording.xml @@ -1,6 +1,7 @@ <menudetailedrecording x="0" y="0" width="100%" height="100%" fadetime="0"> <!-- Available Variables in detailheader elements: - {name} name of recording + {name} full name of recording (including folders) + {epgname} name of recording (name from EPG) {shorttext} shorttext of recording {date} date of recording in dd.mm.yy {time} time of current recording in hh:mm @@ -32,7 +33,8 @@ <detailheader> </detailheader> <!-- Available Variables in tab elements: - {name} title of recording + {name} full name of recording (including folders) + {epgname} name of recording (name from EPG) {shorttext} shorttext of recording {description} description of recording {date} date of recording in dd.mm.yy @@ -46,6 +48,7 @@ {durationevent} duration of corresponding event in minutes {durationeventhours} event duration, full hours {durationeventminutes} event duration, rest of minutes + {cutted} true if recording is cutted {recordingsize} size of recording (automatically in GB / MB) {recordingsizecutted} size of cutted recording (automatically in GB / MB) diff --git a/skinskeleton/xmlfiles/displaymenurecordings.xml b/skinskeleton/xmlfiles/displaymenurecordings.xml index cd57e78..3e66746 100644 --- a/skinskeleton/xmlfiles/displaymenurecordings.xml +++ b/skinskeleton/xmlfiles/displaymenurecordings.xml @@ -2,7 +2,8 @@ <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16"> <!-- Available Variables recordings menu listelement: {nummenuitem} number of item in list, starts with 1 - {name} Name of recording + {name} Real Name of recording (Name of Recording Folder) + {epgname} Name of recording (Name from EPG) {date} Date of recording {time} Time of recording {daynumeric} day as number @@ -33,7 +34,8 @@ {menuitemy} y position of according menu item {menuitemwidth} width of according menu item {menuitemheight} height of according menu item - {name} Name of recording + {name} Real Name of recording (Name of Recording Folder) + {epgname} Name of recording (Name from EPG) {shorttext} Short Text of recording {description} Descrption of recording {date} Date of recording diff --git a/views/displaymenudetailview.c b/views/displaymenudetailview.c index 81040ff..80caff7 100644 --- a/views/displaymenudetailview.c +++ b/views/displaymenudetailview.c @@ -161,9 +161,11 @@ void cDisplayMenuDetailView::SetTokens(void) { } else if (recording) { string name = recording->Name() ? recording->Name() : ""; stringTokens.insert(pair<string,string>("name", name)); + intTokens.insert(pair<string,int>("cutted", recording->IsEdited())); const cRecordingInfo *info = recording->Info(); if (info) { + stringTokens.insert(pair<string,string>("epgname", info->Title() ? info->Title() : name)); stringTokens.insert(pair<string,string>("shorttext", info->ShortText() ? info->ShortText() : "")); stringTokens.insert(pair<string,string>("description", info->Description() ? info->Description() : "")); const cEvent *event = info->GetEvent(); @@ -193,6 +195,7 @@ void cDisplayMenuDetailView::SetTokens(void) { stringTokens.insert(pair<string,string>("durationeventminutes", *cString::sprintf("%.2d", duration%60))); } } else { + stringTokens.insert(pair<string,string>("epgname", "")); stringTokens.insert(pair<string,string>("shorttext", "")); stringTokens.insert(pair<string,string>("description", "")); int recDuration = recording->LengthInSeconds(); @@ -713,6 +716,7 @@ void cDisplayMenuDetailView::DrawHeader(void) { const cRecordingInfo *info = recording->Info(); if (info) { + headerStringTokens.insert(pair<string,string>("epgname", info->Title() ? info->Title() : name)); headerStringTokens.insert(pair<string,string>("shorttext", info->ShortText() ? info->ShortText() : "")); const cEvent *event = info->GetEvent(); if (event) { diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c index b60d4ef..4f1994b 100644 --- a/views/displaymenuitemcurrentview.c +++ b/views/displaymenuitemcurrentview.c @@ -622,6 +622,7 @@ void cDisplayMenuItemCurrentRecordingView::Render(void) { } intTokens.insert(pair<string,int>("extrecinfoavailable", extRecinfoAvailable)); + stringTokens.insert(pair<string,string>("epgname", info->Title() ? info->Title() : buffer)); stringTokens.insert(pair<string,string>("shorttext", info->ShortText() ? info->ShortText() : "")); stringTokens.insert(pair<string,string>("description", info->Description() ? info->Description() : "")); |