Version 0.9.0

1 files changed, 186 insertions, 384 deletions

diff --git a/setup.c b/setup.c
index 07a443f..e48dc41 100644
--- a/setup.c
+++ b/setup.c
@@ -2,14 +2,14 @@
 
 cNopacitySetup::cNopacitySetup(cImageCache *imgCache) {
     this->imgCache = imgCache;
-    tmpNopacityConfig = config;
+    tmpConf = config;
     cFont::GetAvailableFontNames(&fontNames);
     fontNames.Insert(strdup(config.fontDefaultName));
     Setup();
 }
 
 cNopacitySetup::~cNopacitySetup() {
-    config.setDynamicValues();
+    config.SetFontName();
     int start = cTimeMs::Now();
     geoManager->SetGeometry();
     fontManager->DeleteFonts();
@@ -22,7 +22,7 @@ cNopacitySetup::~cNopacitySetup() {
 void cNopacitySetup::Setup(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditStraItem(tr("Font"), &tmpNopacityConfig.fontIndex, fontNames.Size(), &fontNames[0]));
+    Add(new cMenuEditStraItem(tr("Font"), tmpConf.GetValueRef("fontIndex"), fontNames.Size(), &fontNames[0]));
     Add(new cOsdItem(tr("VDR Menu: Common Settings")));
     Add(new cOsdItem(tr("VDR Menu: Main and Setup Menu")));
     Add(new cOsdItem(tr("VDR Menu: Schedules Menu")));
@@ -35,8 +35,7 @@ void cNopacitySetup::Setup(void) {
     Add(new cOsdItem(tr("Messages")));
     Add(new cOsdItem(tr("Volume")));
     Add(new cOsdItem(tr("Image Caching")));
-    Add(new cOsdItem(tr("RSS Feeds")));
-    
+   
     SetCurrent(Get(currentItem));
     Display();
 }
@@ -50,200 +49,51 @@ eOSState cNopacitySetup::ProcessKey(eKeys Key) {
         if ((Key == kOk && !hadSubMenu)) {
             const char* ItemText = Get(Current())->Text();
             if (strcmp(ItemText, tr("VDR Menu: Common Settings")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplay(&tmpConf));
             if (strcmp(ItemText, tr("VDR Menu: Main and Setup Menu")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplayMain(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplayMain(&tmpConf));
             if (strcmp(ItemText, tr("VDR Menu: Schedules Menu")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplaySchedules(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplaySchedules(&tmpConf));
             if (strcmp(ItemText, tr("VDR Menu: Channels Menu")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplayChannels(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplayChannels(&tmpConf));
             if (strcmp(ItemText, tr("VDR Menu: Timers Menu")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplayTimers(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplayTimers(&tmpConf));
             if (strcmp(ItemText, tr("VDR Menu: Recordings Menu")) == 0)
-                state = AddSubMenu(new cNopacitySetupMenuDisplayRecordings(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMenuDisplayRecordings(&tmpConf));
             if (strcmp(ItemText, tr("Channel Switching")) == 0)
-                state = AddSubMenu(new cNopacitySetupChannelDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupChannelDisplay(&tmpConf));
             if (strcmp(ItemText, tr("Replay")) == 0)
-                state = AddSubMenu(new cNopacitySetupReplayDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupReplayDisplay(&tmpConf));
             if (strcmp(ItemText, tr("Audio Tracks")) == 0)
-                state = AddSubMenu(new cNopacitySetupTrackDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupTrackDisplay(&tmpConf));
             if (strcmp(ItemText, tr("Messages")) == 0)
-                state = AddSubMenu(new cNopacitySetupMessageDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupMessageDisplay(&tmpConf));
             if (strcmp(ItemText, tr("Volume")) == 0)
-                state = AddSubMenu(new cNopacitySetupVolumeDisplay(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupVolumeDisplay(&tmpConf));
             if (strcmp(ItemText, tr("Image Caching")) == 0)
-                state = AddSubMenu(new cNopacitySetupCaching(&tmpNopacityConfig, imgCache));
-            if (strcmp(ItemText, tr("RSS Feeds")) == 0)
-                state = AddSubMenu(new cNopacitySetupRssFeed(&tmpNopacityConfig));
+                state = AddSubMenu(new cNopacitySetupCaching(&tmpConf, imgCache));
         }
     }   
     return state;
 }
 
 void cNopacitySetup::Store(void) {
-    config = tmpNopacityConfig;
-    SetupStore("fontIndex", config.fontIndex);
-    SetupStore("channelHeight", config.channelHeight);
-    SetupStore("channelBorderVertical", config.channelBorderVertical);
-    SetupStore("channelBorderBottom", config.channelBorderBottom);
-    SetupStore("logoPosition", config.logoPosition);
-    SetupStore("logoWidth", config.logoWidth);
-    SetupStore("logoHeight", config.logoHeight);
-    SetupStore("logoBorder", config.logoBorder);
-    SetupStore("backgroundStyle", config.backgroundStyle);
-    SetupStore("symbolStyle", config.symbolStyle);
-    SetupStore("roundedCornersChannel", config.roundedCornersChannel);
-    SetupStore("displaySignalStrength", config.displaySignalStrength);
-    SetupStore("displaySourceInfo", config.displaySourceInfo);
-    SetupStore("displayPrevNextChannelGroup", config.displayPrevNextChannelGroup);
-    SetupStore("channelFadeTime", config.channelFadeTime);
-    SetupStore("fontChannelHeaderSize", config.fontChannelHeaderSize);
-    SetupStore("fontChannelDateSize", config.fontChannelDateSize);
-    SetupStore("fontEPGSize", config.fontEPGSize);
-    SetupStore("fontEPGSmallSize", config.fontEPGSmallSize);
-    SetupStore("fontChannelGroupSize", config.fontChannelGroupSize);
-    SetupStore("fontChannelGroupSmallSize", config.fontChannelGroupSmallSize);
-    SetupStore("resolutionIconSize", config.resolutionIconSize);
-    SetupStore("statusIconSize", config.statusIconSize);
-    SetupStore("progressCurrentSchedule", config.progressCurrentSchedule);
-    SetupStore("displayPoster", config.displayPoster);
-    SetupStore("replayHeight", config.replayHeight);
-    SetupStore("replayBorderVertical", config.replayBorderVertical);
-    SetupStore("replayBorderBottom", config.replayBorderBottom);
-    SetupStore("replayFadeTime", config.replayFadeTime);
-    SetupStore("fontReplayHeader", config.fontReplayHeader);
-    SetupStore("fontReplay", config.fontReplay);
-    SetupStore("messageWidth", config.messageWidth);
-    SetupStore("messageHeight", config.messageHeight);
-    SetupStore("messageBorderBottom", config.messageBorderBottom);
-    SetupStore("fontMessage", config.fontMessage);
-    SetupStore("messageFadeTime", config.messageFadeTime);
-    SetupStore("tracksFadeTime", config.tracksFadeTime);
-    SetupStore("tracksWidth", config.tracksWidth);
-    SetupStore("tracksItemHeight", config.tracksItemHeight);
-    SetupStore("tracksPosition", config.tracksPosition);
-    SetupStore("tracksBorderHorizontal", config.tracksBorderHorizontal);
-    SetupStore("tracksBorderVertical", config.tracksBorderVertical);
-    SetupStore("fontTracksHeader", config.fontTracksHeader);
-    SetupStore("fontTracks", config.fontTracks);
-    SetupStore("volumeFadeTime", config.volumeFadeTime);
-    SetupStore("volumeWidth", config.volumeWidth);
-    SetupStore("volumeHeight", config.volumeHeight);
-    SetupStore("volumeBorderBottom", config.volumeBorderBottom);
-    SetupStore("fontVolume", config.fontVolume);
-    SetupStore("scrollMode", config.scrollMode);
-    SetupStore("menuAdjustLeft", config.menuAdjustLeft);
-    SetupStore("scalePicture", config.scalePicture);
-    SetupStore("roundedCorners", config.roundedCorners);
-    SetupStore("cornerRadius", config.cornerRadius);
-    SetupStore("useMenuIcons", config.useMenuIcons);
-    SetupStore("mainMenuTitleStyle", config.mainMenuTitleStyle);
-    SetupStore("narrowMainMenu", config.narrowMainMenu);
-    SetupStore("narrowScheduleMenu", config.narrowScheduleMenu);
-    SetupStore("narrowChannelMenu", config.narrowChannelMenu);
-    SetupStore("narrowTimerMenu", config.narrowTimerMenu);
-    SetupStore("narrowRecordingMenu", config.narrowRecordingMenu);
-    SetupStore("narrowSetupMenu", config.narrowSetupMenu);
-    SetupStore("displayRerunsDetailEPGView", config.displayRerunsDetailEPGView);
-    SetupStore("numReruns", config.numReruns);
-    SetupStore("useSubtitleRerun", config.useSubtitleRerun);
-    SetupStore("displayAdditionalEPGPictures", config.displayAdditionalEPGPictures);
-    SetupStore("numAdditionalEPGPictures", config.numAdditionalEPGPictures);
-    SetupStore("displayAdditionalRecEPGPictures", config.displayAdditionalRecEPGPictures);
-    SetupStore("numAdditionalRecEPGPictures", config.numAdditionalRecEPGPictures);
-    SetupStore("menuChannelDisplayMode", config.menuChannelDisplayMode);
-    SetupStore("menuChannelDisplayTime", config.menuChannelDisplayTime);
-    SetupStore("numEPGEntriesChannelsMenu", config.numEPGEntriesChannelsMenu);
-    SetupStore("menuFadeTime", config.menuFadeTime);
-    SetupStore("menuScrollDelay", config.menuScrollDelay);
-    SetupStore("menuScrollSpeed", config.menuScrollSpeed);
-    SetupStore("menuWidthMain", config.menuWidthMain);
-    SetupStore("menuWidthSchedules", config.menuWidthSchedules);
-    SetupStore("menuWidthChannels", config.menuWidthChannels);
-    SetupStore("menuWidthTimers", config.menuWidthTimers);
-    SetupStore("menuWidthRecordings", config.menuWidthRecordings);
-    SetupStore("menuWidthSetup", config.menuWidthSetup);
-    SetupStore("menuWidthRightItems", config.menuWidthRightItems);
-    SetupStore("menuSizeDiskUsage", config.menuSizeDiskUsage);
-    SetupStore("menuHeightInfoWindow", config.menuHeightInfoWindow);
-    SetupStore("menuEPGWindowFadeTime", config.menuEPGWindowFadeTime);
-    SetupStore("menuInfoTextDelay", config.menuInfoTextDelay);
-    SetupStore("menuInfoScrollDelay", config.menuInfoScrollDelay);
-    SetupStore("menuInfoScrollSpeed", config.menuInfoScrollSpeed);
-    SetupStore("showDiscUsage", config.showDiscUsage);
-    SetupStore("discUsageStyle", config.discUsageStyle);
-    SetupStore("showTimers", config.showTimers);
-    SetupStore("numberTimers", config.numberTimers);
-    SetupStore("checkTimerConflict", config.checkTimerConflict);
-    SetupStore("headerHeight", config.headerHeight);
-    SetupStore("footerHeight", config.footerHeight);
-    SetupStore("numDefaultMenuItems", config.numDefaultMenuItems);
-    SetupStore("iconHeight", config.iconHeight);
-    SetupStore("headerIconHeight", config.headerIconHeight);
-    SetupStore("menuItemLogoWidth", config.menuItemLogoWidth);
-    SetupStore("menuItemLogoHeight", config.menuItemLogoHeight);
-    SetupStore("menuHeaderLogoWidth", config.menuHeaderLogoWidth);
-    SetupStore("menuHeaderLogoHeight", config.menuHeaderLogoHeight);
-    SetupStore("timersLogoWidth", config.timersLogoWidth);
-    SetupStore("timersLogoHeight", config.timersLogoHeight);
-    SetupStore("epgImageWidth", config.epgImageWidth);
-    SetupStore("epgImageHeight", config.epgImageHeight);
-    SetupStore("epgImageWidthLarge", config.epgImageWidthLarge);
-    SetupStore("epgImageHeightLarge", config.epgImageHeightLarge);
-    SetupStore("posterWidth", config.posterWidth);
-    SetupStore("posterHeight", config.posterHeight);
-    SetupStore("menuRecFolderSize", config.menuRecFolderSize);
-    SetupStore("useFolderPoster", config.useFolderPoster);
-    SetupStore("borderDetailedEPG", config.borderDetailedEPG);
-    SetupStore("borderDetailedRecordings", config.borderDetailedRecordings);
-    SetupStore("menuSchedulesWindowMode", config.menuSchedulesWindowMode);
-    SetupStore("menuRecordingsWindowMode", config.menuRecordingsWindowMode);
-    SetupStore("fontHeader", config.fontHeader);
-    SetupStore("fontDate", config.fontDate);
-    SetupStore("fontMenuitemLarge", config.fontMenuitemLarge);
-    SetupStore("fontMenuitemSchedule", config.fontMenuitemSchedule);
-    SetupStore("fontMenuitemScheduleSmall", config.fontMenuitemScheduleSmall);
-    SetupStore("fontMenuitemChannel", config.fontMenuitemChannel);
-    SetupStore("fontMenuitemChannelSmall", config.fontMenuitemChannelSmall);
-    SetupStore("fontMenuitemRecordings", config.fontMenuitemRecordings);
-    SetupStore("fontMenuitemRecordingsSmall", config.fontMenuitemRecordingsSmall);
-    SetupStore("fontMenuitemTimers", config.fontMenuitemTimers);
-    SetupStore("fontMenuitemTimersSmall", config.fontMenuitemTimersSmall);
-    SetupStore("fontMenuitemDefault", config.fontMenuitemDefault);
-    SetupStore("fontDiskUsage", config.fontDiskUsage);
-    SetupStore("fontDiskUsagePercent", config.fontDiskUsagePercent);
-    SetupStore("fontTimersHead", config.fontTimersHead);
-    SetupStore("fontTimers", config.fontTimers);
-    SetupStore("fontButtons", config.fontButtons);
-    SetupStore("fontMessageMenu", config.fontMessageMenu);
-    SetupStore("fontDetailView", config.fontDetailView);
-    SetupStore("fontDetailViewSmall", config.fontDetailViewSmall);
-    SetupStore("fontDetailViewHeader", config.fontDetailViewHeader);
-    SetupStore("fontDetailViewHeaderLarge", config.fontDetailViewHeaderLarge);
-    SetupStore("fontEPGInfoWindow", config.fontEPGInfoWindow);
-    SetupStore("fontEPGInfoWindowLarge", config.fontEPGInfoWindowLarge);
-    SetupStore("displayRSSFeed", config.displayRSSFeed);
-    SetupStore("rssFeedHeight", config.rssFeedHeight);
-    SetupStore("rssFeed[0]", config.rssFeed[0]);
-    SetupStore("rssFeed[1]", config.rssFeed[1]);
-    SetupStore("rssFeed[2]", config.rssFeed[2]);
-    SetupStore("rssFeed[3]", config.rssFeed[3]);
-    SetupStore("rssFeed[4]", config.rssFeed[4]);
-    SetupStore("fontRssFeed", config.fontRssFeed);
-    SetupStore("rssScrollDelay", config.rssScrollDelay);
-    SetupStore("rssScrollSpeed", config.rssScrollSpeed);
-    SetupStore("rssFeedHeightStandalone", config.rssFeedHeightStandalone);
-    SetupStore("fontRssFeedStandalone", config.fontRssFeedStandalone);
-    SetupStore("rssFeedStandalonePos", config.rssFeedStandalonePos);
-    SetupStore("limitLogoCache", config.limitLogoCache);
-    SetupStore("numLogosInitial", config.numLogosInitial);
-    SetupStore("numLogosMax", config.numLogosMax);
+    const char *themeName = Skins.Current()->Theme()->Name();
+    for(std::map<std::string, int>::const_iterator it = tmpConf.GetStart(); it != tmpConf.GetEnd(); it++) {
+        std::string name = (std::string)it->first;
+        int value = (int)it->second;
+        int origValue = config.GetValue(name);
+        if (value != origValue) {
+            SetupStore(*cString::sprintf("%s.%s", themeName, name.c_str()), value);
+        }
+    }
+    config = tmpConf;
 }
     
 //------------------------------------------------------------------------------------------------------------------
 
 cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cNopacityConfig* data) : cOsdMenu(Title, 30) {
-    tmpNopacityConfig = data;
+    tmpConf = data;
     spacer = "   ";
 }
 
@@ -289,28 +139,28 @@ cNopacitySetupMenuDisplay::cNopacitySetupMenuDisplay(cNopacityConfig* data)  : c
 void cNopacitySetupMenuDisplay::Set(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditIntItem(tr("Number of Default Menu Entries per Page"), &tmpNopacityConfig->numDefaultMenuItems, 10, 40));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Default Menu Item"), &tmpNopacityConfig->fontMenuitemDefault, -20, 20));
-    Add(new cMenuEditStraItem(tr("Adjustment of narrow menus"), &tmpNopacityConfig->menuAdjustLeft, 2, adjustLeft));
-    Add(new cMenuEditStraItem(tr("Scale Video size to fit into menu window"), &tmpNopacityConfig->scalePicture, 3, scalePic));
-    Add(new cMenuEditIntItem(tr("Header Height (Percent of OSD Height)"), &tmpNopacityConfig->headerHeight, 5, 30));
-    Add(new cMenuEditIntItem(tr("Header Icon Size (Square Header Menu Icons)"), &tmpNopacityConfig->headerIconHeight, 30, 200));
-    Add(new cMenuEditIntItem(tr("Footer Height (Percent of OSD Height)"), &tmpNopacityConfig->footerHeight, 5, 30));
-    Add(new cMenuEditBoolItem(tr("Rounded Corners for menu items and buttons"), &tmpNopacityConfig->roundedCorners));
-    if (tmpNopacityConfig->roundedCorners)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Radius of rounded corners")), &tmpNopacityConfig->cornerRadius, 5, 30));
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuFadeTime, 0, 1000));
-    Add(new cMenuEditStraItem(tr("Menu Items Scroll Style"), &tmpNopacityConfig->scrollMode, 2, scrollMode));
-    Add(new cMenuEditStraItem(tr("Menu Items Scrolling Speed"), &tmpNopacityConfig->menuScrollSpeed, 4, scrollSpeed));
-    Add(new cMenuEditIntItem(tr("Menu Items Scrolling Delay in s"), &tmpNopacityConfig->menuScrollDelay, 0, 3));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontHeader, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), &tmpNopacityConfig->fontDate, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Color Buttons"), &tmpNopacityConfig->fontButtons, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Messages"), &tmpNopacityConfig->fontMessageMenu, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text"), &tmpNopacityConfig->fontDetailView, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text Small"), &tmpNopacityConfig->fontDetailViewSmall, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header"), &tmpNopacityConfig->fontDetailViewHeader, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header Large"), &tmpNopacityConfig->fontDetailViewHeaderLarge, -20, 20));
+    Add(new cMenuEditIntItem(tr("Number of Default Menu Entries per Page"), tmpConf->GetValueRef("numDefaultMenuItems"), 10, 40));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Default Menu Item"), tmpConf->GetValueRef("fontMenuitemDefault"), -20, 20));
+    Add(new cMenuEditStraItem(tr("Adjustment of narrow menus"), tmpConf->GetValueRef("menuAdjustLeft"), 2, adjustLeft));
+    Add(new cMenuEditStraItem(tr("Scale Video size to fit into menu window"), tmpConf->GetValueRef("scalePicture"), 3, scalePic));
+    Add(new cMenuEditIntItem(tr("Header Height (Percent of OSD Height)"), tmpConf->GetValueRef("headerHeight"), 5, 30));
+    Add(new cMenuEditIntItem(tr("Header Icon Size (Square Header Menu Icons)"), tmpConf->GetValueRef("headerIconHeight"), 30, 200));
+    Add(new cMenuEditIntItem(tr("Footer Height (Percent of OSD Height)"), tmpConf->GetValueRef("footerHeight"), 5, 30));
+    Add(new cMenuEditBoolItem(tr("Rounded Corners for menu items and buttons"), tmpConf->GetValueRef("roundedCorners")));
+    if (tmpConf->GetValue("roundedCorners"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Radius of rounded corners")), tmpConf->GetValueRef("cornerRadius"), 5, 30));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("menuFadeTime"), 0, 1000));
+    Add(new cMenuEditStraItem(tr("Menu Items Scroll Style"), tmpConf->GetValueRef("scrollMode"), 2, scrollMode));
+    Add(new cMenuEditStraItem(tr("Menu Items Scrolling Speed"), tmpConf->GetValueRef("menuScrollSpeed"), 4, scrollSpeed));
+    Add(new cMenuEditIntItem(tr("Menu Items Scrolling Delay in s"), tmpConf->GetValueRef("menuScrollDelay"), 0, 3));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), tmpConf->GetValueRef("fontHeader"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), tmpConf->GetValueRef("fontDate"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Color Buttons"), tmpConf->GetValueRef("fontButtons"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Messages"), tmpConf->GetValueRef("fontMessageMenu"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text"), tmpConf->GetValueRef("fontDetailView"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Text Small"), tmpConf->GetValueRef("fontDetailViewSmall"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header"), tmpConf->GetValueRef("fontDetailViewHeader"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Detail View Header Large"), tmpConf->GetValueRef("fontDetailViewHeaderLarge"), -20, 20));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -333,37 +183,37 @@ cNopacitySetupMenuDisplayMain::cNopacitySetupMenuDisplayMain(cNopacityConfig* da
 void cNopacitySetupMenuDisplayMain::Set(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditBoolItem(tr("Use narrow main menu"), &tmpNopacityConfig->narrowMainMenu));
-    if (tmpNopacityConfig->narrowMainMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthMain, 10, 97));
-    Add(new cMenuEditBoolItem(tr("Use narrow setup menu"), &tmpNopacityConfig->narrowSetupMenu));
-    if (tmpNopacityConfig->narrowSetupMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthSetup, 10, 97));
-
-    Add(new cMenuEditBoolItem(tr("Use menu icons"), &tmpNopacityConfig->useMenuIcons));
-    if (tmpNopacityConfig->useMenuIcons)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Icon Size (Square)")), &tmpNopacityConfig->iconHeight, 30, 200));
-    Add(new cMenuEditStraItem(tr("Main menu title style"), &tmpNopacityConfig->mainMenuTitleStyle, 3, titleStyle));
-    Add(new cMenuEditBoolItem(tr("Display Disk Usage"), &tmpNopacityConfig->showDiscUsage));
-    if (tmpNopacityConfig->showDiscUsage) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size (square, Percent of OSD Width)")), &tmpNopacityConfig->menuSizeDiskUsage, 5, 30));
-        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Free Disc Display")), &tmpNopacityConfig->discUsageStyle, 2, discUsageStyle));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - free")), &tmpNopacityConfig->fontDiskUsage, -20, 20));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - percent")), &tmpNopacityConfig->fontDiskUsagePercent, -20, 20));
+    Add(new cMenuEditBoolItem(tr("Use narrow main menu"), tmpConf->GetValueRef("narrowMainMenu")));
+    if (tmpConf->GetValue("narrowMainMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthMain"), 10, 97));
+    Add(new cMenuEditBoolItem(tr("Use narrow setup menu"), tmpConf->GetValueRef("narrowSetupMenu")));
+    if (tmpConf->GetValue("narrowSetupMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthSetup"), 10, 97));
+
+    Add(new cMenuEditBoolItem(tr("Use menu icons"), tmpConf->GetValueRef("useMenuIcons")));
+    if (tmpConf->GetValue("useMenuIcons"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Icon Size (Square)")), tmpConf->GetValueRef("iconHeight"), 30, 200));
+    Add(new cMenuEditStraItem(tr("Main menu title style"), tmpConf->GetValueRef("mainMenuTitleStyle"), 3, titleStyle));
+    Add(new cMenuEditBoolItem(tr("Display Disk Usage"), tmpConf->GetValueRef("showDiscUsage")));
+    if (tmpConf->GetValue("showDiscUsage")) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size (square, Percent of OSD Width)")), tmpConf->GetValueRef("menuSizeDiskUsage"), 5, 30));
+        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Free Disc Display")), tmpConf->GetValueRef("discUsageStyle"), 2, discUsageStyle));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - free")), tmpConf->GetValueRef("fontDiskUsage"), -20, 20));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - percent")), tmpConf->GetValueRef("fontDiskUsagePercent"), -20, 20));
     }
