2007-06-11: Version 0.0.5rcv0.0.5rc

- Fixed possible crash in recording's details.
- Added MoBuntu theme (Submitted by Morone @vdr-portal.de).
- Added Blue, Blue2, Blue3 and Coolblue theme (Submitted by Uwe @vdr-portal.de).
- Added support for TrueTypeFonts (based on graphtft and text2skin plugins).
- Added support for new epgsearch tags.
- Updated French translation. (Submitted by pat @vdr-portal.de)
- Changed size calculation for scrollbars.
- Add setup options to individually set the fonts to use. See README for details.
- Set used colors for every area in menu OSD when using multiple areas.
- Reworked multiple areas mode in menu OSD.
- Do not disable logos/symbols/flags if 4bpp single area is configured in setup.
- Replaced setup options "One area (if possible)" and "Bpp in single area" by option "Try 8bpp single areas".
- Unified appearance of error/info/status messages in all OSDs.
- Added setup option to selectively enable scrolling text.
- Added setup option to selectively enable logos in the different OSDs.
- Added text effects (e.g. scrolling and blinking) for selected text.
- Removed clrMenuHighlight, clrMessageBorder, clrMenuItemCurrentFg, clrMenuEventTitle, clrMenuEventShortText, clrMenuScrollbarTotal and clrMenuScrollbarShown in themes.
- Fixed height of title/subtitle box in EPG & recording details.
- Recognize mediamanager plugin in mainmenu logos.
- Don't cut info line in EPG & recording details at logo area's left edge.
- Updated Russian translation (Submitted by neptunvasja @vdr-portal.de).
- Added Dutch translation (Submitted by dorpsgek @vdr-portal.de).
- Various bugfixes and graphical changes.

1 files changed, 117 insertions, 302 deletions

