From patchwork Tue Apr 11 19:05:36 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: "vdr@daliman.de" <vdr@daliman.de>
X-Patchwork-Id: 12251
Received: from natlemon.rzone.de ([81.169.145.170])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1FTO6H-0003oK-SE
	for vdr@linuxtv.org; Tue, 11 Apr 2006 21:00:29 +0200
Received: from [192.168.100.101] (Q72ec.q.strato-dslnet.de [89.53.114.236])
	(authenticated bits=0)
	by post.webmailer.de (8.13.6/8.13.6) with ESMTP id k3BJ0TUL005875
	for <vdr@linuxtv.org>; Tue, 11 Apr 2006 21:00:30 +0200 (MEST)
Message-ID: <443BFE00.5000206@daliman.de>
Date: Tue, 11 Apr 2006 21:05:36 +0200
From: "vdr@daliman.de" <vdr@daliman.de>
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050715)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: vdr@linuxtv.org
Subject: [vdr] NordlichtsEPG-8a-Plugin (DaLiMan)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Apr 2006 19:00:30 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 8819

Der gemailte "Patch" ist nicht komplett gewesen und somit auch nicht 
funktionsfähig,
daß kann man in der Antwortmail vom Martin nachlesen. Angefügt habe ich 
jetzt einen
funktionierenden Patch. Sorry.
Gruß, DaLiMan

The first "Patch" was incomplete. This ist the right stuff.
Greet, DaLiMan


--eMail1-------------------------------------------------------------------------------------------
vdr@daliman.de schrieb:

Sorry, but my english is not good enough to translate that.

Ein Fehler im NordlichtsEPG-8b-Plugin bewirkt daß die Beschriftung der 
roten Taste nicht
vorhanden ist, wenn im SetupMenü "Umschalten mit OK" gewählt wurde. Das 
Ändern einer
Codezeile in der Datei nordlichtsepg.c, ca. Zeile 157 " 
*if*(switchwithok)" korrigiert das.

SetHelp(next?tr("Button$Now"):NULL,"<<",">>",tr("Button$Info"));
muß in
SetHelp(next?tr("Button$Now"):tmp,"<<",">>",tr("Button$Info"));
geändert werden.

Gruß, DaLiMan

--eMail2---------------------------------------------------------------------------------------------
Hi,
jumping to the in the setup adjusted time with red doesn't work in 
alternative keymap mode, so it is pretty useless to label the red button 
with this time. Look at the README before complaining about an error 
that isn't one. Btw. is it not your task to give version numbers!
Greets
Martin

diff -Nur nordlichtsepg-0.8a/nordlichtsepg.c nordlichtsepg/nordlichtsepg.c
--- nordlichtsepg-0.8a/nordlichtsepg.c	2006-03-21 14:41:24.000000000 +0100
+++ nordlichtsepg/nordlichtsepg.c	2006-04-11 20:50:22.000000000 +0200
@@ -155,7 +155,8 @@
  SetTitle(next?*DayDateTime(t):tr("What's on now?"));
 
  if(switchwithok)
-  SetHelp(next?tr("Button$Now"):NULL,"<<",">>",tr("Button$Info"));
+//daliman   SetHelp(next?tr("Button$Now"):NULL,"<<",">>",tr("Button$Info"));
+  SetHelp(next?tr("Button$Now"):tmp,"<<",">>",tr("Button$Info"));
  else
   SetHelp(bookmark?tmp:NULL,"<<",">>",next?tr("Button$Now"):tr("Button$Switch"));
 
@@ -294,13 +295,22 @@
               Display();
               jumpto=1;
               break;
+//daliman
+//     case kRed: if(bookmark)
+//                 JumpTo(bookmark/100,bookmark%100);
+//                break;
+//daliman-ende
+
      case kRed: if(next)
                 {
                  next=false;
                  t=time(NULL);
                  LoadSchedules(0);
                 }
+		else if(bookmark)
+                  JumpTo(bookmark/100,bookmark%100);
                 break;
+
      case kGreen: next=true;
                   LoadSchedules(-1);
                   break;