-    Add(new cMenuEditStraItem(tr("Display Timers"), &tmpNopacityConfig->showTimers, 3, showTimers));
-    if (tmpNopacityConfig->showTimers) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximum number of Timers")), &tmpNopacityConfig->numberTimers, 1, 10));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Timers (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRightItems, 5, 30));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Width")), &tmpNopacityConfig->timersLogoWidth, 30, 300));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Height")), &tmpNopacityConfig->timersLogoHeight, 30, 300));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Header")), &tmpNopacityConfig->fontTimersHead, -20, 20));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Title")), &tmpNopacityConfig->fontTimers, -20, 20));
+    Add(new cMenuEditStraItem(tr("Display Timers"), tmpConf->GetValueRef("showTimers"), 3, showTimers));
+    if (tmpConf->GetValue("showTimers")) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximum number of Timers")), tmpConf->GetValueRef("numberTimers"), 1, 10));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width of Timers (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthRightItems"), 5, 30));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Width")), tmpConf->GetValueRef("timersLogoWidth"), 30, 300));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Height")), tmpConf->GetValueRef("timersLogoHeight"), 30, 300));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Header")), tmpConf->GetValueRef("fontTimersHead"), -20, 20));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size - Title")), tmpConf->GetValueRef("fontTimers"), -20, 20));
     }
