From 1809656e5826ebea73ce8f337ef5b6a75ce2714f Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Mon, 20 Oct 2014 17:49:05 +0200
Subject: [PATCH] added token {nummenuitem} as number of item in for every list

---
 HISTORY                                           | 2 ++
 skins/metrixhd/xmlfiles/displaymenuchannels.xml   | 1 +
 skins/metrixhd/xmlfiles/displaymenudefault.xml    | 1 +
 skins/metrixhd/xmlfiles/displaymenumain.xml       | 1 +
 skins/metrixhd/xmlfiles/displaymenurecordings.xml | 1 +
 skins/metrixhd/xmlfiles/displaymenuschedules.xml  | 1 +
 skins/metrixhd/xmlfiles/displaymenusetup.xml      | 1 +
 skins/metrixhd/xmlfiles/displaymenutimers.xml     | 1 +
 skinskeleton/xmlfiles/displaymenuchannels.xml     | 1 +
 skinskeleton/xmlfiles/displaymenudefault.xml      | 1 +
 skinskeleton/xmlfiles/displaymenumain.xml         | 1 +
 skinskeleton/xmlfiles/displaymenurecordings.xml   | 1 +
 skinskeleton/xmlfiles/displaymenuschedules.xml    | 1 +
 skinskeleton/xmlfiles/displaymenusetup.xml        | 1 +
 skinskeleton/xmlfiles/displaymenutimers.xml       | 1 +
 views/displaymenuitemview.c                       | 6 ++++++
 16 files changed, 22 insertions(+)

diff --git a/HISTORY b/HISTORY
index 6e0fd83..65ac438 100644
--- a/HISTORY
+++ b/HISTORY
@@ -28,3 +28,5 @@ Version 0.0.2
 - fixed bug that new font was displayed first after VDR restart when font was changed in OSD Setup menu
 - display always newest recording of folders in recordings list, thanks@ Lars Hanisch for providing the patch
 - added extented recording information
+- added token {nummenuitem} as number of item in for every list, value starts with 1
+
diff --git a/skins/metrixhd/xmlfiles/displaymenuchannels.xml b/skins/metrixhd/xmlfiles/displaymenuchannels.xml
index b55fadb..baeae4b 100644
--- a/skins/metrixhd/xmlfiles/displaymenuchannels.xml
+++ b/skins/metrixhd/xmlfiles/displaymenuchannels.xml
@@ -1,6 +1,7 @@
 <menuchannels x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="16">
         <!-- Available Variables channels menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {number}                  number of the displayed channel
         {name}                    name of the displayed channel
         {channelid}               ChannelID as path to display channel logo
diff --git a/skins/metrixhd/xmlfiles/displaymenudefault.xml b/skins/metrixhd/xmlfiles/displaymenudefault.xml
index c7885d0..20ac1ba 100644
--- a/skins/metrixhd/xmlfiles/displaymenudefault.xml
+++ b/skins/metrixhd/xmlfiles/displaymenudefault.xml
@@ -115,6 +115,7 @@
     the correct column widths -->
     <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" menuitemwidth="94%" determinatefont="column1" numlistelements="16">
         <!-- Available Variables default menu listelement:
+        {nummenuitem}               number of item in list, starts with 1
         {column1}                   text of column1
         {column2}                   text of column2
         {column3}                   text of column3
diff --git a/skins/metrixhd/xmlfiles/displaymenumain.xml b/skins/metrixhd/xmlfiles/displaymenumain.xml
index a6cfd6b..818f054 100644
--- a/skins/metrixhd/xmlfiles/displaymenumain.xml
+++ b/skins/metrixhd/xmlfiles/displaymenumain.xml
@@ -235,6 +235,7 @@
 
     <menuitems x="0" y="7%" orientation="vertical" width="70%" height="56%" align="center" numlistelements="8">
         <!-- Available Variables main menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
         {number}                  number of menu item (or empty string if not set)
         {icon}                    path of appropriate icon
diff --git a/skins/metrixhd/xmlfiles/displaymenurecordings.xml b/skins/metrixhd/xmlfiles/displaymenurecordings.xml
index 1275779..8bae97a 100644
--- a/skins/metrixhd/xmlfiles/displaymenurecordings.xml
+++ b/skins/metrixhd/xmlfiles/displaymenurecordings.xml
@@ -1,6 +1,7 @@
 <menurecordings x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="16">
         <!-- Available Variables recordings menu listelement:
