frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

The LCARS skin's main menu now only displays timers that are actually activated

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-06-08 10:29:03 +02:00
parent e496fac87a
commit 0b6c96a515
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7169,3 +7169,4 @@ Video Disk Recorder Revision History
- Changed the button colors in the LCARS skin to better fit with the rest of the theme. - Changed the button colors in the LCARS skin to better fit with the rest of the theme.
- Removed the gap from the main menu buttons in the LCARS skin. - Removed the gap from the main menu buttons in the LCARS skin.
- Fixed some copy&paste errors in PLUGINS.html (thanks to Winfried Köhler). - Fixed some copy&paste errors in PLUGINS.html (thanks to Winfried Köhler).
- The LCARS skin's main menu now only displays timers that are actually activated.

12
skinlcars.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: skinlcars.c 2.9 2012/06/07 11:43:35 kls Exp $ * $Id: skinlcars.c 2.10 2012/06/08 10:25:39 kls Exp $
*/ */
// "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures,
@ -1179,7 +1179,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
} }
SortedTimers[i] = NULL; SortedTimers[i] = NULL;
} }
else if (!Device) { else if (!Device && Timer->HasFlags(tfActive)) {
DrawTimer(Timer, y, false); DrawTimer(Timer, y, false);
FreeDeviceSlots.Append(y); FreeDeviceSlots.Append(y);
y += lineHeight + Gap; y += lineHeight + Gap;
@ -1209,7 +1209,13 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
} }
} }
} }
osd->DrawText(xs02, ys00, itoa(Timers.Count()), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder); // Total number of active timers:
int NumTimers = 0;
for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) {
if (Timer->HasFlags(tfActive))
NumTimers++;
}
osd->DrawText(xs02, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder);
osd->DrawText(xs08, ys00, itoa(NumDevices), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder); osd->DrawText(xs08, ys00, itoa(NumDevices), Theme.Color(clrMenuFrameFg), frameColor, font, xs09 - xs08, ys01 - ys00, taBottom | taRight | taBorder);
lastSignalDisplay = 0; lastSignalDisplay = 0;
initial = true; // forces redrawing of devices initial = true; // forces redrawing of devices