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

Some changes to RecMenuItems

This commit is contained in:
kamel5 2019-06-16 14:48:20 +02:00
parent 803b28aad9
commit f6a7ae497c
7 changed files with 289 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
po/ca_ES.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n" "Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2019-04-12 14:35+0200\n" "POT-Creation-Date: 2019-06-16 14:37+0200\n"
"PO-Revision-Date: 2013-09-21 17:49+0200\n" "PO-Revision-Date: 2013-09-21 17:49+0200\n"
"Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n" "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -528,12 +528,51 @@ msgstr "coincidència exacta"
msgid "regular expression" msgid "regular expression"
msgstr "expressió regular" msgstr "expressió regular"
msgid "fuzzy"
msgstr ""
msgid "Interval" msgid "Interval"
msgstr "" msgstr ""
msgid "only FTA" msgid "only FTA"
msgstr "" msgstr ""
msgid "same day"
msgstr ""
msgid "same week"
msgstr ""
msgid "same month"
msgstr ""
msgid "Record"
msgstr ""
msgid "Announce by OSD"
msgstr ""
msgid "Switch only"
msgstr ""
msgid "Announce and switch"
msgstr ""
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "no"
msgstr ""
msgid "count recordings"
msgstr ""
msgid "count days"
msgstr ""
msgid "General Settings" msgid "General Settings"
msgstr "Preferències" msgstr "Preferències"
@ -930,9 +969,6 @@ msgstr ""
msgid "yes" msgid "yes"
msgstr "" msgstr ""
msgid "no"
msgstr ""
msgid "Adult" msgid "Adult"
msgstr "" msgstr ""

44
po/de_DE.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n" "Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2019-04-12 14:35+0200\n" "POT-Creation-Date: 2019-06-16 14:37+0200\n"
"PO-Revision-Date: 2012-08-25 17:49+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n"
"Last-Translator: Horst\n" "Last-Translator: Horst\n"
"Language-Team: \n" "Language-Team: \n"
@ -525,12 +525,51 @@ msgstr "exakt"
msgid "regular expression" msgid "regular expression"
msgstr "Regulärer Ausdruck" msgstr "Regulärer Ausdruck"
msgid "fuzzy"
msgstr ""
msgid "Interval" msgid "Interval"
msgstr "Bereich" msgstr "Bereich"
msgid "only FTA" msgid "only FTA"
msgstr "ohne PayTV" msgstr "ohne PayTV"
msgid "same day"
msgstr ""
msgid "same week"
msgstr ""
msgid "same month"
msgstr ""
msgid "Record"
msgstr ""
msgid "Announce by OSD"
msgstr ""
msgid "Switch only"
msgstr ""
msgid "Announce and switch"
msgstr ""
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "no"
msgstr "Nein"
msgid "count recordings"
msgstr ""
msgid "count days"
msgstr ""
msgid "General Settings" msgid "General Settings"
msgstr "Allgemeine Einstellungen" msgstr "Allgemeine Einstellungen"
@ -927,9 +966,6 @@ msgstr "Überblick"
msgid "yes" msgid "yes"
msgstr "Ja" msgstr "Ja"
msgid "no"
msgstr "Nein"
msgid "Adult" msgid "Adult"
msgstr "Nur für Erwachsene" msgstr "Nur für Erwachsene"

44
po/it_IT.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n" "Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2019-04-12 14:35+0200\n" "POT-Creation-Date: 2019-06-16 14:37+0200\n"
"PO-Revision-Date: 2012-08-25 17:49+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n"
"Last-Translator: fiveten_59\n" "Last-Translator: fiveten_59\n"
"Language-Team: \n" "Language-Team: \n"
@ -525,12 +525,51 @@ msgstr "exakt"
msgid "regular expression" msgid "regular expression"
msgstr "Regulärer Ausdruck" msgstr "Regulärer Ausdruck"
msgid "fuzzy"
msgstr ""
msgid "Interval" msgid "Interval"
msgstr "" msgstr ""
msgid "only FTA" msgid "only FTA"
msgstr "" msgstr ""
msgid "same day"
msgstr ""
msgid "same week"
msgstr ""
msgid "same month"
msgstr ""
msgid "Record"
msgstr ""
msgid "Announce by OSD"
msgstr ""
msgid "Switch only"
msgstr ""
msgid "Announce and switch"
msgstr ""
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "no"
msgstr "No"
msgid "count recordings"
msgstr ""
msgid "count days"
msgstr ""
msgid "General Settings" msgid "General Settings"
msgstr "Allgemeine Einstellungen" msgstr "Allgemeine Einstellungen"
@ -927,9 +966,6 @@ msgstr "Überblick"
msgid "yes" msgid "yes"
msgstr "Si" msgstr "Si"
msgid "no"
msgstr "No"
msgid "Adult" msgid "Adult"
msgstr "Per adulti" msgstr "Per adulti"