-    Add(new cMenuEditBoolItem(tr("Show Timer Conflicts"), &tmpNopacityConfig->checkTimerConflict));
-    Add(new cMenuEditIntItem(tr("Header Logo Width"), &tmpNopacityConfig->menuHeaderLogoWidth, 30, 500));
-    Add(new cMenuEditIntItem(tr("Header Logo Height"), &tmpNopacityConfig->menuHeaderLogoHeight, 30, 500));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Items"), &tmpNopacityConfig->fontMenuitemLarge, -20, 20));
+    Add(new cMenuEditBoolItem(tr("Show Timer Conflicts"), tmpConf->GetValueRef("checkTimerConflict")));
+    Add(new cMenuEditIntItem(tr("Header Logo Width"), tmpConf->GetValueRef("menuHeaderLogoWidth"), 30, 500));
+    Add(new cMenuEditIntItem(tr("Header Logo Height"), tmpConf->GetValueRef("menuHeaderLogoHeight"), 30, 500));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Items"), tmpConf->GetValueRef("fontMenuitemLarge"), -20, 20));
     
     SetCurrent(Get(currentItem));
     Display();
@@ -391,34 +241,34 @@ void cNopacitySetupMenuDisplaySchedules::Set(void) {
     int currentItem = Current();
     Clear();
 
-    Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowScheduleMenu));
-    if (tmpNopacityConfig->narrowScheduleMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthSchedules, 10, 97));
-    Add(new cMenuEditIntItem(tr("Channel Logo Width"), &tmpNopacityConfig->menuItemLogoWidth, 30, 200));
-    Add(new cMenuEditIntItem(tr("Channel Logo Height"), &tmpNopacityConfig->menuItemLogoHeight, 30, 200));
-    Add(new cMenuEditStraItem(tr("Mode of EPG Window"), &tmpNopacityConfig->menuSchedulesWindowMode, 2, windowMode));
-    Add(new cMenuEditIntItem(tr("EPG Window Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->menuEPGWindowFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("EPG Window Display Delay in s"), &tmpNopacityConfig->menuInfoTextDelay, 0, 10));
-    Add(new cMenuEditIntItem(tr("EPG Window Scroll Delay in s"), &tmpNopacityConfig->menuInfoScrollDelay, 0, 10));
-    Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), &tmpNopacityConfig->menuInfoScrollSpeed, 4, scrollSpeed));
-    Add(new cMenuEditIntItem(tr("Height of EPG Info Window (Percent of OSD Height)"), &tmpNopacityConfig->menuHeightInfoWindow, 10, 100));
-    Add(new cMenuEditIntItem(tr("Border around detailed EPG view"), &tmpNopacityConfig->borderDetailedEPG, 1, 300));
-    Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), &tmpNopacityConfig->displayRerunsDetailEPGView));
-    if (tmpNopacityConfig->displayRerunsDetailEPGView) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of reruns to display")), &tmpNopacityConfig->numReruns, 1, 10));
-        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Use Subtitle for reruns")), &tmpNopacityConfig->useSubtitleRerun, 3, useSubtitleRerunTexts));
+    Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowScheduleMenu")));
+    if (tmpConf->GetValue("narrowScheduleMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthSchedules"), 10, 97));
+    Add(new cMenuEditIntItem(tr("Channel Logo Width"), tmpConf->GetValueRef("menuItemLogoWidth"), 30, 200));
+    Add(new cMenuEditIntItem(tr("Channel Logo Height"), tmpConf->GetValueRef("menuItemLogoHeight"), 30, 200));
+    Add(new cMenuEditStraItem(tr("Mode of EPG Window"), tmpConf->GetValueRef("menuSchedulesWindowMode"), 2, windowMode));
+    Add(new cMenuEditIntItem(tr("EPG Window Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("menuEPGWindowFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("EPG Window Display Delay in s"), tmpConf->GetValueRef("menuInfoTextDelay"), 0, 10));
+    Add(new cMenuEditIntItem(tr("EPG Window Scroll Delay in s"), tmpConf->GetValueRef("menuInfoScrollDelay"), 0, 10));
+    Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), tmpConf->GetValueRef("menuInfoScrollSpeed"), 4, scrollSpeed));
+    Add(new cMenuEditIntItem(tr("Height of EPG Info Window (Percent of OSD Height)"), tmpConf->GetValueRef("menuHeightInfoWindow"), 10, 100));
+    Add(new cMenuEditIntItem(tr("Border around detailed EPG view"), tmpConf->GetValueRef("borderDetailedEPG"), 1, 300));
+    Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), tmpConf->GetValueRef("displayRerunsDetailEPGView")));
+    if (tmpConf->GetValue("displayRerunsDetailEPGView")) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of reruns to display")), tmpConf->GetValueRef("numReruns"), 1, 10));
+        Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Use Subtitle for reruns")), tmpConf->GetValueRef("useSubtitleRerun"), 3, useSubtitleRerunTexts));
     }
