now setting the menu category introduced in vdr-1.7.28 (bug tracker #1059)

21 files changed, 96 insertions, 0 deletions

diff --git a/changrp.c b/changrp.c
index 81a253f..45be2c3 100644
--- a/changrp.c
+++ b/changrp.c
@@ -305,6 +305,9 @@ void cMenuChannelGroupItem::Set(void)
 cMenuChannelGroups::cMenuChannelGroups(char** GroupName)
 :cOsdMenu(tr("Channel groups"),20)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     groupSel = -1;
     groupName = GroupName;
     if (groupName && *groupName)
@@ -407,6 +410,9 @@ eOSState cMenuChannelGroups::ProcessKey(eKeys Key)
 cMenuEditChannelGroup::cMenuEditChannelGroup(cChannelGroup *Group, bool New)
 :cOsdMenu(tr("Edit channel group"),30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     group = Group;
     channelSel = group->CreateChannelSel();
     strcpy(name, group->name);
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index 2fe0680..b2112c7 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -54,6 +54,9 @@ const char *cMenuSetupMailNotification::MailBoxChars     = " abcdefghijklmnopqrs
 cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cEPGSearchConfig* Data)
     : cOsdMenu(Title, 33)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     data = Data;
 }
 
diff --git a/menu_announcelist.c b/menu_announcelist.c
index 9d2850c..8c27a6b 100644
--- a/menu_announcelist.c
+++ b/menu_announcelist.c
@@ -88,6 +88,9 @@ eOSState cMenuAnnounceList::ProcessKey(eKeys Key)
 cMenuAnnounceDetails::cMenuAnnounceDetails(const cEvent* Event, const cSearchExt* Search)
    :cOsdMenu("", 25), event(Event)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcEvent);
+#endif
    cMenuAnnounceList::showsDetails = true;
    if (event && !isempty(event->Title()))
    {
diff --git a/menu_blacklistedit.c b/menu_blacklistedit.c
index fceaccf..9637bd3 100644
--- a/menu_blacklistedit.c
+++ b/menu_blacklistedit.c
@@ -42,6 +42,9 @@ extern const char AllowedChars[];
 cMenuBlacklistEdit::cMenuBlacklistEdit(cBlacklist *Blacklist, bool New)
 :cOsdMenu(tr("Edit blacklist"),32)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     SearchModes[0] = strdup(tr("phrase"));
     SearchModes[1] = strdup(tr("all words"));
     SearchModes[2] = strdup(tr("at least one word"));
diff --git a/menu_blacklists.c b/menu_blacklists.c
index 443bf8b..932d425 100644
--- a/menu_blacklists.c
+++ b/menu_blacklists.c
@@ -99,6 +99,9 @@ int cMenuBlacklistsItem::Compare(const cListObject &ListObject) const
 cMenuBlacklists::cMenuBlacklists()
 :cOsdMenu(tr("Blacklists"), 3, 20, 11, 6, 5)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     cMutexLock BlacklistLock(&Blacklists);
     cBlacklist *Blacklist = Blacklists.First();
     while (Blacklist) {
diff --git a/menu_commands.c b/menu_commands.c
index 96635bc..9d33863 100644
--- a/menu_commands.c
+++ b/menu_commands.c
@@ -45,6 +45,10 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 cMenuSearchCommands::cMenuSearchCommands(const char *Title, const cEvent* Event, bool DirectCall, cSearchExt* Search)
    :cOsdMenu(Title)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcCommand);
+#endif
+
    directCall = DirectCall;
    SetHasHotkeys();
    LoadCommands();
diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c
index 0d49c23..752b738 100644
--- a/menu_conflictcheck.c
+++ b/menu_conflictcheck.c
@@ -62,6 +62,9 @@ cMenuConflictCheckItem::cMenuConflictCheckItem(cConflictCheckTime* Ct, cConflict
 cMenuConflictCheck::cMenuConflictCheck()
 :cOsdMenu("", 4, 12, 4, 5, 30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSchedule);
+#endif
     showAll = false;
     lastSel = -1;
     BuildList();
@@ -194,6 +197,9 @@ bool cMenuConflictCheckDetailsItem::Update(bool Force)
 cMenuConflictCheckDetails::cMenuConflictCheckDetails(cConflictCheckTimerObj* TimerObj, cConflictCheck* ConflictCheck)
 :cOsdMenu(tr("Timer conflicts"), 2, 4, 13, 3, 2)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSchedule);
+#endif
     timerObj = TimerObj;
     checktime = timerObj->conflCheckTime;
     conflictCheck = ConflictCheck;
diff --git a/menu_deftimercheckmethod.c b/menu_deftimercheckmethod.c
index a1be75c..2b35288 100644
--- a/menu_deftimercheckmethod.c
+++ b/menu_deftimercheckmethod.c
@@ -120,6 +120,9 @@ void cDefTimerCheckModes::SetMode(const cChannel* channel, int mode)
 cMenuDefTimerCheckMethod::cMenuDefTimerCheckMethod()
     :cOsdMenu(tr("Default timer check method"), 20)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSetup);
