Added brougs78-extensions (thanks to Andreas Brugger / references #39)

- added tokens for the next 3 timers:
  CurrentEventsTitle[123], CurrentEventsStartDateTime[123],
  CurrentEventsStopDateTime[123], CurrentEventsChannelNumber[123],
  CurrentEventsChannelName[123], CurrentEventsIsRecording[123]
- added audio- and video-tokens:
  PresentLanguageCode, PresentLanguageDescription, PresentVideoAR and
  implemented the missing code for the Language-token
- added tokens for replay:
  ReplayName, ReplayDateTime, ReplayShortText, ReplayDescription,
  ReplayLanguageCode, ReplayLanguageDescription, ReplayVideoAR
- additional recording-tokens:
  RecordingVideoAR, RecordingSize
- added a reset for scrolling text (configurable)
- added recording-tokens:
  RecordingLength, RecordingCuttedLength
- added tokens:
  OsdWidth, OsdHeight
- switched the search-order for the fonts to priorise the skin-folder
  (this avoids error-messages in the log)
- added the possibility to have a scrollbar in every menu - not fully
  implemented yet (to position in menu-lists is not necessarily correct,
  if there are more items with the same osd-text)
- added a configuration option for showing the scrollbar in the menus
- added token TimerConflicts using the service interface of the epgsearch
  plugin "Epgsearch-lastconflictinfo-v1.0"
- added a test-feature to search for reruns of a program and add the
  information to the extended epg-info (trigger DEVELOPMENT_FEATURES).
  This uses a service interface of the epgsearch plugin
  "Epgsearch-searchresults-v1.0"
- the extended epg-info and the recording-info are extended by AUX-Infos
  (configurable)
  there is also an option to strip known tags
- the tab-widths are scaled for taking into account that different TT-Fonts
  have a different width than the default font from VDR
- added tokens for signal-info:
  FrontendSTR, FrontendSNR, FrontendHasLock, FrontendHasSignal
- added token PresentEventID for EPG-images
- added tokens for recordings:
  RecordingFilename, RecordingPriority, RecordingLifetime
- set EditableWidth. This is important for plugins like 'rotor' or
  'extrecmenu'

3 files changed, 57 insertions, 6 deletions

diff --git a/xml/object.c b/xml/object.c
index 6ea0ab6..4a3beec 100644
--- a/xml/object.c
+++ b/xml/object.c
@@ -144,14 +144,13 @@ const cFont *cxObject::Font(void) const
 {
 	const cFont *font;
 
-	if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) 
-	        != NULL)
-		return font;
-	
 	if ((font = cText2SkinFont::Load(SkinPath() + "/" + mSkin->Name(), mFontFace, mFontSize, 
 	                                 mFontWidth)) != NULL)
 		return font;
-	
+
+	if ((font = cText2SkinFont::Load(SkinPath() + "/fonts", mFontFace, mFontSize, mFontWidth)) != NULL)
+		return font;
+
 	return cFont::GetFont(fontOsd);
 }
 
