From 74a5cc8e14900d48386e33cb576f154a6dd7e557 Mon Sep 17 00:00:00 2001
From: Andreas Brugger <brougs78@gmx.net>
Date: Sun, 19 Nov 2006 16:58:14 +0100
Subject: 2006-11-19: Version 1.1-cvs_ext-0.9
 (vdr-text2skin-1.1-cvs_ext-0.9.diff)

- 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 timer-conflicts are now checked with epgsearch (service-interface
  "Epgsearch-lastconflictinfo-v1.0", as it works more reliable and is
  supported by the plugin author
- 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
- changed token TimerConflict to TimerConflicts
- added token PresentEventID for EPG-images
- added tokens for recordings:
  RecordingFilename, RecordingPriority, RecordingLifetime
- removed Text2skin.diff from the rotor-plugin
---
 menu.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'menu.c')

diff --git a/menu.c b/menu.c
index e8f2306..3117022 100644
--- a/menu.c
+++ b/menu.c
@@ -9,14 +9,28 @@
 
 cText2SkinSetupPage::cText2SkinSetupPage(void) {
 	mData = Text2SkinSetup;
+	Setup();
+}
+
+void cText2SkinSetupPage::Setup(void) {
+	int current = Current();
+	Clear();
+	
 	Add(new cMenuEditBoolItem(tr("Show scrollbar in the menus"), &mData.MenuScrollbar, tr("no"), tr("yes")));
 	Add(new cMenuEditBoolItem(tr("Scrolling behaviour"), &mData.MarqueeLeftRight, tr("to the left"), tr("left and right")));
 	Add(new cMenuEditBoolItem(tr("Reset Marquee for new item"), &mData.MarqueeReset, tr("no"), tr("yes")));
+#if VDRVERSNUM >= 10344
+	Add(new cMenuEditBoolItem(tr("Show auxiliary infos of recordings"), &mData.ShowAux, tr("no"), tr("yes")));
+	if (mData.ShowAux) Add(new cMenuEditBoolItem(tr("   Extract known tags"), &mData.StripAux, tr("no"), tr("yes")));
+#endif
 #if VDRVERSNUM >= 10330
 	Add(new cMenuEditBoolItem(tr("Use 'timeline' to check timer-conflicts"), &mData.CheckTimerConflict, tr("no"), tr("yes")));
 #endif
 	Add(new cOsdItem(tr("Flush image cache"), osUser1));
 	Add(new cMenuEditIntItem(tr("Max. image cache size"), &mData.MaxCacheFill));
+	
+	SetCurrent(Get(current));
+	Display();
 }
 
 cText2SkinSetupPage::~cText2SkinSetupPage() {
@@ -26,6 +40,10 @@ void cText2SkinSetupPage::Store(void) {
 	SetupStore("MenuScrollbar", mData.MenuScrollbar);
 	SetupStore("MarqueeLeftRight", mData.MarqueeLeftRight);
 	SetupStore("MarqueeReset", mData.MarqueeReset);
+#if VDRVERSNUM >= 10344
+	SetupStore("ShowAux", mData.ShowAux);
+	SetupStore("StripAux", mData.StripAux);
+#endif
 #if VDRVERSNUM >= 10330
 	SetupStore("CheckTimerConflict", mData.CheckTimerConflict);
 #endif
@@ -34,6 +52,8 @@ void cText2SkinSetupPage::Store(void) {
 }
 
 eOSState cText2SkinSetupPage::ProcessKey(eKeys Key) {
+	int oldShowAux = mData.ShowAux;
+	
 	eOSState state = cMenuSetupPage::ProcessKey(Key);
 	if (state == osUser1) {
 		Skins.Message(mtInfo, tr("Flushing image cache..."));
@@ -41,6 +61,9 @@ eOSState cText2SkinSetupPage::ProcessKey(eKeys Key) {
 		Skins.Message(mtInfo, NULL);
 		return osContinue;
 	}
+	
+	if (mData.ShowAux != oldShowAux) Setup();
+	
 	return state;
 }
 
-- 
cgit v1.2.3