diff options
author | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2015-02-06 17:23:07 +0100 |
---|---|---|
committer | Martin Schirrmacher <vdr.skinflatplus@schirrmacher.eu> | 2015-02-06 17:23:07 +0100 |
commit | ec4e5aac8ef082d591e40a43134096d83db296d1 (patch) | |
tree | c2ed65d131f4077c413a5de385f3105a5940bb33 | |
parent | 675d5b44db48e314f1224b4056ac5c3d2c236a9e (diff) | |
download | skin-flatplus-ec4e5aac8ef082d591e40a43134096d83db296d1.tar.gz skin-flatplus-ec4e5aac8ef082d591e40a43134096d83db296d1.tar.bz2 |
[fix] subtitles does not use title
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | displaytracks.c | 18 | ||||
-rw-r--r-- | po/de_DE.po | 8 |
3 files changed, 14 insertions, 13 deletions
@@ -8,6 +8,7 @@ VDR Plugin 'skinflatplus' Revision History - [fix] only draw widgets if enabled - [fix] stop dimm on pause when jump between marks - [fix] weather widget update_weather.php - config file path +- [fix] subtitles does not use title - [update] timer widget new options to select which timer to show (recording, active) diff --git a/displaytracks.c b/displaytracks.c index 655ef148..5db0bc31 100644 --- a/displaytracks.c +++ b/displaytracks.c @@ -14,17 +14,17 @@ cFlatDisplayTracks::cFlatDisplayTracks(const char *Title, int NumTracks, const c ac3Width = img_ac3->Width(); if( img_stereo ) stereoWidth = img_stereo->Width(); - + int imgWidthMax = max(ac3Width, stereoWidth); itemHeight = fontHeight + Config.MenuItemPadding + Config.decorBorderTrackSize*2; currentIndex = -1; - maxItemWidth = font->Width(Title) + marginItem*2; + maxItemWidth = font->Width(Title) + marginItem*4; for (int i = 0; i < NumTracks; i++) maxItemWidth = max(maxItemWidth, font->Width(Tracks[i]) + marginItem*2); - - int headerWidth = font->Width(tr("Audio Tracks")) + font->Width(" ") + imgWidthMax; + + int headerWidth = font->Width(Title) + font->Width(" ") + imgWidthMax; maxItemWidth = max(maxItemWidth, headerWidth); - + itemsHeight = (NumTracks+1) * itemHeight; int left = osdWidth - maxItemWidth; left /= 2; @@ -36,8 +36,8 @@ cFlatDisplayTracks::cFlatDisplayTracks(const char *Title, int NumTracks, const c tracksLogoPixmap = osd->CreatePixmap(1, cRect(left, osdHeight - itemsHeight - marginItem, maxItemWidth, itemsHeight)); tracksLogoPixmap->Fill(clrTransparent); - SetItem(tr("Audio Tracks"), -1, false); - + SetItem(Title, -1, false); + for (int i = 0; i < NumTracks; i++) SetItem(Tracks[i], i, false); } @@ -72,7 +72,7 @@ void cFlatDisplayTracks::SetItem(const char *Text, int Index, bool Current) { int left = osdWidth - maxItemWidth; left /= 2; - + int top = osdHeight - itemsHeight - marginItem + y; if( Current ) @@ -84,7 +84,7 @@ void cFlatDisplayTracks::SetItem(const char *Text, int Index, bool Current) { else DecorBorderDraw(left, top, maxItemWidth, fontHeight, Config.decorBorderTrackSize, Config.decorBorderTrackType, Config.decorBorderTrackFg, Config.decorBorderTrackBg); - + } void cFlatDisplayTracks::SetTrack(int Index, const char * const *Tracks) { diff --git a/po/de_DE.po b/po/de_DE.po index e861c350..d292a962 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.5.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-12-10 19:02+0100\n" +"POT-Creation-Date: 2015-02-06 17:18+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" @@ -258,9 +258,6 @@ msgstr "Keine Ausgabe vorhanden" msgid "Weather" msgstr "Wetter" -msgid "Audio Tracks" -msgstr "Tonspuren" - msgid "Volume" msgstr "Lautstärke" @@ -890,3 +887,6 @@ msgstr "Eigene Befehle-Widget: Anzeigen" msgid "Widget custom commands: position" msgstr "Eigene Befehle-Widget: Position" + +#~ msgid "Audio Tracks" +#~ msgstr "Tonspuren" |