summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2015-03-20 17:04:50 +0100
committerlouis <louis.braun@gmx.de>2015-03-20 17:04:50 +0100
commit9283569008ee654d4084c55ea042fb48218f06f3 (patch)
tree694559039bb4315e69833c54669dce16daa180b6
parent4d91408700a3920e19f193f3a6e8d7000f1b600f (diff)
downloadvdr-plugin-tvguideng-9283569008ee654d4084c55ea042fb48218f06f3.tar.gz
vdr-plugin-tvguideng-9283569008ee654d4084c55ea042fb48218f06f3.tar.bz2
completed tokens for time viewelement in detailed view
-rw-r--r--HISTORY1
-rw-r--r--detailview.c11
-rw-r--r--templates/plug-tvguideng-detail.xml8
3 files changed, 20 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index 693ff58..c431827 100644
--- a/HISTORY
+++ b/HISTORY
@@ -15,4 +15,5 @@ Version 0.0.2
- fixed translations
- added dedicated hor. and ver. viewelements for header,
footer and time
+- completed tokens for time viewelement in detailed view
diff --git a/detailview.c b/detailview.c
index 8292eb7..2853641 100644
--- a/detailview.c
+++ b/detailview.c
@@ -261,6 +261,11 @@ bool cDetailView::DrawTime(void) {
int hour = now->tm_hour;
int hourMinutes = hour%12 * 5 + min / 12;
+ char monthname[20];
+ char monthshort[10];
+ strftime(monthshort, sizeof(monthshort), "%b", now);
+ strftime(monthname, sizeof(monthname), "%B", now);
+
watch->Clear();
watch->ClearTokens();
watch->AddIntToken("sec", sec);
@@ -268,6 +273,12 @@ bool cDetailView::DrawTime(void) {
watch->AddIntToken("hour", hour);
watch->AddIntToken("hmins", hourMinutes);
watch->AddStringToken("time", *TimeString(t));
+ watch->AddStringToken("monthname", monthname);
+ watch->AddStringToken("monthnameshort", monthshort);
+ watch->AddStringToken("month", *cString::sprintf("%02d", now->tm_mon + 1));
+ watch->AddStringToken("dayleadingzero", *cString::sprintf("%02d", now->tm_mday));
+ watch->AddStringToken("dayname", *WeekDayNameFull(now->tm_wday));
+ watch->AddStringToken("daynameshort", *WeekDayName(now->tm_wday));
watch->Display();
lastSecond = sec;
diff --git a/templates/plug-tvguideng-detail.xml b/templates/plug-tvguideng-detail.xml
index 37d4af1..607c86c 100644
--- a/templates/plug-tvguideng-detail.xml
+++ b/templates/plug-tvguideng-detail.xml
@@ -44,6 +44,14 @@
{min} current minutes
{hour} current hours
{hmins} current "hourminutes" to display an hour hand
+ {day} day in digits
+ {dayleadingzero} day in digits with leading 0
+ {dayname} Full name of the day
+ {daynameshort} Short 3 char name of the day
+ {month} month in digits with leading 0
+ {monthname} Full name of the month
+ {monthnameshort} 3 letter abbrivation of month name
+ {year} year in yyyy
-->
<viewelement name="time">
</viewelement>