Added possibility to create a recording from search timer result list

HISTORY

@@ -127,3 +127,4 @@ Version 1.2.0
 - changed event result lists that it is possible to scroll page up and
   down directly with left / right. A recording is triggered now with the
   red key.
+- Added possibility to create a recording from search timer result list

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: 2014-02-07 16:15+0100\n"
+"POT-Creation-Date: 2014-02-07 18:08+0100\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"
@@ -417,18 +417,18 @@ msgstr "Utilitzant plantilla"
 msgid "Use other Template"
 msgstr "Utilitza una altra plantilla"
 
-msgid "search results for Search Timer"
-msgstr "cerca resultats per temporitzador"
-
-msgid "search result for Search Timer"
-msgstr "cerca resultat per temporitzador"
-
 msgid "search results for Favorite"
 msgstr ""
 
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "cerca resultats per temporitzador"
+
+msgid "search result for Search Timer"
+msgstr "cerca resultat per temporitzador"
+
 msgid "Nothing found for Search String"
 msgstr "No s'ha trobat la cadena de text"
 

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: 2014-02-07 16:15+0100\n"
+"POT-Creation-Date: 2014-02-07 18:08+0100\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -414,18 +414,18 @@ msgstr "Template"
 msgid "Use other Template"
 msgstr "Anderes Template benutzen"
 
-msgid "search results for Search Timer"
-msgstr "Treffer für Suchtimer"
-
-msgid "search result for Search Timer"
-msgstr "Treffer für Suchtimer"
-
 msgid "search results for Favorite"
 msgstr "Suchergebnisse für Favorit"
 
 msgid "search result for Favorite"
 msgstr "Suchergebnis für Favorit"
 
+msgid "search results for Search Timer"
+msgstr "Treffer für Suchtimer"
+
+msgid "search result for Search Timer"
+msgstr "Treffer für Suchtimer"
+
 msgid "Nothing found for Search String"
 msgstr "Keine Treffer für Suchbegriff"
 
@@ -833,4 +833,3 @@ msgstr "Kanalgruppen Cache"
 
 msgid "Recording Menus Icon Cache"
 msgstr "Recording Menüs Icon Cache"
-

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: 2014-02-07 16:15+0100\n"
+"POT-Creation-Date: 2014-02-07 18:08+0100\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"
@@ -414,18 +414,18 @@ msgstr "Использовать шаблон"
 msgid "Use other Template"
 msgstr "Использовать другие шаблоны"
 
-msgid "search results for Search Timer"
-msgstr "Совпадений найдено"
-
-msgid "search result for Search Timer"
-msgstr "Совпадение найдено"
-
 msgid "search results for Favorite"
 msgstr ""
 
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "Совпадений найдено"
+
+msgid "search result for Search Timer"
+msgstr "Совпадение найдено"
+
 msgid "Nothing found for Search String"
 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: 2014-02-07 16:15+0100\n"
+"POT-Creation-Date: 2014-02-07 18:08+0100\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -414,18 +414,18 @@ msgstr "
 msgid "Use other Template"
 msgstr "Pou¾i» inú ¹ablónu"
 
-msgid "search results for Search Timer"
-msgstr "nájdené výsledky vyhµadávania plánu"
-
-msgid "search result for Search Timer"
-msgstr "nájdený výsledok vyhµadávania plánu"
-
 msgid "search results for Favorite"
 msgstr ""
 
 msgid "search result for Favorite"
 msgstr ""
 
+msgid "search results for Search Timer"
+msgstr "nájdené výsledky vyhµadávania plánu"
+
+msgid "search result for Search Timer"
+msgstr "nájdený výsledok vyhµadávania plánu"
+
 msgid "Nothing found for Search String"
 msgstr "Hµadaný výraz sa nena¹iel"
 

recmenuitem.c