-    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed EPG View"), &tmpNopacityConfig->displayAdditionalEPGPictures, 3, displayEPGPictures));
-    if (tmpNopacityConfig->displayAdditionalEPGPictures)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalEPGPictures, 1, 9));
-    Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Width"), &tmpNopacityConfig->epgImageWidth, 30, 500));
-    Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Height"), &tmpNopacityConfig->epgImageHeight, 30, 500));
-    Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Width"), &tmpNopacityConfig->epgImageWidthLarge, 100, 800));
-    Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Height"), &tmpNopacityConfig->epgImageHeightLarge, 100, 800));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemSchedule, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemScheduleSmall, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window"), &tmpNopacityConfig->fontEPGInfoWindow, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window Header"), &tmpNopacityConfig->fontEPGInfoWindowLarge, -20, 20));
+    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed EPG View"), tmpConf->GetValueRef("displayAdditionalEPGPictures"), 3, displayEPGPictures));
+    if (tmpConf->GetValue("displayAdditionalEPGPictures"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), tmpConf->GetValueRef("numAdditionalEPGPictures"), 1, 9));
+    Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Width"), tmpConf->GetValueRef("epgImageWidth"), 30, 500));
+    Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Height"), tmpConf->GetValueRef("epgImageHeight"), 30, 500));
+    Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Width"), tmpConf->GetValueRef("epgImageWidthLarge"), 100, 800));
+    Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Height"), tmpConf->GetValueRef("epgImageHeightLarge"), 100, 800));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), tmpConf->GetValueRef("fontMenuitemSchedule"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), tmpConf->GetValueRef("fontMenuitemScheduleSmall"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window"), tmpConf->GetValueRef("fontEPGInfoWindow"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window Header"), tmpConf->GetValueRef("fontEPGInfoWindowLarge"), -20, 20));
     
     SetCurrent(Get(currentItem));
     Display();
@@ -437,16 +287,16 @@ void cNopacitySetupMenuDisplayChannels::Set(void) {
     int currentItem = Current();
     Clear();
     
-    Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowChannelMenu));
-    if (tmpNopacityConfig->narrowChannelMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthChannels, 10, 97));
-    Add(new cMenuEditStraItem(tr("Menu Items display mode"), &tmpNopacityConfig->menuChannelDisplayMode, 3, displayModes));
-    if (tmpNopacityConfig->menuChannelDisplayMode == 1) {
-        Add(new cMenuEditBoolItem(cString::sprintf("%s%s", *spacer, tr("Display schedules with time info")), &tmpNopacityConfig->menuChannelDisplayTime));
+    Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowChannelMenu")));
+    if (tmpConf->GetValue("narrowChannelMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthChannels"), 10, 97));
+    Add(new cMenuEditStraItem(tr("Menu Items display mode"), tmpConf->GetValueRef("menuChannelDisplayMode"), 3, displayModes));
+    if (tmpConf->GetValue("menuChannelDisplayMode") == 1) {
+        Add(new cMenuEditBoolItem(cString::sprintf("%s%s", *spacer, tr("Display schedules with time info")), tmpConf->GetValueRef("menuChannelDisplayTime")));
     }
