diff --git a/HISTORY b/HISTORY index 98c5807..07cfc82 100644 --- a/HISTORY +++ b/HISTORY @@ -328,3 +328,6 @@ Version 0.4.5 Version 0.4.6 +- added token {startsin} in displaymenuschedules + + diff --git a/skins/blackhole/xmlfiles/displaymenuschedules.xml b/skins/blackhole/xmlfiles/displaymenuschedules.xml index 5eca045..ae11f22 100644 --- a/skins/blackhole/xmlfiles/displaymenuschedules.xml +++ b/skins/blackhole/xmlfiles/displaymenuschedules.xml @@ -44,6 +44,7 @@ {year} year as number {running} true if event is currently running {elapsed} elapsed time of event, if not running 0 + {startsin} minutes till event starts, if running 0 {duration} duration of event {durationhours} duration, full hours {durationminutes} duration, rest of minutes diff --git a/skinskeleton/xmlfiles/displaymenuschedules.xml b/skinskeleton/xmlfiles/displaymenuschedules.xml index 58c579d..748cbee 100644 --- a/skinskeleton/xmlfiles/displaymenuschedules.xml +++ b/skinskeleton/xmlfiles/displaymenuschedules.xml @@ -30,6 +30,7 @@ {year} year as number {running} true if event is currently running {elapsed} elapsed time of event, if not running 0 + {startsin} minutes till event starts, if running 0 {duration} duration of event {durationhours} duration, full hours {durationminutes} duration, rest of minutes diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c index 6cfef9a..c2d0345 100644 --- a/views/displaymenuitemview.c +++ b/views/displaymenuitemview.c @@ -376,8 +376,10 @@ void cDisplayMenuItemSchedulesView::SetTokens(void) { intTokens.insert(pair("running", isRunning)); if (isRunning) { intTokens.insert(pair("elapsed", (now - event->StartTime())/60)); + intTokens.insert(pair("startsin", 0)); } else { intTokens.insert(pair("elapsed", 0)); + intTokens.insert(pair("startsin", (event->StartTime() - now)/60)); } intTokens.insert(pair("duration", event->Duration() / 60)); intTokens.insert(pair("durationhours", event->Duration() / 3600));