summaryrefslogtreecommitdiff
path: root/recmenus.c
diff options
context:
space:
mode:
Diffstat (limited to 'recmenus.c')
-rw-r--r--recmenus.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/recmenus.c b/recmenus.c
index 312565a..83777ac 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -1413,7 +1413,7 @@ cRecMenuTimeline::cRecMenuTimeline(cTVGuideTimerConflicts *timerConflicts) {
SetStartStop();
conflictsToday = timerConflicts->GetConflictsBetween(timeStart, timeStop);
GetTimersForDay();
- SetWidthPercent(95);
+ SetWidthPercent(90);
header = new cRecMenuItemTimelineHeader(timeStart, numTimersToday, conflictsToday);
SetHeader(header);
cRecMenuItem *footer = new cRecMenuItemButton(tr("Close"), rmsClose, false, true);
@@ -1457,10 +1457,14 @@ void cRecMenuTimeline::GetTimersForDay(void) {
void cRecMenuTimeline::SetTimers(void) {
ClearMenu();
+ GetTimersForDay();
+ conflictsToday = timerConflicts->GetConflictsBetween(timeStart, timeStop);
+ header->UnsetCurrentTimer();
+ header->SetDay(timeStart);
+ header->RefreshTimerDisplay();
+ header->SetNumTimersToday(numTimersToday);
if (numTimersToday == 0) {
AddMenuItem(new cRecMenuItemTimelineTimer(NULL, 0, 0, conflictsToday, header, false));
- header->UnsetCurrentTimer();
- header->SetNumTimersToday(0);
footer->setActive();
} else {
for (int i = 0; i<numTimersToday; i++) {
@@ -1469,7 +1473,6 @@ void cRecMenuTimeline::SetTimers(void) {
item->setActive();
if (!AddMenuItemInitial(item))
break;
- header->SetNumTimersToday(numTimersToday);
}
footer->setInactive();
}
@@ -1483,12 +1486,6 @@ void cRecMenuTimeline::PrevDay(void) {
return;
timeStart -= 3600*24;
timeStop -= 3600*24;
- conflictsToday = timerConflicts->GetConflictsBetween(timeStart, timeStop);
- SetWidthPercent(95);
- header->SetDay(timeStart);
- header->UnsetCurrentTimer();
- header->RefreshTimerDisplay();
- GetTimersForDay();
SetTimers();
Display();
}
@@ -1496,12 +1493,6 @@ void cRecMenuTimeline::PrevDay(void) {
void cRecMenuTimeline::NextDay(void) {
timeStart += 3600*24;
timeStop += 3600*24;
- conflictsToday = timerConflicts->GetConflictsBetween(timeStart, timeStop);
- SetWidthPercent(95);
- header->SetDay(timeStart);
- header->UnsetCurrentTimer();
- header->RefreshTimerDisplay();
- GetTimersForDay();
SetTimers();
Display();
}