summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-06-08 10:29:03 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-06-08 10:29:03 +0200
commit0b6c96a5159962c9263166613ee594bf89ae0a60 (patch)
tree26303d0fdbcd4d37707125792e50bd2f10222585
parente496fac87aa919a63802505e4298cd65c28b168a (diff)
downloadvdr-0b6c96a5159962c9263166613ee594bf89ae0a60.tar.gz
vdr-0b6c96a5159962c9263166613ee594bf89ae0a60.tar.bz2
The LCARS skin's main menu now only displays timers that are actually activated
-rw-r--r--HISTORY1
-rw-r--r--skinlcars.c12
2 files changed, 10 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 15a9235c..fed71e2a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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.
- 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).
+- The LCARS skin's main menu now only displays timers that are actually activated.
diff --git a/skinlcars.c b/skinlcars.c
index 6d543690..2186c296 100644
--- a/skinlcars.c
+++ b/skinlcars.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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,
@@ -1179,7 +1179,7 @@ void cSkinLCARSDisplayMenu::DrawTimers(void)
}
SortedTimers[i] = NULL;
}
- else if (!Device) {
+ else if (!Device && Timer->HasFlags(tfActive)) {
DrawTimer(Timer, y, false);
FreeDeviceSlots.Append(y);
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);
lastSignalDisplay = 0;
initial = true; // forces redrawing of devices