diff --git a/xml/string.c b/xml/string.c
index afc0c7a..3f671bd 100644
--- a/xml/string.c
+++ b/xml/string.c
@@ -11,7 +11,12 @@ static const char *Tokens[__COUNT_TOKEN__] = {
 	// Channel Display
 	"ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", 
 	"ChannelSource", "ChannelID", "PresentStartDateTime", "PresentVPSDateTime", 
+	"CurrentEventsTitle1", "CurrentEventsStartDateTime1", "CurrentEventsStopDateTime1", "CurrentEventsChannelNumber1", "CurrentEventsChannelName1", "CurrentEventsIsRecording1",
+	"CurrentEventsTitle2", "CurrentEventsStartDateTime2", "CurrentEventsStopDateTime2", "CurrentEventsChannelNumber2", "CurrentEventsChannelName2", "CurrentEventsIsRecording2",
+	"CurrentEventsTitle3", "CurrentEventsStartDateTime3", "CurrentEventsStopDateTime3", "CurrentEventsChannelNumber3", "CurrentEventsChannelName3", "CurrentEventsIsRecording3",
+	"TimerConflicts",
 	"PresentEndDateTime", "PresentDuration", "PresentProgress", "PresentRemaining",
+	"PresentLanguageCode", "PresentLanguageDescription", "PresentVideoAR", "PresentEventID",
 	"PresentTitle", "PresentShortText", "PresentDescription", "FollowingStartDateTime", 
 	"FollowingVPSDateTime", "FollowingEndDateTime", "FollowingDuration",
 	"FollowingTitle", "FollowingShortText", "FollowingDescription", "Language",
@@ -30,6 +35,8 @@ static const char *Tokens[__COUNT_TOKEN__] = {
 	
 	// Replay Display
 	"ReplayTitle", "ReplayPositionIndex", "ReplayDurationIndex", "ReplayPrompt", 
+	"ReplayName", "ReplayDateTime", "ReplayShortText", "ReplayDescription",
+	"ReplayLanguageCode", "ReplayLanguageDescription", "ReplayVideoAR",
 	"IsPlaying", "ReplayIsPlaying", "IsFastForward", "ReplayIsFastForward", "IsFastRewind", 
 	"ReplayIsFastRewind", "IsSlowForward", "ReplayIsSlowForward", "IsSlowRewind", 
 	"ReplayIsSlowRewind", "IsPausing", "ReplayIsPausing",
@@ -38,8 +45,10 @@ static const char *Tokens[__COUNT_TOKEN__] = {
 
 	// Menu Page
 	"MenuTitle", "MenuGroup", "IsMenuGroup", "MenuItem", "IsMenuItem", "MenuCurrent", 
-	"IsMenuCurrent", "MenuText", "RecordingName", "RecordingDateTime", "RecordingTitle",
+	"IsMenuCurrent", "MenuText", "RecordingName", "RecordingFilename", "RecordingDateTime", "RecordingTitle",
 	"RecordingShortText", "RecordingDescription", "RecordingLanguageCode",
+	"FrontendSTR", "FrontendSNR", "FrontendHasLock", "FrontendHasSignal", "RecordingPriority", "RecordingLifetime",
+	"RecordingVideoAR", "RecordingSize", "RecordingLength", "RecordingCuttedLength", "OsdWidth", "OsdHeight",
 	"RecordingLanguageDescription", "ButtonRed", "ButtonGreen", 
 	"ButtonYellow", "ButtonBlue", "CanScrollUp", "CanScrollDown"
 };
diff --git a/xml/string.h b/xml/string.h
index 7c3f30f..a459253 100644
--- a/xml/string.h
+++ b/xml/string.h
@@ -26,10 +26,33 @@ enum exToken {
 	// next 9 also in Menu
 	tPresentStartDateTime,
 	tPresentVPSDateTime,
+	tCurrentEventsTitle1,
+	tCurrentEventsStartDateTime1,
+	tCurrentEventsStopDateTime1,
+	tCurrentEventsChannelNumber1,
+	tCurrentEventsChannelName1,
+	tCurrentEventsIsRecording1,
+	tCurrentEventsTitle2,
+	tCurrentEventsStartDateTime2,
+	tCurrentEventsStopDateTime2,
+	tCurrentEventsChannelNumber2,
+	tCurrentEventsChannelName2,
+	tCurrentEventsIsRecording2,
+	tCurrentEventsTitle3,
+	tCurrentEventsStartDateTime3,
+	tCurrentEventsStopDateTime3,
+	tCurrentEventsChannelNumber3,
+	tCurrentEventsChannelName3,
+	tCurrentEventsIsRecording3,
+	tTimerConflicts,
 	tPresentEndDateTime,
 	tPresentDuration,
 	tPresentProgress,
 	tPresentRemaining,
+	tPresentLanguageCode,
+	tPresentLanguageDescription,
+	tPresentVideoAR,
+	tPresentEventID,
 	tPresentTitle,
 	tPresentShortText,
 	tPresentDescription,
@@ -85,6 +108,13 @@ enum exToken {
 	tReplayPositionIndex,
 	tReplayDurationIndex,
 	tReplayPrompt,
+	tReplayName,
+	tReplayDateTime,
+	tReplayShortText,
+	tReplayDescription,
+	tReplayLanguageCode,
+	tReplayLanguageDescription,
+	tReplayVideoAR,
 	tIsPlaying,
 	tReplayIsPlaying, // alias
 	tIsFastForward,
@@ -115,11 +145,24 @@ enum exToken {
 	tMenuText,
 	// Recordings Page
 	tRecordingName,
+	tRecordingFilename,
 	tRecordingDateTime,
 	tRecordingTitle,
 	tRecordingShortText,
 	tRecordingDescription,
 	tRecordingLanguageCode,
+	tFrontendSTR,
+	tFrontendSNR,
+	tFrontendHasLock,
+	tFrontendHasSignal,
+	tRecordingPriority,
+	tRecordingLifetime,
+	tRecordingVideoAR,
+	tRecordingSize,
+	tRecordingLength,
+	tRecordingCuttedLength,
+	tOsdWidth,
+	tOsdHeight,
 	tRecordingLanguageDescription,
 	// next four also in Channel and Replay display (if supported by vdr/plugin)
 	tButtonRed,