From c9ea5c5d475ad272518c9e49aa54ed15f1c850fb Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 21 Nov 2013 16:55:34 +0100 Subject: Usage of channel logo background in displaychannel and on menuelements configurable via plugin setup --- HISTORY | 2 ++ config.c | 2 ++ displaychannelview.c | 2 +- menuitem.c | 2 ++ po/ca_ES.po | 5 ++++- po/de_DE.po | 5 ++++- po/it_IT.po | 5 ++++- po/sk_SK.po | 6 ++++-- setup.c | 2 ++ 9 files changed, 25 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 6400c64..17b1acf 100644 --- a/HISTORY +++ b/HISTORY @@ -372,3 +372,5 @@ Version 0.1.4 - Freestyle Theme new default theme, old default renamed to "blue" - Changed Disc Usage Icon for default theme - Added logo backgrounds in displaychannel also for blended themes +- Usage of channel logo background in displaychannel and on + menuelements configurable via plugin setup diff --git a/config.c b/config.c index dead20f..330e9e1 100644 --- a/config.c +++ b/config.c @@ -110,6 +110,7 @@ void cNopacityConfig::LoadDefaults(void) { conf.insert(std::pair("posterWidth", 500)); conf.insert(std::pair("posterHeight", 750)); conf.insert(std::pair("useFolderPoster", 1)); + conf.insert(std::pair("menuChannelLogoBackground", 1)); conf.insert(std::pair("borderDetailedEPG", 30)); conf.insert(std::pair("borderDetailedRecordings", 30)); conf.insert(std::pair("menuSchedulesWindowMode", 1)); @@ -145,6 +146,7 @@ void cNopacityConfig::LoadDefaults(void) { conf.insert(std::pair("channelBorderBottom", 15)); conf.insert(std::pair("channelFadeTime", 300)); conf.insert(std::pair("channelBackgroundTransparency", 0)); + conf.insert(std::pair("channelUseLogoBackground", 1)); conf.insert(std::pair("logoPosition", 1)); conf.insert(std::pair("logoWidth", 260)); conf.insert(std::pair("logoHeight", 200)); diff --git a/displaychannelview.c b/displaychannelview.c index 8147449..c7ab5f3 100644 --- a/displaychannelview.c +++ b/displaychannelview.c @@ -241,7 +241,7 @@ void cNopacityDisplayChannelView::DrawBackground(void) { } void cNopacityDisplayChannelView::DrawChannelLogo(const cChannel *Channel) { - if (config.GetValue("displayType") != dtFlat) { + if (config.GetValue("displayType") != dtFlat && config.GetValue("channelUseLogoBackground")) { cImage *imgLogoBack = imgCache->GetSkinElement(seChannelLogoBack); if (imgLogoBack) pixmapLogoBackground->DrawImage(cPoint(0,0), *imgLogoBack); diff --git a/menuitem.c b/menuitem.c index f5fbfa7..55a662b 100644 --- a/menuitem.c +++ b/menuitem.c @@ -219,6 +219,8 @@ void cNopacityMenuItem::DrawRoundedCorners(tColor borderColor) { } void cNopacityMenuItem::DrawChannelLogoBackground(void) { + if (!config.GetValue("menuChannelLogoBackground")) + return; int logoWidth = geoManager->menuLogoWidth; pixmapBackground->DrawRectangle(cRect(4,6,logoWidth-4, height-12), Theme.Color(clrMenuChannelLogoBack)); } diff --git a/po/ca_ES.po b/po/ca_ES.po index 6c8fa3a..613ede1 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-09 08:50+0100\n" +"POT-Creation-Date: 2013-11-21 16:50+0100\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Gabychan \n" "Language-Team: \n" @@ -170,6 +170,9 @@ msgstr "Cantells rodons als elements de menú i botons" msgid "Radius of rounded corners" msgstr "Radi dels cantells rodons" +msgid "Use Channel Logo background" +msgstr "" + msgid "Fade-In Time in ms (Zero for switching off fading)" msgstr "Fosa d'entrada, temps en ms (0 per desactivació)" diff --git a/po/de_DE.po b/po/de_DE.po index 629bb87..a75b078 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-09 08:50+0100\n" +"POT-Creation-Date: 2013-11-21 16:50+0100\n" "PO-Revision-Date: 2012-11-11 17:49+0200\n" "Last-Translator: louis\n" "Language-Team: \n" @@ -167,6 +167,9 @@ msgstr "Abgerundete Ecken für Menüelemente und Buttons" msgid "Radius of rounded corners" msgstr "Radius der abgerundeten Ecken" +msgid "Use Channel Logo background" +msgstr "Hintergrund für Kanallogos benutzen" + msgid "Fade-In Time in ms (Zero for switching off fading)" msgstr "Fade-In Zeit in ms (Null zum Abschalten)" diff --git a/po/it_IT.po b/po/it_IT.po index cf5ef71..876631c 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-09 08:50+0100\n" +"POT-Creation-Date: 2013-11-21 16:50+0100\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -170,6 +170,9 @@ msgstr "Angoli smussati per voci menu e tasti" msgid "Radius of rounded corners" msgstr "Raggio angoli smussati" +msgid "Use Channel Logo background" +msgstr "" + msgid "Fade-In Time in ms (Zero for switching off fading)" msgstr "Tempo comparsa in ms (0 per disattivazione)" diff --git a/po/sk_SK.po b/po/sk_SK.po index 221882e..74f7270 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinnopacity\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-09 08:50+0100\n" +"POT-Creation-Date: 2013-11-21 16:50+0100\n" "PO-Revision-Date: 2013-11-11 20:52+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -167,6 +167,9 @@ msgstr "Zaoblen msgid "Radius of rounded corners" msgstr "Polomer zaoblenia rohov" +msgid "Use Channel Logo background" +msgstr "" + msgid "Fade-In Time in ms (Zero for switching off fading)" msgstr "èas efektu zmiznutia v ms (nula vypnú»)" @@ -550,4 +553,3 @@ msgstr "konflikt" msgid "conflicts" msgstr "konflikty" - diff --git a/setup.c b/setup.c index 98197be..9ea3dba 100644 --- a/setup.c +++ b/setup.c @@ -151,6 +151,7 @@ void cNopacitySetupMenuDisplay::Set(void) { 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 cMenuEditBoolItem(tr("Use Channel Logo background"), tmpConf->GetValueRef("menuChannelLogoBackground"))); 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)); @@ -386,6 +387,7 @@ void cNopacitySetupChannelDisplay::Set(void) { 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 cMenuEditBoolItem(cString::sprintf("%s%s", *spacer, tr("Use Channel Logo background")), tmpConf->GetValueRef("channelUseLogoBackground"))); } 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"))); -- cgit v1.2.3