From ccbfb336abc57d85282cc784e364b3036e234390 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 8 Jun 2022 13:12:47 +0200 Subject: Display number of recordings Added display of the number of recordings in the recordings menu. A setup option to switch it on/off has also been added. --- config.c | 1 + displaymenu.c | 15 +++++++++++++-- displaymenu.h | 1 + po/ca_ES.po | 5 ++++- po/de_DE.po | 5 ++++- po/it_IT.po | 5 ++++- po/sk_SK.po | 5 ++++- setup.c | 1 + 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/config.c b/config.c index dc87c4e..5023119 100644 --- a/config.c +++ b/config.c @@ -118,6 +118,7 @@ void cNopacityConfig::LoadDefaults(void) { conf.insert(std::pair("numMainMenuItems", 10)); conf.insert(std::pair("numSchedulesMenuItems", 10)); conf.insert(std::pair("numRecordingsMenuItems", 10)); + conf.insert(std::pair("displayNumberOfRecordings", 1)); conf.insert(std::pair("menuHeaderLogoWidth", 160)); conf.insert(std::pair("menuHeaderLogoHeight", 70)); conf.insert(std::pair("logoMenuScale", 100)); diff --git a/displaymenu.c b/displaymenu.c index 8c25e66..bcbd9ed 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -290,10 +290,21 @@ void cNopacityDisplayMenu::SetTitle(const char *Title) { menuView->ShowHeaderLogo(false); left += menuView->ShowHeaderIconChannelLogo(Title, initial); break; - case mcRecording: + case mcRecording: { menuView->ShowHeaderLogo(false); - title = cString::sprintf("%s (%s)", Title, *cVideoDiskUsage::String()); + cString Text = cString::sprintf(" %s", trVDR("Recordings")); + if (config.GetValue("displayNumberOfRecordings") && (strcmp(Text, title) == 0)) { + { +#if APIVERSNUM > 20300 + LOCK_RECORDINGS_READ; +#endif + countRecordings = Recordings->Count(); + } + title = cString::sprintf("%i %s (%s)", countRecordings, Title, *cVideoDiskUsage::String()); + } else + title = cString::sprintf("%s (%s)", Title, *cVideoDiskUsage::String()); left += menuView->DrawHeaderIcon(MenuCategory(), initial); + } break; default: menuView->ShowHeaderLogo(false); diff --git a/displaymenu.h b/displaymenu.h index efbe01e..da8f043 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -20,6 +20,7 @@ private: bool initial; bool deatilViewRenderDone = false; bool diskUsageDrawn; + int countRecordings = 0; int lastDiskUsageState; int lastTimersState; bool timersDrawn; diff --git a/po/ca_ES.po b/po/ca_ES.po index 9e2cc93..81cd151 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: \n" -"POT-Creation-Date: 2022-06-06 17:02+0200\n" +"POT-Creation-Date: 2022-06-08 13:07+0200\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Gabychan \n" "Language-Team: \n" @@ -500,6 +500,9 @@ msgstr "" msgid "Display Error 0" msgstr "" +msgid "Display number of recordings" +msgstr "" + msgid "Mode of recording Window" msgstr "Mode de gravació" diff --git a/po/de_DE.po b/po/de_DE.po index 8e7ef35..e437dec 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: \n" -"POT-Creation-Date: 2022-06-06 17:02+0200\n" +"POT-Creation-Date: 2022-06-08 13:07+0200\n" "PO-Revision-Date: 2012-11-11 17:49+0200\n" "Last-Translator: louis\n" "Language-Team: \n" @@ -497,6 +497,9 @@ msgstr "Anzahl Fehler im Aufzeichnungsnmenü anzeigen" msgid "Display Error 0" msgstr "0 Fehler anzeigen" +msgid "Display number of recordings" +msgstr "Anzahl der Aufnahmen anzeigen" + msgid "Mode of recording Window" msgstr "Aufnahme Fenster Modus" diff --git a/po/it_IT.po b/po/it_IT.po index 150fc5a..96dbd9c 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: \n" -"POT-Creation-Date: 2022-06-06 17:02+0200\n" +"POT-Creation-Date: 2022-06-08 13:07+0200\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -500,6 +500,9 @@ msgstr "" msgid "Display Error 0" msgstr "" +msgid "Display number of recordings" +msgstr "" + msgid "Mode of recording Window" msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index f782664..22820df 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: \n" -"POT-Creation-Date: 2022-06-06 17:02+0200\n" +"POT-Creation-Date: 2022-06-08 13:07+0200\n" "PO-Revision-Date: 2013-11-11 20:52+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -497,6 +497,9 @@ msgstr "" msgid "Display Error 0" msgstr "" +msgid "Display number of recordings" +msgstr "" + msgid "Mode of recording Window" msgstr "Spôsob zobrazenia okna nahrávok" diff --git a/setup.c b/setup.c index 0c20f1d..4ea7281 100644 --- a/setup.c +++ b/setup.c @@ -349,6 +349,7 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) { Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Show number of errors in the recordings menu")), tmpConf->GetValueRef("menuRecordingsErrorMode"), 3, errorMode)); Add(new cMenuEditBoolItem(cString::sprintf("%s%s", *spacer, tr("Display Error 0")), tmpConf->GetValueRef("menuRecordingsDisplayError0"))); } + Add(new cMenuEditBoolItem(tr("Display number of recordings"), tmpConf->GetValueRef("displayNumberOfRecordings"))); Add(new cMenuEditIntItem(tr("Number of entires per page"), tmpConf->GetValueRef("numRecordingsMenuItems"), 3, 20)); Add(new cMenuEditStraItem(tr("Mode of recording Window"), tmpConf->GetValueRef("menuRecordingsWindowMode"), 2, windowMode)); Add(new cMenuEditIntItem(tr("Border around detailed recording view"), tmpConf->GetValueRef("borderDetailedRecordings"), 1, 300)); -- cgit v1.2.3