diff options
-rw-r--r-- | HISTORY | 5 | ||||
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | config.h | 1 | ||||
-rw-r--r-- | displaychannel.c | 12 | ||||
-rw-r--r-- | po/de_DE.po | 5 | ||||
-rw-r--r-- | po/it_IT.po | 5 | ||||
-rw-r--r-- | setup.c | 4 |
7 files changed, 32 insertions, 2 deletions
@@ -1,5 +1,10 @@ VDR Plugin 'skinflatplus' Revision History --------------------------------------- + +201X-XX-XX: Version XXX +- [add] support for change color key mapping +- [add] displaychannel show event start time on the left before event title + 2016-09-05: Version 0.6.0 - [fix] eMenuSortMode in displaymenu.h for compile with VDR < 2.2.0 - [fix] position of widgets in main menu (add menu item border size) @@ -22,6 +22,7 @@ cFlatConfig::cFlatConfig(void) { MenuContentFullSize = true; + ChannelShowStartTime = true; ChannelFormatShow = true; ChannelResolutionAspectShow = true; ChannelSimpleAspectFormat = true; @@ -377,6 +378,7 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "ChannelDvbapiInfoShow") == 0) ChannelDvbapiInfoShow = atoi(Value); else if (strcmp(Name, "MenuItemRecordingSeenTreshold") == 0) MenuItemRecordingSeenTreshold = atod(Value); else if (strcmp(Name, "MenuItemRecordingDefaultOldDays") == 0) MenuItemRecordingDefaultOldDays = atoi(Value); + else if (strcmp(Name, "ChannelShowStartTime") == 0) ChannelShowStartTime = atoi(Value); else return false; return true; @@ -212,6 +212,7 @@ class cFlatConfig int ChannelSimpleAspectFormat; int ChannelTimeLeft; int ChannelDvbapiInfoShow; + int ChannelShowStartTime; int ChannelWeatherShow; int PlaybackWeatherShow; diff --git a/displaychannel.c b/displaychannel.c index c979f52e..ef9048db 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -331,6 +331,11 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi int RecWidth = fontSml->Width("REC"); int left = heightBottom * 1.34 + marginItem; + int StartTimeLeft = left; + + if( Config.ChannelShowStartTime ) { + left += font->Width("00:00 "); + } if( Present ) { cString startTime = Present->GetTimeString(); @@ -369,6 +374,10 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi chanInfoBottomPixmap->DrawText(cPoint(channelWidth - seenWidth - marginItem * 2, fontSmlHeight), *seen, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml, seenWidth, 0, taRight); + if( Config.ChannelShowStartTime ) { + chanInfoBottomPixmap->DrawText(cPoint(StartTimeLeft, 0), *startTime, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font); + } + if( (epgWidth > channelWidth - left - maxWidth) && Config.ScrollerEnable ) { scrollers.AddScroller(*epg, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom, channelWidth - left - maxWidth, fontHeight), Theme.Color(clrChannelFontEpg), clrTransparent, font); } else { @@ -416,6 +425,9 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi chanInfoBottomPixmap->DrawText(cPoint(channelWidth - durWidth - marginItem * 2, fontHeight + fontSmlHeight*2), *dur, Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml, durWidth, 0, taRight); + if( Config.ChannelShowStartTime ) { + chanInfoBottomPixmap->DrawText(cPoint(StartTimeLeft, fontHeight + fontSmlHeight), *startTime, Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), font); + } if( (epgWidth > channelWidth - left - maxWidth) && Config.ScrollerEnable ) { scrollers.AddScroller(*epg, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom + fontHeight + fontSmlHeight, channelWidth - left - maxWidth, fontHeight), Theme.Color(clrChannelFontEpgFollow), clrTransparent, font); } else { diff --git a/po/de_DE.po b/po/de_DE.po index 264544d2..0bd54873 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.5.1\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2016-08-26 16:35+0200\n" +"POT-Creation-Date: 2017-05-06 16:13+0200\n" "PO-Revision-Date: 2015-02-09 20:09+0100\n" "Last-Translator: Martin Schirrmacher\n" "Language-Team: Martin Schirrmacher\n" @@ -537,6 +537,9 @@ msgstr "Bildercache Einträge" msgid "Show Channelinfo icons" msgstr "Zeige Kanalinfo Logos" +msgid "Show event start time left" +msgstr "Zeige Event Startzeit links" + msgid "Show signal quality" msgstr "Zeige Signalqualität" diff --git a/po/it_IT.po b/po/it_IT.po index 1abffc07..9fd3ecde 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.5.1\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2016-08-26 16:38+0200\n" +"POT-Creation-Date: 2017-05-06 16:13+0200\n" "PO-Revision-Date: 2015-02-09 20:09+0100\n" "Last-Translator: fiveten_59\n" "Language-Team: Italian\n" @@ -537,6 +537,9 @@ msgstr "Ingressi Imagecache" msgid "Show Channelinfo icons" msgstr "Mostra icone info canali" +msgid "Show event start time left" +msgstr "" + msgid "Show signal quality" msgstr "Mostra qualitā segnale" @@ -325,6 +325,7 @@ void cFlatSetup::Store(void) { SetupStore("ChannelDvbapiInfoShow", Config.ChannelDvbapiInfoShow); SetupStore("MenuItemRecordingSeenTreshold", dtoa(Config.MenuItemRecordingSeenTreshold)); SetupStore("MenuItemRecordingDefaultOldDays", Config.MenuItemRecordingDefaultOldDays); + SetupStore("ChannelShowStartTime", Config.ChannelShowStartTime); Config.Init(); } @@ -515,6 +516,7 @@ bool cFlatSetupGeneral::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "ChannelDvbapiInfoShow") == 0) SetupConfig->ChannelDvbapiInfoShow = atoi(Value); else if (strcmp(Name, "MenuItemRecordingSeenTreshold") == 0) SetupConfig->MenuItemRecordingSeenTreshold = atod(Value); else if (strcmp(Name, "MenuItemRecordingDefaultOldDays") == 0) SetupConfig->MenuItemRecordingDefaultOldDays = atoi(Value); + else if (strcmp(Name, "ChannelShowStartTime") == 0) SetupConfig->ChannelShowStartTime = atoi(Value); else return false; return true; @@ -687,6 +689,7 @@ void cFlatSetupGeneral::SaveCurrentSettings(void) { Config.Store("ChannelDvbapiInfoShow", SetupConfig->ChannelDvbapiInfoShow, *Filename); Config.Store("MenuItemRecordingSeenTreshold", dtoa(Config.MenuItemRecordingSeenTreshold), *Filename); Config.Store("MenuItemRecordingDefaultOldDays", SetupConfig->MenuItemRecordingDefaultOldDays, *Filename); + Config.Store("ChannelShowStartTime", SetupConfig->ChannelShowStartTime, *Filename); cString msg = cString::sprintf("%s %s", tr("saved settings in file:"), *File); Skins.Message(mtInfo, msg); @@ -857,6 +860,7 @@ void cFlatSetupChannelInfo::Setup(void) { Clear(); Add(new cMenuEditBoolItem(tr("Show Channelinfo icons"), &SetupConfig->ChannelIconsShow)); + Add(new cMenuEditBoolItem(tr("Show event start time left"), &SetupConfig->ChannelShowStartTime)); Add(new cMenuEditBoolItem(tr("Show signal quality"), &SetupConfig->SignalQualityShow)); Add(new cMenuEditBoolItem(tr("Show weather widget"), &SetupConfig->ChannelWeatherShow)); Add(new cMenuEditPrcItem(tr("Weather widget font size"), &SetupConfig->WeatherFontSize, 0.01, 0.2, 1)); |