From a40698a2bacbe59c0c562c84eefebd1650214bc1 Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 8 Sep 2013 15:47:10 +0200 Subject: Changed default Channelseparator Icon (closes Bug 1412) --- HISTORY | 1 + displaychannel.c | 6 +++--- icons/darkred/skinIcons/Channelseparator.png | Bin 8086 -> 21348 bytes icons/green/skinIcons/Channelseparator.png | Bin 0 -> 19300 bytes icons/skinIcons/Channelseparator.png | Bin 12741 -> 28668 bytes 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 icons/green/skinIcons/Channelseparator.png diff --git a/HISTORY b/HISTORY index 78a145e..cc0643a 100644 --- a/HISTORY +++ b/HISTORY @@ -235,3 +235,4 @@ Version 0.1.4 to select if additional EPG pictures are shown if tvscraper media is available - Added Deadlock Patch +- Changed default Channelseparator Icon (closes Bug 1412) diff --git a/displaychannel.c b/displaychannel.c index fbb6559..df54200 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -1,4 +1,4 @@ -#include "symbols/audio.xpm" + #include "symbols/audio.xpm" #include "symbols/dolbydigital.xpm" #include "displaychannel.h" @@ -577,8 +577,8 @@ void cNopacityDisplayChannel::DrawChannelGroups(const cChannel *Channel, cString cString separator = cString::sprintf("separatorlogos/%s", *ChannelName); if (imgLoader.LoadLogo(*separator)) { pixmapLogo->DrawImage(cPoint(config.logoBorder, (height-config.logoHeight)/2), imgLoader.GetImage()); - } else if (imgLoader.LoadIcon("skinIcons/Channelseparator", config.logoHeight)) { - pixmapLogo->DrawImage(cPoint(config.logoBorder + (config.logoWidth - config.logoHeight)/2, (height-config.logoHeight)/2), imgLoader.GetImage()); + } else if (imgLoader.LoadIcon("skinIcons/Channelseparator", config.logoWidth, config.logoHeight)) { + pixmapLogo->DrawImage(cPoint(config.logoBorder + (config.logoWidth - config.logoWidth)/2, (height-config.logoHeight)/2), imgLoader.GetImage()); } } diff --git a/icons/darkred/skinIcons/Channelseparator.png b/icons/darkred/skinIcons/Channelseparator.png index aa345d5..98cf6ea 100644 Binary files a/icons/darkred/skinIcons/Channelseparator.png and b/icons/darkred/skinIcons/Channelseparator.png differ diff --git a/icons/green/skinIcons/Channelseparator.png b/icons/green/skinIcons/Channelseparator.png new file mode 100644 index 0000000..5880e58 Binary files /dev/null and b/icons/green/skinIcons/Channelseparator.png differ diff --git a/icons/skinIcons/Channelseparator.png b/icons/skinIcons/Channelseparator.png index 1af220e..a1a091c 100644 Binary files a/icons/skinIcons/Channelseparator.png and b/icons/skinIcons/Channelseparator.png differ -- cgit v1.2.3