summaryrefslogtreecommitdiff
path: root/menuitem.c
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2013-09-13 16:38:04 +0200
committerlouis <louis.braun@gmx.de>2013-09-13 16:38:04 +0200
commit24262eefa031a9d5ef243205719e8edc45d66ea4 (patch)
tree3164828d7afbfece68422afbfbe9205cc9051a83 /menuitem.c
parentdcfc3b7083fed403555e0d33907f86699026cd45 (diff)
downloadskin-nopacity-24262eefa031a9d5ef243205719e8edc45d66ea4.tar.gz
skin-nopacity-24262eefa031a9d5ef243205719e8edc45d66ea4.tar.bz2
changed channel logo handling and added logo converter script with some backgrounds
Diffstat (limited to 'menuitem.c')
-rw-r--r--menuitem.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/menuitem.c b/menuitem.c
index 1516481..6d17892 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -524,6 +524,8 @@ void cNopacityScheduleMenuItem::DrawLogo(int logoWidth, int logoHeight) {
cImageLoader imgLoader;
if (imgLoader.LoadLogo(Channel->Name(), logoWidth, logoHeight)) {
pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
+ } else if (imgLoader.LoadLogo(*(Channel->GetChannelID().ToString()), logoWidth, logoHeight)) {
+ pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
} else {
cTextWrapper channel;
channel.Set(Channel->Name(), font, logoWidth);
@@ -764,7 +766,9 @@ void cNopacityChannelMenuItem::Render() {
cImageLoader imgLoader;
if (imgLoader.LoadLogo(Channel->Name(), logoWidth, logoHeight)) {
pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
- }
+ } else if (imgLoader.LoadLogo(*(Channel->GetChannelID().ToString()), logoWidth, logoHeight)) {
+ pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
+ }
drawn = true;
}
SetTextShort();
@@ -934,6 +938,8 @@ void cNopacityTimerMenuItem::DrawLogo(int logoWidth, int logoHeight) {
cImageLoader imgLoader;
if (imgLoader.LoadLogo(Timer->Channel()->Name(), logoWidth, logoHeight)) {
pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
+ } else if (imgLoader.LoadLogo(*(Timer->Channel()->GetChannelID().ToString()), logoWidth, logoHeight)) {
+ pixmapIcon->DrawImage(cPoint(1, 1), imgLoader.GetImage());
} else {
cTextWrapper channel;
channel.Set(Timer->Channel()->Name(), font, logoWidth);