The "Mark/Move" function in the "Channels" menu now also works in the non-numeric sort modes

This commit is contained in:
Klaus Schmidinger 2006-01-05 15:11:04 +01:00
parent 4ddd5fa944
commit 01bbd53fa1
2 changed files with 5 additions and 3 deletions

View File

@ -4100,3 +4100,5 @@ Video Disk Recorder Revision History
- In the "Channels" menu the numeric keys now position the cursor to the channel - In the "Channels" menu the numeric keys now position the cursor to the channel
with the given number (see MANUAL, section "Remote Control Keys", note (3) for with the given number (see MANUAL, section "Remote Control Keys", note (3) for
details). details).
- The "Mark/Move" function in the "Channels" menu now also works in the non-numeric
sort modes.

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.385 2006/01/05 13:26:37 kls Exp $ * $Id: menu.c 1.386 2006/01/05 14:02:45 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -434,7 +434,7 @@ void cMenuChannels::Setup(void)
if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber) if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
Sort(); Sort();
SetCurrent(currentItem); SetCurrent(currentItem);
SetHelp(tr("Edit"), tr("New"), tr("Delete"), cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber ? tr("Mark") : NULL); SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
Display(); Display();
} }
@ -567,7 +567,7 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
case kRed: return Edit(); case kRed: return Edit();
case kGreen: return New(); case kGreen: return New();
case kYellow: return Delete(); case kYellow: return Delete();
case kBlue: if (!HasSubMenu() && cMenuChannelItem::SortMode() == cMenuChannelItem::csmNumber) case kBlue: if (!HasSubMenu())
Mark(); Mark();
break; break;
default: break; default: break;