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

Cosmetic changes

This commit is contained in:
kamel5 2019-06-16 13:11:28 +02:00
parent d0c1519463
commit 872a0618f8
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recmanager.c
View File

@ -591,9 +591,9 @@ void cRecManager::DeleteSearchTimer(cTVGuideSearchTimer *searchTimer, bool delTi
if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) { if (epgSearchPlugin->Service("Epgsearch-services-v1.1", epgSearch)) {
bool success = epgSearch->handler->DelSearchTimer(searchTimerID); bool success = epgSearch->handler->DelSearchTimer(searchTimerID);
if (success) { if (success) {
esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->SearchString().c_str()); esyslog("tvguide: search timer \"%s\" sucessfully deleted", searchTimer->GetSearchString().c_str());
} else { } else {
esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->SearchString().c_str()); esyslog("tvguide: error deleting search timer \"%s\"", searchTimer->GetSearchString().c_str());
} }
} }
} }

6
recmenuitem.c
View File

@ -2693,10 +2693,10 @@ void cRecMenuItemSearchTimer::SetPixmaps(void) {
void cRecMenuItemSearchTimer::Draw(void) { void cRecMenuItemSearchTimer::Draw(void) {
int textX = DrawIcons(); int textX = DrawIcons();
bool timerIsActive = timer.Active(); bool timerIsActive = timer.IsActive();
pixmapText->Fill(clrTransparent); pixmapText->Fill(clrTransparent);
textX += 20; textX += 20;
cString label = cString::sprintf("\"%s\"", timer.SearchString().c_str()); cString label = cString::sprintf("\"%s\"", timer.GetSearchString().c_str());
cString inactive = cString::sprintf("(%s)", tr("inactive")); cString inactive = cString::sprintf("(%s)", tr("inactive"));
int numTimersActive = timer.GetNumTimers(); int numTimersActive = timer.GetNumTimers();
int numRecordings = timer.GetNumRecordings(); int numRecordings = timer.GetNumRecordings();
@ -2822,7 +2822,7 @@ void cRecMenuItemFavorite::Draw(void) {
int textX = DrawIcons(); int textX = DrawIcons();
pixmapText->Fill(clrTransparent); pixmapText->Fill(clrTransparent);
textX += 20; textX += 20;
cString label = cString::sprintf("\"%s\"", favorite.SearchString().c_str()); cString label = cString::sprintf("\"%s\"", favorite.GetSearchString().c_str());
pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge); pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge);
} }

4
recmenumanager.c
View File

@ -367,12 +367,12 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
if (numSearchResults) { if (numSearchResults) {
activeMenuBuffer = activeMenu; activeMenuBuffer = activeMenu;
activeMenuBuffer->Hide(); activeMenuBuffer->Hide();
activeMenu = new cRecMenuSearchTimerResults(searchTimer.SearchString(), searchResult, numSearchResults, "", recState); activeMenu = new cRecMenuSearchTimerResults(searchTimer.GetSearchString(), searchResult, numSearchResults, "", recState);
activeMenu->Display(); activeMenu->Display();
} else { } else {
activeMenuBuffer = activeMenu; activeMenuBuffer = activeMenu;
activeMenuBuffer->Hide(); activeMenuBuffer->Hide();
activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.SearchString()); activeMenu = new cRecMenuSearchTimerNothingFound(searchTimer.GetSearchString());
activeMenu->Display(); activeMenu->Display();
} }
break; } break; }

10
recmenus.c
View File

