2009-04-25: Version 0.1.0v0.1.0

- Fixed: Calculating width of events' start times in channel info OSD (Reported by tomglx @vdr-poprtal.de).
- Changed: pause scrolling when text has scrolled all to the left in scroll behaviour "to the left" (Reported by Andreas Brugger).
- Reworked: (simplified) font loading/caching.
- Updated Italian translation (Provided by Diego Pierotto).
- Removed: ENABLE_COPYFONT define.
- Changed: Reduced number of font recreations (Reported by balta @vdr-portal.de).
- Added: more CA systems to text mappings in channel info OSD (Submitted by free-x @vdr-portal.de).
- Added: symbol in channel info OSD if current channel has subtitles.
- Changed: background colors for the DarkBlue theme (Submitted by zulu @vdr-portal.de).
- Added: New option "Show CA system as text".
- Changed: Reduced number of locks while drawing to OSD which increases display speed especially in menu OSD.
- Added: show signal strength and signal-to-noise ratio in channel info OSD (can be disabled by setting SKINENIGMA_DISABLE_SIGNALINFO to 1).
- Fixed: compiler error with certain gcc versions (Reported by C-3PO @ vdr-portal.de).
- Changed: smooth scrolling text (based on skinelchi by Christoph Haubrich <christoph.haubrich (AT) web.de>).
- Removed: SKINENIGMA_DISABLE_ANIMATED_TEXT define.
- Changed: Replace "/" by "~" in channel logo names.
- Added: new setting "Show scrollbar in menu".
- Added: Override VDR's SetTabs() to adopt column widths in menu OSD to selected font size.
- Added: Support subtitle tracks in tracks OSD: logo will only be shown if icons/subtitle/subtitle.xpm exists.
- Fixed: missing logo in tracks OSD while using single area.
- Minor bugfixes and enhancements.
- Requires at least VDR v1.6.0.

1 files changed, 87 insertions, 122 deletions

diff --git a/skinenigmang.c b/skinenigmang.c
index 000578e..c623f5c 100644
--- a/skinenigmang.c
+++ b/skinenigmang.c
@@ -8,7 +8,6 @@
 #include "common.h"
 #include "config.h"
 #include "enigma.h"
-#include "i18n.h"
 #include "logo.h"
 #include "setup.h"
 #include "status.h"
@@ -16,24 +15,18 @@
 #include <getopt.h>
 #include <vdr/plugin.h>
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10400
-#error "VDR-1.4.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-#if VDRVERSNUM == 10503
-#warning "YOU NEED A PATCHED VDR 1.5.3 OR EnigmaNG WILL CRASH!"
-#endif
 
-static const char VERSION[] = "0.0.6";
+static const char VERSION[] = "0.1.0";
 static const char DESCRIPTION[] = trNOOP("EnigmaNG skin");
 
 class cPluginSkinEnigma : public cPlugin {
 private:
   bool fLogodirSet;
   bool fImagesDirSet;
-#ifdef HAVE_FREETYPE
-  bool fFontsDirSet;
-#endif
 
 public:
   cPluginSkinEnigma(void);
@@ -72,9 +65,6 @@ cPluginSkinEnigma::cPluginSkinEnigma(void)
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
   fLogodirSet = false;
   fImagesDirSet = false;
-#ifdef HAVE_FREETYPE
-  fFontsDirSet = false;
-#endif
 }
 
 cPluginSkinEnigma::~cPluginSkinEnigma()
@@ -86,9 +76,6 @@ const char *cPluginSkinEnigma::CommandLineHelp(void)
 { 
   // return a string that describes all known command line options.
   return 
-#ifdef HAVE_FREETYPE
-         "  -f <FONTSDIR>, --fonts=<FONTSDIR> Set directory where truetype fonts are stored\n"
-#endif
          "  -i <IMAGESDIR>, --epgimages=<IMAGESDIR> Set directory where epgimages are stored\n"
          "  -l <LOGODIR>, --logodir=<LOGODIR>       Set directory where logos are stored.\n";
 }
