small fix, add icons

7 files changed, 9 insertions, 2 deletions

diff --git a/displaymenu.c b/displaymenu.c
index 3f40dae0..4ce767ff 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -184,8 +184,10 @@ void cFlatDisplayMenu::SetTitle(const char *Title) {
         cString icon;
         switch( menuCategory ) {
             case mcMain:
+                TopBarSetTitle("");
                 icon = "menuIcons/vdrlogo";
                 break;
+            case mcSchedule:
             case mcScheduleNow:
             case mcScheduleNext:
                 icon = "menuIcons/Schedule";
@@ -360,7 +362,12 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S
                     if (imgLoader.LoadIcon(*cIcon, fontHeight)) {
                         //printf("icon %s\n", *cIcon);
                         menuIconsPixmap->DrawImage(cPoint(xt + Config.decorBorderMenuItemSize, y), imgLoader.GetImage());
-                    }// else
+                    } else {
+                        if (imgLoader.LoadIcon("menuIcons/blank", fontHeight)) {
+                            //printf("icon %s\n", *cIcon);
+                            menuIconsPixmap->DrawImage(cPoint(xt + Config.decorBorderMenuItemSize, y), imgLoader.GetImage());
+                        }
+                    }
                         //printf("no icon %s\n", *cIcon);
                     
                     menuPixmap->DrawText(cPoint(fontHeight + marginItem + xt + Config.decorBorderMenuItemSize, y), s, ColorFg, ColorBg, font,
@@ -1036,7 +1043,7 @@ void cFlatDisplayMenu::SetText(const char *Text, bool FixedFont) {
     contentHeadPixmap->Fill(clrTransparent);
 
     int Left = Config.decorBorderMenuContentSize;
-    int Top = topBarHeight + marginItem + Config.decorBorderTopBarSize*2 + Config.decorBorderMenuContentHeadSize;
+    int Top = topBarHeight + marginItem + Config.decorBorderTopBarSize*2 + Config.decorBorderMenuContentSize;
     int Width = menuWidth - Config.decorBorderMenuContentSize*2;
     int Height = osdHeight - (topBarHeight + Config.decorBorderTopBarSize*2 +
         buttonsHeight + Config.decorBorderButtonSize*2 + marginItem*3);
diff --git a/icons/aspect.pdn b/icons/aspect.pdn
deleted file mode 100644
index 5dfee2dd..00000000
--- a/icons/aspect.pdn
+++ /dev/null
diff --git a/icons/default/menuIcons/Miscellaneous.png b/icons/default/menuIcons/Miscellaneous.png
new file mode 100644
index 00000000..d4bd9b53
--- /dev/null
+++ b/icons/default/menuIcons/Miscellaneous.png
diff --git a/icons/default/menuIcons/OSD.png b/icons/default/menuIcons/OSD.png
new file mode 100644
index 00000000..e34d7cac
--- /dev/null
+++ b/icons/default/menuIcons/OSD.png
diff --git a/icons/default/menuIcons/blank.png b/icons/default/menuIcons/blank.png
new file mode 100644
index 00000000..d32037f7
--- /dev/null
+++ b/icons/default/menuIcons/blank.png
diff --git a/icons/resolution.pdn b/icons/resolution.pdn
deleted file mode 100644
index 2b528695..00000000
--- a/icons/resolution.pdn
+++ /dev/null
diff --git a/icons/sd_hd.pdn b/icons/sd_hd.pdn
deleted file mode 100644
index a16a0876..00000000
--- a/icons/sd_hd.pdn
+++ /dev/null