diff options
| -rw-r--r-- | displaymenu.c | 17 | ||||
| -rw-r--r-- | displaymenu.h | 2 | ||||
| -rw-r--r-- | flat.h | 4 | ||||
| -rw-r--r-- | po/de_DE.po | 5 |
4 files changed, 19 insertions, 9 deletions
diff --git a/displaymenu.c b/displaymenu.c index 48de48e5..840851f5 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -765,13 +765,13 @@ bool cFlatDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bool C } if( Config.MenuChannelView == 4 && Event && Current ) { - DrawItemExtraEvent(Event); + DrawItemExtraEvent(Event, ""); } return true; } -void cFlatDisplayMenu::DrawItemExtraEvent(const cEvent *Event) { +void cFlatDisplayMenu::DrawItemExtraEvent(const cEvent *Event, cString EmptyText) { cLeft = menuItemWidth + Config.decorBorderMenuItemSize*2 + Config.decorBorderMenuContentSize + marginItem; if( isScrolling ) @@ -856,7 +856,8 @@ void cFlatDisplayMenu::DrawItemExtraEvent(const cEvent *Event) { text << endl << tr("Subtitle") << ": "<< subtitle.str(); } } - } + } else + text << *EmptyText; ContentCreate(cLeft, cTop, cWidth, cHeight, 2); ContentSet( text.str().c_str(), Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg) ); @@ -916,11 +917,13 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current int imageTop = Top; cString TimerIconName(""); - if (!(Timer->HasFlags(tfActive))) + if (!(Timer->HasFlags(tfActive))) { TimerIconName = "timerInactive"; - else if (Timer->Recording()) + ColorFg = Theme.Color( clrMenuTimerItemDisabledFont ); + } else if (Timer->Recording()) { TimerIconName = "timerRecording"; - else + ColorFg = Theme.Color( clrMenuTimerItemRecordingFont ); + } else TimerIconName = "timerActive"; if( imgLoader.LoadIcon(TimerIconName, imageHeight, imageHeight) ) { @@ -1042,7 +1045,7 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current } if( Config.MenuTimerView == 3 && Current ) { - DrawItemExtraEvent(Event); + DrawItemExtraEvent(Event, tr("timer not enabled")); } return true; diff --git a/displaymenu.h b/displaymenu.h index 090a56b0..7a30133f 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -45,7 +45,7 @@ class cFlatDisplayMenu : public cFlatBaseRender, public cSkinDisplayMenu { cBitmap *bmNew, *bmRec, *bmArrowTurn, *bmClock, *bmClocksml, *bmVPS; static cBitmap bmCNew, bmCRec, bmCArrowTurn, bmCClock, bmCClocksml, bmCHD, bmCVPS; - void DrawItemExtraEvent(const cEvent *Event); + void DrawItemExtraEvent(const cEvent *Event, cString EmptyText); public: cFlatDisplayMenu(void); virtual ~cFlatDisplayMenu(); @@ -121,6 +121,10 @@ THEME_CLR(Theme, clrMenuItemSelableBorderBg, 0xC0101010); THEME_CLR(Theme, clrMenuItemCurrentBorderFg, 0xC03090B0); THEME_CLR(Theme, clrMenuItemCurrentBorderBg, 0xC03090B0); +// Menu Timer Item +THEME_CLR(Theme, clrMenuTimerItemDisabledFont, 0xFFA0A0A0); +THEME_CLR(Theme, clrMenuTimerItemRecordingFont, 0xFFEEEEEE); + // Replay THEME_CLR(Theme, clrReplayBg, 0xC0101010); THEME_CLR(Theme, clrReplayFont, 0xFFEEEEEE); diff --git a/po/de_DE.po b/po/de_DE.po index 7dbe54cc..eb4b0b56 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.0.1\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-02-09 15:39+0100\n" +"POT-Creation-Date: 2014-02-11 18:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,6 +33,9 @@ msgstr "Audio" msgid "Subtitle" msgstr "Untertitel" +msgid "timer not enabled" +msgstr "" + msgid "Length" msgstr "Länge" |