-    Add(new cMenuEditIntItem(tr("Number of EPG Entries in Schedules Info Window"), &tmpNopacityConfig->numEPGEntriesChannelsMenu, 1, 100));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemChannel, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemChannelSmall, -20, 20));
+    Add(new cMenuEditIntItem(tr("Number of EPG Entries in Schedules Info Window"), tmpConf->GetValueRef("numEPGEntriesChannelsMenu"), 1, 100));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), tmpConf->GetValueRef("fontMenuitemChannel"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), tmpConf->GetValueRef("fontMenuitemChannelSmall"), -20, 20));
    
     SetCurrent(Get(currentItem));
     Display();
@@ -462,11 +312,11 @@ void cNopacitySetupMenuDisplayTimers::Set(void) {
     int currentItem = Current();
     Clear();
     
-    Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowTimerMenu));
-    if (tmpNopacityConfig->narrowTimerMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthTimers, 10, 97));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemTimers, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemTimersSmall, -20, 20));
+    Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowTimerMenu")));
+    if (tmpConf->GetValue("narrowTimerMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthTimers"), 10, 97));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), tmpConf->GetValueRef("fontMenuitemTimers"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), tmpConf->GetValueRef("fontMenuitemTimersSmall"), -20, 20));
    
     SetCurrent(Get(currentItem));
     Display();
