Refactor cRecMenuSearch

6 files changed, 37 insertions, 34 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index ce76d92..168df9b 100644
--- a/po/ca_ES.po
+++ b/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 15:32+0200\n"
+"POT-Creation-Date: 2022-04-29 15:40+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"
@@ -525,6 +525,9 @@ msgstr "No s'ha creat el canvi de temporitzador"
 msgid "Switch Timer deleted"
 msgstr "Canvi de temporitzador esborrat"
 
+msgid "Perform Search"
+msgstr "Realitza la cerca"
+
 msgid "Search Mode"
 msgstr "Mode de cerca"
 
@@ -543,9 +546,6 @@ msgstr "Cerca a la descripció"
 msgid "Show Search Options"
 msgstr "Mostra opcions de cerca"
 
-msgid "Perform Search"
-msgstr "Realitza la cerca"
-
 msgid "search results for"
 msgstr "resultats de cerca per"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 2e28f14..30e5821 100644
--- a/po/de_DE.po
+++ b/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 15:32+0200\n"
+"POT-Creation-Date: 2022-04-29 15:40+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -522,6 +522,9 @@ msgstr "Umschalttimer NICHT erfolgreich angelegt"
 msgid "Switch Timer deleted"
 msgstr "Umschalttimer gelöscht"
 
+msgid "Perform Search"
+msgstr "Suche ausführen"
+
 msgid "Search Mode"
 msgstr "Suchmodus"
 
@@ -540,9 +543,6 @@ msgstr "In Beschreibung suchen"
 msgid "Show Search Options"
 msgstr "Suchoptionen anzeigen"
 
-msgid "Perform Search"
-msgstr "Suche ausführen"
-
 msgid "search results for"
 msgstr "Suchergebnisse für"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index c41c967..f4a561a 100644
--- a/po/it_IT.po
+++ b/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 15:32+0200\n"
+"POT-Creation-Date: 2022-04-29 15:40+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: fiveten_59\n"
 "Language-Team: \n"
@@ -522,6 +522,9 @@ msgstr "Switch Timer NON creato"
 msgid "Switch Timer deleted"
 msgstr "Switch Timer eliminato"
 
+msgid "Perform Search"
+msgstr "Fai una ricerca"
+
 msgid "Search Mode"
 msgstr "Modalità di ricerca"
 
@@ -540,9 +543,6 @@ msgstr "Cerca nella descrizione"
 msgid "Show Search Options"
 msgstr "Mostra opzioni di ricerca"
 
-msgid "Perform Search"
-msgstr "Fai una ricerca"
-
 msgid "search results for"
 msgstr "cerca risultati per"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3059aa0..53a3c7e 100644
--- a/po/ru_RU.po
+++ b/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 15:32+0200\n"
+"POT-Creation-Date: 2022-04-29 15:40+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"
@@ -522,6 +522,9 @@ msgstr "Таймер переключения НЕ был создан!"
 msgid "Switch Timer deleted"
 msgstr "Таймер переключения удален"
 
+msgid "Perform Search"
+msgstr "Найти"
+
 msgid "Search Mode"
 msgstr "Режим поиска"
 
@@ -540,9 +543,6 @@ msgstr "Искать в описаниях"
 msgid "Show Search Options"
 msgstr "Показать параметры поиска"
 
-msgid "Perform Search"
-msgstr "Найти"
-
 msgid "search results for"
 msgstr "Найдено по запросу"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 21be423..548f102 100644
--- a/po/sk_SK.po
+++ b/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 15:32+0200\n"
+"POT-Creation-Date: 2022-04-29 15:40+0200\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -522,6 +522,9 @@ msgstr "Pl�n prepnutia nie je vytvoren�"
 msgid "Switch Timer deleted"
 msgstr "Pl�n prepnutia vymazan�"
 
+msgid "Perform Search"
+msgstr "Vykona� vyh�ad�vanie"
+
 msgid "Search Mode"
 msgstr "Re�im vyh�ad�vania"
 
@@ -540,9 +543,6 @@ msgstr "H�ada� v popise"
 msgid "Show Search Options"
 msgstr "Zobrazi� mo�nosti vyh�ad�vania"
 
-msgid "Perform Search"
-msgstr "Vykona� vyh�ad�vanie"
-
 msgid "search results for"
 msgstr "vyh�adan� v�sledky pre"
 
diff --git a/recmenus.c b/recmenus.c
index 93c9496..e09b325 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -1152,33 +1152,36 @@ cRecMenuSwitchTimerDelete::cRecMenuSwitchTimerDelete(void) { // OK
 
 
 // --- cRecMenuSearch  ---------------------------------------------------------
-cRecMenuSearch::cRecMenuSearch(std::string searchString, bool withOptions) {
+cRecMenuSearch::cRecMenuSearch(std::string searchString, bool withOptions) { // OK
+    SetWidthPercent(60);
+
     strncpy(this->searchString, searchString.c_str(), TEXTINPUTLENGTH);
     mode = 0;
     channelNr = 0;
     useTitle = true;
     useSubTitle = true;
     useDescription = false;
-    SetWidthPercent(60);
-    cString infoText = tr("Search");
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
+
+    const cString line1 = tr("Search");
+
+    AddHeader(new cRecMenuItemInfo(*line1, 1, "", "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButtonYesNo(tr("Perform Search"), tr("Cancel"), rmsSearchPerform, rmsClose, true));
+
     AddMenuItem(new cRecMenuItemText(tr("Search Expression:"), TEXTINPUTLENGTH, false, this->searchString));
+
     if (withOptions) {
         std::vector<std::string> searchModes;
         cTVGuideSearchTimer searchTimer;
         searchTimer.GetSearchModes(&searchModes);
-        AddMenuItemInitial(new cRecMenuItemSelect(tr("Search Mode"), searchModes, false, &mode));
-        AddMenuItemInitial(new cRecMenuItemChannelChooser(tr("Channel to Search"), false, &channelNr));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in title"), false, &useTitle));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Subtitle"), false, &useSubTitle));
-        AddMenuItemInitial(new cRecMenuItemBool(tr("Search in Description"), false, &useDescription));
+        AddMenuItem(new cRecMenuItemSelect(tr("Search Mode"), searchModes, false, &mode));
+        AddMenuItem(new cRecMenuItemChannelChooser(tr("Channel to Search"), false, &channelNr));
+        AddMenuItem(new cRecMenuItemBool(tr("Search in title"), false, &useTitle));
+        AddMenuItem(new cRecMenuItemBool(tr("Search in Subtitle"), false, &useSubTitle));
+        AddMenuItem(new cRecMenuItemBool(tr("Search in Description"), false, &useDescription));
     } else {
-        AddMenuItemInitial(new cRecMenuItemButton(tr("Show Search Options"), rmsSearchWithOptions, false));
+        AddMenuItem(new cRecMenuItemButton(tr("Show Search Options"), rmsSearchWithOptions, false));
     }
-    cRecMenuItemButtonYesNo *button = new cRecMenuItemButtonYesNo(tr("Perform Search"), tr("Cancel"), rmsSearchPerform, rmsClose, true);
-    SetFooter(button);
+
     CalculateHeight();
     CreatePixmap();
     Arrange();