added tokens for various menucategories in menudefault

3 files changed, 65 insertions, 8 deletions

diff --git a/coreengine/definitions.h b/coreengine/definitions.h
index 7178ecf..44f9710 100644
--- a/coreengine/definitions.h
+++ b/coreengine/definitions.h
@@ -650,8 +650,15 @@ enum class eLeMenuDefaultIT {
     column4pbsize,
     column5pbsize,
     column6pbsize,
+    unknown,
+    channeledit,
+    timeredit,
+    recordinginfo,
+    recordingedit,
     setup,
     commands,
+    folder,
+    cam,
     fritzbox,
     systeminfo,
     mailbox,
diff --git a/coreengine/listelements.c b/coreengine/listelements.c
index 240da4a..6cff3d9 100644
--- a/coreengine/listelements.c
+++ b/coreengine/listelements.c
@@ -13,7 +13,7 @@ cListElement::cListElement(void) {
     wasCurrent = false;
     selectable = false;
     currentElement = NULL;
-    menuCat = mcUnknown;
+    menuCat = mcUndefined;
 };
 
 cListElement::cListElement(const cListElement &other) : cViewElement(other) {
@@ -161,8 +161,15 @@ void cLeMenuDefault::SetTokenContainer(void) {
     tokenContainer->DefineIntToken("{column4pbsize}", (int)eLeMenuDefaultIT::column4pbsize);
     tokenContainer->DefineIntToken("{column5pbsize}", (int)eLeMenuDefaultIT::column5pbsize);
     tokenContainer->DefineIntToken("{column6pbsize}", (int)eLeMenuDefaultIT::column6pbsize);
+    tokenContainer->DefineIntToken("{unknown}", (int)eLeMenuDefaultIT::unknown);
+    tokenContainer->DefineIntToken("{channeledit}", (int)eLeMenuDefaultIT::channeledit);
+    tokenContainer->DefineIntToken("{timeredit}", (int)eLeMenuDefaultIT::timeredit);
+    tokenContainer->DefineIntToken("{recordinginfo}", (int)eLeMenuDefaultIT::recordinginfo);
+    tokenContainer->DefineIntToken("{recordingedit}", (int)eLeMenuDefaultIT::recordingedit);
     tokenContainer->DefineIntToken("{setup}", (int)eLeMenuDefaultIT::setup);
     tokenContainer->DefineIntToken("{commands}", (int)eLeMenuDefaultIT::commands);
+    tokenContainer->DefineIntToken("{folder}", (int)eLeMenuDefaultIT::folder);
+    tokenContainer->DefineIntToken("{cam}", (int)eLeMenuDefaultIT::cam);
     tokenContainer->DefineIntToken("{fritzbox}", (int)eLeMenuDefaultIT::fritzbox);
     tokenContainer->DefineIntToken("{systeminfo}", (int)eLeMenuDefaultIT::systeminfo);
     tokenContainer->DefineIntToken("{mailbox}", (int)eLeMenuDefaultIT::mailbox);
@@ -230,13 +237,48 @@ const char *cLeMenuDefault::GetTabbedText(const char *s, int tab) {
 }
 
 void cLeMenuDefault::SetMenuCategory(void) {
-    if (menuCat >= mcPluginSetup && menuCat <= mcSetupPlugins) {
-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::setup, 1);
-        return;
-    } else if (menuCat == mcCommand) {
-        tokenContainer->AddIntToken((int)eLeMenuDefaultIT::commands, 1);        
-        return;
-    } 
+    switch (menuCat) {
+        case mcUnknown:
+        case mcUndefined:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::unknown, 1);
+            break;
+        case mcChannelEdit:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::channeledit, 1);
+            break;
+        case mcTimerEdit:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::timeredit, 1);
+            break;
+        case mcRecordingInfo:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::recordinginfo, 1);
+            break;
+        case mcRecordingEdit:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::recordingedit, 1);
+            break;
+        case mcPluginSetup:
+        case mcSetup:
+        case mcSetupOsd:
+        case mcSetupEpg:
+        case mcSetupDvb:
+        case mcSetupLnb:
+        case mcSetupCam:
+        case mcSetupRecord:
+        case mcSetupReplay:
+        case mcSetupMisc:
+        case mcSetupPlugins:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::setup, 1);
+            return;
+        case mcCommand:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::commands, 1);
+            return;
+        case mcFolder:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::folder, 1);
+            break;
+        case mcCam:
+            tokenContainer->AddIntToken((int)eLeMenuDefaultIT::cam, 1);
+            break;
+        default:
+            break;
+    }
 
     if (!plugName) {
         return;
diff --git a/skinskeleton/xmlfiles/displaymenudefault.xml b/skinskeleton/xmlfiles/displaymenudefault.xml
index 64718c2..3c6b9e5 100644
--- a/skinskeleton/xmlfiles/displaymenudefault.xml
+++ b/skinskeleton/xmlfiles/displaymenudefault.xml
@@ -45,6 +45,14 @@
         {setup}                     is set to true
         For the commands menu
         {commands}                  is set to true
+        The following tokens are set for the different other menu categiries:
+        {unknown}                    true if mcUndefined or mcUnknown is set
+        {channeledit}                true if mcChannelEdit is set
+        {timeredit}                  true if mcTimerEdit is set
+        {recordinginfo}              true if mcRecordingInfo is set
+        {recordingedit}              true if mcRecordingEdit is set
+        {folder}                     true if mcFolder is set
+        {cam}                        true if mcCam is set
         If a plugin is running, a token called as the name of the plugin is set to true
         {pluginname}                is set to true
         -->