@@ -1871,7 +1871,7 @@ int cRecMenuItemEvent::DrawIcons(void) {
         if (imgHasTimer) {
             pixmapIcons->DrawImage(cPoint(width - iconSize - 10, iconY), *imgHasTimer);
         }
-    } else {
+    } else if (action2 != rmsDisabled) {
         std::string iconRec = active ? "record_active" : "record_inactive";
         cImage *imgRec = imgCache.GetIcon(iconRec, iconSize, iconSize);
         if (imgRec) {

recmenuitem.h

@@ -53,6 +53,7 @@ enum eRecMenuState {
     rmsSearchTimerDeleteConfirm,
     rmsSearchTimerDelete,
     rmsSearchTimerDeleteWithTimers,
+    rmsSearchTimerRecord,
     //SWITCHTIMER
     rmsSwitchTimer,
     rmsSwitchTimerCreate,

recmenumanager.c

@@ -316,11 +316,13 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             //caller: cRecMenuSearchTimerEdit, cRecMenuSearchTimerTemplatesCreate, cRecMenuSearchTimers, cRecMenuFavorites
             //show results of currently choosen search timer
             cTVGuideSearchTimer searchTimer;
-            bool showRecIcon = false;
+            eRecMenuState recState = rmsDisabled;
             if (cRecMenuSearchTimerEdit *menu = dynamic_cast<cRecMenuSearchTimerEdit*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
+                recState = rmsSearchTimerRecord;
             } else if  (cRecMenuSearchTimers *menu = dynamic_cast<cRecMenuSearchTimers*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
+                recState = rmsSearchTimerRecord;
             } else if (cRecMenuSearchTimerTemplatesCreate *menu = dynamic_cast<cRecMenuSearchTimerTemplatesCreate*>(activeMenu)) {
                 searchTimer = menu->GetSearchTimer();
                 TVGuideEPGSearchTemplate tmpl = menu->GetTemplate();
@@ -328,7 +330,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
                 searchTimer.Parse(true);
             } else if (cRecMenuFavorites *menu = dynamic_cast<cRecMenuFavorites*>(activeMenu)) {
                 searchTimer = menu->GetFavorite();
-                showRecIcon = true;
+                recState = rmsFavoritesRecord;
             } else break;
             int numSearchResults = 0;
             std::string searchString = searchTimer.BuildSearchString();
@@ -336,7 +338,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             if (numSearchResults) {
                 activeMenuBuffer = activeMenu;
                 activeMenuBuffer->Hide();
-                activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", showRecIcon?rmsFavoritesRecord:rmsDisabled);
+                activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", recState);
                 activeMenu->Display();
             } else {
                activeMenuBuffer = activeMenu;
@@ -408,6 +410,20 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
             activeMenuBuffer = NULL;
             DisplaySearchTimerList();
             break; }
+        case rmsSearchTimerRecord: {
+            //caller: cRecMenuSearchTimerResults
+            const cEvent *ev = NULL;
+            if (cRecMenuSearchTimerResults *menu = dynamic_cast<cRecMenuSearchTimerResults*>(activeMenu)) {
+                ev = menu->GetEvent();
+            } else break;
+            if (!ev)
+                break;
+            recManager->createTimer(ev, "");
+            activeMenuBuffer2 = activeMenu;
+            activeMenuBuffer2->Hide();
+            activeMenu = new cRecMenuSearchConfirmTimer(ev, rmsFavoritesRecordConfirm);
+            activeMenu->Display();
+            break; }
         /********************************************************************************************** 
          *    SWITCH TIMER 
          ***********************************************************************************************/

recmenus.c

@@ -978,13 +978,13 @@ cRecMenuSearchTimerResults::cRecMenuSearchTimerResults(std::string searchString,
     this->numResults = numResults;
     SetWidthPercent(70);
     cString message1 = "", message2 = "", message3 = "", infoText = "";
-    if (action2 == rmsDisabled) {
+    if (action2 == rmsFavoritesRecord) {
+        message1 = tr("search results for Favorite");
+        message2 = tr("search result for Favorite");
+    } else {
         message1 = tr("search results for Search Timer");
         message2 = tr("search result for Search Timer");
         message3 = tr("Using Template");
-    } else if (action2 == rmsFavoritesRecord) {
-        message1 = tr("search results for Favorite");
-        message2 = tr("search result for Favorite");
     }
     if (templateName.size() > 0) {
         infoText = cString::sprintf("%d %s:\n\"%s\"\n%s \"%s\"", numResults, (numResults>1)?(*message1):(*message2), searchString.c_str(), *message3, templateName.c_str());