From 0766d679806e1ed098f562672e88ef324c3cd680 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 11 Jul 2019 11:28:11 +0200 Subject: Change tvguideConfig to Config --- setup.c | 208 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'setup.c') diff --git a/setup.c b/setup.c index 4c97158..04e5baf 100644 --- a/setup.c +++ b/setup.c @@ -1,7 +1,7 @@ #include "setup.h" cTvguideSetup::cTvguideSetup() { - tmpConfig = tvguideConfig; + tmpConfig = config; Setup(); } @@ -9,8 +9,8 @@ cTvguideSetup::~cTvguideSetup() { geoManager.SetGeometry(cOsd::OsdWidth(), cOsd::OsdHeight(), true); fontManager.DeleteFonts(); fontManager.SetFonts(); - tvguideConfig.LoadTheme(); - tvguideConfig.setDynamicValues(); + config.LoadTheme(); + config.setDynamicValues(); imgCache.Clear(); imgCache.CreateCache(); } @@ -56,104 +56,104 @@ eOSState cTvguideSetup::ProcessKey(eKeys Key) { void cTvguideSetup::Store(void) { - tvguideConfig = tmpConfig; - SetupStore("debugImageLoading", tvguideConfig.debugImageLoading); - SetupStore("useNopacityTheme", tvguideConfig.useNopacityTheme); - SetupStore("themeIndex", tvguideConfig.themeIndex); - SetupStore("showMainMenuEntry", tvguideConfig.showMainMenuEntry); - SetupStore("replaceOriginalSchedule", tvguideConfig.replaceOriginalSchedule); - SetupStore("displayMode", tvguideConfig.displayMode); - SetupStore("showTimeInGrid", tvguideConfig.showTimeInGrid); - SetupStore("displayStatusHeader", tvguideConfig.displayStatusHeader); - SetupStore("displayChannelGroups", tvguideConfig.displayChannelGroups); - SetupStore("displayTimeBase", tvguideConfig.displayTimeBase); - SetupStore("headerHeightPercent", tvguideConfig.headerHeightPercent); - SetupStore("channelGroupsPercent", tvguideConfig.channelGroupsPercent); - SetupStore("epgViewBorder", tvguideConfig.epgViewBorder); - SetupStore("scaleVideo", tvguideConfig.scaleVideo); - SetupStore("decorateVideo", tvguideConfig.decorateVideo); - SetupStore("roundedCorners", tvguideConfig.roundedCorners); - SetupStore("timeFormat", tvguideConfig.timeFormat); - SetupStore("channelCols", tvguideConfig.channelCols); - SetupStore("channelRows", tvguideConfig.channelRows); - SetupStore("displayTime", tvguideConfig.displayTime); - SetupStore("displayHorizontalTime", tvguideConfig.displayHorizontalTime); - SetupStore("bigStepHours", tvguideConfig.bigStepHours); - SetupStore("hugeStepHours", tvguideConfig.hugeStepHours); - SetupStore("channelJumpMode", tvguideConfig.channelJumpMode); - SetupStore("blueKeyMode", tvguideConfig.blueKeyMode); - SetupStore("numkeyMode", tvguideConfig.numkeyMode); - SetupStore("useRemoteTimers", tvguideConfig.useRemoteTimers); - SetupStore("closeOnSwitch", tvguideConfig.closeOnSwitch); - SetupStore("hideLastGroup", tvguideConfig.hideLastGroup); - SetupStore("hideChannelLogos", tvguideConfig.hideChannelLogos); - SetupStore("logoExtension", tvguideConfig.logoExtension); - SetupStore("logoWidthRatio", tvguideConfig.logoWidthRatio); - SetupStore("logoHeightRatio", tvguideConfig.logoHeightRatio); - SetupStore("hideEpgImages", tvguideConfig.hideEpgImages); - SetupStore("epgImageWidth", tvguideConfig.epgImageWidth); - SetupStore("epgImageHeight", tvguideConfig.epgImageHeight); - SetupStore("numAdditionalEPGPictures", tvguideConfig.numAdditionalEPGPictures); - SetupStore("epgImageWidthLarge", tvguideConfig.epgImageWidthLarge); - SetupStore("epgImageHeightLarge", tvguideConfig.epgImageHeightLarge); - SetupStore("detailedViewScrollStep", tvguideConfig.detailedViewScrollStep); - SetupStore("timeLineWidthPercent", tvguideConfig.timeLineWidthPercent); - SetupStore("timeLineHeightPercent", tvguideConfig.timeLineHeightPercent); - SetupStore("displayChannelName", tvguideConfig.displayChannelName); - SetupStore("channelHeaderWidthPercent", tvguideConfig.channelHeaderWidthPercent); - SetupStore("channelHeaderHeightPercent", tvguideConfig.channelHeaderHeightPercent); - SetupStore("footerHeightPercent", tvguideConfig.footerHeightPercent); - SetupStore("instRecFolderMode", tvguideConfig.instRecFolderMode); - SetupStore("instRecFixedFolder", tvguideConfig.instRecFixedFolder.c_str()); - SetupStore("favWhatsOnNow", tvguideConfig.favWhatsOnNow); - SetupStore("favWhatsOnNext", tvguideConfig.favWhatsOnNext); - SetupStore("favUseTime1", tvguideConfig.favUseTime1); - SetupStore("favUseTime2", tvguideConfig.favUseTime2); - SetupStore("favUseTime3", tvguideConfig.favUseTime3); - SetupStore("favUseTime4", tvguideConfig.favUseTime4); - SetupStore("favTime1", tvguideConfig.favTime1); - SetupStore("favTime2", tvguideConfig.favTime2); - SetupStore("favTime3", tvguideConfig.favTime3); - SetupStore("favTime4", tvguideConfig.favTime4); - SetupStore("descUser1", tvguideConfig.descUser1.c_str()); - SetupStore("descUser2", tvguideConfig.descUser2.c_str()); - SetupStore("descUser3", tvguideConfig.descUser3.c_str()); - SetupStore("descUser4", tvguideConfig.descUser4.c_str()); - SetupStore("favLimitChannels", tvguideConfig.favLimitChannels); - SetupStore("favStartChannel", tvguideConfig.favStartChannel); - SetupStore("favStopChannel", tvguideConfig.favStopChannel); - SetupStore("switchMode", tvguideConfig.switchMode); - SetupStore("switchMinsBefore", tvguideConfig.switchMinsBefore); - SetupStore("fontIndex", tvguideConfig.fontIndex); - SetupStore("FontButtonDelta", tvguideConfig.FontButtonDelta); - SetupStore("FontDetailViewDelta", tvguideConfig.FontDetailViewDelta); - SetupStore("FontDetailHeaderDelta", tvguideConfig.FontDetailHeaderDelta); - SetupStore("FontMessageBoxDelta", tvguideConfig.FontMessageBoxDelta); - SetupStore("FontMessageBoxLargeDelta", tvguideConfig.FontMessageBoxLargeDelta); - SetupStore("FontStatusHeaderDelta", tvguideConfig.FontStatusHeaderDelta); - SetupStore("FontStatusHeaderLargeDelta", tvguideConfig.FontStatusHeaderLargeDelta); - SetupStore("FontChannelHeaderDelta", tvguideConfig.FontChannelHeaderDelta); - SetupStore("FontChannelGroupsDelta", tvguideConfig.FontChannelGroupsDelta); - SetupStore("FontGridDelta", tvguideConfig.FontGridDelta); - SetupStore("FontGridSmallDelta", tvguideConfig.FontGridSmallDelta); - SetupStore("FontTimeLineWeekdayDelta", tvguideConfig.FontTimeLineWeekdayDelta); - SetupStore("FontTimeLineDateDelta", tvguideConfig.FontTimeLineDateDelta); - SetupStore("FontTimeLineTimeDelta", tvguideConfig.FontTimeLineTimeDelta); - SetupStore("FontChannelHeaderHorizontalDelta", tvguideConfig.FontChannelHeaderHorizontalDelta); - SetupStore("FontChannelGroupsHorizontalDelta", tvguideConfig.FontChannelGroupsHorizontalDelta); - SetupStore("FontGridHorizontalDelta", tvguideConfig.FontGridHorizontalDelta); - SetupStore("FontGridHorizontalSmallDelta", tvguideConfig.FontGridHorizontalSmallDelta); - SetupStore("FontTimeLineDateHorizontalDelta", tvguideConfig.FontTimeLineDateHorizontalDelta); - SetupStore("FontTimeLineTimeHorizontalDelta", tvguideConfig.FontTimeLineTimeHorizontalDelta); - SetupStore("FontRecMenuItemDelta", tvguideConfig.FontRecMenuItemDelta); - SetupStore("FontRecMenuItemSmallDelta", tvguideConfig.FontRecMenuItemSmallDelta); - SetupStore("FontRecMenuItemLargeDelta", tvguideConfig.FontRecMenuItemLargeDelta); - SetupStore("displayRerunsDetailEPGView", tvguideConfig.displayRerunsDetailEPGView); - SetupStore("numReruns", tvguideConfig.numReruns); - SetupStore("useSubtitleRerun", tvguideConfig.useSubtitleRerun); - SetupStore("numLogosInitial", tvguideConfig.numLogosInitial); - SetupStore("numLogosMax", tvguideConfig.numLogosMax); - SetupStore("limitLogoCache", tvguideConfig.limitLogoCache); + config = tmpConfig; + SetupStore("debugImageLoading", config.debugImageLoading); + SetupStore("useNopacityTheme", config.useNopacityTheme); + SetupStore("themeIndex", config.themeIndex); + SetupStore("showMainMenuEntry", config.showMainMenuEntry); + SetupStore("replaceOriginalSchedule", config.replaceOriginalSchedule); + SetupStore("displayMode", config.displayMode); + SetupStore("showTimeInGrid", config.showTimeInGrid); + SetupStore("displayStatusHeader", config.displayStatusHeader); + SetupStore("displayChannelGroups", config.displayChannelGroups); + SetupStore("displayTimeBase", config.displayTimeBase); + SetupStore("headerHeightPercent", config.headerHeightPercent); + SetupStore("channelGroupsPercent", config.channelGroupsPercent); + SetupStore("epgViewBorder", config.epgViewBorder); + SetupStore("scaleVideo", config.scaleVideo); + SetupStore("decorateVideo", config.decorateVideo); + SetupStore("roundedCorners", config.roundedCorners); + SetupStore("timeFormat", config.timeFormat); + SetupStore("channelCols", config.channelCols); + SetupStore("channelRows", config.channelRows); + SetupStore("displayTime", config.displayTime); + SetupStore("displayHorizontalTime", config.displayHorizontalTime); + SetupStore("bigStepHours", config.bigStepHours); + SetupStore("hugeStepHours", config.hugeStepHours); + SetupStore("channelJumpMode", config.channelJumpMode); + SetupStore("blueKeyMode", config.blueKeyMode); + SetupStore("numkeyMode", config.numkeyMode); + SetupStore("useRemoteTimers", config.useRemoteTimers); + SetupStore("closeOnSwitch", config.closeOnSwitch); + SetupStore("hideLastGroup", config.hideLastGroup); + SetupStore("hideChannelLogos", config.hideChannelLogos); + SetupStore("logoExtension", config.logoExtension); + SetupStore("logoWidthRatio", config.logoWidthRatio); + SetupStore("logoHeightRatio", config.logoHeightRatio); + SetupStore("hideEpgImages", config.hideEpgImages); + SetupStore("epgImageWidth", config.epgImageWidth); + SetupStore("epgImageHeight", config.epgImageHeight); + SetupStore("numAdditionalEPGPictures", config.numAdditionalEPGPictures); + SetupStore("epgImageWidthLarge", config.epgImageWidthLarge); + SetupStore("epgImageHeightLarge", config.epgImageHeightLarge); + SetupStore("detailedViewScrollStep", config.detailedViewScrollStep); + SetupStore("timeLineWidthPercent", config.timeLineWidthPercent); + SetupStore("timeLineHeightPercent", config.timeLineHeightPercent); + SetupStore("displayChannelName", config.displayChannelName); + SetupStore("channelHeaderWidthPercent", config.channelHeaderWidthPercent); + SetupStore("channelHeaderHeightPercent", config.channelHeaderHeightPercent); + SetupStore("footerHeightPercent", config.footerHeightPercent); + SetupStore("instRecFolderMode", config.instRecFolderMode); + SetupStore("instRecFixedFolder", config.instRecFixedFolder.c_str()); + SetupStore("favWhatsOnNow", config.favWhatsOnNow); + SetupStore("favWhatsOnNext", config.favWhatsOnNext); + SetupStore("favUseTime1", config.favUseTime1); + SetupStore("favUseTime2", config.favUseTime2); + SetupStore("favUseTime3", config.favUseTime3); + SetupStore("favUseTime4", config.favUseTime4); + SetupStore("favTime1", config.favTime1); + SetupStore("favTime2", config.favTime2); + SetupStore("favTime3", config.favTime3); + SetupStore("favTime4", config.favTime4); + SetupStore("descUser1", config.descUser1.c_str()); + SetupStore("descUser2", config.descUser2.c_str()); + SetupStore("descUser3", config.descUser3.c_str()); + SetupStore("descUser4", config.descUser4.c_str()); + SetupStore("favLimitChannels", config.favLimitChannels); + SetupStore("favStartChannel", config.favStartChannel); + SetupStore("favStopChannel", config.favStopChannel); + SetupStore("switchMode", config.switchMode); + SetupStore("switchMinsBefore", config.switchMinsBefore); + SetupStore("fontIndex", config.fontIndex); + SetupStore("FontButtonDelta", config.FontButtonDelta); + SetupStore("FontDetailViewDelta", config.FontDetailViewDelta); + SetupStore("FontDetailHeaderDelta", config.FontDetailHeaderDelta); + SetupStore("FontMessageBoxDelta", config.FontMessageBoxDelta); + SetupStore("FontMessageBoxLargeDelta", config.FontMessageBoxLargeDelta); + SetupStore("FontStatusHeaderDelta", config.FontStatusHeaderDelta); + SetupStore("FontStatusHeaderLargeDelta", config.FontStatusHeaderLargeDelta); + SetupStore("FontChannelHeaderDelta", config.FontChannelHeaderDelta); + SetupStore("FontChannelGroupsDelta", config.FontChannelGroupsDelta); + SetupStore("FontGridDelta", config.FontGridDelta); + SetupStore("FontGridSmallDelta", config.FontGridSmallDelta); + SetupStore("FontTimeLineWeekdayDelta", config.FontTimeLineWeekdayDelta); + SetupStore("FontTimeLineDateDelta", config.FontTimeLineDateDelta); + SetupStore("FontTimeLineTimeDelta", config.FontTimeLineTimeDelta); + SetupStore("FontChannelHeaderHorizontalDelta", config.FontChannelHeaderHorizontalDelta); + SetupStore("FontChannelGroupsHorizontalDelta", config.FontChannelGroupsHorizontalDelta); + SetupStore("FontGridHorizontalDelta", config.FontGridHorizontalDelta); + SetupStore("FontGridHorizontalSmallDelta", config.FontGridHorizontalSmallDelta); + SetupStore("FontTimeLineDateHorizontalDelta", config.FontTimeLineDateHorizontalDelta); + SetupStore("FontTimeLineTimeHorizontalDelta", config.FontTimeLineTimeHorizontalDelta); + SetupStore("FontRecMenuItemDelta", config.FontRecMenuItemDelta); + SetupStore("FontRecMenuItemSmallDelta", config.FontRecMenuItemSmallDelta); + SetupStore("FontRecMenuItemLargeDelta", config.FontRecMenuItemLargeDelta); + SetupStore("displayRerunsDetailEPGView", config.displayRerunsDetailEPGView); + SetupStore("numReruns", config.numReruns); + SetupStore("useSubtitleRerun", config.useSubtitleRerun); + SetupStore("numLogosInitial", config.numLogosInitial); + SetupStore("numLogosMax", config.numLogosMax); + SetupStore("limitLogoCache", config.limitLogoCache); } cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cTvguideConfig* data) : cOsdMenu(Title, 40) { @@ -299,7 +299,7 @@ void cMenuSetupScreenLayout::Set(void) { Add(new cMenuEditBoolItem(tr("Display current time baseline"), &tmpConfig->displayTimeBase)); Add(new cMenuEditStraItem(tr("Show Channel Logos"), &tmpConfig->hideChannelLogos, 2, hideChannelLogosItems)); if (!tmpConfig->hideChannelLogos) { - Add(InfoItem(tr("Logo Path used"), *tvguideConfig.logoPath)); + Add(InfoItem(tr("Logo Path used"), *config.logoPath)); Add(new cMenuEditStraItem(*cString::sprintf("%s%s", *indent, tr("Logo Extension")), &tmpConfig->logoExtension, 2, logoExtensionItems)); Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo width ratio")), &tmpConfig->logoWidthRatio, 1, 1000)); Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Logo height ratio")), &tmpConfig->logoHeightRatio, 1, 1000)); @@ -309,7 +309,7 @@ void cMenuSetupScreenLayout::Set(void) { Add(new cMenuEditStraItem(tr("Show EPG Images"), &tmpConfig->hideEpgImages, 2, hideChannelLogosItems)); if (!tmpConfig->hideEpgImages) { - Add(InfoItem(tr("EPG Images Path used"), *tvguideConfig.epgImagePath)); + Add(InfoItem(tr("EPG Images Path used"), *config.epgImagePath)); Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image width")), &tmpConfig->epgImageWidth, 0, 800)); Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("EPG Image height")), &tmpConfig->epgImageHeight, 0, 800)); Add(new cMenuEditIntItem(*cString::sprintf("%s%s", *indent, tr("Number of additional EPG Images")), &tmpConfig->numAdditionalEPGPictures, 0, 20)); @@ -346,7 +346,7 @@ eOSState cMenuSetupScreenLayout::ProcessKey(eKeys Key) { cMenuSetupFont::cMenuSetupFont(cTvguideConfig* data) : cMenuSetupSubMenu(tr("Fonts and Fontsizes"), data) { cFont::GetAvailableFontNames(&fontNames); - fontNames.Insert(strdup(tvguideConfig.fontNameDefault)); + fontNames.Insert(strdup(config.fontNameDefault)); Set(); } -- cgit v1.2.3