mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Version 1.5.8
- Added missing install-i18n to the install target in the Makefile (reported by Joachim Wilke). - Fixed a faulty comment in Make.config.template (reported by Marco Schlüßler). - Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott). - Moved the "all" target in plugin Makefiles before the "Implicit rules", so that a plain "make" will compile everything (suggested by Matthias Schwarzott). The "newplugin" script has been changed accordingly. Plugin authors may want to change their Makefiles, too. - Added DESTDIR and PREFIX handling to the Makefile (thanks to Matthias Schwarzott). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added internationalization to the "skincurses" plugin (thanks to Rolf Ahrenberg). - Checking the string for NULL in I18nTranslate(). - Updated the French OSD texts (thanks to Bruno Roussel). - Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch). - Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch). - Optimized cNitFilter::Process() (thanks to Tobias Bratfisch). - Reduced the number of time(NULL) calls in vdr.c's main loop to a single call (thanks to Tobias Bratfisch). - Changed cBitmap::DrawText() to always draw the background unless ColorBg is clrTransparent (thanks to Christoph Haubrich). - The "Setup/OSD/Language" menu now only shows those languages that actually have a locale (suggested by Anssi Hannula). - Now using setenv() instead of setlocale() to set the language for gettext() (suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using _nl_msg_cat_cntr). - When scanning the locale directory, VDR now explicitly looks for a file named vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the name of the plugin. The "newplugin" script has been changed accordingly, and plugin authors should change their Makefiles, too.
This commit is contained in:
16
osd.c
16
osd.c
@@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: osd.c 1.72 2007/08/12 11:33:17 kls Exp $
|
||||
* $Id: osd.c 1.73 2007/08/17 15:23:50 kls Exp $
|
||||
*/
|
||||
|
||||
#include "osd.h"
|
||||
@@ -449,13 +449,13 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
|
||||
int w = Font->Width(s);
|
||||
int h = Font->Height();
|
||||
int limit = 0;
|
||||
int cw = Width ? Width : w;
|
||||
int ch = Height ? Height : h;
|
||||
if (!Intersects(x, y, x + cw - 1, y + ch - 1))
|
||||
return;
|
||||
if (ColorBg != clrTransparent)
|
||||
DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
|
||||
if (Width || Height) {
|
||||
int cw = Width ? Width : w;
|
||||
int ch = Height ? Height : h;
|
||||
if (!Intersects(x, y, x + cw - 1, y + ch - 1))
|
||||
return;
|
||||
if (ColorBg != clrTransparent)
|
||||
DrawRectangle(x, y, x + cw - 1, y + ch - 1, ColorBg);
|
||||
limit = x + cw - x0;
|
||||
if (Width) {
|
||||
if ((Alignment & taLeft) != 0)
|
||||
@@ -482,8 +482,6 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (!Intersects(x, y, x + w - 1, y + h - 1))
|
||||
return;
|
||||
x -= x0;
|
||||
y -= y0;
|
||||
Font->DrawText(this, x, y, s, ColorFg, ColorBg, limit);
|
||||
|
Reference in New Issue
Block a user