From 185b81474ca56f7f17d60fa89c64183147423e43 Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Wed, 20 Nov 2013 22:34:41 +0100 Subject: small fix, add icons --- displaymenu.c | 11 +++++++++-- icons/aspect.pdn | Bin 7950 -> 0 bytes icons/default/menuIcons/Miscellaneous.png | Bin 0 -> 3202 bytes icons/default/menuIcons/OSD.png | Bin 0 -> 5445 bytes icons/default/menuIcons/blank.png | Bin 0 -> 429 bytes icons/resolution.pdn | Bin 9098 -> 0 bytes icons/sd_hd.pdn | Bin 9212 -> 0 bytes 7 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 icons/aspect.pdn create mode 100644 icons/default/menuIcons/Miscellaneous.png create mode 100644 icons/default/menuIcons/OSD.png create mode 100644 icons/default/menuIcons/blank.png delete mode 100644 icons/resolution.pdn delete mode 100644 icons/sd_hd.pdn 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 Binary files a/icons/aspect.pdn and /dev/null differ diff --git a/icons/default/menuIcons/Miscellaneous.png b/icons/default/menuIcons/Miscellaneous.png new file mode 100644 index 00000000..d4bd9b53 Binary files /dev/null and b/icons/default/menuIcons/Miscellaneous.png differ diff --git a/icons/default/menuIcons/OSD.png b/icons/default/menuIcons/OSD.png new file mode 100644 index 00000000..e34d7cac Binary files /dev/null and b/icons/default/menuIcons/OSD.png differ diff --git a/icons/default/menuIcons/blank.png b/icons/default/menuIcons/blank.png new file mode 100644 index 00000000..d32037f7 Binary files /dev/null and b/icons/default/menuIcons/blank.png differ diff --git a/icons/resolution.pdn b/icons/resolution.pdn deleted file mode 100644 index 2b528695..00000000 Binary files a/icons/resolution.pdn and /dev/null differ diff --git a/icons/sd_hd.pdn b/icons/sd_hd.pdn deleted file mode 100644 index a16a0876..00000000 Binary files a/icons/sd_hd.pdn and /dev/null differ -- cgit v1.2.3