summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/ca_ES.po8
-rw-r--r--po/de_DE.po14
-rw-r--r--po/it_IT.po14
-rw-r--r--po/ru_RU.po8
-rw-r--r--po/sk_SK.po8
-rw-r--r--recmenumanager.c6
-rw-r--r--recmenus.c18
-rw-r--r--recmenus.h3
8 files changed, 25 insertions, 54 deletions
diff --git a/po/ca_ES.po b/po/ca_ES.po
index daa62be..1ffe8de 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-06-16 14:37+0200\n"
+"POT-Creation-Date: 2019-06-17 11:52+0200\n"
"PO-Revision-Date: 2013-09-21 17:49+0200\n"
"Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
"Language-Team: \n"
@@ -327,9 +327,6 @@ msgstr "Canals restringits"
msgid "Use Time"
msgstr "Utilitza temps"
-msgid "Display advanced Options"
-msgstr ""
-
msgid "Limit Days of the Week"
msgstr ""
@@ -354,9 +351,6 @@ msgstr ""
msgid "Use in Favorites"
msgstr ""
-msgid "Hide advanced Options"
-msgstr ""
-
msgid "Display Results for Search Timer"
msgstr "Mostra resultats de la cerca"
diff --git a/po/de_DE.po b/po/de_DE.po
index 7c04167..1cef253 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-06-16 14:37+0200\n"
+"POT-Creation-Date: 2019-06-17 11:52+0200\n"
"PO-Revision-Date: 2012-08-25 17:49+0200\n"
"Last-Translator: Horst\n"
"Language-Team: \n"
@@ -324,9 +324,6 @@ msgstr "Kanäle einschränken"
msgid "Use Time"
msgstr "Zeit benutzen"
-msgid "Display advanced Options"
-msgstr "Erweiterte Optionen anzeigen"
-
msgid "Limit Days of the Week"
msgstr "Wochentage beschränken"
@@ -351,9 +348,6 @@ msgstr "Wiederholungen vermeiden"
msgid "Use in Favorites"
msgstr "Als Favorit benutzen"
-msgid "Hide advanced Options"
-msgstr "Erweiterte Optionen ausblenden"
-
msgid "Display Results for Search Timer"
msgstr "Ergebnisse für Suchtimer anzeigen"
@@ -995,3 +989,9 @@ msgstr "TheMovieDB Popularität"
msgid "TheMovieDB Vote Average"
msgstr "TheMovieDB durchschnittliche Bewertung"
+
+#~ msgid "Display advanced Options"
+#~ msgstr "Erweiterte Optionen anzeigen"
+
+#~ msgid "Hide advanced Options"
+#~ msgstr "Erweiterte Optionen ausblenden"
diff --git a/po/it_IT.po b/po/it_IT.po
index 373d47a..855b33c 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-06-16 14:37+0200\n"
+"POT-Creation-Date: 2019-06-17 11:52+0200\n"
"PO-Revision-Date: 2012-08-25 17:49+0200\n"
"Last-Translator: fiveten_59\n"
"Language-Team: \n"
@@ -324,9 +324,6 @@ msgstr "Limite Canale"
msgid "Use Time"
msgstr "Utilizza Time"
-msgid "Display advanced Options"
-msgstr "Mostra Opzioni avanzate"
-
msgid "Limit Days of the Week"
msgstr "Limite dei giorni della settimana"
@@ -351,9 +348,6 @@ msgstr "Evita ripetizioni"
msgid "Use in Favorites"
msgstr "Utilizza nei favoriti"
-msgid "Hide advanced Options"
-msgstr "Nascondi Opzioni avanzate"
-
msgid "Display Results for Search Timer"
msgstr "Mostra risultati per il Search Timer"
@@ -995,3 +989,9 @@ msgstr "TheMovieDB Popularità"
msgid "TheMovieDB Vote Average"
msgstr "Voto medio di TheMovieDB"
+
+#~ msgid "Display advanced Options"
+#~ msgstr "Mostra Opzioni avanzate"
+
+#~ msgid "Hide advanced Options"
+#~ msgstr "Nascondi Opzioni avanzate"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4698c48..db7014a 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 1.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-06-16 14:37+0200\n"
+"POT-Creation-Date: 2019-06-17 11:52+0200\n"
"PO-Revision-Date: 2013-09-25 17:49+0400\n"
"Last-Translator: AmiD, ilya\n"
"Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -324,9 +324,6 @@ msgstr "Ограничить список каналов"
msgid "Use Time"
msgstr "Время"
-msgid "Display advanced Options"
-msgstr ""
-
msgid "Limit Days of the Week"
msgstr ""
@@ -351,9 +348,6 @@ msgstr ""
msgid "Use in Favorites"
msgstr ""
-msgid "Hide advanced Options"
-msgstr ""
-
msgid "Display Results for Search Timer"
msgstr "Тест"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 6e56d32..9b30a92 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 1.1.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-06-16 14:37+0200\n"
+"POT-Creation-Date: 2019-06-17 11:52+0200\n"
"PO-Revision-Date: 2013-09-15 00:12+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@@ -324,9 +324,6 @@ msgstr "Obmedzi kanly"
msgid "Use Time"
msgstr "Poui as"
-msgid "Display advanced Options"
-msgstr ""
-
msgid "Limit Days of the Week"
msgstr ""
@@ -351,9 +348,6 @@ msgstr ""
msgid "Use in Favorites"
msgstr ""
-msgid "Hide advanced Options"
-msgstr ""
-
msgid "Display Results for Search Timer"
msgstr "Pozrie vsledky pre vyhadvanie plnov"
diff --git a/recmenumanager.c b/recmenumanager.c
index 9db1ce4..29e7da0 100644
--- a/recmenumanager.c
+++ b/recmenumanager.c
@@ -313,7 +313,7 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
} else {
std::vector<std::string> channelGroups;
recManager->GetChannelGroups(&channelGroups);
- activeMenu = new cRecMenuSearchTimerEdit(searchTimer, false, channelGroups);
+ activeMenu = new cRecMenuSearchTimerEdit(searchTimer, channelGroups);
}
}
activeMenu->Display();
@@ -326,19 +326,17 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) {
case rmsSearchTimerEditAdvanced: {
//caller: cRecMenuSearchTimers, cRecMenuSearchTimerEdit, cRecMenuSearchTimerTemplates
cTVGuideSearchTimer searchTimer;
- bool advancedOptions = false;
if (cRecMenuSearchTimers *menu = dynamic_cast<cRecMenuSearchTimers*>(activeMenu)) {
searchTimer = menu->GetSearchTimer();
} else if (cRecMenuSearchTimerEdit *menu = dynamic_cast<cRecMenuSearchTimerEdit*>(activeMenu)) {
searchTimer = menu->GetSearchTimer();
- advancedOptions = (nextState == rmsSearchTimerEditAdvanced) ? true : false;
} else if (cRecMenuSearchTimerTemplates *menu = dynamic_cast<cRecMenuSearchTimerTemplates*>(activeMenu)) {
searchTimer = menu->GetSearchTimer();
} else break;
delete activeMenu;
std::vector<std::string> channelGroups;
recManager->GetChannelGroups(&channelGroups);
- activeMenu = new cRecMenuSearchTimerEdit(searchTimer, advancedOptions, channelGroups);
+ activeMenu = new cRecMenuSearchTimerEdit(searchTimer, channelGroups);
activeMenu->Display();
break; }
case rmsSearchTimerTest: {
diff --git a/recmenus.c b/recmenus.c
index 0f645a5..b0b9f04 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -722,9 +722,8 @@ int cRecMenuSearchTimers::GetTotalNumMenuItems(void) {
}
// --- cRecMenuSearchTimerEdit ---------------------------------------------------------
-cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, bool advancedOptions, std::vector<std::string> channelGroups) {
+cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, std::vector<std::string> channelGroups) {
deleteMenuItems = false;
- this->advancedOptions = advancedOptions;
this->searchTimer = searchTimer;
this->channelGroups = channelGroups;
strncpy(searchString, searchTimer.GetSearchString().c_str(), TEXTINPUTLENGTH);
@@ -768,7 +767,7 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer
cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
infoItem->CalculateHeight(width - 2 * border);
SetHeader(infoItem);
- cRecMenuItemButtonYesNo *footerButton = new cRecMenuItemButtonYesNo(tr("Save Search Timer"), tr("Cancel"), rmsSearchTimerSave, rmsSearchTimers, (advancedOptions)?false:true);
+ cRecMenuItemButtonYesNo *footerButton = new cRecMenuItemButtonYesNo(tr("Save Search Timer"), tr("Cancel"), rmsSearchTimerSave, rmsSearchTimers, false);
SetFooter(footerButton);
InitMenuItems();
CreateMenuItems();
@@ -842,9 +841,6 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) {
mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Description"), useDescription, false, false, &useDescription, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemSelect(tr("Limit Channels"), useChannelModes, useChannel, false, &useChannel, rmsSearchTimerSave, true));
mainMenuItems.push_back(new cRecMenuItemBool(tr("Use Time"), useTime, true, false, &useTime, rmsSearchTimerSave));
- if (!advancedOptions) {
- mainMenuItems.push_back(new cRecMenuItemButton(tr("Display advanced Options"), rmsSearchTimerEditAdvanced, false));
- } else {
mainMenuItems.push_back(new cRecMenuItemBool(tr("Limit Days of the Week"), useDayOfWeek, true, false, &useDayOfWeek, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemInt(tr("Priority"), priority, 0, 99, false, &priority, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemInt(tr("Lifetime"), lifetime, 0, 99, false, &lifetime, rmsSearchTimerSave));
@@ -855,8 +851,6 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) {
mainMenuItems.push_back(new cRecMenuItemBool(tr("Use VPS"), useVPS, false, false, &useVPS, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemBool(tr("Avoid Repeats"), avoidRepeats, true, false, &avoidRepeats, rmsSearchTimerSave));
mainMenuItems.push_back(new cRecMenuItemBool(tr("Use in Favorites"), useInFavorites, false, false, &useInFavorites, rmsSearchTimerSave));
- mainMenuItems.push_back(new cRecMenuItemButton(tr("Hide advanced Options"), rmsSearchTimerEdit, false));
- }
mainMenuItems.push_back(new cRecMenuItemButton(tr("Display Results for Search Timer"), rmsSearchTimerTest, false));
if (startChannel == 0)
@@ -877,13 +871,11 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) {
useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start after"), startTime, false, &startTime, rmsSearchTimerSave));
useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start before"), stopTime, false, &stopTime, rmsSearchTimerSave));
- if (advancedOptions) {
useDayOfWeekSubMenu.push_back(new cRecMenuItemDayChooser(tr("Select Days"), dayOfWeek, false, &dayOfWeek));
avoidRepeatSubMenu.push_back(new cRecMenuItemInt(tr("Number of allowed repeats"), allowedRepeats, 0, 30, false, &allowedRepeats, rmsSearchTimerSave));
avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Title"), compareTitle, false, false, &compareTitle, rmsSearchTimerSave));
avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Subtitle"), compareSubtitle, false, false, &compareSubtitle, rmsSearchTimerSave));
avoidRepeatSubMenu.push_back(new cRecMenuItemBool(tr("Compare Description"), compareSummary, false, false, &compareSummary, rmsSearchTimerSave));
- }
}
@@ -906,16 +898,16 @@ void cRecMenuSearchTimerEdit::CreateMenuItems(void) {
AddSubMenu(&useGroupSubMenu);
else if ((i == useTimePos) && useTime)
AddSubMenu(&useTimeSubMenu);
- else if (advancedOptions && (i == useDayOfWeekPos) && useDayOfWeek)
+ else if ((i == useDayOfWeekPos) && useDayOfWeek)
AddSubMenu(&useDayOfWeekSubMenu);
- else if (advancedOptions && (i == avoidRepeatsPos) && avoidRepeats)
+ else if ((i == avoidRepeatsPos) && avoidRepeats)
AddSubMenu(&avoidRepeatSubMenu);
}
int numMenuItemsAll = currentMenuItems.size();
int start = GetStartIndex();
for (int i = start; i < numMenuItemsAll; i++) {
- if ((i == start) && !reDraw && advancedOptions) {
+ if ((i == start) && !reDraw) {
currentMenuItems[i]->setActive();
}
if (!AddMenuItemInitial(currentMenuItems[i])) {
diff --git a/recmenus.h b/recmenus.h
index 24bb5c5..9d5bde8 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -207,7 +207,6 @@ public:
// --- cRecMenuSearchTimerEdit ---------------------------------------------------------
class cRecMenuSearchTimerEdit: public cRecMenu {
private:
- bool advancedOptions;
cTVGuideSearchTimer searchTimer;
std::vector<std::string> channelGroups;
std::vector<cRecMenuItem*> mainMenuItems;
@@ -256,7 +255,7 @@ private:
void AddSubMenu(std::vector<cRecMenuItem*> *subMenu);
int SplitChannelGroups(std::vector<std::string> *channelGroups, std::vector<std::string> *channelgroups);
public:
- cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, bool advancedOptions, std::vector<std::string> channelGroups);
+ cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer, std::vector<std::string> channelGroups);
void CreateMenuItems(void);
virtual ~cRecMenuSearchTimerEdit(void);
cTVGuideSearchTimer GetSearchTimer(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 01:15:13 +0000