diff --git a/po/ca_ES.po b/po/ca_ES.po index e9ec0ba..daa62be 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: \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" "Last-Translator: My friend Thanks David \n" "Language-Team: \n" @@ -528,12 +528,51 @@ msgstr "coincidència exacta" msgid "regular expression" msgstr "expressió regular" +msgid "fuzzy" +msgstr "" + msgid "Interval" msgstr "" msgid "only FTA" 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" msgstr "Preferències" @@ -930,9 +969,6 @@ msgstr "" msgid "yes" msgstr "" -msgid "no" -msgstr "" - msgid "Adult" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 8df1478..7c04167 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: \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" "Last-Translator: Horst\n" "Language-Team: \n" @@ -525,12 +525,51 @@ msgstr "exakt" msgid "regular expression" msgstr "Regulärer Ausdruck" +msgid "fuzzy" +msgstr "" + msgid "Interval" msgstr "Bereich" msgid "only FTA" 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" msgstr "Allgemeine Einstellungen" @@ -927,9 +966,6 @@ msgstr "Überblick" msgid "yes" msgstr "Ja" -msgid "no" -msgstr "Nein" - msgid "Adult" msgstr "Nur für Erwachsene" diff --git a/po/it_IT.po b/po/it_IT.po index ef06ddf..373d47a 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: \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" "Last-Translator: fiveten_59\n" "Language-Team: \n" @@ -525,12 +525,51 @@ msgstr "exakt" msgid "regular expression" msgstr "Regulärer Ausdruck" +msgid "fuzzy" +msgstr "" + msgid "Interval" msgstr "" msgid "only FTA" 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" msgstr "Allgemeine Einstellungen" @@ -927,9 +966,6 @@ msgstr "Überblick" msgid "yes" msgstr "Si" -msgid "no" -msgstr "No" - msgid "Adult" msgstr "Per adulti" diff --git a/po/ru_RU.po b/po/ru_RU.po index 8a08654..4698c48 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: \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" "Last-Translator: AmiD, ilya\n" "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n" @@ -525,12 +525,51 @@ msgstr "точное совпадение" msgid "regular expression" msgstr "регулярные выражения" +msgid "fuzzy" +msgstr "" + msgid "Interval" msgstr "" msgid "only FTA" 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" msgstr "Основные настройки" @@ -927,9 +966,6 @@ msgstr "" msgid "yes" msgstr "" -msgid "no" -msgstr "" - msgid "Adult" msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index 796db07..6e56d32 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: \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" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -525,12 +525,51 @@ msgstr "presn msgid "regular expression" msgstr "regulrny vraz" +msgid "fuzzy" +msgstr "" + msgid "Interval" msgstr "" msgid "only FTA" 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" msgstr "Veobecn nastavenia" @@ -927,9 +966,6 @@ msgstr "" msgid "yes" msgstr "" -msgid "no" -msgstr "" - msgid "Adult" msgstr "" diff --git a/recmenuitem.c b/recmenuitem.c index 9017067..a58c428 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -275,7 +275,7 @@ cRecMenuItemInfo::~cRecMenuItemInfo(void) { void cRecMenuItemInfo::CalculateHeight(int textWidth) { wrapper.Set(*text, fontInfo, textWidth); - height = fontInfo->Height() * wrapper.Lines() + 2*border; + height = fontInfo->Height() * wrapper.Lines() + 2 * border; } void cRecMenuItemInfo::setBackground(void) { @@ -300,15 +300,19 @@ cRecMenuItemInt::cRecMenuItemInt(cString text, int initialVal, int minVal, int maxVal, +// bool refresh; bool active, int *callback, - eRecMenuState action) { + eRecMenuState action, + int indent) { selectable = true; this->text = text; this->currentVal = initialVal; this->minVal = minVal; this->maxVal = maxVal; +// this->refresh = refresh; this->active = active; + this->indent = indent; this->callback = callback; this->action = action; height = 3 * font->Height() / 2; @@ -348,7 +352,7 @@ void cRecMenuItemInt::setBackground() { void cRecMenuItemInt::Draw(void) { 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(); } @@ -371,7 +375,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) { *callback = currentVal; DrawValue(); } - return rmsConsumed; + return (currentVal == 0) ? rmsRefresh : rmsConsumed; break; case kRight: fresh = true; @@ -381,7 +385,7 @@ eRecMenuState cRecMenuItemInt::ProcessKey(eKeys Key) { *callback = currentVal; DrawValue(); } - return rmsConsumed; + return (currentVal == 1) ? rmsRefresh : rmsConsumed; break; case k0 ... k9: if (fresh) { @@ -410,13 +414,34 @@ cRecMenuItemBool::cRecMenuItemBool(cString text, bool refresh, bool active, bool *callback, - eRecMenuState action) { + eRecMenuState action, + int indent) { selectable = true; this->text = text; this->yes = initialVal; this->refresh = refresh; this->active = active; 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; height = 3 * font->Height() / 2; pixmapVal = NULL; @@ -449,7 +474,7 @@ void cRecMenuItemBool::Show(void) { void cRecMenuItemBool::Draw(void) { 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(); } @@ -494,7 +519,8 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text, bool active, int *callback, eRecMenuState action, - bool refresh) { + bool refresh, + int indent) { selectable = true; this->text = text; strings = Strings; @@ -506,6 +532,7 @@ cRecMenuItemSelect::cRecMenuItemSelect(cString text, this->active = active; this->callback = callback; this->refresh = refresh; + this->indent = indent; this->action = action; height = 3 * font->Height() / 2; pixmapVal = NULL; @@ -538,7 +565,7 @@ void cRecMenuItemSelect::Show(void) { void cRecMenuItemSelect::Draw(void) { 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(); } @@ -602,12 +629,14 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text, bool active, char *callback, eRecMenuState action, - bool isSearchTimer) { + bool isSearchTimer, + int indent) { selectable = true; this->text = text; this->originalFolder = originalFolder; this->active = active; this->callback = callback; + this->indent = indent; this->action = action; height = 3 * font->Height() / 2; pixmapVal = NULL; @@ -646,7 +675,7 @@ void cRecMenuItemSelectDirectory::Show(void) { void cRecMenuItemSelectDirectory::Draw(void) { 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(); } @@ -1297,7 +1326,8 @@ cRecMenuItemTime::cRecMenuItemTime(cString text, int initialVal, bool active, int *callback, - eRecMenuState action) { + eRecMenuState action, + int indent) { selectable = true; this->text = text; this->value = initialVal; @@ -1307,6 +1337,7 @@ cRecMenuItemTime::cRecMenuItemTime(cString text, fresh = true; this->active = active; this->callback = callback; + this->indent = indent; this->action = action; height = 3 * font->Height() / 2; pixmapVal = NULL; @@ -1339,7 +1370,7 @@ void cRecMenuItemTime::Show(void) { void cRecMenuItemTime::Draw(void) { 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(); } @@ -1721,7 +1752,7 @@ cRecMenuItemTimerConflictHeader::cRecMenuItemTimerConflictHeader(time_t conflict this->conflictStop = conflictStop; this->overlapStart = overlapStart; this->overlapStop = overlapStop; - height = 3*font->Height()/2; + height = 3 * font->Height() / 2; pixmapStatus = NULL; } @@ -1795,7 +1826,7 @@ cRecMenuItemEvent::cRecMenuItemEvent(const cEvent *event, this->action2 = action2; iconActive = 0; this->active = active; - height = font->Height() + 2*fontSmall->Height() + 10; + height = font->Height() + 2 * fontSmall->Height() + 10; pixmapText = NULL; pixmapIcons = NULL; } @@ -1929,7 +1960,8 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text, const cChannel *initialChannel, bool active, int *callback, - eRecMenuState action) { + eRecMenuState action, + int indent) { selectable = true; this->text = text; this->channel = initialChannel; @@ -1941,8 +1973,10 @@ cRecMenuItemChannelChooser::cRecMenuItemChannelChooser(cString text, fresh = true; this->active = active; this->callback = callback; + this->indent = indent; this->action = action; - height = 2 * font->Height(); + height = 3 * font->Height() / 2; +// height = 2 * font->Height(); pixmapChannel = NULL; } @@ -1973,7 +2007,7 @@ void cRecMenuItemChannelChooser::Show(void) { void cRecMenuItemChannelChooser::Draw(void) { 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(); } @@ -2103,7 +2137,8 @@ eRecMenuState cRecMenuItemChannelChooser::ProcessKey(eKeys Key) { cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text, int weekdays, bool active, - int *callback) { + int *callback, + int indent) { selectable = true; this->text = text; if (weekdays < 1) @@ -2111,7 +2146,9 @@ cRecMenuItemDayChooser::cRecMenuItemDayChooser(cString text, this->weekdays = weekdays; this->active = active; this->callback = callback; - height = 2 * font->Height(); + this->indent = indent; + height = 3 * font->Height() / 2; +// height = 2 * font->Height(); selectedDay = 0; pixmapWeekdays = NULL; pixmapWeekdaysSelect = NULL; @@ -2173,7 +2210,7 @@ void cRecMenuItemDayChooser::setBackground() { void cRecMenuItemDayChooser::Draw(void) { 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(); } @@ -2248,7 +2285,7 @@ cRecMenuItemRecording::cRecMenuItemRecording(const cRecording *recording, bool a selectable = true; this->recording = recording; this->active = active; - height = font->Height() + 2*fontSmall->Height() + 10; + height = font->Height() + 2 * fontSmall->Height() + 10; pixmapText = NULL; } diff --git a/recmenuitem.h b/recmenuitem.h index f468553..84b11f7 100644 --- a/recmenuitem.h +++ b/recmenuitem.h @@ -195,6 +195,8 @@ private: int *callback; int minVal; int maxVal; +// bool refresh; + int indent; cPixmap *pixmapVal; bool fresh; void DrawValue(void); @@ -203,9 +205,11 @@ public: int initialVal, int minVal, int maxVal, +// bool refresh = false, bool active = false, int *callback = NULL, - eRecMenuState action = rmsNotConsumed); + eRecMenuState action = rmsNotConsumed, + int indent = 0); virtual ~cRecMenuItemInt(void); void SetPixmaps(void); void Hide(void); @@ -221,6 +225,7 @@ class cRecMenuItemBool : public cRecMenuItem { private: cString text; bool yes; + int indent; bool *callback; cPixmap *pixmapVal; bool refresh; @@ -231,7 +236,15 @@ public: bool refresh = false, bool active = false, 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); void SetPixmaps(void); void Hide(void); @@ -248,6 +261,7 @@ private: int currentVal; int *callback; bool refresh; + int indent; std::vector strings; int numValues; cPixmap *pixmapVal; @@ -259,7 +273,8 @@ public: bool active = false, int *callback = NULL, eRecMenuState action = rmsNotConsumed, - bool refresh = false); + bool refresh = false, + int indent = 0); virtual ~cRecMenuItemSelect(void); void SetPixmaps(void); void Hide(void); @@ -278,6 +293,7 @@ private: std::vector folders; int currentVal; char *callback; + int indent; int numValues; cPixmap *pixmapVal; void DrawValue(void); @@ -289,7 +305,8 @@ public: bool active = false, char *callback = NULL, eRecMenuState action = rmsNotConsumed, - bool isSearchTimer = false); + bool isSearchTimer = false, + int indent = 0); virtual ~cRecMenuItemSelectDirectory(void); void SetPixmaps(void); void Hide(void); @@ -363,6 +380,7 @@ private: cString text; int value; int *callback; + int indent; int mm; int hh; int pos; @@ -374,7 +392,8 @@ public: int initialVal, bool active = false, int *callback = NULL, - eRecMenuState action = rmsNotConsumed); + eRecMenuState action = rmsNotConsumed, + int indent = 0); virtual ~cRecMenuItemTime(void); void SetPixmaps(void); void Hide(void); @@ -494,6 +513,7 @@ private: const cChannel *channel; int channelNumber; int *callback; + int indent; bool initialChannelSet; bool fresh; cPixmap *pixmapChannel; @@ -503,7 +523,8 @@ public: const cChannel *initialChannel, bool active = false, int *callback = NULL, - eRecMenuState action = rmsNotConsumed); + eRecMenuState action = rmsNotConsumed, + int indent = 0); virtual ~cRecMenuItemChannelChooser(void); void SetPixmaps(void); void Hide(void); @@ -519,6 +540,7 @@ private: cString text; int weekdays; int *callback; + int indent; bool epgsearchMode; std::string days; int daysX; @@ -536,7 +558,8 @@ public: cRecMenuItemDayChooser (cString text, int weekdays, bool active = false, - int *callback = NULL); + int *callback = NULL, + int indent = 0); virtual ~cRecMenuItemDayChooser(void); void SetPixmaps(void); void Hide(void);