diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2004-05-16 18:00:00 +0200 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2004-05-16 18:00:00 +0200 |
commit | c80a53ff6ea22aa14d1f9772b310b77ea0da7c42 (patch) | |
tree | c2c6d9dc5c939765abc61fb0f19de00f988aecc9 /themes.h | |
parent | 9384e56566f56e77d577319a42929e708936e7c7 (diff) | |
download | vdr-patch-lnbsharing-c80a53ff6ea22aa14d1f9772b310b77ea0da7c42.tar.gz vdr-patch-lnbsharing-c80a53ff6ea22aa14d1f9772b310b77ea0da7c42.tar.bz2 |
Version 1.3.7vdr-1.3.7
- Fixed a memory leak in thread handling when using NPTL (thanks to Jon Burgess).
- Fixed handling Setup.RecordDolbyDigital, which was broken since version 1.1.6.
- Fixed handling text lengths for itemized EPG texts (thanks to Marcel Wiesweg).
- Fixed the help for LSTE and LSTR (was broken in 1.3.6).
- Improved iso8859-7 fonts (thanks to Dimitrios Dimitrakos).
- Added some 3-letter language codes (thanks to Marcus Mönnig).
- Added language code handling to the subtitling descriptor in 'libsi' (thanks to
Pekka Virtanen).
- Moved several menu item classes from menu.c to menuitems.[hc] to make them
available for plugins.
- The epg2html.pl script now handles '|' in description texts.
- The new setup option "OSD/Use small font" can be used to control the use of
the small font (see MANUAL for details).
- Swapped osd.[hc] and osdbase.[hc] to have the virtual OSD base class named cOsd.
Plugins may need to adjust their #include statements.
- Colors are now given as AARRGGBB instead of AABBGGRR. The values are mapped to
the driver's (wrong) sequence in dvbosd.c (this should really be fixed in the
driver, together with the endian problem).
- The new OSD setup parameters "Left" and "Top" can be used to define the top left
corner of the OSD.
- The OSD size parameters are now in pixel (as opposed to formerly characters).
When reading a 'setup.conf' file from an older version of VDR, the OSDwidth
and OSDheight values will be converted to pixel automatically.
- The OSD is now fully device independent. See the comments in VDR/osd.h and the
description in PLUGINS.html for information on how a plugin can implement an OSD
display on arbitrary hardware.
- The OSD (actually its cBitmap class) can now handle XPM files. There are several
XPM files in the VDR/symbols directory which can be used by skins (some of these
have been taken from the "elchi" patch). See VDR/skinsttng.c for examples on how
to use these.
- Due to the changes in the OSD handling the DEBUG_OSD option for a textual OSD
has been dropped. There will be a plugin that implements a skin with this
functionality later.
- The entire OSD display can now be implemented via "skins". See VDR/skins.[hc],
VDR/skinclassic.[hc], VDR/skinsttng.[hc] and PLUGINS.html for information on how
a plugin can implement its own skin. By default VDR comes with a "Classic" skin
that implements the OSD display known from previous versions, and the new skin
named "ST:TNG Panels", which is also the default skin now. The actual skin can
be selected through "Setup/OSD/Skin".
- The colors used in a skin can now be configured using "themes". See PLUGINS.html
for information on how a skin can make use of themes, and man vdr(5) for the
structure of a theme file. The actual theme to use can be selected through
"Setup/OSD/Theme".
- Added Croatian language texts (thanks to Drazen Dupor).
NOTE: there is apparently a problem with the newly introduced iso8859-2 font,
because as soon as Setup/OSD/Language is set to Croatian (currently the last one
in the list) everything freezes and the vdr processes have to be killed with -9
and the driver needs to be reloaded. Maybe somebody else can find out what's
going wrong here...
- Added missing NULL checks when accessing sectionHandler in device.c (thanks to
Pekka Virtanen).
- Fixed setting the time from the DVB data stream (thanks to Helmut Auer for
pointing out a frequency/transponder handling mixup). This now also takes the
actual source (sat, cable etc.) into account. Please go into "Setup/EPG" and
set the "Set system time" and "Use time from transponder" parameters accordingly
(this is necessary even if you have already set them before!).
Diffstat (limited to 'themes.h')
-rw-r--r-- | themes.h | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/themes.h b/themes.h new file mode 100644 index 0000000..617f1d2 --- /dev/null +++ b/themes.h @@ -0,0 +1,82 @@ +/* + * themes.h: Color themes used by skins + * + * See the main source file 'vdr.c' for copyright information and + * how to reach the author. + * + * $Id: themes.h 1.1 2004/05/15 14:22:16 kls Exp $ + */ + +#ifndef __THEMES_H +#define __THEMES_H + +#include "i18n.h" +#include "osd.h" + +class cTheme { +public: + enum { MaxThemeColors = 128 }; +private: + char *name; + char *descriptions[I18nNumLanguages]; + char *colorNames[MaxThemeColors]; + tColor colorValues[MaxThemeColors]; + bool FileNameOk(const char *FileName, bool SetName = false); +public: + cTheme(void); + ///< Creates a new theme class. + ~cTheme(); + const char *Name(void) { return name; } + const char *Description(void); + ///< Returns a user visible, single line description of this theme. + ///< The actual text shouldn't be too long, so that it can be + ///< fully displayed in the Setup/OSD menu. + bool Load(const char *FileName, bool OnlyDescriptions = false); + ///< Loads the theme data from the given file. + bool Save(const char *FileName); + ///< Saves the theme data to the given file. + ///< FileName must be in the form "<skin>-<theme>.theme", where <skin> + ///< is the name of the skin this theme applies to, and <theme> is the + ///< actual theme name, which will be used to identify this theme in the + ///< 'setup.conf', and is normally not seen by the user. It should + ///< consist of only lowercase letters and digits. + int AddColor(const char *Name, tColor Color); + ///< Adds a color with the given Name to this theme, initializes it + ///< with Color and returns an index into the color array that can + ///< be used in a call to Color() later. The index returned from the + ///< first call to AddColor() is 0, and subsequent calls will return + ///< values that are incremented by 1 with every call. + ///< If a color entry with the given Name already exists, its value + ///< will be overwritten with Color and the returned index will be + ///< that of the existing entry. + tColor Color(int Subject); + ///< Returns the color for the given Subject. Subject must be one of + ///< the values returned by a previous call to AddColor(). + }; + +// A helper macro that simplifies defining theme colors. +#define THEME_CLR(Theme, Subject, Color) static const int Subject = Theme.AddColor(#Subject, Color) + +class cThemes { +private: + int numThemes; + char **names; + char **fileNames; + char **descriptions; + static char *themesDirectory; + void Clear(void); +public: + cThemes(void); + ~cThemes(); + bool Load(const char *SkinName); + int NumThemes(void) { return numThemes; } + const char *Name(int Index) { return Index < numThemes ? names[Index] : NULL; } + const char *FileName(int Index) { return Index < numThemes ? fileNames[Index] : NULL; } + const char * const *Descriptions(void) { return descriptions; } + int GetThemeIndex(const char *Description); + static void SetThemesDirectory(const char *ThemesDirectory); + static void Load(const char *SkinName, const char *ThemeName, cTheme *Theme); + static void Save(const char *SkinName, cTheme *Theme); + }; + +#endif //__THEMES_H |