+        {nummenuitem}           number of item in list, starts with 1
         {name}                  Name of recording
         {date}                  Date of recording
         {time}                  Time of recording
diff --git a/skins/metrixhd/xmlfiles/displaymenuschedules.xml b/skins/metrixhd/xmlfiles/displaymenuschedules.xml
index ad608dc..95f8174 100644
--- a/skins/metrixhd/xmlfiles/displaymenuschedules.xml
+++ b/skins/metrixhd/xmlfiles/displaymenuschedules.xml
@@ -20,6 +20,7 @@
 
     <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="16">
         <!-- Available Variables schedules menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {title}                   title of event
         {shorttext}               shorttext of event
         {start}                   event start time in hh::mm
diff --git a/skins/metrixhd/xmlfiles/displaymenusetup.xml b/skins/metrixhd/xmlfiles/displaymenusetup.xml
index b5b8fb4..d8d1852 100644
--- a/skins/metrixhd/xmlfiles/displaymenusetup.xml
+++ b/skins/metrixhd/xmlfiles/displaymenusetup.xml
@@ -66,6 +66,7 @@
 
     <menuitems x="0" y="7%" orientation="vertical" width="98%" height="86%" align="center" numlistelements="10">
         <!-- Available Variables setup menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
         {number}                  number of menu item (or empty string if not set)
         {icon}                    path of appropriate icon
diff --git a/skins/metrixhd/xmlfiles/displaymenutimers.xml b/skins/metrixhd/xmlfiles/displaymenutimers.xml
index 60b66a5..d191172 100644
--- a/skins/metrixhd/xmlfiles/displaymenutimers.xml
+++ b/skins/metrixhd/xmlfiles/displaymenutimers.xml
@@ -1,6 +1,7 @@
 <menutimers x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="10%" orientation="vertical" width="100%" height="82%" align="center" numlistelements="16">
         <!-- Available Variables channels menu listelement:
+        {nummenuitem}       number of item in list, starts with 1
         {title}             Title of Timer
         {timerstart}        Start Time of Timer in hh::mm
         {timerstop}         End Time of Timer in hh::mm
diff --git a/skinskeleton/xmlfiles/displaymenuchannels.xml b/skinskeleton/xmlfiles/displaymenuchannels.xml
index be8ea3b..048d86c 100644
--- a/skinskeleton/xmlfiles/displaymenuchannels.xml
+++ b/skinskeleton/xmlfiles/displaymenuchannels.xml
@@ -1,6 +1,7 @@
 <menuchannels x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16">
         <!-- Available Variables channels menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {number}                  number of the displayed channel
         {name}                    name of the displayed channel
         {channelid}               ChannelID as path to display channel logo
diff --git a/skinskeleton/xmlfiles/displaymenudefault.xml b/skinskeleton/xmlfiles/displaymenudefault.xml
index aed2738..8f38b18 100644
--- a/skinskeleton/xmlfiles/displaymenudefault.xml
+++ b/skinskeleton/xmlfiles/displaymenudefault.xml
@@ -4,6 +4,7 @@
     the correct column widths -->
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" menuitemwidth="94%" determinatefont="column1" numlistelements="16">
         <!-- Available Variables default menu listelement:
+        {nummenuitem}               number of item in list, starts with 1
         {column1}                   text of column1
         {column2}                   text of column2
         {column3}                   text of column3
diff --git a/skinskeleton/xmlfiles/displaymenumain.xml b/skinskeleton/xmlfiles/displaymenumain.xml
index 98c108a..23a5e2d 100644
--- a/skinskeleton/xmlfiles/displaymenumain.xml
+++ b/skinskeleton/xmlfiles/displaymenumain.xml
@@ -58,6 +58,7 @@
 
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="8">
         <!-- Available Variables main menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
         {number}                  number of menu item (or empty string if not set)
         {icon}                    path of appropriate icon
diff --git a/skinskeleton/xmlfiles/displaymenurecordings.xml b/skinskeleton/xmlfiles/displaymenurecordings.xml
index 4898026..cd57e78 100644
--- a/skinskeleton/xmlfiles/displaymenurecordings.xml
+++ b/skinskeleton/xmlfiles/displaymenurecordings.xml
@@ -1,6 +1,7 @@
 <menurecordings x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16">
         <!-- Available Variables recordings menu listelement:
+        {nummenuitem}           number of item in list, starts with 1
         {name}                  Name of recording
         {date}                  Date of recording
         {time}                  Time of recording
