improved menu icon display

3 files changed, 14 insertions, 3 deletions

diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index db4b079..7c8ee6a 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -6,6 +6,7 @@
 #include "../libcore/helpers.h"
 
 cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(rootView) {
+    cat = mcUndefined;
     viewType = svUndefined;
     subView = NULL;
     subViewAvailable = false;
@@ -81,6 +82,7 @@ bool cDisplayMenuRootView::createOsd(void) {
 
 void cDisplayMenuRootView::SetMenu(eMenuCategory menuCat, bool menuInit) {
     eSubView newViewType = svUndefined;
+    cat = menuCat;
     bool isListView = true;
     switch (menuCat) {
         case mcMain:
@@ -157,7 +159,7 @@ void cDisplayMenuRootView::SetMenu(eMenuCategory menuCat, bool menuInit) {
             default:
                 view = new cDisplayMenuView(subView, menuInit);
         }
-        
+        view->SetMenuCat(cat);
         //Cleanup root view
         ClearRootView();
 
@@ -408,7 +410,8 @@ void cDisplayMenuRootView::DrawHeader(void) {
 
     //check for standard menu entries
     bool hasIcon = false;
-    string icon = imgCache->GetIconName(menuTitle);
+
+    string icon = imgCache->GetIconName(menuTitle, cat);
     if (icon.size() > 0)
         hasIcon = true;
 
diff --git a/views/displaymenurootview.h b/views/displaymenurootview.h
index 2979746..0852570 100644
--- a/views/displaymenurootview.h
+++ b/views/displaymenurootview.h
@@ -8,6 +8,7 @@
 
 class cDisplayMenuRootView : public cView {
 private:
+    eMenuCategory cat;
     eSubView viewType;
     cTemplateView *subView;
     bool subViewAvailable;
diff --git a/views/displaymenuview.c b/views/displaymenuview.c
index 47c1591..f5a841c 100644
--- a/views/displaymenuview.c
+++ b/views/displaymenuview.c
@@ -41,7 +41,7 @@ bool cDisplayMenuView::DrawHeader(void) {
 
     //check for standard menu entries
     bool hasIcon = false;
-    string icon = imgCache->GetIconName(menuTitle);
+    string icon = imgCache->GetIconName(menuTitle, cat);
     if (icon.size() > 0)
         hasIcon = true;
     stringTokens.insert(pair<string,string>("icon", icon));
@@ -435,6 +435,13 @@ bool cDisplayMenuSchedulesView::DrawHeader(void) {
         stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
         
     }
+    bool hasIcon = false;
+    string icon = imgCache->GetIconName(menuTitle, cat);
+    if (icon.size() > 0)
+        hasIcon = true;
+
+    stringTokens.insert(pair<string,string>("icon", icon));
+    intTokens.insert(pair<string,int>("hasicon", hasIcon));
     ClearViewElement(veHeader);
     DrawViewElement(veHeader, &stringTokens, &intTokens);
     return true;