+#endif
     CheckModes[0] = tr("no check");
     CheckModes[UPD_CHDUR] = tr("by channel and time");
     CheckModes[UPD_EVENTID] = tr("by event ID");
diff --git a/menu_dirselect.c b/menu_dirselect.c
index cac1e9e..c88ffb6 100644
--- a/menu_dirselect.c
+++ b/menu_dirselect.c
@@ -64,6 +64,10 @@ int cMenuDirItem::Compare(const cListObject &ListObject) const
 cMenuDirSelect::cMenuDirSelect(char* szDirectory)
     :cOsdMenu(tr("Select directory"))
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcTimer);
+#endif
+
     Directory = szDirectory;
     yellow=NULL;
     MaxLevel = 1;
diff --git a/menu_event.c b/menu_event.c
index 97bf466..b1e8880 100644
--- a/menu_event.c
+++ b/menu_event.c
@@ -34,6 +34,9 @@ cMenuEventSearch::cMenuEventSearch(const cEvent* Event, cEventObjects& EventObje
    eventObjects(EventObjects),
    surfMode(SurfMode)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcEvent);
+#endif
 
    eventObjects.SetCurrent(Event);
    szGreen = szYellow = NULL;
diff --git a/menu_main.c b/menu_main.c
index 41e19c8..830f43a 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -49,6 +49,9 @@ 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
+  SetMenuCategory(mcSchedule);
+#endif
   helpKeys = -1;
   otherChannel = 0;
   toggleKeys = 0;
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index 424a82a..c727501 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -40,6 +40,9 @@ 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);
+#endif
     CheckModes[0] = tr("no check");
     CheckModes[UPD_CHDUR] = tr("by channel and time");
     CheckModes[UPD_EVENTID] = tr("by event ID");
diff --git a/menu_recsdone.c b/menu_recsdone.c
index 4a25025..9c7bd04 100644
--- a/menu_recsdone.c
+++ b/menu_recsdone.c
@@ -71,6 +71,9 @@ int cMenuRecDoneItem::Compare(const cListObject &ListObject) const
 cMenuRecsDone::cMenuRecsDone(cSearchExt* Search)
 :cOsdMenu("", 16)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcRecording);
+#endif
     search = Search;
     showMode = SHOW_RECDONE_ALL;
     showEpisodeOnly = false;
diff --git a/menu_search.c b/menu_search.c
index ca37bb3..43492c2 100644
--- a/menu_search.c
+++ b/menu_search.c
@@ -108,6 +108,9 @@ int cMenuSearchExtItem::Compare(const cListObject &ListObject) const
 cMenuEPGSearchExt::cMenuEPGSearchExt()
 :cOsdMenu("", 2, 20, 11, 6, 5)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
 	cMutexLock SearchExtsLock(&SearchExts);
 	cSearchExt *SearchExt = SearchExts.First();
 	while (SearchExt) {
diff --git a/menu_searchactions.c b/menu_searchactions.c
index f83ccf7..42c9e0c 100644
--- a/menu_searchactions.c
+++ b/menu_searchactions.c
@@ -48,6 +48,9 @@ extern int updateForced;
 cMenuSearchActions::cMenuSearchActions(cSearchExt* Search, bool DirectCall)
 :cOsdMenu(tr("Search actions"))
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcCommand);
+#endif
     directCall = DirectCall;
     SetHasHotkeys();
 
diff --git a/menu_searchedit.c b/menu_searchedit.c
index 1fb133b..c312278 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -49,6 +49,9 @@ cSearchExtCats SearchExtCats;
 cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Template, bool FromEPG)
    :cOsdMenu(tr("Edit search"),32)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
    templateMode = Template;
 
    SearchModes[0] = strdup(tr("phrase"));