@@ -97,23 +84,14 @@ bool cPluginSkinEnigma::ProcessArgs(int argc, char *argv[])
 {
   // implement command line argument processing here if applicable.
   static const struct option long_options[] = {
-#ifdef HAVE_FREETYPE
-    { "fonts", required_argument, NULL, 'f' },
-#endif
     { "epgimages", required_argument, NULL, 'i' },
     { "logodir", required_argument, NULL, 'l' },
-    { NULL }
+    { 0, 0, 0, 0 }
   };
 
   int c;
   while ((c = getopt_long(argc, argv, "i:f:l:", long_options, NULL)) != -1) {
     switch (c) {
-#ifdef HAVE_FREETYPE
-      case 'f':
-        EnigmaConfig.SetFontsDir(optarg);
-        fFontsDirSet = true;
-        break;
-#endif
       case 'i':
         EnigmaConfig.SetImagesDir(optarg);
         fImagesDirSet = true;
@@ -141,10 +119,6 @@ bool cPluginSkinEnigma::Start(void)
   // start any background activities the plugin shall perform.
   debug("cPluginSkinEnigma::Start()");
 
-#if VDRVERSNUM < 10507
-  RegisterI18n(Phrases);
-#endif
-
   if (!fLogodirSet) {
     // set logo directory
     EnigmaConfig.SetLogoDir(cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
@@ -160,18 +134,6 @@ bool cPluginSkinEnigma::Start(void)
       free(dir);
     }
   }
-#ifdef HAVE_FREETYPE
-  if (!fFontsDirSet) {
-    // set fonts directory
-    char *dir = NULL;
-    asprintf(&dir, "%s/fonts", cPlugin::ConfigDirectory(PLUGIN_NAME_I18N));
-    if (dir) {
-      EnigmaConfig.SetFontsDir(dir);
-      fFontsDirSet = true;
-      free(dir);
-    }
-  }
-#endif
 
   // resize logo cache
   EnigmaLogoCache.Resize(EnigmaConfig.cacheSize);
@@ -204,94 +166,97 @@ cMenuSetupPage *cPluginSkinEnigma::SetupMenu(void)
   return new cPluginSkinEnigmaSetup();
 }
 
-bool cPluginSkinEnigma::SetupParse(const char *Name, const char *Value)
+bool cPluginSkinEnigma::SetupParse(const char *OptionName, const char *Value)
 {
   // parse your own setup parameters and store their values.
 //  debug("cPluginSkinEnigma::SetupParse()");
 
-       if (!strcasecmp(Name, "SingleArea8Bpp"))            EnigmaConfig.singleArea8Bpp = atoi(Value);
-  else if (!strcasecmp(Name, "ShowAuxInfo"))               EnigmaConfig.showAuxInfo = atoi(Value);
-  else if (!strcasecmp(Name, "ShowProgressBar"))           EnigmaConfig.showProgressbar = atoi(Value);
-  else if (!strcasecmp(Name, "ShowRemaining"))             EnigmaConfig.showRemaining = atoi(Value);
-  else if (!strcasecmp(Name, "ShowListSymbols"))           EnigmaConfig.showListSymbols = atoi(Value);
-  else if (!strcasecmp(Name, "ShowSymbols"))               EnigmaConfig.showSymbols = atoi(Value);
-  else if (!strcasecmp(Name, "ShowSymbolsMenu"))           EnigmaConfig.showSymbolsMenu = atoi(Value);
-  else if (!strcasecmp(Name, "ShowSymbolsReplay"))         EnigmaConfig.showSymbolsReplay = atoi(Value);
-  else if (!strcasecmp(Name, "ShowSymbolsMsgs"))           EnigmaConfig.showSymbolsMsgs = atoi(Value);
-  else if (!strcasecmp(Name, "ShowSymbolsAudio"))          EnigmaConfig.showSymbolsAudio = atoi(Value);
-  else if (!strcasecmp(Name, "ShowLogo"))                  EnigmaConfig.showLogo = atoi(Value);
-  else if (!strcasecmp(Name, "ShowInfo"))                  EnigmaConfig.showInfo = atoi(Value);
-  else if (!strcasecmp(Name, "ShowMarker"))                EnigmaConfig.showMarker = atoi(Value);
-  else if (!strcasecmp(Name, "ShowVPS"))                   EnigmaConfig.showVps = atoi(Value);
-  else if (!strcasecmp(Name, "ShowFlags"))                 EnigmaConfig.showFlags = atoi(Value);
-  else if (!strcasecmp(Name, "CacheSize"))                 EnigmaConfig.cacheSize = atoi(Value);
-  else if (!strcasecmp(Name, "UseChannelId"))              EnigmaConfig.useChannelId = atoi(Value);
-  else if (!strcasecmp(Name, "NumReruns"))                 EnigmaConfig.numReruns = atoi(Value);
-  else if (!strcasecmp(Name, "UseSubtitleRerun"))          EnigmaConfig.useSubtitleRerun = atoi(Value);
-  else if (!strcasecmp(Name, "ShowTimerConflicts"))        EnigmaConfig.showTimerConflicts = atoi(Value);
-  else if (!strcasecmp(Name, "ShowRecSize"))               EnigmaConfig.showRecSize = atoi(Value);
-  else if (!strcasecmp(Name, "ShowImages"))                EnigmaConfig.showImages = atoi(Value);
-  else if (!strcasecmp(Name, "ResizeImages"))              EnigmaConfig.resizeImages = atoi(Value);
-  else if (!strcasecmp(Name, "ShowMailIcon"))              EnigmaConfig.showMailIcon = atoi(Value);
-  else if (!strcasecmp(Name, "ImageWidth"))                EnigmaConfig.imageWidth = atoi(Value);
-  else if (!strcasecmp(Name, "ImageHeight"))               EnigmaConfig.imageHeight = atoi(Value);
-  else if (!strcasecmp(Name, "ImageExtension"))            EnigmaConfig.imageExtension = atoi(Value);
-  else if (!strcasecmp(Name, "FullTitleWidth"))            EnigmaConfig.fullTitleWidth = atoi(Value);
-  else if (!strcasecmp(Name, "UseTextEffects"))            EnigmaConfig.useTextEffects = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollDelay"))               EnigmaConfig.scrollDelay = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollPause"))               EnigmaConfig.scrollPause = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollMode"))                EnigmaConfig.scrollMode = atoi(Value);
-  else if (!strcasecmp(Name, "BlinkPause"))                EnigmaConfig.blinkPause = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollInfo"))                EnigmaConfig.scrollInfo = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollListItem"))            EnigmaConfig.scrollListItem = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollOther"))               EnigmaConfig.scrollOther = atoi(Value);
-  else if (!strcasecmp(Name, "ScrollTitle"))               EnigmaConfig.scrollTitle = atoi(Value);
-  else if (!strcasecmp(Name, "FontOsdTitle"))              EnigmaConfig.SetFont(FONT_OSDTITLE, atoi(Value));
-  else if (!strcasecmp(Name, "FontOsdTitleName"))          EnigmaConfig.SetFont(FONT_OSDTITLE, Value);
-  else if (!strcasecmp(Name, "FontMessage"))               EnigmaConfig.SetFont(FONT_MESSAGE, atoi(Value));
-  else if (!strcasecmp(Name, "FontMessageName"))           EnigmaConfig.SetFont(FONT_MESSAGE, Value);
-  else if (!strcasecmp(Name, "FontDate"))                  EnigmaConfig.SetFont(FONT_DATE, atoi(Value));
-  else if (!strcasecmp(Name, "FontDateName"))              EnigmaConfig.SetFont(FONT_DATE, Value);
-  else if (!strcasecmp(Name, "FontHelpKeys"))              EnigmaConfig.SetFont(FONT_HELPKEYS, atoi(Value));
-  else if (!strcasecmp(Name, "FontHelpKeysName"))          EnigmaConfig.SetFont(FONT_HELPKEYS, Value);
-  else if (!strcasecmp(Name, "FontCiTitle"))               EnigmaConfig.SetFont(FONT_CITITLE, atoi(Value));
-  else if (!strcasecmp(Name, "FontCiTitleName"))           EnigmaConfig.SetFont(FONT_CITITLE, Value);
-  else if (!strcasecmp(Name, "FontCiSubtitle"))            EnigmaConfig.SetFont(FONT_CISUBTITLE, atoi(Value));
-  else if (!strcasecmp(Name, "FontCiSubtitleName"))        EnigmaConfig.SetFont(FONT_CISUBTITLE, Value);
-  else if (!strcasecmp(Name, "FontCiLanguage"))            EnigmaConfig.SetFont(FONT_CILANGUAGE, atoi(Value));
-  else if (!strcasecmp(Name, "FontCiLanguageName"))        EnigmaConfig.SetFont(FONT_CILANGUAGE, Value);
-  else if (!strcasecmp(Name, "FontListItem"))              EnigmaConfig.SetFont(FONT_LISTITEM, atoi(Value));
-  else if (!strcasecmp(Name, "FontListItemName"))          EnigmaConfig.SetFont(FONT_LISTITEM, Value);
-  else if (!strcasecmp(Name, "FontInfoTimerHeadline"))     EnigmaConfig.SetFont(FONT_INFOTIMERHEADLINE, atoi(Value));
-  else if (!strcasecmp(Name, "FontInfoTimerHeadlineName")) EnigmaConfig.SetFont(FONT_INFOTIMERHEADLINE, Value);
-  else if (!strcasecmp(Name, "FontInfoTimerText"))         EnigmaConfig.SetFont(FONT_INFOTIMERTEXT, atoi(Value));
-  else if (!strcasecmp(Name, "FontInfoTimerTextName"))     EnigmaConfig.SetFont(FONT_INFOTIMERTEXT, Value);
-  else if (!strcasecmp(Name, "FontInfoWarnHeadline"))      EnigmaConfig.SetFont(FONT_INFOWARNHEADLINE, atoi(Value));
-  else if (!strcasecmp(Name, "FontInfoWarnHeadlineName"))  EnigmaConfig.SetFont(FONT_INFOWARNHEADLINE, Value);
-  else if (!strcasecmp(Name, "FontInfoWarnText"))          EnigmaConfig.SetFont(FONT_INFOWARNTEXT, atoi(Value));
-  else if (!strcasecmp(Name, "FontInfoWarnTextName"))      EnigmaConfig.SetFont(FONT_INFOWARNTEXT, Value);
-  else if (!strcasecmp(Name, "FontDetailsTitle"))          EnigmaConfig.SetFont(FONT_DETAILSTITLE, atoi(Value));
-  else if (!strcasecmp(Name, "FontDetailsTitleName"))      EnigmaConfig.SetFont(FONT_DETAILSTITLE, Value);
-  else if (!strcasecmp(Name, "FontDetailsSubtitle"))       EnigmaConfig.SetFont(FONT_DETAILSSUBTITLE, atoi(Value));
-  else if (!strcasecmp(Name, "FontDetailsSubtitleName"))   EnigmaConfig.SetFont(FONT_DETAILSSUBTITLE, Value);
-  else if (!strcasecmp(Name, "FontDetailsDate"))           EnigmaConfig.SetFont(FONT_DETAILSDATE, atoi(Value));
-  else if (!strcasecmp(Name, "FontDetailsDateName"))       EnigmaConfig.SetFont(FONT_DETAILSDATE, Value);
-  else if (!strcasecmp(Name, "FontDetailsText"))           EnigmaConfig.SetFont(FONT_DETAILSTEXT, atoi(Value));
-  else if (!strcasecmp(Name, "FontDetailsTextName"))       EnigmaConfig.SetFont(FONT_DETAILSTEXT, Value);
-  else if (!strcasecmp(Name, "FontReplayTimes"))           EnigmaConfig.SetFont(FONT_REPLAYTIMES, atoi(Value));
-  else if (!strcasecmp(Name, "FontReplayTimesName"))       EnigmaConfig.SetFont(FONT_REPLAYTIMES, Value);
-  else if (!strcasecmp(Name, "FontFixed"))                 EnigmaConfig.SetFont(FONT_FIXED, atoi(Value));
-  else if (!strcasecmp(Name, "FontFixedName"))             EnigmaConfig.SetFont(FONT_FIXED, Value);
-  else if (!strcasecmp(Name, "DynOSD"))                    EnigmaConfig.dynOsd = atoi(Value);
-  else if (!strcasecmp(Name, "StatusLineMode"))            EnigmaConfig.statusLineMode = atoi(Value);
-  else if (!strcasecmp(Name, "ShowWssSymbols"))            EnigmaConfig.showWssSymbols = atoi(Value);
-  else if (!strcasecmp(Name, "ShowStatusSymbols"))         EnigmaConfig.showStatusSymbols = atoi(Value);
+       if (!strcasecmp(OptionName, "SingleArea8Bpp"))            EnigmaConfig.singleArea8Bpp = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowAuxInfo"))               EnigmaConfig.showAuxInfo = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowProgressBar"))           EnigmaConfig.showProgressbar = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowRemaining"))             EnigmaConfig.showRemaining = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowListSymbols"))           EnigmaConfig.showListSymbols = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSymbols"))               EnigmaConfig.showSymbols = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSymbolsMenu"))           EnigmaConfig.showSymbolsMenu = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSymbolsReplay"))         EnigmaConfig.showSymbolsReplay = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSymbolsMsgs"))           EnigmaConfig.showSymbolsMsgs = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSymbolsAudio"))          EnigmaConfig.showSymbolsAudio = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowLogo"))                  EnigmaConfig.showLogo = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowInfo"))                  EnigmaConfig.showInfo = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowMarker"))                EnigmaConfig.showMarker = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowVPS"))                   EnigmaConfig.showVps = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowFlags"))                 EnigmaConfig.showFlags = atoi(Value);
+  else if (!strcasecmp(OptionName, "CacheSize"))                 EnigmaConfig.cacheSize = atoi(Value);
+  else if (!strcasecmp(OptionName, "UseChannelId"))              EnigmaConfig.useChannelId = atoi(Value);
+  else if (!strcasecmp(OptionName, "NumReruns"))                 EnigmaConfig.numReruns = atoi(Value);
+  else if (!strcasecmp(OptionName, "UseSubtitleRerun"))          EnigmaConfig.useSubtitleRerun = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowTimerConflicts"))        EnigmaConfig.showTimerConflicts = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowRecSize"))               EnigmaConfig.showRecSize = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowImages"))                EnigmaConfig.showImages = atoi(Value);
+  else if (!strcasecmp(OptionName, "ResizeImages"))              EnigmaConfig.resizeImages = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowMailIcon"))              EnigmaConfig.showMailIcon = atoi(Value);
+  else if (!strcasecmp(OptionName, "ImageWidth"))                EnigmaConfig.imageWidth = atoi(Value);
+  else if (!strcasecmp(OptionName, "ImageHeight"))               EnigmaConfig.imageHeight = atoi(Value);
+  else if (!strcasecmp(OptionName, "ImageExtension"))            EnigmaConfig.imageExtension = atoi(Value);
+  else if (!strcasecmp(OptionName, "FullTitleWidth"))            EnigmaConfig.fullTitleWidth = atoi(Value);
+  else if (!strcasecmp(OptionName, "UseTextEffects"))            EnigmaConfig.useTextEffects = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollDelay"))               EnigmaConfig.scrollDelay = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollPause"))               EnigmaConfig.scrollPause = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollMode"))                EnigmaConfig.scrollMode = atoi(Value);
+  else if (!strcasecmp(OptionName, "BlinkPause"))                EnigmaConfig.blinkPause = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollInfo"))                EnigmaConfig.scrollInfo = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollListItem"))            EnigmaConfig.scrollListItem = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollOther"))               EnigmaConfig.scrollOther = atoi(Value);
+  else if (!strcasecmp(OptionName, "ScrollTitle"))               EnigmaConfig.scrollTitle = atoi(Value);
+  else if (!strcasecmp(OptionName, "FontOsdTitle"))              EnigmaConfig.SetFont(FONT_OSDTITLE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontOsdTitleName"))          EnigmaConfig.SetFont(FONT_OSDTITLE, Value);
+  else if (!strcasecmp(OptionName, "FontMessage"))               EnigmaConfig.SetFont(FONT_MESSAGE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontMessageName"))           EnigmaConfig.SetFont(FONT_MESSAGE, Value);
+  else if (!strcasecmp(OptionName, "FontDate"))                  EnigmaConfig.SetFont(FONT_DATE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontDateName"))              EnigmaConfig.SetFont(FONT_DATE, Value);
+  else if (!strcasecmp(OptionName, "FontHelpKeys"))              EnigmaConfig.SetFont(FONT_HELPKEYS, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontHelpKeysName"))          EnigmaConfig.SetFont(FONT_HELPKEYS, Value);
+  else if (!strcasecmp(OptionName, "FontCiTitle"))               EnigmaConfig.SetFont(FONT_CITITLE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontCiTitleName"))           EnigmaConfig.SetFont(FONT_CITITLE, Value);
+  else if (!strcasecmp(OptionName, "FontCiSubtitle"))            EnigmaConfig.SetFont(FONT_CISUBTITLE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontCiSubtitleName"))        EnigmaConfig.SetFont(FONT_CISUBTITLE, Value);
+  else if (!strcasecmp(OptionName, "FontCiLanguage"))            EnigmaConfig.SetFont(FONT_CILANGUAGE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontCiLanguageName"))        EnigmaConfig.SetFont(FONT_CILANGUAGE, Value);
+  else if (!strcasecmp(OptionName, "FontListItem"))              EnigmaConfig.SetFont(FONT_LISTITEM, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontListItemName"))          EnigmaConfig.SetFont(FONT_LISTITEM, Value);
+  else if (!strcasecmp(OptionName, "FontInfoTimerHeadline"))     EnigmaConfig.SetFont(FONT_INFOTIMERHEADLINE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontInfoTimerHeadlineName")) EnigmaConfig.SetFont(FONT_INFOTIMERHEADLINE, Value);
+  else if (!strcasecmp(OptionName, "FontInfoTimerText"))         EnigmaConfig.SetFont(FONT_INFOTIMERTEXT, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontInfoTimerTextName"))     EnigmaConfig.SetFont(FONT_INFOTIMERTEXT, Value);
+  else if (!strcasecmp(OptionName, "FontInfoWarnHeadline"))      EnigmaConfig.SetFont(FONT_INFOWARNHEADLINE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontInfoWarnHeadlineName"))  EnigmaConfig.SetFont(FONT_INFOWARNHEADLINE, Value);
+  else if (!strcasecmp(OptionName, "FontInfoWarnText"))          EnigmaConfig.SetFont(FONT_INFOWARNTEXT, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontInfoWarnTextName"))      EnigmaConfig.SetFont(FONT_INFOWARNTEXT, Value);
+  else if (!strcasecmp(OptionName, "FontDetailsTitle"))          EnigmaConfig.SetFont(FONT_DETAILSTITLE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontDetailsTitleName"))      EnigmaConfig.SetFont(FONT_DETAILSTITLE, Value);
+  else if (!strcasecmp(OptionName, "FontDetailsSubtitle"))       EnigmaConfig.SetFont(FONT_DETAILSSUBTITLE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontDetailsSubtitleName"))   EnigmaConfig.SetFont(FONT_DETAILSSUBTITLE, Value);
+  else if (!strcasecmp(OptionName, "FontDetailsDate"))           EnigmaConfig.SetFont(FONT_DETAILSDATE, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontDetailsDateName"))       EnigmaConfig.SetFont(FONT_DETAILSDATE, Value);
+  else if (!strcasecmp(OptionName, "FontDetailsText"))           EnigmaConfig.SetFont(FONT_DETAILSTEXT, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontDetailsTextName"))       EnigmaConfig.SetFont(FONT_DETAILSTEXT, Value);
+  else if (!strcasecmp(OptionName, "FontReplayTimes"))           EnigmaConfig.SetFont(FONT_REPLAYTIMES, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontReplayTimesName"))       EnigmaConfig.SetFont(FONT_REPLAYTIMES, Value);
+  else if (!strcasecmp(OptionName, "FontFixed"))                 EnigmaConfig.SetFont(FONT_FIXED, atoi(Value));
+  else if (!strcasecmp(OptionName, "FontFixedName"))             EnigmaConfig.SetFont(FONT_FIXED, Value);
+  else if (!strcasecmp(OptionName, "DynOSD"))                    EnigmaConfig.dynOsd = atoi(Value);
+  else if (!strcasecmp(OptionName, "StatusLineMode"))            EnigmaConfig.statusLineMode = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowWssSymbols"))            EnigmaConfig.showWssSymbols = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowStatusSymbols"))         EnigmaConfig.showStatusSymbols = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowScrollbar"))             EnigmaConfig.showScrollbar = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowSignalInfo"))            EnigmaConfig.showSignalInfo = atoi(Value);
+  else if (!strcasecmp(OptionName, "ShowCaMode"))                EnigmaConfig.showCaMode = atoi(Value);
   else return false;
 
   return true;
 }
 
-bool cPluginSkinEnigma::Service(const char *Id, void *Data)
+bool cPluginSkinEnigma::Service(const char * /* Id */, void * /* Data */)
 {
   // handle custom service requests from other plugins
   return false;
@@ -303,7 +268,7 @@ const char **cPluginSkinEnigma::SVDRPHelpPages(void)
   return NULL;
 }
 
-cString cPluginSkinEnigma::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+cString cPluginSkinEnigma::SVDRPCommand(const char * /* Command */, const char * /* Option */, int & /* ReplyCode */)
 {
   // process SVDRP commands this plugin implements
   return NULL;