frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

removed color buttons if detailed view is called from recmenu

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
footer.c
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[1]);
ClearButton(positionButtons[2]); ClearButton(positionButtons[2]);
if (tvguideConfig.blueKeyMode != eBlueKeySwitch) { if (fromRecMenu) {
ClearButton(positionButtons[0]);
ClearButton(positionButtons[3]);
} else if (tvguideConfig.blueKeyMode != eBlueKeySwitch) {
ClearButton(positionButtons[3]); ClearButton(positionButtons[3]);
drawBlueButton(true); drawBlueButton(true);
} }
} }
void cFooter::LeaveDetailedViewMode(const cChannel *channel) { void cFooter::LeaveDetailedViewMode(const cChannel *channel) {
drawRedButton();
drawBlueButton();
if (tvguideConfig.channelJumpMode == eNumJump) { if (tvguideConfig.channelJumpMode == eNumJump) {
drawGreenButton(); drawGreenButton();
drawYellowButton(); drawYellowButton();
drawBlueButton();
} else { } else {
UpdateGroupButtons(channel, true); UpdateGroupButtons(channel, true);
} }

2
footer.h
View File

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

2
recmenumanager.c
View File

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

24
searchtimer.c
View File

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

22
searchtimer.h
View File

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