44
po/ru_RU.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-tvguide 1.0.0\n" "Project-Id-Version: vdr-tvguide 1.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2019-04-12 14:35+0200\n" "POT-Creation-Date: 2019-06-16 14:37+0200\n"
"PO-Revision-Date: 2013-09-25 17:49+0400\n" "PO-Revision-Date: 2013-09-25 17:49+0400\n"
"Last-Translator: AmiD, ilya\n" "Last-Translator: AmiD, ilya\n"
"Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n" "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@ -525,12 +525,51 @@ msgstr "точное совпадение"
msgid "regular expression" msgid "regular expression"
msgstr "регулярные выражения" msgstr "регулярные выражения"
msgid "fuzzy"
msgstr ""
msgid "Interval" msgid "Interval"
msgstr "" msgstr ""
msgid "only FTA" msgid "only FTA"
msgstr "" msgstr ""
msgid "same day"
msgstr ""
msgid "same week"
msgstr ""
msgid "same month"
msgstr ""
msgid "Record"
msgstr ""
msgid "Announce by OSD"
msgstr ""
msgid "Switch only"
msgstr ""
msgid "Announce and switch"
msgstr ""
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "no"
msgstr ""
msgid "count recordings"
msgstr ""
msgid "count days"
msgstr ""
msgid "General Settings" msgid "General Settings"
msgstr "Основные настройки" msgstr "Основные настройки"
@ -927,9 +966,6 @@ msgstr ""
msgid "yes" msgid "yes"
msgstr "" msgstr ""
msgid "no"
msgstr ""
msgid "Adult" msgid "Adult"
msgstr "" msgstr ""

44
po/sk_SK.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-tvguide 1.1.0\n" "Project-Id-Version: vdr-tvguide 1.1.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2019-04-12 14:35+0200\n" "POT-Creation-Date: 2019-06-16 14:37+0200\n"
"PO-Revision-Date: 2013-09-15 00:12+0100\n" "PO-Revision-Date: 2013-09-15 00:12+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -525,12 +525,51 @@ msgstr "presn
msgid "regular expression" msgid "regular expression"
msgstr "regulárny výraz" msgstr "regulárny výraz"
msgid "fuzzy"
msgstr ""
msgid "Interval" msgid "Interval"
msgstr "" msgstr ""
msgid "only FTA" msgid "only FTA"
msgstr "" msgstr ""
msgid "same day"
msgstr ""
msgid "same week"
msgstr ""
msgid "same month"
msgstr ""
msgid "Record"
msgstr ""
msgid "Announce by OSD"
msgstr ""
msgid "Switch only"
msgstr ""
msgid "Announce and switch"
msgstr ""
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "no"
msgstr ""
msgid "count recordings"
msgstr ""
msgid "count days"
msgstr ""
msgid "General Settings" msgid "General Settings"
msgstr "V¹eobecné nastavenia" msgstr "V¹eobecné nastavenia"
@ -927,9 +966,6 @@ msgstr ""
msgid "yes" msgid "yes"
msgstr "" msgstr ""
msgid "no"
msgstr ""
msgid "Adult" msgid "Adult"
msgstr "" msgstr ""

81
recmenuitem.c
View File