@ -632,7 +632,7 @@ cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer s
this->templates = templates; this->templates = templates;
SetWidthPercent(70); SetWidthPercent(70);
cString message = tr("Configure Search Timer for Search String"); cString message = tr("Configure Search Timer for Search String");
cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.SearchString().c_str()); cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.GetSearchString().c_str());
cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
infoItem->CalculateHeight(width - 2 * border); infoItem->CalculateHeight(width - 2 * border);
SetHeader(infoItem); SetHeader(infoItem);
@ -727,8 +727,8 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer
this->advancedOptions = advancedOptions; this->advancedOptions = advancedOptions;
this->searchTimer = searchTimer; this->searchTimer = searchTimer;
this->channelGroups = channelGroups; this->channelGroups = channelGroups;
strncpy(searchString, searchTimer.SearchString().c_str(), TEXTINPUTLENGTH); strncpy(searchString, searchTimer.GetSearchString().c_str(), TEXTINPUTLENGTH);
timerActive = searchTimer.Active(); timerActive = searchTimer.IsActive();
mode = searchTimer.SearchMode(); mode = searchTimer.SearchMode();
useTitle = searchTimer.UseTitle(); useTitle = searchTimer.UseTitle();
useSubtitle = searchTimer.UseSubtitle(); useSubtitle = searchTimer.UseSubtitle();
@ -1001,7 +1001,7 @@ cRecMenuSearchTimerDeleteConfirm::cRecMenuSearchTimerDeleteConfirm(cTVGuideSearc
this->searchTimer = searchTimer; this->searchTimer = searchTimer;
SetWidthPercent(70); SetWidthPercent(70);
cString message = tr("Really delete Search Timer"); cString message = tr("Really delete Search Timer");
cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.SearchString().c_str()); cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.GetSearchString().c_str());
cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
infoItem->CalculateHeight(width - 2 * border); infoItem->CalculateHeight(width - 2 * border);
SetHeader(infoItem); SetHeader(infoItem);
@ -1051,7 +1051,7 @@ cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEP
cString message2 = tr("Search Term"); cString message2 = tr("Search Term");
cString message3 = tr("Using Template"); cString message3 = tr("Using Template");
cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.SearchString().c_str(), *message3, templ.name.c_str()); cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.GetSearchString().c_str(), *message3, templ.name.c_str());
cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText); cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText);
infoItem->CalculateHeight(width - 2 * border); infoItem->CalculateHeight(width - 2 * border);
AddMenuItem(infoItem); AddMenuItem(infoItem);

4
searchtimer.c
View File

@ -78,7 +78,7 @@ cTVGuideSearchTimer::~cTVGuideSearchTimer(void) {
} }
bool cTVGuideSearchTimer::operator < (const cTVGuideSearchTimer& other) const { bool cTVGuideSearchTimer::operator < (const cTVGuideSearchTimer& other) const {
std::string searchStringOther = other.SearchString(); std::string searchStringOther = other.GetSearchString();
searchStringOther = StrToLowerCase(searchStringOther); searchStringOther = StrToLowerCase(searchStringOther);
std::string thisSearchString = StrToLowerCase(searchString); std::string thisSearchString = StrToLowerCase(searchString);
int comp = thisSearchString.compare(searchStringOther); int comp = thisSearchString.compare(searchStringOther);
@ -520,7 +520,7 @@ std::string cTVGuideSearchTimer::BuildSearchString(void) {
return strTimer; return strTimer;
} }
bool cTVGuideSearchTimer::Active(void) { bool cTVGuideSearchTimer::IsActive(void) {
if (useAsSearchTimer) if (useAsSearchTimer)
return true; return true;
return false; return false;

4
searchtimer.h
View File

@ -76,8 +76,8 @@ public:
std::string BuildSearchString(void); std::string BuildSearchString(void);
int GetID(void) { return ID; }; int GetID(void) { return ID; };
//GETTER //GETTER
std::string SearchString(void) const { return searchString; }; std::string GetSearchString(void) const { return searchString; };
bool Active(void); bool IsActive(void);
bool UseTitle(void) { return useTitle; }; bool UseTitle(void) { return useTitle; };
bool UseSubtitle(void) { return useSubtitle; }; bool UseSubtitle(void) { return useSubtitle; };
bool UseDescription(void) { return useDescription; }; bool UseDescription(void) { return useDescription; };