From 7301f2de0879fe10bf22c16191fcfd7bf836e148 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 1 Jul 2021 15:40:46 +0200 Subject: The Recordings menu now marks recordings with errors, and the number of errors (if any) is displayed in the recording's Info menu --- PLUGINS/src/skincurses/HISTORY | 5 +++++ PLUGINS/src/skincurses/po/de_DE.po | 5 ++++- PLUGINS/src/skincurses/po/et_EE.po | 5 ++++- PLUGINS/src/skincurses/po/fi_FI.po | 5 ++++- PLUGINS/src/skincurses/po/it_IT.po | 5 ++++- PLUGINS/src/skincurses/po/lt_LT.po | 5 ++++- PLUGINS/src/skincurses/po/pl_PL.po | 5 ++++- PLUGINS/src/skincurses/po/ru_RU.po | 5 ++++- PLUGINS/src/skincurses/po/sk_SK.po | 5 ++++- PLUGINS/src/skincurses/skincurses.c | 15 ++++++++++++--- 10 files changed, 49 insertions(+), 11 deletions(-) (limited to 'PLUGINS/src/skincurses') diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index cda9fa36..051addab 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -152,3 +152,8 @@ VDR Plugin 'skincurses' Revision History - Reacting to changes in screen size. - Simplified color handling. - Using 'stdscr' directly instead of an additional window. + +2021-07-01: Version 2.4.3 + +- The number of errors (if any) of a recording is now displayed in the recording's + Info menu. diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po index 94291d70..20102c57 100644 --- a/PLUGINS/src/skincurses/po/de_DE.po +++ b/PLUGINS/src/skincurses/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-15 16:07+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Eine reine Text-Oberfläche" +msgid "errors" +msgstr "Fehler" + msgid "Key$Mute" msgstr "Stumm" diff --git a/PLUGINS/src/skincurses/po/et_EE.po b/PLUGINS/src/skincurses/po/et_EE.po index f2f63c9a..9e19b545 100644 --- a/PLUGINS/src/skincurses/po/et_EE.po +++ b/PLUGINS/src/skincurses/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-14 20:48+0300\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstipõhine kest" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Hääletu" diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po index 2e9316e0..16bdc040 100644 --- a/PLUGINS/src/skincurses/po/fi_FI.po +++ b/PLUGINS/src/skincurses/po/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-14 20:48+0300\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstipohjainen ulkoasu" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Mykistys" diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po index 3727b8de..77a5b62b 100644 --- a/PLUGINS/src/skincurses/po/it_IT.po +++ b/PLUGINS/src/skincurses/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2008-01-27 20:35+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Una interfaccia solo testo" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Muto" diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po index 405ec2be..74fc54ab 100644 --- a/PLUGINS/src/skincurses/po/lt_LT.po +++ b/PLUGINS/src/skincurses/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2010-02-22 18:18+0200\n" "Last-Translator: Valdemaras Pipiras \n" "Language-Team: Lithuanian \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstinis apvalkalas" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "IÅ¡jungti garsÄ…" diff --git a/PLUGINS/src/skincurses/po/pl_PL.po b/PLUGINS/src/skincurses/po/pl_PL.po index d2f1dc0e..7e8123ed 100644 --- a/PLUGINS/src/skincurses/po/pl_PL.po +++ b/PLUGINS/src/skincurses/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 00:48+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2018-02-19 01:02+0100\n" "Last-Translator: Tomasz Maciej Nowak \n" "Language-Team: Polish \n" @@ -21,6 +21,9 @@ msgstr "" msgid "A text only skin" msgstr "Skóra tekstowa" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Wycisz" diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po index 7e060392..228d3347 100644 --- a/PLUGINS/src/skincurses/po/ru_RU.po +++ b/PLUGINS/src/skincurses/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2008-03-14 00:21+0100\n" "Last-Translator: Alexander Gross \n" "Language-Team: Russian \n" @@ -20,6 +20,9 @@ msgstr "" msgid "A text only skin" msgstr "¿àÞáâÞ âÕÚáâÞÒëÙ ØÝâÕàäÕÙá" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "²ëÚÛ. ÓàÞÜÚÞáâì" diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po index 4ddf1800..a9ebca7c 100644 --- a/PLUGINS/src/skincurses/po/sk_SK.po +++ b/PLUGINS/src/skincurses/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2009-09-30 12:52+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: Slovak \n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Iba text vzhµadu" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Stlmi» zvuk" diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 9e8b59e8..2b671457 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 4.6 2020/05/11 10:23:15 kls Exp $ + * $Id: skincurses.c 5.1 2021/07/01 15:40:46 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include #include -static const char *VERSION = "2.4.2"; +static const char *VERSION = "2.4.3"; static const char *DESCRIPTION = trNOOP("A text only skin"); static const char *MAINMENUENTRY = NULL; @@ -447,9 +447,18 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording) cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground); y += ts.Height(); + int xt = ScOsdWidth; if (Info->GetEvent()->ParentalRating()) { cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString()); - osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font); + int w = Utf8StrLen(buffer); + osd->DrawText(xt - w, y, buffer, clrBlack, clrYellow, &Font); + xt -= w + 1; + } + if (Info->Errors() > 0) { + cString buffer = cString::sprintf(" %d %s ", Info->Errors(), tr("errors")); + int w = Utf8StrLen(buffer); + osd->DrawText(xt - w, y, buffer, clrBlack, clrYellow, &Font); + xt -= w + 1; } y += 1; const char *Title = Info->Title(); -- cgit v1.2.3