@@ -487,20 +337,20 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
     int currentItem = Current();
     Clear();
     
-    Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowRecordingMenu));
-    if (tmpNopacityConfig->narrowRecordingMenu)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRecordings, 10, 97));
-    Add(new cMenuEditStraItem(tr("Mode of recording Window"), &tmpNopacityConfig->menuRecordingsWindowMode, 2, windowMode));
-    Add(new cMenuEditIntItem(tr("Border around detailed recording view"), &tmpNopacityConfig->borderDetailedRecordings, 1, 300));
-    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed recording View"), &tmpNopacityConfig->displayAdditionalRecEPGPictures, 3, displayEPGPictures));
-    if (tmpNopacityConfig->displayAdditionalRecEPGPictures)
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalRecEPGPictures, 1, 9));
-    Add(new cMenuEditIntItem(tr("Folder Icon Size"), &tmpNopacityConfig->menuRecFolderSize, 30, 300));
-    Add(new cMenuEditBoolItem(tr("Use folder poster if available"), &tmpNopacityConfig->useFolderPoster));
-    Add(new cMenuEditIntItem(tr("Width of manually set recording poster"), &tmpNopacityConfig->posterWidth, 100, 1000));
-    Add(new cMenuEditIntItem(tr("Height of manually set recording poster"), &tmpNopacityConfig->posterHeight, 100, 1000));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemRecordings, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), &tmpNopacityConfig->fontMenuitemRecordingsSmall, -20, 20));
+    Add(new cMenuEditBoolItem(tr("Use narrow menu"), tmpConf->GetValueRef("narrowRecordingMenu")));
+    if (tmpConf->GetValue("narrowRecordingMenu"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), tmpConf->GetValueRef("menuWidthRecordings"), 10, 97));
+    Add(new cMenuEditStraItem(tr("Mode of recording Window"), tmpConf->GetValueRef("menuRecordingsWindowMode"), 2, windowMode));
+    Add(new cMenuEditIntItem(tr("Border around detailed recording view"), tmpConf->GetValueRef("borderDetailedRecordings"), 1, 300));
+    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed recording View"), tmpConf->GetValueRef("displayAdditionalRecEPGPictures"), 3, displayEPGPictures));
+    if (tmpConf->GetValue("displayAdditionalRecEPGPictures"))
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), tmpConf->GetValueRef("numAdditionalRecEPGPictures"), 1, 9));
+    Add(new cMenuEditIntItem(tr("Folder Icon Size"), tmpConf->GetValueRef("menuRecFolderSize"), 30, 300));
+    Add(new cMenuEditBoolItem(tr("Use folder poster if available"), tmpConf->GetValueRef("useFolderPoster")));
+    Add(new cMenuEditIntItem(tr("Width of manually set recording poster"), tmpConf->GetValueRef("posterWidth"), 100, 1000));
+    Add(new cMenuEditIntItem(tr("Height of manually set recording poster"), tmpConf->GetValueRef("posterHeight"), 100, 1000));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), tmpConf->GetValueRef("fontMenuitemRecordings"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), tmpConf->GetValueRef("fontMenuitemRecordingsSmall"), -20, 20));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -509,8 +359,6 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
 //----ChannelDisplay--------------------------------------------------------------------------------------------------------------
 
 cNopacitySetupChannelDisplay::cNopacitySetupChannelDisplay(cNopacityConfig* data)  : cMenuSetupSubMenu(tr("Channel Switching"), data) {
-    symStyle[0] = tr("simple, one common image");
-    symStyle[1] = tr("complex, dedicated images");
     bgStyle[0] = tr("transparent channel logo");
     bgStyle[1] = tr("full osd width");
     logoPos[0] = tr("do not display");
@@ -524,33 +372,31 @@ cNopacitySetupChannelDisplay::cNopacitySetupChannelDisplay(cNopacityConfig* data
 void cNopacitySetupChannelDisplay::Set(void) {
     int currentItem = Current();
     Clear();
-
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->channelFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Height of Channel Display (Percent of OSD Height)"), &tmpNopacityConfig->channelHeight, 15, 80));
-    Add(new cMenuEditIntItem(tr("Left & Right Border Width"), &tmpNopacityConfig->channelBorderVertical, 0, 300));
-    Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->channelBorderBottom, 0, 300));
-    Add(new cMenuEditStraItem(tr("Background Style"), &tmpNopacityConfig->backgroundStyle, 2, bgStyle));
-    Add(new cMenuEditBoolItem(tr("Rounded Corners"), &tmpNopacityConfig->roundedCornersChannel));
-    Add(new cMenuEditStraItem(tr("Channel Logo Position"), &tmpNopacityConfig->logoPosition, 3, logoPos));
-    if (tmpNopacityConfig->logoPosition) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Width")), &tmpNopacityConfig->logoWidth, 30, 500));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Height")), &tmpNopacityConfig->logoHeight, 30, 500));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo Border")), &tmpNopacityConfig->logoBorder, 0, 200));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("channelFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Height of Channel Display (Percent of OSD Height)"), tmpConf->GetValueRef("channelHeight"), 15, 80));
+    Add(new cMenuEditIntItem(tr("Left & Right Border Width"), tmpConf->GetValueRef("channelBorderVertical"), 0, 300));
+    Add(new cMenuEditIntItem(tr("Bottom Border Height"), tmpConf->GetValueRef("channelBorderBottom"), 0, 300));
+    if (config.GetValue("displayType") != dtGraphical) {
+        Add(new cMenuEditStraItem(tr("Background Style"), tmpConf->GetValueRef("backgroundStyle"), 2, bgStyle));
+        Add(new cMenuEditBoolItem(tr("Rounded Corners"), tmpConf->GetValueRef("roundedCornersChannel")));
     }
