diff options
Diffstat (limited to 'recmenus.c')
| -rw-r--r-- | recmenus.c | 53 |
1 files changed, 23 insertions, 30 deletions
@@ -1020,37 +1020,32 @@ cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEP // --- cRecMenuSearchTimerResults --------------------------------------------------------- -cRecMenuSearchTimerResults::cRecMenuSearchTimerResults(std::string searchString, const cEvent **searchResults, int numResults, std::string templateName, eRecMenuState action2) { +cRecMenuSearchTimerResults::cRecMenuSearchTimerResults(std::string searchString, const cEvent **searchResults, int numResults, std::string templateName, eRecMenuState action2) { // OK + SetWidthPercent(70); + this->searchResults = searchResults; this->action2 = action2; this->numResults = numResults; - SetWidthPercent(70); - cString message1 = "", message2 = "", message3 = "", infoText = ""; - 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"); - } - 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()); - } else { - infoText = cString::sprintf("%d %s:\n\"%s\"", numResults, (numResults>1)?(*message1):(*message2), searchString.c_str()); - } - cRecMenuItem *infoItem = new cRecMenuItemInfo(*infoText, true); - infoItem->CalculateHeight(width - 2 * border); - SetHeader(infoItem); - - cRecMenuItem *buttons = new cRecMenuItemButton(tr("Close"), rmsClose, false); - SetFooter(buttons); + + int i = (templateName.size() > 0) ? 3 : 2; + const cString line1 = cString::sprintf("%d %s:", numResults, (numResults > 1) ? + (action2 == rmsFavoritesRecord) ? tr("search results for Favorite") + : tr("search results for Search Timer") : + (action2 == rmsFavoritesRecord) ? tr("search result for Favorite") + : tr("search result for Search Timer")); + const cString line2 = cString::sprintf("\"%s\"", searchString.c_str()); + const cString line3 = (i == 3) ? cString::sprintf("%s \"%s\"", tr("Using Template"), templateName.c_str()) : ""; + + AddHeader(new cRecMenuItemInfo(*line1, i, *line2, *line3, "", width - 2 * border, true)); + AddFooter(new cRecMenuItemButton(tr("Close"), rmsClose, false)); + if (searchResults && (numResults > 0)) { - for (int i=0; i<numResults; i++) { - if (!AddMenuItemInitial(new cRecMenuItemEvent(searchResults[i], rmsSearchShowInfo, action2, (i==0)?true:false))) + for (int i = 0; i < numResults; i++) { + if (!AddMenuItemInitial(new cRecMenuItemEvent(searchResults[i], rmsSearchShowInfo, action2, (i == 0) ? true : false))) break; } } + CalculateHeight(); CreatePixmap(); Arrange(); @@ -1058,8 +1053,8 @@ cRecMenuSearchTimerResults::cRecMenuSearchTimerResults(std::string searchString, cRecMenuItem *cRecMenuSearchTimerResults::GetMenuItem(int number) { if ((number >= 0) && (number < numResults)) { - cRecMenuItem *result = new cRecMenuItemEvent(searchResults[number], rmsSearchShowInfo, action2, false); - return result; + if (cRecMenuItem *result = new cRecMenuItemEvent(searchResults[number], rmsSearchShowInfo, action2, false)) + return result; } return NULL; } @@ -1069,10 +1064,9 @@ int cRecMenuSearchTimerResults::GetTotalNumMenuItems(void) { } const cEvent *cRecMenuSearchTimerResults::GetEvent(void) { - const cEvent *ev = NULL; if (cRecMenuItemEvent *activeItem = dynamic_cast<cRecMenuItemEvent*>(GetActiveMenuItem())) - ev = activeItem->GetEventValue(); - return ev; + return activeItem->GetEventValue(); + return NULL; } // --- cRecMenuSearchTimerNothingFound --------------------------------------------------------- @@ -1504,7 +1498,6 @@ const cTimer *cRecMenuTimeline::GetTimer(void) { return NULL; } - eRecMenuState cRecMenuTimeline::ProcessKey(eKeys Key) { eRecMenuState state = rmsContinue; switch (Key & ~k_Repeat) { |