summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2015-04-19 12:06:41 +0200
committerMartin Schirrmacher <vdr.skinflatplus@schirrmacher.eu>2015-04-19 12:06:41 +0200
commitd6ef829e55059ee0fb5e9b3b04e283e280b18ca2 (patch)
treefa206d963422eaadea384ee5f842745955bb5639
parent6cfbe89ce0d0e03c0db4a5a3c42bbcd9d9c183b7 (diff)
downloadskin-flatplus-d6ef829e55059ee0fb5e9b3b04e283e280b18ca2.tar.gz
skin-flatplus-d6ef829e55059ee0fb5e9b3b04e283e280b18ca2.tar.bz2
[fix] wrong epg logo in epgsearch eventsview
Diffstat
-rw-r--r--HISTORY2
-rw-r--r--displaymenu.c87
-rw-r--r--icons/default/menuIcons/RecsSortDate.pngbin3010 -> 0 bytes
-rw-r--r--icons/default/menuIcons/RecsSortName.pngbin2664 -> 0 bytes
-rw-r--r--icons/default/pluginIcons/dvbapi.pngbin2769 -> 2769 bytes
-rw-r--r--icons/default/text_arrowturn_cur.pngbin972 -> 1348 bytes
-rw-r--r--icons/default/text_new_cur.pngbin7004 -> 7021 bytes
-rw-r--r--icons/default/text_rec_cur.pngbin9537 -> 9626 bytes
-rw-r--r--icons/default/text_timer_full_cur.pngbin3699 -> 5523 bytes
-rw-r--r--icons/default/text_timer_partial_cur.pngbin3929 -> 5992 bytes
-rw-r--r--icons/default/text_vps_cur.pngbin9908 -> 9901 bytes
11 files changed, 72 insertions, 17 deletions
diff --git a/HISTORY b/HISTORY
index e39167cd..79ec737b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,7 +3,7 @@ VDR Plugin 'skinflatplus' Revision History
2015-MM-DD: Version 0.5.2
- [fix] eMenuSortMode in displaymenu.h for compile with VDR < 2.2.0
- [fix] position of widgets in main menu (add menu item border size)
-
+- [fix] wrong epg logo in epgsearch eventsview
2015-02-14: Version 0.5.1
- [fix] topbar number recordings
diff --git a/displaymenu.c b/displaymenu.c
index 850bae6e..1ec42757 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -520,9 +520,17 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S
DrawProgressBarFromText(rec, recBG, s, ColorFg, ColorBarFg, ColorBg);
} else {
if( (menuCategory == mcMain || menuCategory == mcSetup) && Config.MenuItemIconsShow) {
- cString cIcon = GetIconName( MainMenuText(s) );
cImageLoader imgLoader;
- cImage *img = imgLoader.LoadIcon(*cIcon, fontHeight - marginItem*2, fontHeight - marginItem*2);
+ cString cIcon = GetIconName( MainMenuText(s) );
+ cString cIconCur;
+ cImage *img = NULL;
+ if( Current ) {
+ cIconCur = cString::sprintf("%s_cur", *cIcon);
+ img = imgLoader.LoadIcon(*cIconCur, fontHeight - marginItem*2, fontHeight - marginItem*2);
+ }
+ if( img == NULL )
+ img = imgLoader.LoadIcon(*cIcon, fontHeight - marginItem*2, fontHeight - marginItem*2);
+
if( img ) {
menuIconsPixmap->DrawImage(cPoint(xt + Config.decorBorderMenuItemSize + marginItem, y + marginItem), *img);
} else {
@@ -806,7 +814,11 @@ bool cFlatDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bool C
bool isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0))) ? true : false;
if( isRadioChannel ) {
- img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current)
+ img = imgLoader.LoadIcon("radio_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -822,7 +834,10 @@ bool cFlatDisplayMenu::SetItemChannel(const cChannel *Channel, int Index, bool C
Left += imageBGWidth + marginItem * 2;
}
} else {
- img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current)
+ img = imgLoader.LoadIcon("tv_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -1216,7 +1231,11 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
cString TimerIconName("");
if (!(Timer->HasFlags(tfActive))) {
- TimerIconName = "timerInactive";
+ if( Current )
+ TimerIconName = "timerInactive_cur";
+ else
+ TimerIconName = "timerInactive";
+
ColorFg = Theme.Color( clrMenuTimerItemDisabledFont );
} else if (Timer->Recording()) {
TimerIconName = "timerRecording";
@@ -1262,7 +1281,11 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
bool isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0))) ? true : false;
if( isRadioChannel ) {
- img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current )
+ img = imgLoader.LoadIcon("radio_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -1276,7 +1299,11 @@ bool cFlatDisplayMenu::SetItemTimer(const cTimer *Timer, int Index, bool Current
menuIconsPixmap->DrawImage( cPoint(imageLeft, imageTop), *img );
}
} else {
- img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current )
+ img = imgLoader.LoadIcon("tv_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
+
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -1480,7 +1507,9 @@ bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current
}
if( Channel ) {
- ItemEventLastChannelName = Channel->Name();
+ if( Current ) {
+ ItemEventLastChannelName = Channel->Name();
+ }
cString ws = cString::sprintf("%d", Channels.MaxNumber());
w = font->Width(ws);
if( !Channel->GroupSep() ) {
@@ -1511,7 +1540,11 @@ bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current
bool isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0))) ? true : false;
if( isRadioChannel ) {
- img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current )
+ img = imgLoader.LoadIcon("radio_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("radio", imageBGWidth - 10, imageBGHeight - 10);
+
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -1525,7 +1558,11 @@ bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current
menuIconsPixmap->DrawImage( cPoint(imageLeft, imageTop), *img );
}
} else {
- img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
+ if( Current )
+ img = imgLoader.LoadIcon("tv_cur", imageBGWidth - 10, imageBGHeight - 10);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("tv", imageBGWidth - 10, imageBGHeight - 10);
+
if( img ) {
imageTop = Top + (imageBGHeight - img->Height()) / 2;
imageLeft = Left + (imageBGWidth - img->Width()) / 2;
@@ -1917,7 +1954,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
marginItem * 3 + font->Width("99.99.99 99:99 99:99 ");
if( Total == 0 ) {
- img = imgLoader.LoadIcon("recording", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("recording_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("recording", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += fontHeight + marginItem;
@@ -1992,7 +2032,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
menuPixmap->DrawText(cPoint(Left, Top), RecName, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
}
} else if( Total > 0 ) {
- img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("folder_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += img->Width() + marginItem;
@@ -2020,7 +2063,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
}
LeftWidth += font->Width(RecName) + marginItem*2;
} else if( Total == -1 ) {
- img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("folder_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += img->Width() + marginItem;
@@ -2034,7 +2080,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
}
} else {
if( Total == 0 ) {
- img = imgLoader.LoadIcon("recording", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("recording_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("recording", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += fontHeight + marginItem;
@@ -2115,7 +2164,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
Left += imgRecCut->Width() + marginItem;
} else if( Total > 0 ) {
- img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("folder_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += img->Width() + marginItem;
@@ -2144,7 +2196,10 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorExtraTextFg, ColorBg, fontSml, menuItemWidth - Left - marginItem);
}
} else if( Total == -1 ) {
- img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
+ if( Current )
+ img = imgLoader.LoadIcon("folder_cur", fontHeight, fontHeight);
+ if( img == NULL )
+ img = imgLoader.LoadIcon("folder", fontHeight, fontHeight);
if( img ) {
menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
Left += img->Width() + marginItem;
diff --git a/icons/default/menuIcons/RecsSortDate.png b/icons/default/menuIcons/RecsSortDate.png
deleted file mode 100644
index d563cd9d..00000000
--- a/icons/default/menuIcons/RecsSortDate.png
+++ /dev/null
Binary files differ
diff --git a/icons/default/menuIcons/RecsSortName.png b/icons/default/menuIcons/RecsSortName.png
deleted file mode 100644
index daaf4258..00000000
--- a/icons/default/menuIcons/RecsSortName.png
+++ /dev/null
Binary files differ
diff --git a/icons/default/pluginIcons/dvbapi.png b/icons/default/pluginIcons/dvbapi.png
index 1f28a8ba..583e109d 100644
--- a/icons/default/pluginIcons/dvbapi.png
+++ b/icons/default/pluginIcons/dvbapi.png
Binary files differ
diff --git a/icons/default/text_arrowturn_cur.png b/icons/default/text_arrowturn_cur.png
index ff60c83e..fe7ae1e0 100644
--- a/icons/default/text_arrowturn_cur.png
+++ b/icons/default/text_arrowturn_cur.png
Binary files differ
diff --git a/icons/default/text_new_cur.png b/icons/default/text_new_cur.png
index b073dcbe..4c773e6c 100644
--- a/icons/default/text_new_cur.png
+++ b/icons/default/text_new_cur.png
Binary files differ
diff --git a/icons/default/text_rec_cur.png b/icons/default/text_rec_cur.png
index 123978f7..6e3aba18 100644
--- a/icons/default/text_rec_cur.png
+++ b/icons/default/text_rec_cur.png
Binary files differ
diff --git a/icons/default/text_timer_full_cur.png b/icons/default/text_timer_full_cur.png
index 9c01dbda..37bcc4b7 100644
--- a/icons/default/text_timer_full_cur.png
+++ b/icons/default/text_timer_full_cur.png
Binary files differ
diff --git a/icons/default/text_timer_partial_cur.png b/icons/default/text_timer_partial_cur.png
index 0c49eb60..db4a4155 100644
--- a/icons/default/text_timer_partial_cur.png
+++ b/icons/default/text_timer_partial_cur.png
Binary files differ
diff --git a/icons/default/text_vps_cur.png b/icons/default/text_vps_cur.png
index 7ec5a981..c053c863 100644
--- a/icons/default/text_vps_cur.png
+++ b/icons/default/text_vps_cur.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 22:57:20 +0000