-    Add(new cMenuEditStraItem(tr("Kind of time display for current schedule"), &tmpNopacityConfig->progressCurrentSchedule, 2, progressStyleCurrentSchedule));
-    Add(new cMenuEditBoolItem(tr("Display Signal Strength & Quality"), &tmpNopacityConfig->displaySignalStrength));
-    Add(new cMenuEditBoolItem(tr("Display Channel Source information"), &tmpNopacityConfig->displaySourceInfo));
-    Add(new cMenuEditBoolItem(tr("Display Poster or Fanart from TVScraper"), &tmpNopacityConfig->displayPoster));
-    Add(new cMenuEditBoolItem(tr("Display previous and next Channel Group"), &tmpNopacityConfig->displayPrevNextChannelGroup));
-    Add(new cMenuEditIntItem(tr("Screen Resolution Icon Size"), &tmpNopacityConfig->resolutionIconSize, 30, 200));
-    Add(new cMenuEditIntItem(tr("Status Icons Size"), &tmpNopacityConfig->statusIconSize, 30, 150));
-    Add(new cMenuEditStraItem(tr("Status Icon Style"), &tmpNopacityConfig->symbolStyle, 2, symStyle));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontChannelHeaderSize, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), &tmpNopacityConfig->fontChannelDateSize, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Text"), &tmpNopacityConfig->fontEPGSize, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Infotext"), &tmpNopacityConfig->fontEPGSmallSize, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Channel Group"), &tmpNopacityConfig->fontChannelGroupSize, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Next/Prev Channel Group"), &tmpNopacityConfig->fontChannelGroupSmallSize, -20, 20));
+    Add(new cMenuEditStraItem(tr("Channel Logo Position"), tmpConf->GetValueRef("logoPosition"), 3, logoPos));
+    if (tmpConf->GetValue("logoPosition")) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo original Width")), tmpConf->GetValueRef("logoWidthOriginal"), 30, 500));
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Channel Logo original Height")), tmpConf->GetValueRef("logoHeightOriginal"), 30, 500));
+    }
+    Add(new cMenuEditStraItem(tr("Kind of time display for current schedule"), tmpConf->GetValueRef("progressCurrentSchedule"), 2, progressStyleCurrentSchedule));
+    Add(new cMenuEditBoolItem(tr("Display Signal Strength & Quality"), tmpConf->GetValueRef("displaySignalStrength")));
+    Add(new cMenuEditBoolItem(tr("Display Channel Source information"), tmpConf->GetValueRef("displaySourceInfo")));
+    Add(new cMenuEditBoolItem(tr("Display Poster or Fanart from TVScraper"), tmpConf->GetValueRef("displayPoster")));
+    Add(new cMenuEditBoolItem(tr("Display previous and next Channel Group"), tmpConf->GetValueRef("displayPrevNextChannelGroup")));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), tmpConf->GetValueRef("fontChannelHeaderSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Date"), tmpConf->GetValueRef("fontChannelDateSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Text"), tmpConf->GetValueRef("fontEPGSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Infotext"), tmpConf->GetValueRef("fontEPGSmallSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Channel Source Info"), tmpConf->GetValueRef("fontChannelSourceInfoSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Channel Group"), tmpConf->GetValueRef("fontChannelGroupSize"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Next/Prev Channel Group"), tmpConf->GetValueRef("fontChannelGroupSmallSize"), -20, 20));
     SetCurrent(Get(currentItem));
     Display();
 }
