From 4e8dedb7ad04f1e95d718be803c60af5eb329b69 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 6 Apr 2012 12:35:39 +0200 Subject: [PATCH] Now limiting the number of characters of a channel's (short) name to 16 in the schedules menus --- HISTORY | 5 ++++- menu.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 0dfa0c45..e4ddf093 100644 --- a/HISTORY +++ b/HISTORY @@ -7052,10 +7052,13 @@ Video Disk Recorder Revision History - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank Schmirler). -2012-04-04: Version 1.7.28 +2012-04-06: Version 1.7.28 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed getting the maximum short channel name length in case there are no short names at all (reported by Derek Kelly). - The new function cDevice::DeviceType() returns a string identifying the type of the given device. +- Now limiting the number of characters of a channel's (short) name to 16 in the + schedules menus, to keep that column from getting overly wide in case there is + a channel with a very long name that has no short name. diff --git a/menu.c b/menu.c index ad1cac3c..b8df22f9 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.45 2012/03/13 13:14:38 kls Exp $ + * $Id: menu.c 2.46 2012/04/06 12:33:40 kls Exp $ */ #include "menu.h" @@ -47,9 +47,10 @@ #define CAMRESPONSETIMEOUT 5 // seconds to wait for a response from a CAM #define MINFREEDISK 300 // minimum free disk space (in MB) required to start recording #define NODISKSPACEDELTA 300 // seconds between "Not enough disk space to start recording!" messages +#define MAXCHNAMWIDTH 16 // maximum number of characters of channels' short names shown in schedules menus #define CHNUMWIDTH (numdigits(Channels.MaxNumber()) + 1) -#define CHNAMWIDTH (Channels.MaxShortChannelNameLength() + 1) +#define CHNAMWIDTH (min(MAXCHNAMWIDTH, Channels.MaxShortChannelNameLength() + 1)) // --- cFreeDiskSpace --------------------------------------------------------