frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename setActive() to SetActive()

This commit is contained in:
kamel5 2019-11-10 13:54:35 +01:00
parent 6174461af6
commit 5923c9c0ed
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recmenu.c
View File

@ -190,7 +190,7 @@ void cRecMenu::Activate(cRecMenuItem *itemOld, cRecMenuItem *item) {
itemOld->setInactive(); itemOld->setInactive();
itemOld->setBackground(); itemOld->setBackground();
itemOld->Draw(); itemOld->Draw();
item->setActive(); item->SetActive();
item->setBackground(); item->setBackground();
item->Draw(); item->Draw();
} }
@ -359,7 +359,7 @@ void cRecMenu::PageUp(void) {
bool spaceLeft = true; bool spaceLeft = true;
while (newItem = GetMenuItem(startIndex-1)) { while (newItem = GetMenuItem(startIndex-1)) {
if (startIndex-1 == newActive) if (startIndex-1 == newActive)
newItem->setActive(); newItem->SetActive();
spaceLeft = AddMenuItemInitial(newItem, true); spaceLeft = AddMenuItemInitial(newItem, true);
if (!spaceLeft) if (!spaceLeft)
break; break;
@ -372,7 +372,7 @@ void cRecMenu::PageUp(void) {
} }
} }
if (GetNumActive() == numItems) if (GetNumActive() == numItems)
menuItems.front()->setActive(); menuItems.front()->SetActive();
if (CalculateHeight(true)) if (CalculateHeight(true))
CreatePixmap(); CreatePixmap();
Arrange(deleteMenuItems); Arrange(deleteMenuItems);
@ -401,7 +401,7 @@ void cRecMenu::PageDown(void) {
bool spaceLeft = true; bool spaceLeft = true;
while (newItem = GetMenuItem(stopIndex)) { while (newItem = GetMenuItem(stopIndex)) {
if (stopIndex == newActive) if (stopIndex == newActive)
newItem->setActive(); newItem->SetActive();
spaceLeft = AddMenuItemInitial(newItem); spaceLeft = AddMenuItemInitial(newItem);
if (!spaceLeft) if (!spaceLeft)
break; break;
@ -414,7 +414,7 @@ void cRecMenu::PageDown(void) {
} }
} }
if (GetNumActive() == GetTotalNumMenuItems()) if (GetNumActive() == GetTotalNumMenuItems())
menuItems.back()->setActive(); menuItems.back()->SetActive();
if (CalculateHeight(true)) if (CalculateHeight(true))
CreatePixmap(); CreatePixmap();
Arrange(deleteMenuItems); Arrange(deleteMenuItems);
@ -454,7 +454,7 @@ void cRecMenu::JumpBegin(void) {
startIndex = 0; startIndex = 0;
stopIndex = currentItem; stopIndex = currentItem;
cRecMenuItem *first = menuItems.front(); cRecMenuItem *first = menuItems.front();
first->setActive(); first->SetActive();
first->setBackground(); first->setBackground();
first->Draw(); first->Draw();
Display(false); Display(false);
@ -502,12 +502,12 @@ void cRecMenu::JumpEnd(void) {
stopIndex = totalNumItems; stopIndex = totalNumItems;
startIndex = stopIndex - numItems; startIndex = stopIndex - numItems;
if (footer) { if (footer) {
footer->setActive(); footer->SetActive();
footer->setBackground(); footer->setBackground();
footer->Draw(); footer->Draw();
} else { } else {
cRecMenuItem *last = menuItems.back(); cRecMenuItem *last = menuItems.back();
last->setActive(); last->SetActive();
last->setBackground(); last->setBackground();
last->Draw(); last->Draw();
} }

4
recmenuitem.c
View File

@ -2555,7 +2555,7 @@ cRecMenuItemTimelineTimer::cRecMenuItemTimelineTimer(const cTimer *timer, time_t
this->active = active; this->active = active;
height = geoManager.osdHeight / 16; height = geoManager.osdHeight / 16;
if (active) if (active)
setActive(); SetActive();
} }
cRecMenuItemTimelineTimer::~cRecMenuItemTimelineTimer(void) { cRecMenuItemTimelineTimer::~cRecMenuItemTimelineTimer(void) {
@ -2668,7 +2668,7 @@ void cRecMenuItemTimelineTimer::DrawNoTimerInfo(void) {
pixmap->DrawText(cPoint(x, y), *noTimersText, colorText, clrTransparent, font); pixmap->DrawText(cPoint(x, y), *noTimersText, colorText, clrTransparent, font);
} }
void cRecMenuItemTimelineTimer::setActive(void) { void cRecMenuItemTimelineTimer::SetActive(void) {
active = true; active = true;
header->SetCurrentTimer(timer); header->SetCurrentTimer(timer);
header->RefreshTimerDisplay(); header->RefreshTimerDisplay();

4
recmenuitem.h
View File

@ -110,7 +110,7 @@ public:
virtual int GetHeight(void) { return height; }; virtual int GetHeight(void) { return height; };
virtual int GetWidth(void) { return 0; }; virtual int GetWidth(void) { return 0; };
virtual void CalculateHeight(int textWidth) {}; 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; } virtual void setInactive(void) { this->active = false; }
bool isSelectable(void) { return selectable; } bool isSelectable(void) { return selectable; }
bool IsActive(void) { return active; } bool IsActive(void) { return active; }
@ -621,7 +621,7 @@ private:
public: public:
cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active); cRecMenuItemTimelineTimer(const cTimer *timer, time_t start, time_t stop, std::vector<cTVGuideTimerConflict*> conflictsToday, cRecMenuItemTimelineHeader *header, bool active);
virtual ~cRecMenuItemTimelineTimer(void); virtual ~cRecMenuItemTimelineTimer(void);
void setActive(void); void SetActive(void);
void setInactive(void); void setInactive(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);

6
recmenus.c
View File

@ -900,7 +900,7 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
} }
} }
if (reDraw) if (reDraw)
mainMenuItems[activeMenuItem]->setActive(); mainMenuItems[activeMenuItem]->SetActive();
if (init) { if (init) {
init = !init; init = !init;
@ -1353,7 +1353,7 @@ void cRecMenuTimeline::SetTimers(void) {
header->SetNumTimersToday(numTimersToday); header->SetNumTimersToday(numTimersToday);
if (numTimersToday == 0) { if (numTimersToday == 0) {
AddMenuItem(new cRecMenuItemTimelineTimer(NULL, 0, 0, conflictsToday, header, false)); AddMenuItem(new cRecMenuItemTimelineTimer(NULL, 0, 0, conflictsToday, header, false));
footer->setActive(); footer->SetActive();
} else { } else {
for (int i = 0; i < numTimersToday; i++) { for (int i = 0; i < numTimersToday; i++) {
if (!AddMenuItemInitial(new cRecMenuItemTimelineTimer(timersToday[i], timeStart, timeStop, conflictsToday, header, (i == 0) ? true : false))) if (!AddMenuItemInitial(new cRecMenuItemTimelineTimer(timersToday[i], timeStart, timeStop, conflictsToday, header, (i == 0) ? true : false)))
@ -1520,7 +1520,7 @@ cRecMenuFavorites::cRecMenuFavorites(std::vector<cTVGuideSearchTimer> favorites)
for (int i = 0; i < numFavorites; i++) { for (int i = 0; i < numFavorites; i++) {
if (i == 0) if (i == 0)
myMenuItems[i]->setActive(); myMenuItems[i]->SetActive();
if (!AddMenuItemInitial(myMenuItems[i])) if (!AddMenuItemInitial(myMenuItems[i]))
break; break;
} }