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

Adjusting column width for channel numbers in case there are more than 999 channels

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-03-29 10:50:20 +01:00
parent 2625c46232
commit d9b6236191
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1120,7 +1120,7 @@ Video Disk Recorder Revision History
exits. The 'runvdr' script can be used for this purpose. exits. The 'runvdr' script can be used for this purpose.
- Refined texts of the "Setup" menu. - Refined texts of the "Setup" menu.
2002-03-24: Version 1.0.0pre5 2002-03-29: Version 1.0.0pre5
- Fixed restoring CICAM setup values for a fourth DVB card. - Fixed restoring CICAM setup values for a fourth DVB card.
- Completed internationalization of OSD texts (thanks to Hannu Savolainen, - Completed internationalization of OSD texts (thanks to Hannu Savolainen,
@ -1139,3 +1139,5 @@ Video Disk Recorder Revision History
delimiter (thanks to Bernd Zierath for helping to debug this one). delimiter (thanks to Bernd Zierath for helping to debug this one).
- Added a manual page vdr(1). - Added a manual page vdr(1).
- New command command line option '-V' to display the VDR version. - New command command line option '-V' to display the VDR version.
- Adjusting column width for channel numbers in case there are more than 999
channels.

10
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.175 2002/03/23 15:17:14 kls Exp $ * $Id: menu.c 1.176 2002/03/29 10:49:22 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -21,6 +21,8 @@
#define MAXWAIT4EPGINFO 10 // seconds #define MAXWAIT4EPGINFO 10 // seconds
#define MODETIMEOUT 3 // seconds #define MODETIMEOUT 3 // seconds
#define CHNUMWIDTH (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^"; const char *FileNameChars = " aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789-.#~^";
// --- cMenuEditItem --------------------------------------------------------- // --- cMenuEditItem ---------------------------------------------------------
@ -780,7 +782,7 @@ public:
}; };
cMenuChannels::cMenuChannels(void) cMenuChannels::cMenuChannels(void)
:cOsdMenu(tr("Channels"), 4) :cOsdMenu(tr("Channels"), CHNUMWIDTH)
{ {
//TODO //TODO
int i = 0; int i = 0;
@ -1186,7 +1188,7 @@ public:
}; };
cMenuTimers::cMenuTimers(void) cMenuTimers::cMenuTimers(void)
:cOsdMenu(tr("Timers"), 2, 4, 10, 6, 6) :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
{ {
int i = 0; int i = 0;
cTimer *timer; cTimer *timer;
@ -1412,7 +1414,7 @@ static int CompareEventChannel(const void *p1, const void *p2)
} }
cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr) cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentChannelNr)
:cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), 4, 7, 6) :cOsdMenu(Now ? tr("What's on now?") : tr("What's on next?"), CHNUMWIDTH, 7, 6)
{ {
const cSchedule *Schedule = Schedules->First(); const cSchedule *Schedule = Schedules->First();
const cEventInfo **pArray = NULL; const cEventInfo **pArray = NULL;