diff --git a/skinskeleton/xmlfiles/displaymenuschedules.xml b/skinskeleton/xmlfiles/displaymenuschedules.xml
index b96aaf4..281535e 100644
--- a/skinskeleton/xmlfiles/displaymenuschedules.xml
+++ b/skinskeleton/xmlfiles/displaymenuschedules.xml
@@ -15,6 +15,7 @@
 
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16">
         <!-- Available Variables schedules menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {title}                   title of event
         {shorttext}               shorttext of event
         {start}                   event start time in hh::mm
diff --git a/skinskeleton/xmlfiles/displaymenusetup.xml b/skinskeleton/xmlfiles/displaymenusetup.xml
index fe21641..59b6740 100644
--- a/skinskeleton/xmlfiles/displaymenusetup.xml
+++ b/skinskeleton/xmlfiles/displaymenusetup.xml
@@ -2,6 +2,7 @@
 
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16">
         <!-- Available Variables setup menu listelement:
+        {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
         {number}                  number of menu item (or empty string if not set)
         {icon}                    path of appropriate icon
diff --git a/skinskeleton/xmlfiles/displaymenutimers.xml b/skinskeleton/xmlfiles/displaymenutimers.xml
index 612c23f..93b64fd 100644
--- a/skinskeleton/xmlfiles/displaymenutimers.xml
+++ b/skinskeleton/xmlfiles/displaymenutimers.xml
@@ -1,6 +1,7 @@
 <menutimers x="0" y="0" width="100%" height="100%" fadetime="0">
     <menuitems x="0" y="0" orientation="vertical" width="100%" height="100%" align="center" numlistelements="16">
         <!-- Available Variables channels menu listelement:
+        {nummenuitem}       number of item in list, starts with 1
         {title}             Title of Timer
         {timerstart}        Start Time of Timer in hh::mm
         {timerstop}         End Time of Timer in hh::mm
diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c
index 7a546e9..42901b5 100644
--- a/views/displaymenuitemview.c
+++ b/views/displaymenuitemview.c
@@ -137,6 +137,7 @@ void cDisplayMenuItemDefaultView::SetTokens(void) {
     }
     intTokens.insert(pair<string,int>("current", current));
     intTokens.insert(pair<string,int>("separator", !selectable));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
 }
 
 void cDisplayMenuItemDefaultView::Prepare(void) {
@@ -187,6 +188,7 @@ void cDisplayMenuItemMainView::SetTokens(void) {
 
     intTokens.insert(pair<string,int>("current", current));
     intTokens.insert(pair<string,int>("separator", !selectable));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
 }
 
 void cDisplayMenuItemMainView::Prepare(void) {
@@ -282,6 +284,7 @@ void cDisplayMenuItemSchedulesView::SetTokens(void) {
     itemInit = false;
     intTokens.insert(pair<string,int>("current", current));
     intTokens.insert(pair<string,int>("separator", !selectable));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
     intTokens.insert(pair<string,int>("whatson", (cat == mcSchedule) ? true: false));
     intTokens.insert(pair<string,int>("whatsonnow", (cat == mcScheduleNow) ? true: false));
     intTokens.insert(pair<string,int>("whatsonnext", (cat == mcScheduleNext) ? true: false));
@@ -404,6 +407,7 @@ void cDisplayMenuItemChannelsView::SetTokens(void) {
     //general channel information
     intTokens.insert(pair<string,int>("current", current));
     intTokens.insert(pair<string,int>("separator", !selectable));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
     intTokens.insert(pair<string,int>("number", channel->Number()));
     intTokens.insert(pair<string,int>("transponder", channel->Transponder()));
     intTokens.insert(pair<string,int>("frequency", channel->Frequency()));
@@ -498,6 +502,7 @@ void cDisplayMenuItemTimersView::SetTokens(void) {
     itemInit = false;
  
     intTokens.insert(pair<string,int>("current", current));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
     intTokens.insert(pair<string,int>("flagactive", timer->HasFlags(tfActive)));
     intTokens.insert(pair<string,int>("flaginstant", timer->HasFlags(tfInstant)));
     intTokens.insert(pair<string,int>("flagvps", timer->HasFlags(tfVps)));
@@ -607,6 +612,7 @@ void cDisplayMenuItemRecordingView::SetTokens(void) {
     if (!recording) return;
 
     intTokens.insert(pair<string,int>("current", current));
+    intTokens.insert(pair<string,int>("nummenuitem", num+1));
     bool isFolder = (total > 0) ? true : false;
     intTokens.insert(pair<string,int>("folder", isFolder));