From 7f7a16498c42a820aa4be8df378f2a48cd456c3e Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 9 Nov 2019 14:22:41 +0100 Subject: [PATCH] Refactor cRecMenuSearchTimerCreateConfirm --- po/ca_ES.po | 2 +- po/de_DE.po | 2 +- po/it_IT.po | 2 +- po/ru_RU.po | 2 +- po/sk_SK.po | 4 ++-- recmenus.c | 25 ++++++++++++++----------- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index 40253c5..d8ea49b 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -459,7 +459,7 @@ msgstr "" msgid "Delete Search Timer and created Timers" msgstr "" -msgid "Search Timer sucessfully created." +msgid "Search Timer sucessfully created" msgstr "S'ha creat cerca de temporitzador" msgid "Search Timer update initialised" diff --git a/po/de_DE.po b/po/de_DE.po index 8f9e71c..fa9633b 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -456,7 +456,7 @@ msgstr "Nur Suchtimer löschen" msgid "Delete Search Timer and created Timers" msgstr "Suchtimer und erzeugte Timer löschen" -msgid "Search Timer sucessfully created." +msgid "Search Timer sucessfully created" msgstr "Suchtimer erfolgreich angelegt" msgid "Search Timer update initialised" diff --git a/po/it_IT.po b/po/it_IT.po index eb397d1..3812149 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -456,7 +456,7 @@ msgstr "Elimina solo il Search Timer" msgid "Delete Search Timer and created Timers" msgstr "Elimina il Search Timer e Timers creati" -msgid "Search Timer sucessfully created." +msgid "Search Timer sucessfully created" msgstr "Search Timer creato con successo" msgid "Search Timer update initialised" diff --git a/po/ru_RU.po b/po/ru_RU.po index 2f1110c..e6b3308 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -456,7 +456,7 @@ msgstr "" msgid "Delete Search Timer and created Timers" msgstr "" -msgid "Search Timer sucessfully created." +msgid "Search Timer sucessfully created" msgstr "Поисковый таймер создан" msgid "Search Timer update initialised" diff --git a/po/sk_SK.po b/po/sk_SK.po index 13430ae..784cb6a 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -456,8 +456,8 @@ msgstr "" msgid "Delete Search Timer and created Timers" msgstr "" -msgid "Search Timer sucessfully created." -msgstr "Vyhadva plnu vytvoren." +msgid "Search Timer sucessfully created" +msgstr "Vyhadva plnu vytvoren" msgid "Search Timer update initialised" msgstr "Vyhladva plnu inicializovan" diff --git a/recmenus.c b/recmenus.c index 24ce694..89960e6 100644 --- a/recmenus.c +++ b/recmenus.c @@ -975,19 +975,22 @@ cTVGuideSearchTimer cRecMenuSearchTimerDeleteConfirm::GetSearchTimer(void) { } // --- cRecMenuSearchTimerCreateConfirm --------------------------------------------------------- -cRecMenuSearchTimerCreateConfirm::cRecMenuSearchTimerCreateConfirm(bool success) { +cRecMenuSearchTimerCreateConfirm::cRecMenuSearchTimerCreateConfirm(bool success) { // OK SetWidthPercent(50); - - cString message1a = tr("Search Timer sucessfully created."); - cString message1b = tr ("Search Timer update initialised"); - cString message1 = cString::sprintf("%s\n%s", *message1a, *message1b); - cString message2 = tr("Search Timer NOT sucessfully created"); - cString infoText = success?message1:message2; - cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText); - infoItem->CalculateHeight(width - 2 * border); - AddMenuItem(infoItem); - AddMenuItem(new cRecMenuItemButton(tr("OK"), rmsClose, true)); + int i = 1; + cString line1 = ""; + cString line2 = ""; + if (success) { + line1 = tr("Search Timer sucessfully created"); + line2 = tr("Search Timer update initialised"); + i = 2; + } else { + line1 = tr("Search Timer NOT sucessfully created"); + } + + AddHeader(new cRecMenuItemInfo(*line1, i, *line2, "", "", width - 2 * border)); + AddFooter(new cRecMenuItemButton(tr("OK"), rmsClose, true)); CalculateHeight(); CreatePixmap();