From 2531526a4dd15af0cca96bd49150e05a4c3d2287 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 9 Nov 2019 13:32:08 +0100 Subject: [PATCH] Refactor cRecMenuSeriesTimer --- po/ca_ES.po | 22 +++++++++++----------- po/de_DE.po | 22 +++++++++++----------- po/it_IT.po | 22 +++++++++++----------- po/ru_RU.po | 22 +++++++++++----------- po/sk_SK.po | 22 +++++++++++----------- recmenus.c | 18 +++++++++--------- 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index 0ae7016..62a5f2d 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: 2022-04-29 13:18+0200\n" +"POT-Creation-Date: 2022-04-29 14:39+0200\n" "PO-Revision-Date: 2013-09-21 17:49+0200\n" "Last-Translator: My friend Thanks David \n" "Language-Team: \n" @@ -225,6 +225,12 @@ msgstr "" msgid "replaced by rerun" msgstr "" +msgid "Save" +msgstr "Desa" + +msgid "Cancel" +msgstr "Cancel·la" + msgid "Timer Active" msgstr "Temporitzador actiu" @@ -249,14 +255,11 @@ msgstr "" msgid "New Folder" msgstr "" -msgid "Save" -msgstr "Desa" +msgid "Create Series Timer based on:" +msgstr "Programa enregistrament de Sèries segons:" -msgid "Cancel" -msgstr "Cancel·la" - -msgid "Create Series Timer based on" -msgstr "Programa enregistrament de Sèries segons" +msgid "Create Timer" +msgstr "Crea temporitzador" msgid "Series Timer start time" msgstr "Inici temporitzador Sèries" @@ -270,9 +273,6 @@ msgstr "Dies a enregistrar" msgid "Day to start" msgstr "Dia d'inici" -msgid "Create Timer" -msgstr "Crea temporitzador" - msgid "Series Timer created" msgstr "Sèrie programada" diff --git a/po/de_DE.po b/po/de_DE.po index a65f7b8..1ac9ff3 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: 2022-04-29 13:18+0200\n" +"POT-Creation-Date: 2022-04-29 14:39+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: Horst\n" "Language-Team: \n" @@ -222,6 +222,12 @@ msgstr "Timer für" msgid "replaced by rerun" msgstr "ersetzt durch Wiederholung" +msgid "Save" +msgstr "Speichern" + +msgid "Cancel" +msgstr "Abbrechen" + msgid "Timer Active" msgstr "Timer aktiv" @@ -246,14 +252,11 @@ msgstr "Timer Datei" msgid "New Folder" msgstr "Neues Verzeichnis" -msgid "Save" -msgstr "Speichern" +msgid "Create Series Timer based on:" +msgstr "Serientimer anlegen basierend auf:" -msgid "Cancel" -msgstr "Abbrechen" - -msgid "Create Series Timer based on" -msgstr "Serientimer anlegen basierend auf" +msgid "Create Timer" +msgstr "Timer anlegen" msgid "Series Timer start time" msgstr "Serientimer Start Zeit" @@ -267,9 +270,6 @@ msgstr "Tage" msgid "Day to start" msgstr "Beginnen am" -msgid "Create Timer" -msgstr "Timer anlegen" - msgid "Series Timer created" msgstr "Serientimer angelegt" diff --git a/po/it_IT.po b/po/it_IT.po index 5bb5196..6c8589e 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: 2022-04-29 13:18+0200\n" +"POT-Creation-Date: 2022-04-29 14:39+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: fiveten_59\n" "Language-Team: \n" @@ -222,6 +222,12 @@ msgstr "Timer per" msgid "replaced by rerun" msgstr "rimosso dal riavvio" +msgid "Save" +msgstr "Salva" + +msgid "Cancel" +msgstr "Cancella" + msgid "Timer Active" msgstr "Timer attivo" @@ -246,14 +252,11 @@ msgstr "File del Timer" msgid "New Folder" msgstr "Nuova cartella" -msgid "Save" -msgstr "Salva" +msgid "Create Series Timer based on:" +msgstr "Crea il Series Timer basato su:" -msgid "Cancel" -msgstr "Cancella" - -msgid "Create Series Timer based on" -msgstr "Crea il Series Timer basato su" +msgid "Create Timer" +msgstr "Crea il Timer" msgid "Series Timer start time" msgstr "Ora d'avvio del Series Timer" @@ -267,9 +270,6 @@ msgstr "Giorni da registrare" msgid "Day to start" msgstr "Giorno d'inizio" -msgid "Create Timer" -msgstr "Crea il Timer" - msgid "Series Timer created" msgstr "Series Timer creato" diff --git a/po/ru_RU.po b/po/ru_RU.po index e4e165a..19c267d 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: 2022-04-29 13:18+0200\n" +"POT-Creation-Date: 2022-04-29 14:39+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" @@ -222,6 +222,12 @@ msgstr "" msgid "replaced by rerun" msgstr "" +msgid "Save" +msgstr "Сохранить" + +msgid "Cancel" +msgstr "Отменить" + msgid "Timer Active" msgstr "Таймер активен" @@ -246,14 +252,11 @@ msgstr "" msgid "New Folder" msgstr "" -msgid "Save" -msgstr "Сохранить" +msgid "Create Series Timer based on:" +msgstr "Настроить циклический таймер:" -msgid "Cancel" -msgstr "Отменить" - -msgid "Create Series Timer based on" -msgstr "Настроить циклический таймер" +msgid "Create Timer" +msgstr "Создать" msgid "Series Timer start time" msgstr "Время с" @@ -267,9 +270,6 @@ msgstr "Дни недели" msgid "Day to start" msgstr "Начиная с" -msgid "Create Timer" -msgstr "Создать" - msgid "Series Timer created" msgstr "Циклический таймер создан" diff --git a/po/sk_SK.po b/po/sk_SK.po index f004231..7510967 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: 2022-04-29 13:18+0200\n" +"POT-Creation-Date: 2022-04-29 14:39+0200\n" "PO-Revision-Date: 2013-09-15 00:12+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -222,6 +222,12 @@ msgstr "" msgid "replaced by rerun" msgstr "" +msgid "Save" +msgstr "Uloi" + +msgid "Cancel" +msgstr "Zrui" + msgid "Timer Active" msgstr "Pln aktvny" @@ -246,14 +252,11 @@ msgstr "" msgid "New Folder" msgstr "" -msgid "Save" -msgstr "Uloi" +msgid "Create Series Timer based on:" +msgstr "Vytvorenie plnu na zklade srie:" -msgid "Cancel" -msgstr "Zrui" - -msgid "Create Series Timer based on" -msgstr "Vytvorenie plnu na zklade srie" +msgid "Create Timer" +msgstr "Vytvori pln" msgid "Series Timer start time" msgstr "Sriov pln zana" @@ -267,9 +270,6 @@ msgstr "Dni" msgid "Day to start" msgstr "Zana da" -msgid "Create Timer" -msgstr "Vytvori pln" - msgid "Series Timer created" msgstr "Vytvoren sriov pln" diff --git a/recmenus.c b/recmenus.c index bd1ff8e..fbadee8 100644 --- a/recmenus.c +++ b/recmenus.c @@ -497,9 +497,12 @@ cTimer *cRecMenuEditTimer::GetTimer(void) { ******************************************************************************************/ // --- cRecMenuSeriesTimer --------------------------------------------------------- -cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder) { +cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder) { // OK if (!initialChannel) return; + + SetWidthPercent(70); + timerActive = true; channel = initialChannel->Number(); dayOfWeek = 127; @@ -508,12 +511,11 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const c CalculateTimes(event); this->folder = folder; - SetWidthPercent(70); - cString title = tr("Create Series Timer based on"); - cString infoText = cString::sprintf("%s:\n%s", *title, event->Title()); - cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); - infoItem->CalculateHeight(width - 2 * border); - SetHeader(infoItem); + const cString line1 = tr("Create Series Timer based on:"); + const cString line2 = cString::sprintf("\"%s\"", event->Title()); + + AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true)); + AddFooter(new cRecMenuItemButtonYesNo(tr("Create Timer"), tr("Cancel"), rmsSeriesTimerCreate, rmsClose, true)); AddMenuItem(new cRecMenuItemBool(tr("Timer Active"), false, &timerActive)); AddMenuItem(new cRecMenuItemChannelChooser(tr("Channel"), false, &channel)); @@ -524,8 +526,6 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const c AddMenuItem(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &priority)); AddMenuItem(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime)); - AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create Timer"), tr("Cancel"), rmsSeriesTimerCreate, rmsClose, true)); - CalculateHeight(); CreatePixmap(); Arrange();