diff options
-rw-r--r-- | HISTORY | 3 | ||||
-rw-r--r-- | config.c | 1 | ||||
-rw-r--r-- | displaychannelview.c | 8 | ||||
-rw-r--r-- | po/ca_ES.po | 5 | ||||
-rw-r--r-- | po/de_DE.po | 5 | ||||
-rw-r--r-- | po/it_IT.po | 5 | ||||
-rw-r--r-- | po/sk_SK.po | 5 | ||||
-rw-r--r-- | setup.c | 3 | ||||
-rw-r--r-- | themes/nOpacity-freestyle.theme | 2 |
9 files changed, 28 insertions, 9 deletions
@@ -333,4 +333,5 @@ Version 0.1.4 - Added configurable transparency for channeldisplay background - Added background with dedicated theme color for status icons in displaychannel -- Added background with dedicated theme color for channel logos in menus +- Added background with dedicated theme color for channel logos in menus +- Improved Display of Poster or Banner in displaychannel @@ -163,6 +163,7 @@ void cNopacityConfig::LoadDefaults(void) { conf.insert(std::pair<std::string, int>("fontChannelGroupSmallSize", 0)); conf.insert(std::pair<std::string, int>("progressCurrentSchedule", 0)); conf.insert(std::pair<std::string, int>("displayPoster", 1)); + conf.insert(std::pair<std::string, int>("channelPosterBorder", 10)); //Display Replay conf.insert(std::pair<std::string, int>("replayHeight", 25)); conf.insert(std::pair<std::string, int>("replayBorderVertical", 15)); diff --git a/displaychannelview.c b/displaychannelview.c index e9041bd..96eddaa 100644 --- a/displaychannelview.c +++ b/displaychannelview.c @@ -581,16 +581,18 @@ void cNopacityDisplayChannelView::DrawPoster(const cEvent *event, bool initial) mediaWidth = ratio * call.media.width; mediaHeight = ratio * call.media.height; } + int border = config.GetValue("channelPosterBorder"); pixmapPoster = osd->CreatePixmap(1, cRect(config.GetValue("channelBorderVertical"), config.GetValue("channelBorderBottom"), - mediaWidth + 2*config.GetValue("channelBorderVertical"), - mediaHeight + 2*config.GetValue("channelBorderBottom"))); + mediaWidth + 2 * border, + mediaHeight + 2 * border)); if (initial && config.GetValue("channelFadeTime")) pixmapPoster->SetAlpha(0); cImageLoader imgLoader; if (imgLoader.LoadPoster(call.media.path.c_str(), mediaWidth, mediaHeight)) { pixmapPoster->Fill(Theme.Color(clrChannelBackground)); - pixmapPoster->DrawImage(cPoint(config.GetValue("channelBorderVertical"), config.GetValue("channelBorderBottom")), imgLoader.GetImage()); + pixmapPoster->DrawImage(cPoint(border, border), imgLoader.GetImage()); + DrawRoundedCorners(pixmapPoster, border, 0, 0, pixmapPoster->ViewPort().Width(), pixmapPoster->ViewPort().Height()); } else { pixmapPoster->Fill(clrTransparent); } diff --git a/po/ca_ES.po b/po/ca_ES.po index 7d5ff4a..88a78df 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: <see README>\n" -"POT-Creation-Date: 2013-11-02 09:35+0100\n" +"POT-Creation-Date: 2013-11-02 15:27+0100\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Gabychan <gbonich@gmail.com>\n" "Language-Team: \n" @@ -461,6 +461,9 @@ msgstr "Mostra informació del canal" msgid "Display Poster or Fanart from TVScraper" msgstr "" +msgid "Border in Pixel" +msgstr "" + msgid "Display previous and next Channel Group" msgstr "Mostra grups de canals anterior i posterior" diff --git a/po/de_DE.po b/po/de_DE.po index d1c84b2..cdd03b8 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: <see README>\n" -"POT-Creation-Date: 2013-11-02 09:35+0100\n" +"POT-Creation-Date: 2013-11-02 15:27+0100\n" "PO-Revision-Date: 2012-11-11 17:49+0200\n" "Last-Translator: louis\n" "Language-Team: \n" @@ -458,6 +458,9 @@ msgstr "Quellinformationen für Kanal anzeigen" msgid "Display Poster or Fanart from TVScraper" msgstr "Poster bzw. Fanart von TVScraper anzeigen" +msgid "Border in Pixel" +msgstr "Rahmen in Pixel" + msgid "Display previous and next Channel Group" msgstr "Vorherige und nächste Kanalgruppe anzeigen" diff --git a/po/it_IT.po b/po/it_IT.po index 2f60e6c..0cc6e43 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: <see README>\n" -"POT-Creation-Date: 2013-11-02 09:35+0100\n" +"POT-Creation-Date: 2013-11-02 15:27+0100\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: \n" @@ -461,6 +461,9 @@ msgstr "" msgid "Display Poster or Fanart from TVScraper" msgstr "" +msgid "Border in Pixel" +msgstr "" + msgid "Display previous and next Channel Group" msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index 52f0814..c0680b4 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: <see README>\n" -"POT-Creation-Date: 2013-11-02 09:35+0100\n" +"POT-Creation-Date: 2013-11-02 15:27+0100\n" "PO-Revision-Date: 2013-09-16 19:34+0100\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Language-Team: \n" @@ -458,6 +458,9 @@ msgstr "Zobrazi» zdroj kanálu" msgid "Display Poster or Fanart from TVScraper" msgstr "Zobrazenie plagátu alebo Fanartu z TVScraper" +msgid "Border in Pixel" +msgstr "" + msgid "Display previous and next Channel Group" msgstr "Zobrazi» predchádzajúcu a nasledujúcu skupinu kanálu" @@ -393,6 +393,9 @@ void cNopacitySetupChannelDisplay::Set(void) { 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"))); + if (tmpConf->GetValue("displayPoster")) { + Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Border in Pixel")), tmpConf->GetValueRef("channelPosterBorder"), 0, 200)); + } 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)); diff --git a/themes/nOpacity-freestyle.theme b/themes/nOpacity-freestyle.theme index e3ec378..5e6b01f 100644 --- a/themes/nOpacity-freestyle.theme +++ b/themes/nOpacity-freestyle.theme @@ -1,5 +1,5 @@ Description = Freestyle -clrChannelBackground = B0000000 +clrChannelBackground = B012273f clrChannelBackBlend = B0858585 clrChannelHead = FFEEEEEE clrChannelEPG = FFFFFFFF |