diff options
| -rw-r--r-- | footer.c | 10 | ||||
| -rw-r--r-- | footer.h | 2 | ||||
| -rw-r--r-- | recmenumanager.c | 2 | ||||
| -rw-r--r-- | searchtimer.c | 24 | ||||
| -rw-r--r-- | searchtimer.h | 22 |
5 files changed, 32 insertions, 28 deletions
@@ -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);
}
@@ -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);
};
diff --git a/recmenumanager.c b/recmenumanager.c index 2b74e79..f0b2074 100644 --- a/recmenumanager.c +++ b/recmenumanager.c @@ -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();
diff --git a/searchtimer.c b/searchtimer.c index 4d37fbd..67dd2b3 100644 --- a/searchtimer.c +++ b/searchtimer.c @@ -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;
diff --git a/searchtimer.h b/searchtimer.h index eb345f8..0ffdfc2 100644 --- a/searchtimer.h +++ b/searchtimer.h @@ -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;
|