@@ -824,6 +827,9 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key)
 cMenuEditDaysOfWeek::cMenuEditDaysOfWeek(int* DaysOfWeek, int Offset, bool Negate)
    :cOsdMenu(tr("Edit user-defined days of week"),30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
    int i=0;
    offset = Offset;
    negate = Negate;
@@ -867,6 +873,9 @@ eOSState cMenuEditDaysOfWeek::ProcessKey(eKeys Key)
 cMenuSearchEditCompCats::cMenuSearchEditCompCats(int* catarrayAvoidRepeats)
    :cOsdMenu(tr("Compare categories"),30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
    search_catarrayAvoidRepeats = catarrayAvoidRepeats;
    edit_catarrayAvoidRepeats = (int*) malloc(SearchExtCats.Count() * sizeof(int));
    cSearchExtCat *SearchExtCat = SearchExtCats.First();
@@ -914,6 +923,9 @@ eOSState cMenuSearchEditCompCats::ProcessKey(eKeys Key)
 cMenuBlacklistsSelection::cMenuBlacklistsSelection(cList<cBlacklistObject>* pBlacklists)
 :cOsdMenu(tr("Select blacklists"),30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
    blacklists = pBlacklists;
    blacklistsSel = new int[Blacklists.Count()];
    cMutexLock BlacklistLock(&Blacklists);
@@ -1056,6 +1068,10 @@ eOSState cMenuBlacklistsSelection::ProcessKey(eKeys Key)
 cMenuCatValuesSelect::cMenuCatValuesSelect(char* CatValues, int CatIndex, int SearchMode)
    :cOsdMenu(tr("Values for EPG category"), 1, 40)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
+
    catValues = CatValues;
    catIndex = CatIndex;
    searchMode = SearchMode;
@@ -1185,6 +1201,10 @@ eOSState cMenuCatValuesSelect::ProcessKey(eKeys Key)
 cMenuSearchActivSettings::cMenuSearchActivSettings(cSearchExt *SearchExt)
 :cOsdMenu(tr("Activation of search timer"), 25)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
+
   searchExt = SearchExt;
   if (searchExt)
     {
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 6b3d3b9..b6511b9 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -191,6 +191,10 @@ const cEvent *cMenuSearchResults::scheduleEventInfo = NULL;
 cMenuSearchResults::cMenuSearchResults(cMenuTemplate* MenuTemplate)
    :cOsdMenu("", MenuTemplate->Tab(0), MenuTemplate->Tab(1), MenuTemplate->Tab(2), MenuTemplate->Tab(3), MenuTemplate->Tab(4))
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcSchedule);
+#endif
+
   helpKeys = -1;
   menuTemplate = MenuTemplate;
   modeYellow = showTitleEpisode;
diff --git a/menu_searchtemplate.c b/menu_searchtemplate.c
index 2df0837..efd716c 100644
--- a/menu_searchtemplate.c
+++ b/menu_searchtemplate.c
@@ -107,6 +107,9 @@ int cMenuSearchTemplateItem::Compare(const cListObject &ListObject) const
 cMenuEPGSearchTemplate::cMenuEPGSearchTemplate(cSearchExt* Search, cBlacklist* Blacklist, bool New)
 :cOsdMenu(tr("Search templates"), 2, 20, 11, 6, 5)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
     search = Search;
     blacklist = Blacklist;
     newSearch = New;
diff --git a/menu_switchtimers.c b/menu_switchtimers.c
index 7078f27..48bbc85 100644
--- a/menu_switchtimers.c
+++ b/menu_switchtimers.c
@@ -40,6 +40,10 @@ public:
 cMenuEditSwitchTimer::cMenuEditSwitchTimer(cSwitchTimer* SwitchTimer, bool New)
 :cOsdMenu(tr("Edit entry"),30)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
+
   SwitchModes[0] = strdup(tr("Switch"));
   SwitchModes[1] = strdup(tr("Announce only"));
   SwitchModes[2] = strdup(tr("Announce and switch"));
@@ -151,6 +155,10 @@ int cMenuSwitchTimerItem::Compare(const cListObject &ListObject) const
 cMenuSwitchTimers::cMenuSwitchTimers()
 :cOsdMenu(tr("Switch list"), 2, 4, 6, 6, 4)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcPlugin);
+#endif
+
     Set();
     Display();
 }
diff --git a/menu_timersdone.c b/menu_timersdone.c
index 8285647..a06bcd8 100644
--- a/menu_timersdone.c
+++ b/menu_timersdone.c
@@ -67,6 +67,10 @@ int cMenuTimerDoneItem::Compare(const cListObject &ListObject) const
 cMenuTimersDone::cMenuTimersDone(cSearchExt* Search)
    :cOsdMenu("", 4, 15)
 {
+#if VDRVERSNUM >= 10728
+  SetMenuCategory(mcTimer);
+#endif
+
    search = Search;
    showAll = true;
    sortModeTimerDone = 0;
diff --git a/menu_whatson.c b/menu_whatson.c
index cf48bc9..e411b81 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -259,6 +259,10 @@ 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);
+#endif
+
   helpKeys = -1;
   shiftTime = 0;
   schedules = Schedules;