mirror of
				https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
				synced 2023-10-19 15:58:31 +00:00 
			
		
		
		
	added tokens {month}, {monthname} and {year} in displaymenutimers listitem and currentitem
This commit is contained in:
		
							
								
								
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								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 | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) { | ||||
|   | ||||
| @@ -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) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user