diff options
| -rw-r--r-- | recmenus.c | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -57,30 +57,32 @@ cRecMenuMain::cRecMenuMain(bool epgSearchAvailable, bool timerActive, bool switc ******************************************************************************************/ // --- cRecMenuAskFolder --------------------------------------------------------- -cRecMenuAskFolder::cRecMenuAskFolder(const cEvent *event, eRecMenuState nextAction) { +cRecMenuAskFolder::cRecMenuAskFolder(const cEvent *event, eRecMenuState nextAction) { // OK SetWidthPercent(80); + NextAction = nextAction; - cString message = tr("Set Folder for"); - cString headerText = cString::sprintf("%s\n\"%s\"", *message, event->Title()); - cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*headerText, true); - infoItem->CalculateHeight(width - 2 * border); - SetHeader(infoItem); - + + const cString line1 = tr("Set Folder for"); + const cString line2 = (event && event->Title()) ? cString::sprintf("\"%s\"", event->Title()) : ""; + + AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true)); + AddFooter(new cRecMenuItemButton(tr("root video folder"), nextAction, true, false, true)); + AddMenuItemInitial(new cRecMenuItemButton(tr("root video folder"), nextAction, true, false, true)); - + ReadRecordingDirectories(&folders, NULL, ""); int numFolders = folders.size(); - for (int i=0; i < numFolders; i++) { + for (int i = 0; i < numFolders; i++) { if (!AddMenuItemInitial(new cRecMenuItemButton(folders[i].c_str(), nextAction, false, false, true))) break; } - + CalculateHeight(); CreatePixmap(); Arrange(); } -cRecMenuItem *cRecMenuAskFolder::GetMenuItem(int number) { +cRecMenuItem *cRecMenuAskFolder::GetMenuItem(int number) { if (number == 0) { cRecMenuItem *result = new cRecMenuItemButton(tr("root video folder"), rmsInstantRecord, false, false, true); return result; @@ -92,7 +94,7 @@ cRecMenuItem *cRecMenuAskFolder::GetMenuItem(int number) { } int cRecMenuAskFolder::GetTotalNumMenuItems(void) { - return folders.size()+1; + return folders.size() + 1; } std::string cRecMenuAskFolder::GetFolder(void) { |