diff --git a/skinenigmang.c b/skinenigmang.c
index 10ad221..76ee4b4 100644
--- a/skinenigmang.c
+++ b/skinenigmang.c
@@ -1,5 +1,5 @@
 /*
- * enigma.c: A plugin for the Video Disk Recorder
+ * skinenigmang.c: 'EnigmaNG' skin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -7,10 +7,12 @@
 
 #include "common.h"
 #include "config.h"
+#include "enigma.h"
 #include "i18n.h"
 #include "logo.h"
-#include "enigma.h"
+#include "setup.h"
 #include "status.h"
+
 #include <getopt.h>
 #include <vdr/plugin.h>
 
@@ -18,13 +20,16 @@
 #error "VDR-1.4.0 API version or greater is required!"
 #endif
 
-static const char VERSION[] = "0.0.4";
+static const char VERSION[] = "0.0.5rc";
 static const char DESCRIPTION[] = "EnigmaNG skin";
 
 class cPluginSkinEnigma : public cPlugin {
 private:
   bool fLogodirSet;
   bool fImagesDirSet;
+#ifdef HAVE_FREETYPE
+  bool fFontsDirSet;
+#endif
 
 public:
   cPluginSkinEnigma(void);
@@ -56,27 +61,6 @@ public:
   virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
 };
 
-class cPluginSkinEnigmaSetup : public cMenuSetupPage {
-private:
-  cEnigmaConfig data;
-  const char *showSymbolsTexts[4];
-  const char *showRemainingTexts[3];
-  const char *useSubtitleRerunTexts[3];
-  const char *showRecSizeTexts[3];
-  const char *resizeImagesTexts[3];
-#ifdef USE_PLUGIN_MAILBOX
-  const char *showMailIconTexts[3];
-#endif
-
-  virtual void Setup(void);
-  void AddCategory(const char *Title);
-protected:
-  virtual eOSState ProcessKey(eKeys Key);
-  virtual void Store(void);
-public:
-    cPluginSkinEnigmaSetup(void);
-};
-
 cPluginSkinEnigma::cPluginSkinEnigma(void)
 {
   // initialize any member variables here.
@@ -84,6 +68,9 @@ cPluginSkinEnigma::cPluginSkinEnigma(void)
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
   fLogodirSet = false;
   fImagesDirSet = false;
+#ifdef HAVE_FREETYPE
+  fFontsDirSet = false;
+#endif
 }
 
 cPluginSkinEnigma::~cPluginSkinEnigma()
@@ -94,7 +81,11 @@ cPluginSkinEnigma::~cPluginSkinEnigma()
 const char *cPluginSkinEnigma::CommandLineHelp(void)
 { 
   // return a string that describes all known command line options.
-  return "  -i <IMAGESDIR>, --epgimages=<IMAGESDIR> Set directory where epgimages are stored\n"
+  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";
 }
 
@@ -102,14 +93,23 @@ bool cPluginSkinEnigma::ProcessArgs(int argc, char *argv[])
 {
   // implement command line argument processing here if applicable.
   static const struct option long_options[] = {
-    { "logodir", required_argument, NULL, 'l' },
+#ifdef HAVE_FREETYPE
+    { "fonts", required_argument, NULL, 'f' },
+#endif
     { "epgimages", required_argument, NULL, 'i' },
+    { "logodir", required_argument, NULL, 'l' },
     { NULL }
   };
 
   int c;
-  while ((c = getopt_long(argc, argv, "l:i:", long_options, NULL)) != -1) {
+  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;
@@ -152,6 +152,19 @@ 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);
   // create skin
@@ -186,59 +199,83 @@ cMenuSetupPage *cPluginSkinEnigma::SetupMenu(void)
 bool cPluginSkinEnigma::SetupParse(const char *Name, const char *Value)
 {
   // parse your own setup parameters and store their values.
-  debug("cPluginSkinEnigma::SetupParse()\n");
-  if (!strcasecmp(Name, "TrySingleArea"))
-    EnigmaConfig.singleArea = atoi(Value);
-  else 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, "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
-    return false;
+//  debug("cPluginSkinEnigma::SetupParse()\n");
+
+       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 return false;
 
   return true;
 }
@@ -261,227 +298,5 @@ cString cPluginSkinEnigma::SVDRPCommand(const char *Command, const char *Option,
   return NULL;
 }
 
-cPluginSkinEnigmaSetup::cPluginSkinEnigmaSetup(void)
-{
-  // create setup menu
-  debug("cPluginSkinEnigmaSetup()\n");
-  data = EnigmaConfig;
-  Setup();
-  SetHelp(tr("Button$Flush cache"), NULL, NULL, NULL);
-}
-
-void cPluginSkinEnigmaSetup::AddCategory(const char *Title) {
-  char *buffer = NULL;
-
-  asprintf(&buffer, "--- %s ----------------------------------------------------------------------------------", Title );
-
-  cOsdItem *item = new cOsdItem(buffer);
-  free(buffer);
-
-  if (item) {
-    item->SetSelectable(false);
-    Add(item);
-  }
-}
-
-void cPluginSkinEnigmaSetup::Setup(void)
-{
-  // update setup display
-  int current = Current();
-
-  Clear();
-
-  showSymbolsTexts[0] = tr("never");
-  showSymbolsTexts[1] = tr("always");
-#ifndef SKINENIGMA_NO_MENULOGO
-#define NUM_SHOWSYMBOLSTEXTS 4
-  showSymbolsTexts[2] = tr("not in menu");
-  showSymbolsTexts[3] = tr("only in menu");
-#else
-#define NUM_SHOWSYMBOLSTEXTS 2
-#endif
-
-  showRemainingTexts[0] = tr("elapsed");
-  showRemainingTexts[1] = tr("remaining");
-  showRemainingTexts[2] = tr("percent");
-
-  useSubtitleRerunTexts[0] = tr("never");
-  useSubtitleRerunTexts[1] = tr("if exists");
-  useSubtitleRerunTexts[2] = tr("always");
-
-  showRecSizeTexts[0] = tr("never");
-  showRecSizeTexts[1] = tr("use size.vdr only");
-  showRecSizeTexts[2] = tr("always");
-
-#ifndef SKINENIGMA_NO_MENULOGO
-  resizeImagesTexts[0] = tr("pixel algo");
-  resizeImagesTexts[1] = tr("ratio algo");
-  resizeImagesTexts[2] = tr("zoom image");
-#endif
-
-#ifdef USE_PLUGIN_MAILBOX
-	showMailIconTexts[0] = tr("never");
-	showMailIconTexts[1] = tr("only if new mail present");
-	showMailIconTexts[2] = tr("always");
-#endif
-
-  Add(new cMenuEditBoolItem(tr("One area (if possible)"), &data.singleArea,
-                            tr("no"), tr("yes")));
-  if (data.singleArea) {
-    Add(new cMenuEditBoolItem(tr("Bpp in single area"), &data.singleArea8Bpp,
-                              "4", "8"));
-  }
-  Add(new cMenuEditBoolItem(tr("Show info area in main menu"), &data.showInfo,
-                            tr("no"), tr("yes")));
-  Add(new cMenuEditBoolItem(tr("Show auxiliary information"), &data.showAuxInfo,
-                            tr("top"), tr("bottom")));
-  Add(new cMenuEditStraItem(tr("Show recording's size"), &data.showRecSize,
-                            3, showRecSizeTexts));
-  Add(new cMenuEditBoolItem(tr("Full title width"), &data.fullTitleWidth,
-                            tr("no"), tr("yes")));
-  Add(new cMenuEditStraItem(tr("Show remaining/elapsed time"), &data.showRemaining,
-                            3, showRemainingTexts));
-  Add(new cMenuEditBoolItem(tr("Show VPS"), &data.showVps,
-                            tr("no"), tr("yes")));
-  Add(new cMenuEditBoolItem(tr("Show progressbar"), &data.showProgressbar,
-                            tr("no"), tr("yes")));
-
-  AddCategory(tr("Logos & Symbols"));
-  if (!data.singleArea || data.singleArea8Bpp) {
-    Add(new cMenuEditStraItem(tr("Show symbols"), &data.showSymbols,
-                              NUM_SHOWSYMBOLSTEXTS, showSymbolsTexts));
-  }
-  Add(new cMenuEditBoolItem(tr("Show symbols in lists"), &data.showListSymbols,
-                            tr("no"), tr("yes")));
-  Add(new cMenuEditBoolItem(tr("Show marker in lists"), &data.showMarker,
-                            tr("no"), tr("yes")));
-  if (!data.singleArea || data.singleArea8Bpp) {
-    Add(new cMenuEditBoolItem(tr("Show flags"), &data.showFlags,
-                              tr("no"), tr("yes")));
-  }
-
-#ifdef USE_PLUGIN_MAILBOX
-  cPlugin *MailBoxPlugin = cPluginManager::GetPlugin("mailbox");
-  if (MailBoxPlugin && MailBoxPlugin->Service("MailBox-HasNewMail-1.0", 0)) {
-    Add(new cMenuEditStraItem(tr("Show mail icon"), &data.showMailIcon,
-                              3, showMailIconTexts));
-  }
-#endif
-
-#ifndef SKINENIGMA_NO_MENULOGO
-  if ((!data.singleArea || data.singleArea8Bpp) && (data.showSymbols == 1 || data.showSymbols == 3)) {
-    Add(new cMenuEditBoolItem(tr("Show event/recording images"), &data.showImages,
-                              tr("no"), tr("yes")));
-    if (data.showImages) {
-#ifdef HAVE_IMAGEMAGICK
-      Add(new cMenuEditStraItem(tr("Resize images"), &data.resizeImages,
-                                3, resizeImagesTexts));
-#endif
-      Add(new cMenuEditIntItem(tr("Image width" ), &data.imageWidth,
-                                80, 180));
-     Add(new cMenuEditIntItem(tr("Image height" ), &data.imageHeight,
-                                80, 144));
-#ifdef HAVE_IMAGEMAGICK
-     Add(new cMenuEditStraItem(tr("Image format"), &data.imageExtension,
-                                3, imageExtensionTexts));
-#endif
-    }
-  }
-#endif //SKINENIGMA_NO_MENULOGO
-
-  if (!data.singleArea || data.singleArea8Bpp) {
-    Add(new cMenuEditBoolItem(tr("Show channel logos"), &data.showLogo,
-                              tr("no"), tr("yes")));
-    if (data.showLogo) {
-      Add(new cMenuEditBoolItem(tr("Identify channel by"), &data.useChannelId,
-                              tr("name"), tr("data")));
-    }
-    if (data.showLogo || data.showSymbols) {
-      Add(new cMenuEditIntItem(tr("Channel logo cache size"), &data.cacheSize,
-                              0, 1000));
-    }
-  }
-
-#ifdef SKINENIGMA_HAVE_EPGSEARCH
-  AddCategory(tr("EPGSearch"));
-  Add(new cMenuEditIntItem(tr("Number of Reruns"), &data.numReruns,
-                            0, 10));
-  Add(new cMenuEditStraItem(tr("Use Subtitle for reruns"), &data.useSubtitleRerun,
-                            3, useSubtitleRerunTexts));
-  if (data.showInfo) {
-    Add(new cMenuEditBoolItem(tr("Show timer conflicts"), &data.showTimerConflicts,
-                              tr("no"), tr("yes")));
-  }
-#endif
-
-  SetCurrent(Get(current));
-  Display();
-}
-
-void cPluginSkinEnigmaSetup::Store(void)
-{
-  // store setup data
-  debug("cPluginSkinEnigmaSetup::Store()\n");
-  EnigmaConfig = data;
-  SetupStore("TrySingleArea", EnigmaConfig.singleArea);
-  SetupStore("SingleArea8Bpp", EnigmaConfig.singleArea8Bpp);
-  SetupStore("ShowAuxInfo", EnigmaConfig.showAuxInfo);
-  SetupStore("ShowRemaining", EnigmaConfig.showRemaining);
-  SetupStore("ShowProgressBar", EnigmaConfig.showProgressbar);
-  SetupStore("ShowListSymbols", EnigmaConfig.showListSymbols);
-  SetupStore("ShowSymbols", EnigmaConfig.showSymbols);
-  SetupStore("ShowLogo", EnigmaConfig.showLogo);
-  SetupStore("ShowInfo", EnigmaConfig.showInfo);
-  SetupStore("ShowVPS", EnigmaConfig.showVps);
-  SetupStore("ShowFlags", EnigmaConfig.showFlags);
-  SetupStore("ShowMarker", EnigmaConfig.showMarker);
-  SetupStore("CacheSize", EnigmaConfig.cacheSize);
-  SetupStore("UseChannelId", EnigmaConfig.useChannelId);
-  SetupStore("NumReruns", EnigmaConfig.numReruns);
-  SetupStore("UseSubtitleRerun", EnigmaConfig.useSubtitleRerun);
-  SetupStore("ShowTimerConflicts", EnigmaConfig.showTimerConflicts);
-  SetupStore("ShowRecSize", EnigmaConfig.showRecSize);
-  SetupStore("ShowImages", EnigmaConfig.showImages);
-  SetupStore("ResizeImages", EnigmaConfig.resizeImages);
-  SetupStore("ShowMailIcon", EnigmaConfig.showMailIcon);
-  SetupStore("ImageWidth", EnigmaConfig.imageWidth);
-  SetupStore("ImageHeight", EnigmaConfig.imageHeight);
-  SetupStore("ImageExtension", EnigmaConfig.imageExtension);
-  SetupStore("FullTitleWidth", EnigmaConfig.fullTitleWidth);
-  // resize logo cache
-  EnigmaLogoCache.Resize(EnigmaConfig.cacheSize);
-}
-
-eOSState cPluginSkinEnigmaSetup::ProcessKey(eKeys Key)
-{
-  // process key presses
-  int oldShowLogo = data.showLogo;
-  int oldShowSymbols = data.showSymbols;
-  int oldSingleArea = data.singleArea;
-  int oldSingleArea8Bpp = data.singleArea8Bpp;
-  int oldShowInfo = data.showInfo;
-  int oldShowImages = data.showImages;
-
-  eOSState state = cMenuSetupPage::ProcessKey(Key);
-  if ((state == osUnknown) && (Key == kRed)) {
-    Skins.Message(mtInfo, tr("Flushing channel logo cache..."));
-    EnigmaLogoCache.Flush();
-    Skins.Message(mtInfo, NULL);
-    state = osContinue;
-  }
-  if (Key != kNone &&
-      ((data.singleArea != oldSingleArea)
-       || (data.singleArea8Bpp != oldSingleArea8Bpp)
-       || (data.showLogo != oldShowLogo) 
-       || (data.showSymbols != oldShowSymbols) 
-       || (oldShowInfo != data.showInfo)
-       || (oldShowImages != data.showImages)
-      )) {
-    Setup();
-  }
-
-  return state;
-}
-
 VDRPLUGINCREATOR(cPluginSkinEnigma);    // don't touch this!
 // vim:et:sw=2:ts=2: