frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-10-03 11:26:07 +02:00
parent c03de9e15e
commit 4acbc0fd47
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -3883,3 +3883,4 @@ Video Disk Recorder Revision History
- Speeded up initial opening of the CAM menu. - Speeded up initial opening of the CAM menu.
- Fixed handling of menus with no selectable items. - Fixed handling of menus with no selectable items.
- The character 0x8A in CAM menu strings is now mapped to a real newline. - The character 0x8A in CAM menu strings is now mapped to a real newline.
- The 'sub-title' and 'bottom text' in the CAM menu can now consist of several lines.

21
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.371 2005/10/02 14:53:48 kls Exp $ * $Id: menu.c 1.372 2005/10/03 10:41:26 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1297,16 +1297,16 @@ cMenuCam::cMenuCam(cCiMenu *CiMenu)
SetTitle(*ciMenu->TitleText() ? ciMenu->TitleText() : "CAM"); SetTitle(*ciMenu->TitleText() ? ciMenu->TitleText() : "CAM");
dsyslog("CAM: '%s'", ciMenu->TitleText()); dsyslog("CAM: '%s'", ciMenu->TitleText());
if (*ciMenu->SubTitleText()) { if (*ciMenu->SubTitleText()) {
Add(new cOsdItem(ciMenu->SubTitleText(), osUnknown, false));
offset = 1;
dsyslog("CAM: '%s'", ciMenu->SubTitleText()); dsyslog("CAM: '%s'", ciMenu->SubTitleText());
AddMultiLineItem(ciMenu->SubTitleText());
offset = Count();
} }
for (int i = 0; i < ciMenu->NumEntries(); i++) { for (int i = 0; i < ciMenu->NumEntries(); i++) {
Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable())); Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
dsyslog("CAM: '%s'", ciMenu->Entry(i)); dsyslog("CAM: '%s'", ciMenu->Entry(i));
} }
if (*ciMenu->BottomText()) { if (*ciMenu->BottomText()) {
Add(new cOsdItem(ciMenu->BottomText(), osUnknown, false)); AddMultiLineItem(ciMenu->BottomText());
dsyslog("CAM: '%s'", ciMenu->BottomText()); dsyslog("CAM: '%s'", ciMenu->BottomText());
} }
Display(); Display();
@ -1319,6 +1319,19 @@ cMenuCam::~cMenuCam()
delete ciMenu; delete ciMenu;
} }
void cMenuCam::AddMultiLineItem(const char *s)
{
while (s && *s) {
const char *p = strchr(s, '\n');
int l = p ? p - s : strlen(s);
cOsdItem *item = new cOsdItem;
item->SetSelectable(false);
item->SetText(strndup(s, l), false);
Add(item);
s = p ? p + 1 : p;
}
}
eOSState cMenuCam::Select(void) eOSState cMenuCam::Select(void)
{ {
if (ciMenu->Selectable()) { if (ciMenu->Selectable()) {

3
menu.h
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.h 1.75 2005/10/02 09:59:30 kls Exp $ * $Id: menu.h 1.76 2005/10/03 10:39:08 kls Exp $
*/ */
#ifndef __MENU_H #ifndef __MENU_H
@ -121,6 +121,7 @@ private:
cCiMenu *ciMenu; cCiMenu *ciMenu;
bool selected; bool selected;
int offset; int offset;
void AddMultiLineItem(const char *s);
eOSState Select(void); eOSState Select(void);
public: public:
cMenuCam(cCiMenu *CiMenu); cMenuCam(cCiMenu *CiMenu);