@ -275,7 +275,7 @@ cRecMenuItemInfo::~cRecMenuItemInfo(void) {
void cRecMenuItemInfo::CalculateHeight(int textWidth) { void cRecMenuItemInfo::CalculateHeight(int textWidth) {
wrapper.Set(*text, fontInfo, textWidth); wrapper.Set(*text, fontInfo, textWidth);
height = fontInfo->Height() * wrapper.Lines() + 2*border; height = fontInfo->Height() * wrapper.Lines() + 2 * border;
} }
void cRecMenuItemInfo::setBackground(void) { void cRecMenuItemInfo::setBackground(void) {
@ -300,15 +300,19 @@ cRecMenuItemInt::cRecMenuItemInt(cString text,
int initialVal, int initialVal,
int minVal, int minVal,
int maxVal, int maxVal,
// bool refresh;
bool active, bool active,
int *callback, int *callback,
eRecMenuState action) { eRecMenuState action,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
this->currentVal = initialVal; this->currentVal = initialVal;
this->minVal = minVal; this->minVal = minVal;
this->maxVal = maxVal; this->maxVal = maxVal;
// this->refresh = refresh;
this->active = active; this->active = active;
this->indent = indent;
this->callback = callback; this->callback = callback;
this->action = action; this->action = action;
height = 3 * font->Height() / 2; height = 3 * font->Height() / 2;
@ -348,7 +352,7 @@ void cRecMenuItemInt::setBackground() {
void cRecMenuItemInt::Draw(void) { void cRecMenuItemInt::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -371,7 +375,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) {
*callback = currentVal; *callback = currentVal;
DrawValue(); DrawValue();
} }
return rmsConsumed; return (currentVal == 0) ? rmsRefresh : rmsConsumed;
break; break;
case kRight: case kRight:
fresh = true; fresh = true;
@ -381,7 +385,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) {
*callback = currentVal; *callback = currentVal;
DrawValue(); DrawValue();
} }
return rmsConsumed; return (currentVal == 1) ? rmsRefresh : rmsConsumed;
break; break;
case k0 ... k9: case k0 ... k9:
if (fresh) { if (fresh) {
@ -410,13 +414,34 @@ cRecMenuItemBool::cRecMenuItemBool(cString text,
bool refresh, bool refresh,
bool active, bool active,
bool *callback, bool *callback,
eRecMenuState action) { eRecMenuState action,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
this->yes = initialVal; this->yes = initialVal;
this->refresh = refresh; this->refresh = refresh;
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
this->indent = indent;
this->action = action;
height = 3 * font->Height() / 2;
pixmapVal = NULL;
}
cRecMenuItemBool::cRecMenuItemBool(cString text,
bool initialVal,
bool refresh,
bool active,
int *callback,
eRecMenuState action,
int indent) {
selectable = true;
this->text = text;
this->yes = initialVal;
this->refresh = refresh;
this->active = active;
this->callback = (bool*)callback;
this->indent = indent;
this->action = action; this->action = action;
height = 3 * font->Height() / 2; height = 3 * font->Height() / 2;
pixmapVal = NULL; pixmapVal = NULL;
@ -449,7 +474,7 @@ void cRecMenuItemBool::Show(void) {
void cRecMenuItemBool::Draw(void) { void cRecMenuItemBool::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -494,7 +519,8 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text,
bool active, bool active,
int *callback, int *callback,
eRecMenuState action, eRecMenuState action,
bool refresh) { bool refresh,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
strings = Strings; strings = Strings;
@ -506,6 +532,7 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text,
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
this->refresh = refresh; this->refresh = refresh;
this->indent = indent;
this->action = action; this->action = action;
height = 3 * font->Height() / 2; height = 3 * font->Height() / 2;
pixmapVal = NULL; pixmapVal = NULL;
@ -538,7 +565,7 @@ void cRecMenuItemSelect::Show(void) {
void cRecMenuItemSelect::Draw(void) { void cRecMenuItemSelect::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -602,12 +629,14 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text,
bool active, bool active,
char *callback, char *callback,
eRecMenuState action, eRecMenuState action,
bool isSearchTimer) { bool isSearchTimer,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
this->originalFolder = originalFolder; this->originalFolder = originalFolder;
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
this->indent = indent;
this->action = action; this->action = action;
height = 3 * font->Height() / 2; height = 3 * font->Height() / 2;
pixmapVal = NULL; pixmapVal = NULL;
@ -646,7 +675,7 @@ void cRecMenuItemSelectDirectory::Show(void) {
void cRecMenuItemSelectDirectory::Draw(void) { void cRecMenuItemSelectDirectory::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -1297,7 +1326,8 @@ cRecMenuItemTime::cRecMenuItemTime(cString text,
int initialVal, int initialVal,
bool active, bool active,
int *callback, int *callback,
eRecMenuState action) { eRecMenuState action,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
this->value = initialVal; this->value = initialVal;
@ -1307,6 +1337,7 @@ cRecMenuItemTime::cRecMenuItemTime(cString text,
fresh = true; fresh = true;
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
this->indent = indent;
this->action = action; this->action = action;
height = 3 * font->Height() / 2; height = 3 * font->Height() / 2;
pixmapVal = NULL; pixmapVal = NULL;
@ -1339,7 +1370,7 @@ void cRecMenuItemTime::Show(void) {
void cRecMenuItemTime::Draw(void) { void cRecMenuItemTime::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -1721,7 +1752,7 @@ cRecMenuItemTimerConflictHeader::cRecMenuItemTimerConflictHeader(time_t conflict
this->conflictStop = conflictStop; this->conflictStop = conflictStop;
this->overlapStart = overlapStart; this->overlapStart = overlapStart;
this->overlapStop = overlapStop; this->overlapStop = overlapStop;
height = 3*font->Height()/2; height = 3 * font->Height() / 2;
pixmapStatus = NULL; pixmapStatus = NULL;
} }
@ -1795,7 +1826,7 @@ cRecMenuItemEvent::cRecMenuItemEvent(const cEvent *event,
this->action2 = action2; this->action2 = action2;
iconActive = 0; iconActive = 0;
this->active = active; this->active = active;
height = font->Height() + 2*fontSmall->Height() + 10; height = font->Height() + 2 * fontSmall->Height() + 10;
pixmapText = NULL; pixmapText = NULL;
pixmapIcons = NULL; pixmapIcons = NULL;
} }
@ -1929,7 +1960,8 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
const cChannel *initialChannel, const cChannel *initialChannel,
bool active, bool active,
int *callback, int *callback,
eRecMenuState action) { eRecMenuState action,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
this->channel = initialChannel; this->channel = initialChannel;
@ -1941,8 +1973,10 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text,
fresh = true; fresh = true;
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
this->indent = indent;
this->action = action; this->action = action;
height = 2 * font->Height(); height = 3 * font->Height() / 2;
// height = 2 * font->Height();
pixmapChannel = NULL; pixmapChannel = NULL;
} }
@ -1973,7 +2007,7 @@ void cRecMenuItemChannelChooser::Show(void) {
void cRecMenuItemChannelChooser::Draw(void) { void cRecMenuItemChannelChooser::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawValue(); DrawValue();
} }
@ -2103,7 +2137,8 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) {
cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text, cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text,
int weekdays, int weekdays,
bool active, bool active,
int *callback) { int *callback,
int indent) {
selectable = true; selectable = true;
this->text = text; this->text = text;
if (weekdays < 1) if (weekdays < 1)
@ -2111,7 +2146,9 @@ cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text,
this->weekdays = weekdays; this->weekdays = weekdays;
this->active = active; this->active = active;
this->callback = callback; this->callback = callback;
height = 2 * font->Height(); this->indent = indent;
height = 3 * font->Height() / 2;
// height = 2 * font->Height();
selectedDay = 0; selectedDay = 0;
pixmapWeekdays = NULL; pixmapWeekdays = NULL;
pixmapWeekdaysSelect = NULL; pixmapWeekdaysSelect = NULL;
@ -2173,7 +2210,7 @@ void cRecMenuItemDayChooser::setBackground() {
void cRecMenuItemDayChooser::Draw(void) { void cRecMenuItemDayChooser::Draw(void) {
int textY = (height - font->Height()) / 2; int textY = (height - font->Height()) / 2;
pixmap->DrawText(cPoint(10, textY), *text, colorText, colorTextBack, font); pixmap->DrawText(cPoint(10 + indent * 30, textY), *text, colorText, colorTextBack, font);
DrawDays(); DrawDays();
} }
@ -2248,7 +2285,7 @@ cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool a
selectable = true; selectable = true;
this->recording = recording; this->recording = recording;
this->active = active; this->active = active;
height = font->Height() + 2*fontSmall->Height() + 10; height = font->Height() + 2 * fontSmall->Height() + 10;
pixmapText = NULL; pixmapText = NULL;
} }

37
recmenuitem.h
View File

@ -195,6 +195,8 @@ private:
int *callback; int *callback;
int minVal; int minVal;
int maxVal; int maxVal;
// bool refresh;
int indent;
cPixmap *pixmapVal; cPixmap *pixmapVal;
bool fresh; bool fresh;
void DrawValue(void); void DrawValue(void);
@ -203,9 +205,11 @@ public:
int initialVal, int initialVal,
int minVal, int minVal,
int maxVal, int maxVal,
// bool refresh = false,
bool active = false, bool active = false,
int *callback = NULL, int *callback = NULL,
eRecMenuState action = rmsNotConsumed); eRecMenuState action = rmsNotConsumed,
int indent = 0);
virtual ~cRecMenuItemInt(void); virtual ~cRecMenuItemInt(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -221,6 +225,7 @@ class cRecMenuItemBool : public cRecMenuItem {
private: private:
cString text; cString text;
bool yes; bool yes;
int indent;
bool *callback; bool *callback;
cPixmap *pixmapVal; cPixmap *pixmapVal;
bool refresh; bool refresh;
@ -231,7 +236,15 @@ public:
bool refresh = false, bool refresh = false,
bool active = false, bool active = false,
bool *callback = NULL, bool *callback = NULL,
eRecMenuState action = rmsNotConsumed); eRecMenuState action = rmsNotConsumed,
int indent = 0);
cRecMenuItemBool(cString text,
bool initialVal,
bool refresh = false,
bool active = false,
int *callback = NULL,
eRecMenuState action = rmsNotConsumed,
int indent = 0);
virtual ~cRecMenuItemBool(void); virtual ~cRecMenuItemBool(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -248,6 +261,7 @@ private:
int currentVal; int currentVal;
int *callback; int *callback;
bool refresh; bool refresh;
int indent;
std::vector<std::string> strings; std::vector<std::string> strings;
int numValues; int numValues;
cPixmap *pixmapVal; cPixmap *pixmapVal;
@ -259,7 +273,8 @@ public:
bool active = false, bool active = false,
int *callback = NULL, int *callback = NULL,
eRecMenuState action = rmsNotConsumed, eRecMenuState action = rmsNotConsumed,
bool refresh = false); bool refresh = false,
int indent = 0);
virtual ~cRecMenuItemSelect(void); virtual ~cRecMenuItemSelect(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -278,6 +293,7 @@ private:
std::vector<std::string> folders; std::vector<std::string> folders;
int currentVal; int currentVal;
char *callback; char *callback;
int indent;
int numValues; int numValues;
cPixmap *pixmapVal; cPixmap *pixmapVal;
void DrawValue(void); void DrawValue(void);
@ -289,7 +305,8 @@ public:
bool active = false, bool active = false,
char *callback = NULL, char *callback = NULL,
eRecMenuState action = rmsNotConsumed, eRecMenuState action = rmsNotConsumed,
bool isSearchTimer = false); bool isSearchTimer = false,
int indent = 0);
virtual ~cRecMenuItemSelectDirectory(void); virtual ~cRecMenuItemSelectDirectory(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -363,6 +380,7 @@ private:
cString text; cString text;
int value; int value;
int *callback; int *callback;
int indent;
int mm; int mm;
int hh; int hh;
int pos; int pos;
@ -374,7 +392,8 @@ public:
int initialVal, int initialVal,
bool active = false, bool active = false,
int *callback = NULL, int *callback = NULL,
eRecMenuState action = rmsNotConsumed); eRecMenuState action = rmsNotConsumed,
int indent = 0);
virtual ~cRecMenuItemTime(void); virtual ~cRecMenuItemTime(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -494,6 +513,7 @@ private:
const cChannel *channel; const cChannel *channel;
int channelNumber; int channelNumber;
int *callback; int *callback;
int indent;
bool initialChannelSet; bool initialChannelSet;
bool fresh; bool fresh;
cPixmap *pixmapChannel; cPixmap *pixmapChannel;
@ -503,7 +523,8 @@ public:
const cChannel *initialChannel, const cChannel *initialChannel,
bool active = false, bool active = false,
int *callback = NULL, int *callback = NULL,
eRecMenuState action = rmsNotConsumed); eRecMenuState action = rmsNotConsumed,
int indent = 0);
virtual ~cRecMenuItemChannelChooser(void); virtual ~cRecMenuItemChannelChooser(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);
@ -519,6 +540,7 @@ private:
cString text; cString text;
int weekdays; int weekdays;
int *callback; int *callback;
int indent;
bool epgsearchMode; bool epgsearchMode;
std::string days; std::string days;
int daysX; int daysX;
@ -536,7 +558,8 @@ public:
cRecMenuItemDayChooser (cString text, cRecMenuItemDayChooser (cString text,
int weekdays, int weekdays,
bool active = false, bool active = false,
int *callback = NULL); int *callback = NULL,
int indent = 0);
virtual ~cRecMenuItemDayChooser(void); virtual ~cRecMenuItemDayChooser(void);
void SetPixmaps(void); void SetPixmaps(void);
void Hide(void); void Hide(void);