removed color buttons if detailed view is called from recmenu

This commit is contained in:
louis 2014-01-25 15:04:03 +01:00
parent 0d3d2efd62
commit 0cbc226651
5 changed files with 32 additions and 28 deletions

View File

@ -74,20 +74,24 @@ void cFooter::UpdateGroupButtons(const cChannel *channel, bool force) {
}
}
void cFooter::SetDetailedViewMode(void) {
void cFooter::SetDetailedViewMode(bool fromRecMenu) {
ClearButton(positionButtons[1]);
ClearButton(positionButtons[2]);
if (tvguideConfig.blueKeyMode != eBlueKeySwitch) {
if (fromRecMenu) {
ClearButton(positionButtons[0]);
ClearButton(positionButtons[3]);
} else if (tvguideConfig.blueKeyMode != eBlueKeySwitch) {
ClearButton(positionButtons[3]);
drawBlueButton(true);
}
}
void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
drawRedButton();
drawBlueButton();
if (tvguideConfig.channelJumpMode == eNumJump) {
drawGreenButton();
drawYellowButton();
drawBlueButton();
} else {
UpdateGroupButtons(channel, true);
}

View File

@ -26,7 +26,7 @@ public:
void drawYellowButton(const char *text);
void drawBlueButton(bool detailedEPG = false);
void UpdateGroupButtons(const cChannel *channel, bool force = false);
void SetDetailedViewMode(void);
void SetDetailedViewMode(bool fromRecMenu = false);
void LeaveDetailedViewMode(const cChannel *channel);
};

View File

@ -831,7 +831,7 @@ bool cRecMenuManager::DisplayTimerConflict(int timerID) {
void cRecMenuManager::DisplayDetailedView(const cEvent *ev) {
activeMenu->Hide();
detailView = new cDetailView(ev, footer);
footer->SetDetailedViewMode();
footer->SetDetailedViewMode(true);
detailView->setContent();
detailView->drawHeader();
detailView->drawContent();

View File

@ -12,18 +12,18 @@ cTVGuideSearchTimer::cTVGuideSearchTimer(void) {
strTimer = "";
ID = -1;
searchString = "";
useTime = false;
startTime = 0000;
stopTime = 2359;
useChannel = false;
channelMin = Channels.GetByNumber(cDevice::CurrentChannel());
channelMax = Channels.GetByNumber(cDevice::CurrentChannel());
channelGroup = "";
useCase = false;
mode = 0;
useTitle = true;
useSubtitle = true;
useDescription = true;
useTime = false;
startTime = 0000;
stopTime = 2359;
useChannel = false;
channelMin = Channels.GetByNumber(cDevice::CurrentChannel());
channelMax = Channels.GetByNumber(cDevice::CurrentChannel());
channelGroup = "";
useCase = false;
mode = 0;
useTitle = true;
useSubtitle = true;
useDescription = true;
useDuration = false;
minDuration = 0;
maxDuration = 2359;

View File

@ -5,20 +5,20 @@
class cTVGuideSearchTimer {
private:
std::string strTimer;
int ID;
int ID;
std::string searchString;
int useTime;
int startTime;
int stopTime;
int useChannel;
cChannel *channelMin;
int useTime;
int startTime;
int stopTime;
int useChannel;
cChannel *channelMin;
cChannel *channelMax;
std::string channelGroup;
int useCase;
int mode;
int useTitle;
int useSubtitle;
int useDescription;
int useCase;
int mode;
int useTitle;
int useSubtitle;
int useDescription;
int useDuration;
int minDuration;
int maxDuration;