diff --git a/recmenu.c b/recmenu.c index 3cc70dc..504658f 100644 --- a/recmenu.c +++ b/recmenu.c @@ -190,7 +190,7 @@ void cRecMenu::Activate(cRecMenuItem *itemOld, cRecMenuItem *item) { itemOld->setInactive(); itemOld->setBackground(); itemOld->Draw(); - item->setActive(); + item->SetActive(); item->setBackground(); item->Draw(); } @@ -359,7 +359,7 @@ void cRecMenu::PageUp(void) { bool spaceLeft = true; while (newItem = GetMenuItem(startIndex-1)) { if (startIndex-1 == newActive) - newItem->setActive(); + newItem->SetActive(); spaceLeft = AddMenuItemInitial(newItem, true); if (!spaceLeft) break; @@ -372,7 +372,7 @@ void cRecMenu::PageUp(void) { } } if (GetNumActive() == numItems) - menuItems.front()->setActive(); + menuItems.front()->SetActive(); if (CalculateHeight(true)) CreatePixmap(); Arrange(deleteMenuItems); @@ -401,7 +401,7 @@ void cRecMenu::PageDown(void) { bool spaceLeft = true; while (newItem = GetMenuItem(stopIndex)) { if (stopIndex == newActive) - newItem->setActive(); + newItem->SetActive(); spaceLeft = AddMenuItemInitial(newItem); if (!spaceLeft) break; @@ -414,7 +414,7 @@ void cRecMenu::PageDown(void) { } } if (GetNumActive() == GetTotalNumMenuItems()) - menuItems.back()->setActive(); + menuItems.back()->SetActive(); if (CalculateHeight(true)) CreatePixmap(); Arrange(deleteMenuItems); @@ -454,7 +454,7 @@ void cRecMenu::JumpBegin(void) { startIndex = 0; stopIndex = currentItem; cRecMenuItem *first = menuItems.front(); - first->setActive(); + first->SetActive(); first->setBackground(); first->Draw(); Display(false); @@ -502,12 +502,12 @@ void cRecMenu::JumpEnd(void) { stopIndex = totalNumItems; startIndex = stopIndex - numItems; if (footer) { - footer->setActive(); + footer->SetActive(); footer->setBackground(); footer->Draw(); } else { cRecMenuItem *last = menuItems.back(); - last->setActive(); + last->SetActive(); last->setBackground(); last->Draw(); } diff --git a/recmenuitem.c b/recmenuitem.c index df9c117..f459159 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -2555,7 +2555,7 @@ cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t this->active = active; height = geoManager.osdHeight / 16; if (active) - setActive(); + SetActive(); } cRecMenuItemTimelineTimer::~cRecMenuItemTimelineTimer(void) { @@ -2668,7 +2668,7 @@ void cRecMenuItemTimelineTimer::DrawNoTimerInfo(void) { pixmap->DrawText(cPoint(x, y), *noTimersText, colorText, clrTransparent, font); } -void cRecMenuItemTimelineTimer::setActive(void) { +void cRecMenuItemTimelineTimer::SetActive(void) { active = true; header->SetCurrentTimer(timer); header->RefreshTimerDisplay(); diff --git a/recmenuitem.h b/recmenuitem.h index be1e2a7..f02fe0e 100644 --- a/recmenuitem.h +++ b/recmenuitem.h @@ -110,7 +110,7 @@ public: virtual int GetHeight(void) { return height; }; virtual int GetWidth(void) { return 0; }; virtual void CalculateHeight(int textWidth) {}; - virtual void setActive(void) { this->active = true; } + virtual void SetActive(void) { this->active = true; } virtual void setInactive(void) { this->active = false; } bool isSelectable(void) { return selectable; } bool IsActive(void) { return active; } @@ -621,7 +621,7 @@ private: public: cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector conflictsToday, cRecMenuItemTimelineHeader *header, bool active); virtual ~cRecMenuItemTimelineTimer(void); - void setActive(void); + void SetActive(void); void setInactive(void); void SetPixmaps(void); void Hide(void); diff --git a/recmenus.c b/recmenus.c index b299cb4..09d15c1 100644 --- a/recmenus.c +++ b/recmenus.c @@ -900,7 +900,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) { } } if (reDraw) - mainMenuItems[activeMenuItem]->setActive(); + mainMenuItems[activeMenuItem]->SetActive(); if (init) { init = !init; @@ -1353,7 +1353,7 @@ void cRecMenuTimeline::SetTimers(void) { header->SetNumTimersToday(numTimersToday); if (numTimersToday == 0) { AddMenuItem(new cRecMenuItemTimelineTimer(NULL, 0, 0, conflictsToday, header, false)); - footer->setActive(); + footer->SetActive(); } else { for (int i = 0; i < numTimersToday; i++) { if (!AddMenuItemInitial(new cRecMenuItemTimelineTimer(timersToday[i], timeStart, timeStop, conflictsToday, header, (i == 0) ? true : false))) @@ -1520,7 +1520,7 @@ cRecMenuFavorites::cRecMenuFavorites(std::vector favorites) for (int i = 0; i < numFavorites; i++) { if (i == 0) - myMenuItems[i]->setActive(); + myMenuItems[i]->SetActive(); if (!AddMenuItemInitial(myMenuItems[i])) break; }