From 73e331f97f6238112ca196cc71001916a8d4df54 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 9 Nov 2019 11:43:44 +0100 Subject: [PATCH] Refactor cRecMenuTimerConflicts --- po/ca_ES.po | 13 +++++-------- po/de_DE.po | 13 +++++-------- po/it_IT.po | 13 +++++-------- po/ru_RU.po | 13 +++++-------- po/sk_SK.po | 13 +++++-------- recmenus.c | 40 ++++++++++++++++++++-------------------- 6 files changed, 45 insertions(+), 60 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index 3837df0..0ae7016 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: 2021-12-15 15:05+0100\n" +"POT-Creation-Date: 2022-04-29 13:18+0200\n" "PO-Revision-Date: 2013-09-21 17:49+0200\n" "Last-Translator: My friend Thanks David \n" "Language-Team: \n" @@ -180,14 +180,14 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "One" -msgstr "Un" +msgid "Timer Conflicts" +msgstr "Conflicte al temporitzador" msgid "detected" msgstr "detectat" -msgid "Timer Conflicts" -msgstr "Conflicte al temporitzador" +msgid "Ignore Conflicts" +msgstr "Ignora conflictes" msgid "Show conflict" msgstr "Mostra conflicte" @@ -195,9 +195,6 @@ msgstr "Mostra conflicte" msgid "timers involved" msgstr "temporitzadors involucrats" -msgid "Ignore Conflicts" -msgstr "Ignora conflictes" - msgid "Ignore Conflict" msgstr "Ignora conflicte" diff --git a/po/de_DE.po b/po/de_DE.po index bda8d89..a65f7b8 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: 2021-12-15 15:05+0100\n" +"POT-Creation-Date: 2022-04-29 13:18+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: Horst\n" "Language-Team: \n" @@ -177,14 +177,14 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "One" -msgstr "Ein" +msgid "Timer Conflicts" +msgstr "Timerkonflikte" msgid "detected" msgstr "gefunden" -msgid "Timer Conflicts" -msgstr "Timerkonflikte" +msgid "Ignore Conflicts" +msgstr "Konflikte ignorieren" msgid "Show conflict" msgstr "Konflikt zeigen" @@ -192,9 +192,6 @@ msgstr "Konflikt zeigen" msgid "timers involved" msgstr "Timer beteiligt" -msgid "Ignore Conflicts" -msgstr "Konflikte ignorieren" - msgid "Ignore Conflict" msgstr "Konflikt ignorieren" diff --git a/po/it_IT.po b/po/it_IT.po index 290f997..5bb5196 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: 2021-12-15 15:05+0100\n" +"POT-Creation-Date: 2022-04-29 13:18+0200\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: fiveten_59\n" "Language-Team: \n" @@ -177,14 +177,14 @@ msgstr "Si" msgid "No" msgstr "No" -msgid "One" -msgstr "Uno" +msgid "Timer Conflicts" +msgstr "Conflitti del Timer" msgid "detected" msgstr "rilevato" -msgid "Timer Conflicts" -msgstr "Conflitti del Timer" +msgid "Ignore Conflicts" +msgstr "Ignora conflitti" msgid "Show conflict" msgstr "Mostra conflitto" @@ -192,9 +192,6 @@ msgstr "Mostra conflitto" msgid "timers involved" msgstr "Timers impegnati" -msgid "Ignore Conflicts" -msgstr "Ignora conflitti" - msgid "Ignore Conflict" msgstr "Ignora conflitto" diff --git a/po/ru_RU.po b/po/ru_RU.po index cc43474..e4e165a 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: 2021-12-15 15:05+0100\n" +"POT-Creation-Date: 2022-04-29 13:18+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" @@ -177,14 +177,14 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "One" -msgstr "Один" +msgid "Timer Conflicts" +msgstr "Таймер-конфликты" msgid "detected" msgstr "обнаружен" -msgid "Timer Conflicts" -msgstr "Таймер-конфликты" +msgid "Ignore Conflicts" +msgstr "Игнорировать конфликты" msgid "Show conflict" msgstr "Показать конфликты" @@ -192,9 +192,6 @@ msgstr "Показать конфликты" msgid "timers involved" msgstr "Таймер" -msgid "Ignore Conflicts" -msgstr "Игнорировать конфликты" - msgid "Ignore Conflict" msgstr "Игнорировать конфликт" diff --git a/po/sk_SK.po b/po/sk_SK.po index 2190390..f004231 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: 2021-12-15 15:05+0100\n" +"POT-Creation-Date: 2022-04-29 13:18+0200\n" "PO-Revision-Date: 2013-09-15 00:12+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -177,14 +177,14 @@ msgstr " msgid "No" msgstr "Nie" -msgid "One" -msgstr "Jeden" +msgid "Timer Conflicts" +msgstr "Konflikty plnov" msgid "detected" msgstr "njdench" -msgid "Timer Conflicts" -msgstr "Konflikty plnov" +msgid "Ignore Conflicts" +msgstr "Ignorova konflikty" msgid "Show conflict" msgstr "Zobrazi konflikt" @@ -192,9 +192,6 @@ msgstr "Zobrazi msgid "timers involved" msgstr "plny komplikovan" -msgid "Ignore Conflicts" -msgstr "Ignorova konflikty" - msgid "Ignore Conflict" msgstr "Ignorova konflikt" diff --git a/recmenus.c b/recmenus.c index f98f92e..1fa7b9e 100644 --- a/recmenus.c +++ b/recmenus.c @@ -196,34 +196,34 @@ cRecMenuAskDeleteTimer::cRecMenuAskDeleteTimer(const cEvent *event) { // OK } // --- cRecMenuTimerConflicts --------------------------------------------------------- -cRecMenuTimerConflicts::cRecMenuTimerConflicts(cTVGuideTimerConflicts *conflicts) { +cRecMenuTimerConflicts::cRecMenuTimerConflicts(cTVGuideTimerConflicts *conflicts) { // OK SetWidthPercent(50); int numConflicts = (conflicts) ? conflicts->NumConflicts() : 0; - cString text; - if (numConflicts == 1) { - text = cString::sprintf("%s %s %s", tr("One"), tr("Timer Conflict"), tr("detected")); - } else { - text = cString::sprintf("%d %s %s", conflicts->NumConflicts(), tr("Timer Conflicts"), tr("detected")); - } - cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*text, true); - - for (int i=0; iGetConflict(i); if (!conflict) continue; - cString dateTime = DayDateTime(conflict->time); + const cString dateTime = DayDateTime(conflict->time); int numTimers = conflict->timerIDs.size(); - cString textConflict = cString::sprintf("%s: %s (%d %s)", tr("Show conflict"), *dateTime, numTimers, tr("timers involved")); - bool isActive = (i==0)?true:false; - AddMenuItem(new cRecMenuItemButton(*textConflict, rmsTimerConflict, isActive)); + AddMenuItem(new cRecMenuItemButton(cString::sprintf("%s: %s (%d %s)", + tr("Show conflict"), + *dateTime, + numTimers, + tr("timers involved")), + rmsTimerConflict, (i == 0) ? true : false)); } - - SetWidthPixel(CalculateOptimalWidth() + 4*border); - infoItem->CalculateHeight(width - 2 * border); - SetHeader(infoItem); - AddMenuItem(new cRecMenuItemButton(tr("Ignore Conflicts"), rmsClose, false)); - + + SetWidthPixel(CalculateOptimalWidth() + 4 * border); + CalculateHeight(); CreatePixmap(); Arrange();