added tokens {month}, {monthname} and {year} in displaymenutimers listitem and currentitem

5 files changed, 47 insertions, 0 deletions

diff --git a/HISTORY b/HISTORY
index 0693f0e..31d7e72 100644
--- a/HISTORY
+++ b/HISTORY
@@ -54,4 +54,5 @@ Version 0.0.3
 - fixed Bug that displaychannel was not shown after closing displaymenu with "backspace" (with active 
   menuorg plugin)
 - fixed Bug with menuselection Patch
+- added tokens {month}, {monthname} and {year} in displaymenutimers listitem and currentitem
 
diff --git a/skins/metrixhd/xmlfiles/displaymenutimers.xml b/skins/metrixhd/xmlfiles/displaymenutimers.xml
index d191172..8fb5856 100644
--- a/skins/metrixhd/xmlfiles/displaymenutimers.xml
+++ b/skins/metrixhd/xmlfiles/displaymenutimers.xml
@@ -7,6 +7,9 @@
         {timerstop}         End Time of Timer in hh::mm
         {day}               Day (numerical)
         {dayname}           Day, for repeating timers days where timer is active
+        {month}             Month (two digits)
+        {monthname}         Month, three letter abbrevation
+        {year}              Year (4 digits)
         {channelname}       Name of channel which is set for the timer
         {channelid}         ID of channel which is set for the timer (for dispalying channel logo)
         {channelnumber}     Number of channel which is set for the timer
@@ -42,6 +45,9 @@
         {timerstop}         End Time of Timer in hh::mm
         {day}               Day (numerical)
         {dayname}           Day, for repeating timers days where timer is active
+        {month}             Month (two digits)
+        {monthname}         Month, three letter abbrevation
+        {year}              Year (4 digits)
         {channelname}       Name of channel which is set for the timer
         {channelid}         ID of channel which is set for the timer (for dispalying channel logo)
         {channelnumber}     Number of channel which is set for the timer
diff --git a/skinskeleton/xmlfiles/displaymenutimers.xml b/skinskeleton/xmlfiles/displaymenutimers.xml
index 93b64fd..584ec73 100644
--- a/skinskeleton/xmlfiles/displaymenutimers.xml
+++ b/skinskeleton/xmlfiles/displaymenutimers.xml
@@ -7,6 +7,9 @@
         {timerstop}         End Time of Timer in hh::mm
         {day}               Day (numerical)
         {dayname}           Day, for repeating timers days where timer is active
+        {month}             Month (two digits)
+        {monthname}         Month, three letter abbrevation
+        {year}              Year (4 digits)
         {channelname}       Name of channel which is set for the timer
         {channelid}         ID of channel which is set for the timer (for dispalying channel logo)
         {channelnumber}     Number of channel which is set for the timer
@@ -33,6 +36,9 @@
         {timerstop}         End Time of Timer in hh::mm
         {day}               Day (numerical)
         {dayname}           Day, for repeating timers days where timer is active
+        {month}             Month (two digits)
+        {monthname}         Month, three letter abbrevation
+        {year}              Year (4 digits)#
         {channelname}       Name of channel which is set for the timer
         {channelid}         ID of channel which is set for the timer (for dispalying channel logo)
         {channelnumber}     Number of channel which is set for the timer
diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c
index 741c7d1..4044b4f 100644
--- a/views/displaymenuitemcurrentview.c
+++ b/views/displaymenuitemcurrentview.c
@@ -433,8 +433,25 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
         strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
         day = buffer;
     }
+
+    struct tm tm_r;
+    time_t timerDate = timer->Day();
+    localtime_r(&timerDate, &tm_r);
+    char buffer[4];
+    strftime(buffer, sizeof(buffer), "%m", &tm_r);
+    int month = atoi(buffer);
+    char buffer2[6];
+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);
+    string monthName = buffer2;
+    char buffer3[6];
+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);
+    int year = atoi(buffer3);
+
     stringTokens.insert(pair<string,string>("day", day));
     stringTokens.insert(pair<string,string>("dayname", dayName));
+    intTokens.insert(pair<string,int>("month", month));
+    stringTokens.insert(pair<string,string>("monthname", monthName));
+    intTokens.insert(pair<string,int>("year", year));
 
     const cChannel *channel = timer->Channel();
     if (channel) {
diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c
index 67fd641..0618363 100644
--- a/views/displaymenuitemview.c
+++ b/views/displaymenuitemview.c
@@ -537,8 +537,25 @@ void cDisplayMenuItemTimersView::SetTokens(void) {
         strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);

         day = buffer;

     }

+    

+    struct tm tm_r;

+    time_t timerDate = timer->Day();

+    localtime_r(&timerDate, &tm_r);

+    char buffer[4];

+    strftime(buffer, sizeof(buffer), "%m", &tm_r);

+    int month = atoi(buffer);

+    char buffer2[6];

+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);

+    string monthName = buffer2;

+    char buffer3[6];

+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);

+    int year = atoi(buffer3);

+

     stringTokens.insert(pair<string,string>("day", day));

     stringTokens.insert(pair<string,string>("dayname", dayName));

+    intTokens.insert(pair<string,int>("month", month));

+    stringTokens.insert(pair<string,string>("monthname", monthName));

+    intTokens.insert(pair<string,int>("year", year));

 

     const cChannel *channel = timer->Channel();

     if (channel) {