Refactor cRecMenuSearchTimerTemplates

po/ca_ES.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 14:39+0200\n"
+"POT-Creation-Date: 2022-04-29 14:48+0200\n"
 "PO-Revision-Date: 2013-09-21 17:49+0200\n"
 "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -285,14 +285,14 @@ msgstr "Final"
 msgid "Configure Search Timer based on:"
 msgstr "Configura cerca de temporitzadors segons:"
 
-msgid "Search Expression:"
-msgstr "Cerca expressió:"
-
 msgid "Continue"
 msgstr "Continua"
 
-msgid "Configure Search Timer for Search String"
+msgid "Search Expression:"
-msgstr "Configura cerca de temporitzadors amb text"
+msgstr "Cerca expressió:"
+
+msgid "Configure Search Timer for Search String:"
+msgstr "Configura cerca de temporitzadors amb text:"
 
 msgid "Manually configure Options"
 msgstr "Opcions de configuració manual"

po/de_DE.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 14:39+0200\n"
+"POT-Creation-Date: 2022-04-29 14:48+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -282,14 +282,14 @@ msgstr "Stop"
 msgid "Configure Search Timer based on:"
 msgstr "Suchtimer konfigurieren basierend auf:"
 
-msgid "Search Expression:"
-msgstr "Suchausdruck:"
-
 msgid "Continue"
 msgstr "Weiter"
 
-msgid "Configure Search Timer for Search String"
+msgid "Search Expression:"
-msgstr "Suchtimer konfigurieren für Suchbegriff"
+msgstr "Suchausdruck:"
+
+msgid "Configure Search Timer for Search String:"
+msgstr "Suchtimer konfigurieren für Suchbegriff:"
 
 msgid "Manually configure Options"
 msgstr "Optionen manuell konfigurieren"

po/it_IT.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 14:39+0200\n"
+"POT-Creation-Date: 2022-04-29 14:48+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: fiveten_59\n"
 "Language-Team: \n"
@@ -282,14 +282,14 @@ msgstr "Ferma"
 msgid "Configure Search Timer based on:"
 msgstr "Configura il Search Timer in serie basato su:"
 
-msgid "Search Expression:"
-msgstr "Cerca espressione:"
-
 msgid "Continue"
 msgstr "Continua"
 
-msgid "Configure Search Timer for Search String"
+msgid "Search Expression:"
-msgstr "Configura il Search Timer basato su Search String"
+msgstr "Cerca espressione:"
+
+msgid "Configure Search Timer for Search String:"
+msgstr "Configura il Search Timer basato su Search String:"
 
 msgid "Manually configure Options"
 msgstr "Configura manualmente le Opzioni"

po/ru_RU.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.0.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 14:39+0200\n"
+"POT-Creation-Date: 2022-04-29 14:48+0200\n"
 "PO-Revision-Date: 2013-09-25 17:49+0400\n"
 "Last-Translator: AmiD, ilya\n"
 "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -282,14 +282,14 @@ msgstr "Стоп"
 msgid "Configure Search Timer based on:"
 msgstr "Настроить поисковый таймер:"
 
-msgid "Search Expression:"
-msgstr "Искать выражение:"
-
 msgid "Continue"
 msgstr "Продолжить"
 
-msgid "Configure Search Timer for Search String"
+msgid "Search Expression:"
-msgstr "Настройка таймера поиска по ключевым словам"
+msgstr "Искать выражение:"
+
+msgid "Configure Search Timer for Search String:"
+msgstr "Настройка таймера поиска по ключевым словам:"
 
 msgid "Manually configure Options"
 msgstr "Ручная настройка параметров"

po/sk_SK.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2022-04-29 14:39+0200\n"
+"POT-Creation-Date: 2022-04-29 14:48+0200\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -282,14 +282,14 @@ msgstr "Stop"
 msgid "Configure Search Timer based on:"
 msgstr "Vyhµadávanie plánu nastavi» na základe:"
 
-msgid "Search Expression:"
-msgstr "Hµadaný výraz:"
-
 msgid "Continue"
 msgstr "Ïal¹ie"
 
-msgid "Configure Search Timer for Search String"
+msgid "Search Expression:"
-msgstr "Konfigurácia vyhµadávania plánu pre hµadané kµúèové slovo "
+msgstr "Hµadaný výraz:"
+
+msgid "Configure Search Timer for Search String:"
+msgstr "Konfigurácia vyhµadávania plánu pre hµadané kµúèové slovo:"
 
 msgid "Manually configure Options"
 msgstr "Ruène konfigurova» mo¾nosti"

recmenus.c

@@ -617,24 +617,25 @@ cRecMenuSearchTimer::cRecMenuSearchTimer(const cEvent *event) { // OK
 }
 
 // --- cRecMenuSearchTimerTemplates  ---------------------------------------------------------
-cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer searchTimer, std::vector<TVGuideEPGSearchTemplate> templates) {
+cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer searchTimer, std::vector<TVGuideEPGSearchTemplate> templates) { // OK
+    SetWidthPercent(70);
+
     this->searchTimer = searchTimer;
     this->templates = templates;
-    SetWidthPercent(70);
-    cString message = tr("Configure Search Timer for Search String");
-    cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.GetSearchString().c_str());
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
 
-    AddMenuItemInitial(new cRecMenuItemButton(tr("Manually configure Options"), rmsSearchTimerEdit, true));
+    const cString line1 = tr("Configure Search Timer for Search String:");
+    const cString line2 = cString::sprintf("\"%s\"", searchTimer.GetSearchString().c_str());
+
+    AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButton(tr("Manually configure Options"), rmsSearchTimerEdit, true));
 
     numTemplates = templates.size();
-    for (int i=0; i<numTemplates; i++) {
+    for (int i = 0; i < numTemplates; i++) {
-        cString buttonText = cString::sprintf("%s \"%s\"", tr("Use Template"), templates[i].name.c_str());
+        const cString buttonText = cString::sprintf("%s \"%s\"", tr("Use Template"), templates[i].name.c_str());
         if (!AddMenuItemInitial(new cRecMenuItemButton(*buttonText, rmsSearchTimerCreateWithTemplate, false)))
             break;
     }
+
     CalculateHeight();
     CreatePixmap();
     Arrange();
@@ -662,6 +663,7 @@ TVGuideEPGSearchTemplate cRecMenuSearchTimerTemplates::GetTemplate(void) {
         templ = templates[tmplActive];
     return templ;
 }
+
 // --- cRecMenuSearchTimers  ---------------------------------------------------------
 cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers) {
     this->searchTimers = searchTimers;