@@ -565,12 +411,12 @@ void cNopacitySetupReplayDisplay::Set(void) {
     int currentItem = Current();
     Clear();
 
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->replayFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Height of Replay Display (Percent of OSD Height)"), &tmpNopacityConfig->replayHeight, 15, 80));
-    Add(new cMenuEditIntItem(tr("Left & Right Border Width"), &tmpNopacityConfig->replayBorderVertical, 0, 300));
-    Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->replayBorderBottom, 0, 300));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontReplayHeader, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Text"), &tmpNopacityConfig->fontReplay, -20, 20));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("replayFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Height of Replay Display (Percent of OSD Height)"), tmpConf->GetValueRef("replayHeight"), 15, 80));
+    Add(new cMenuEditIntItem(tr("Left & Right Border Width"), tmpConf->GetValueRef("replayBorderVertical"), 0, 300));
+    Add(new cMenuEditIntItem(tr("Bottom Border Height"), tmpConf->GetValueRef("replayBorderBottom"), 0, 300));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), tmpConf->GetValueRef("fontReplayHeader"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Text"), tmpConf->GetValueRef("fontReplay"), -20, 20));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -585,14 +431,14 @@ cNopacitySetupTrackDisplay::cNopacitySetupTrackDisplay(cNopacityConfig* data)  :
 void cNopacitySetupTrackDisplay::Set(void) {
     int currentItem = Current();
     Clear();
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->tracksFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Width of Tracks Display (Percent of OSD Width)"), &tmpNopacityConfig->tracksWidth, 10, 100));
-    Add(new cMenuEditIntItem(tr("Height of Track Items (in pixels)"), &tmpNopacityConfig->tracksItemHeight, 30, 200));
-    Add(new cMenuEditIntItem(tr("Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"), &tmpNopacityConfig->tracksPosition, 0, 7));
-    Add(new cMenuEditIntItem(tr("Border Top / Bottom"), &tmpNopacityConfig->tracksBorderHorizontal, 0, 100));
-    Add(new cMenuEditIntItem(tr("Border Left / Right"), &tmpNopacityConfig->tracksBorderVertical, 0, 100));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), &tmpNopacityConfig->fontTracksHeader, -20, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size - Buttons"), &tmpNopacityConfig->fontTracks, -20, 20));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("tracksFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Width of Tracks Display (Percent of OSD Width)"), tmpConf->GetValueRef("tracksWidth"), 10, 100));
+    Add(new cMenuEditIntItem(tr("Height of Track Items (in pixels)"), tmpConf->GetValueRef("tracksItemHeight"), 30, 200));
+    Add(new cMenuEditIntItem(tr("Position (0: bot. center, 1: bot. left, ... , 7: bot. right)"), tmpConf->GetValueRef("tracksPosition"), 0, 7));
+    Add(new cMenuEditIntItem(tr("Border Top / Bottom"), tmpConf->GetValueRef("tracksBorderHorizontal"), 0, 100));
+    Add(new cMenuEditIntItem(tr("Border Left / Right"), tmpConf->GetValueRef("tracksBorderVertical"), 0, 100));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Header"), tmpConf->GetValueRef("fontTracksHeader"), -20, 20));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size - Buttons"), tmpConf->GetValueRef("fontTracks"), -20, 20));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -608,11 +454,11 @@ void cNopacitySetupMessageDisplay::Set(void) {
     int currentItem = Current();
     Clear();
 
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->messageFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Width of Message Display (Percent of OSD Height)"), &tmpNopacityConfig->messageWidth, 30, 100));
-    Add(new cMenuEditIntItem(tr("Height of Message Display (Percent of OSD Height)"), &tmpNopacityConfig->messageHeight, 5, 100));
-    Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->messageBorderBottom, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size"), &tmpNopacityConfig->fontMessage, -30, 30));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("messageFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Width of Message Display (Percent of OSD Height)"), tmpConf->GetValueRef("messageWidth"), 30, 100));
+    Add(new cMenuEditIntItem(tr("Height of Message Display (Percent of OSD Height)"), tmpConf->GetValueRef("messageHeight"), 5, 100));
+    Add(new cMenuEditIntItem(tr("Bottom Border Height"), tmpConf->GetValueRef("messageBorderBottom"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size"), tmpConf->GetValueRef("fontMessage"), -30, 30));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -627,12 +473,11 @@ cNopacitySetupVolumeDisplay::cNopacitySetupVolumeDisplay(cNopacityConfig* data)
 void cNopacitySetupVolumeDisplay::Set(void) {
     int currentItem = Current();
     Clear();
-
-    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), &tmpNopacityConfig->volumeFadeTime, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Width of Volume Display (Percent of OSD Height)"), &tmpNopacityConfig->volumeWidth, 10, 100));
-    Add(new cMenuEditIntItem(tr("Height of Volume Display (Percent of OSD Height)"), &tmpNopacityConfig->volumeHeight, 5, 100));
-    Add(new cMenuEditIntItem(tr("Bottom Border Height"), &tmpNopacityConfig->volumeBorderBottom, 0, 1000));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size"), &tmpNopacityConfig->fontVolume, -30, 30));
+    Add(new cMenuEditIntItem(tr("Fade-In Time in ms (Zero for switching off fading)"), tmpConf->GetValueRef("volumeFadeTime"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Width of Volume Display (Percent of OSD Height)"), tmpConf->GetValueRef("volumeWidth"), 10, 100));
+    Add(new cMenuEditIntItem(tr("Height of Volume Display (Percent of OSD Height)"), tmpConf->GetValueRef("volumeHeight"), 5, 100));
+    Add(new cMenuEditIntItem(tr("Bottom Border Height"), tmpConf->GetValueRef("volumeBorderBottom"), 0, 1000));
+    Add(new cMenuEditIntItem(tr("Adjust Font Size"), tmpConf->GetValueRef("fontVolume"), -30, 30));
 
     SetCurrent(Get(currentItem));
     Display();
@@ -649,11 +494,11 @@ void cNopacitySetupCaching::Set(void) {
     int currentItem = Current();
     Clear();
     
-    Add(new cMenuEditBoolItem(tr("Limit Logo Cache"), &tmpNopacityConfig->limitLogoCache));
-    if (tmpNopacityConfig->limitLogoCache) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximal number of logos to cache")), &tmpNopacityConfig->numLogosMax, 1, 9999));
+    Add(new cMenuEditBoolItem(tr("Limit Logo Cache"), tmpConf->GetValueRef("limitLogoCache")));
+    if (tmpConf->GetValue("limitLogoCache")) {
+        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Maximal number of logos to cache")), tmpConf->GetValueRef("numLogosMax"), 1, 9999));
     }
-    Add(new cMenuEditIntItem(tr("Number of  logos to cache at start"), &tmpNopacityConfig->numLogosInitial, 0, 9999));
+    Add(new cMenuEditIntItem(tr("Number of  logos to cache at start"), tmpConf->GetValueRef("numLogosInitial"), 0, 9999));
 
     Add(InfoItem(tr("Cache Sizes"), ""));
     Add(InfoItem(tr("Menu Icon cache"), (imgCache->GetCacheSize(ctMenuIcon)).c_str()));
@@ -661,51 +506,8 @@ void cNopacitySetupCaching::Set(void) {
     Add(InfoItem(tr("Logo cache"), (imgCache->GetCacheSize(ctLogo)).c_str()));
     Add(InfoItem(tr("Menu Item Logo cache"), (imgCache->GetCacheSize(ctLogoMenuItem)).c_str()));
     Add(InfoItem(tr("Timer Logo cache"), (imgCache->GetCacheSize(ctLogoTimer)).c_str()));
-    Add(InfoItem(tr("Background Images cache"), (imgCache->GetCacheSize(ctBackground)).c_str()));
+    Add(InfoItem(tr("Background Images cache"), (imgCache->GetCacheSize(ctSkinElement)).c_str()));
     
     SetCurrent(Get(currentItem));
     Display();
-}
-
-//-----RSS Feeds-------------------------------------------------------------------------------------------------------------
-
-cNopacitySetupRssFeed::cNopacitySetupRssFeed(cNopacityConfig* data)  : cMenuSetupSubMenu(tr("RSS Feeds"), data) {
-    scrollSpeed[0] = tr("slow");
-    scrollSpeed[1] = tr("medium");
-    scrollSpeed[2] = tr("fast");
-    feedsWithNone[0] = tr("none");
-    int i = 0;
-    for (std::vector<RssFeed>::iterator it = config.rssFeeds.begin(); it!=config.rssFeeds.end(); ++it) {
-        feeds[i] = it->name.c_str();
-        feedsWithNone[i+1] = it->name.c_str();
-        i++;
-        if (i==20)
-            break;
-    }
-    standalonePos[0] = tr("bottom");
-    standalonePos[1] = tr("top");
-    Set();
-}
-
-void cNopacitySetupRssFeed::Set(void) {
-    int currentItem = Current();
-    Clear();
-
-    Add(new cMenuEditBoolItem(tr("Display RSS Feed in Skin"), &tmpNopacityConfig->displayRSSFeed));
-    if (tmpNopacityConfig->displayRSSFeed) {
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Height of RSS Feed Line (Percent of OSD Height)")), &tmpNopacityConfig->rssFeedHeight, 3, 10));
-        Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Adjust Font Size")), &tmpNopacityConfig->fontRssFeed, -30, 30));
-    }
-    Add(new cMenuEditIntItem(tr("Height of standalone RSS Feed (Percent of OSD Height)"), &tmpNopacityConfig->rssFeedHeightStandalone, 3, 20));
-    Add(new cMenuEditIntItem(tr("Adjust Font Size of standalone Feed"), &tmpNopacityConfig->fontRssFeedStandalone, -30, 30));
-    Add(new cMenuEditStraItem(tr("Standalone RSS Feed Position"), &tmpNopacityConfig->rssFeedStandalonePos, 2, standalonePos));
-    Add(new cMenuEditStraItem(tr("RSS Feed 1"), &tmpNopacityConfig->rssFeed[0], config.rssFeeds.size(), feeds));
-    Add(new cMenuEditStraItem(tr("RSS Feed 2"), &tmpNopacityConfig->rssFeed[1], config.rssFeeds.size()+1, feedsWithNone));
-    Add(new cMenuEditStraItem(tr("RSS Feed 3"), &tmpNopacityConfig->rssFeed[2], config.rssFeeds.size()+1, feedsWithNone));
-    Add(new cMenuEditStraItem(tr("RSS Feed 4"), &tmpNopacityConfig->rssFeed[3], config.rssFeeds.size()+1, feedsWithNone));
-    Add(new cMenuEditStraItem(tr("RSS Feed 5"), &tmpNopacityConfig->rssFeed[4], config.rssFeeds.size()+1, feedsWithNone));
-    Add(new cMenuEditStraItem(tr("Scrolling Speed"), &tmpNopacityConfig->rssScrollSpeed, 3, scrollSpeed));
-    Add(new cMenuEditIntItem(tr("Scrolling Delay in s"), &tmpNopacityConfig->rssScrollDelay, 0, 3));
-    SetCurrent(Get(currentItem));
-    Display();
 }
\ No newline at end of file