- use of new menu categories introduced in vdr-1.7.33/34

- call SetItemEvent to pass schedule info to skins

7 files changed, 34 insertions, 7 deletions

diff --git a/menu_main.c b/menu_main.c
index 1b48602..8dc1c56 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -49,7 +49,7 @@ int cMenuSearchMain::forceMenu = 0; // 1 = now, 2 = schedule, 3 = summary
 cMenuSearchMain::cMenuSearchMain(void)
 :cOsdMenu("", GetTab(1), GetTab(2), GetTab(3), GetTab(4), GetTab(5))
 {
-#if VDRVERSNUM >= 10728
+#if VDRVERSNUM >= 10734
   SetMenuCategory(mcSchedule);
 #endif
   helpKeys = -1;
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index 256518f..836829c 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -40,8 +40,8 @@ const char *cMenuMyEditTimer::CheckModes[3];
 cMenuMyEditTimer::cMenuMyEditTimer(cTimer *Timer, bool New, const cEvent* Event, const cChannel* forcechannel)
 :cOsdMenu(trVDR("Edit timer"), 14)
 {
-#if VDRVERSNUM >= 10728
-  SetMenuCategory(mcTimer);
+#if VDRVERSNUM >= 10734
+  SetMenuCategory(mcTimerEdit);
 #endif
     CheckModes[0] = tr("no check");
     CheckModes[UPD_CHDUR] = tr("by channel and time");
diff --git a/menu_recsdone.c b/menu_recsdone.c
index 9c7bd04..ec790b8 100644
--- a/menu_recsdone.c
+++ b/menu_recsdone.c
@@ -71,8 +71,8 @@ int cMenuRecDoneItem::Compare(const cListObject &ListObject) const
 cMenuRecsDone::cMenuRecsDone(cSearchExt* Search)
 :cOsdMenu("", 16)
 {
-#if VDRVERSNUM >= 10728
-  SetMenuCategory(mcRecording);
+#if VDRVERSNUM >= 10734
+  SetMenuCategory(mcRecordingInfo);
 #endif
     search = Search;
     showMode = SHOW_RECDONE_ALL;
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 04b564a..81d5cf2 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -184,6 +184,15 @@ cMenuSearchResultsItem::cMenuSearchResultsItem(cRecording *Recording)
    SetText(Recording->Title('\t'));
 }
 
+void cMenuSearchResultsItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+#if APIVERSNUM >= 10733
+  cChannel *channel = event?Channels.GetByChannelID(event->ChannelID(), true, true):NULL;
+  if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, true, timerMatch))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+#endif
+}
+
 // --- cMenuSearchResults -------------------------------------------------------
 
 const cEvent *cMenuSearchResults::scheduleEventInfo = NULL;
diff --git a/menu_searchresults.h b/menu_searchresults.h
index 61634db..bbaa6a6 100644
--- a/menu_searchresults.h
+++ b/menu_searchresults.h
@@ -60,6 +60,7 @@ class cMenuSearchResultsItem : public cOsdItem {
                            const cSearchExt* Search = NULL);
     cMenuSearchResultsItem(cRecording *Recording);
     bool Update(bool Force = false);
+    void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
 };
 
 // --- cMenuSearchResults ------------------------------------------------------
diff --git a/menu_whatson.c b/menu_whatson.c
index 1143419..96dcd16 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -246,6 +246,16 @@ bool cMenuMyScheduleItem::Update(bool Force)
    return result;
 }
 
+void cMenuMyScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable)
+{
+#if APIVERSNUM >= 10733
+  bool withDate = (channel == NULL); // search for a better way to determine this
+  if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch))
+     DisplayMenu->SetItem(Text(), Index, Current, Selectable);
+#endif
+}
+
+
 // --- cMenuWhatsOnSearch ----------------------------------------------------------
 
 int cMenuWhatsOnSearch::currentChannel = 0;
@@ -259,8 +269,13 @@ int cMenuWhatsOnSearch::shiftTime = 0;
 cMenuWhatsOnSearch::cMenuWhatsOnSearch(const cSchedules *Schedules, int CurrentChannelNr)
    :cOsdMenu("", GetTab(1), GetTab(2), GetTab(3), GetTab(4), GetTab(5))
 {
-#if VDRVERSNUM >= 10728
-  SetMenuCategory(mcSchedule);
+#if VDRVERSNUM >= 10734
+  if (currentShowMode == showNow)
+    SetMenuCategory(mcScheduleNow);
+  else if (currentShowMode == showNext)
+    SetMenuCategory(mcScheduleNext);
+  else
+    SetMenuCategory(mcSchedule);
 #endif
 
   helpKeys = -1;
diff --git a/menu_whatson.h b/menu_whatson.h
index fa0f3ec..a30a5ab 100644
--- a/menu_whatson.h
+++ b/menu_whatson.h
@@ -41,6 +41,8 @@ public:
 
   cMenuMyScheduleItem(const cEvent *Event, cChannel *Channel = NULL, showMode ShowMode = showNow, cMenuTemplate* menuTemplate = NULL);
   bool Update(bool Force = false);
+  virtual void SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable);
+
 };
 
 // --- cMenuWhatsOnSearch ----------------------------------------------------------