From cd33c3dfe2a9d65cf1711f6422d100920f7b5f15 Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 27 Apr 2014 15:33:25 +0200 Subject: cleaned up and restructured setup menu --- HISTORY | 1 + config.c | 5 --- po/ca_ES.po | 128 ++++++++++++++++++++++++++++++++++-------------------------- po/de_DE.po | 128 ++++++++++++++++++++++++++++++++++-------------------------- po/it_IT.po | 123 ++++++++++++++++++++++++++++++++------------------------- po/sk_SK.po | 128 ++++++++++++++++++++++++++++++++++-------------------------- setup.c | 56 ++++++++++++++------------ setup.h | 10 ++++- 8 files changed, 328 insertions(+), 251 deletions(-) diff --git a/HISTORY b/HISTORY index cbe4b27..768bf3e 100644 --- a/HISTORY +++ b/HISTORY @@ -425,3 +425,4 @@ Version 1.1.2 - fixed naming of reruns tab when displaying recordings - scroll speed with up / down configurable (lines per click) - fixed bug that floating text is not shown completely +- cleaned up and restructured setup menu diff --git a/config.c b/config.c index 982112b..77df707 100644 --- a/config.c +++ b/config.c @@ -63,13 +63,8 @@ void cNopacityConfig::LoadDefaults(void) { conf.insert(std::pair("narrowTimerMenu", 1)); conf.insert(std::pair("narrowRecordingMenu", 1)); conf.insert(std::pair("narrowSetupMenu", 1)); - conf.insert(std::pair("displayRerunsDetailEPGView", 1)); conf.insert(std::pair("numReruns", 5)); conf.insert(std::pair("useSubtitleRerun", 1)); - conf.insert(std::pair("displayAdditionalEPGPictures", 1)); - conf.insert(std::pair("numAdditionalEPGPictures", 9)); - conf.insert(std::pair("displayAdditionalRecEPGPictures", 1)); - conf.insert(std::pair("numAdditionalRecEPGPictures", 9)); conf.insert(std::pair("menuChannelDisplayMode", 0)); conf.insert(std::pair("menuChannelDisplayTime", 1)); conf.insert(std::pair("numEPGEntriesChannelsMenu", 15)); diff --git a/po/ca_ES.po b/po/ca_ES.po index d616f60..6fbb658 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 14:25+0200\n" +"POT-Creation-Date: 2014-04-27 15:27+0200\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Gabychan \n" "Language-Team: \n" @@ -197,6 +197,9 @@ msgstr "Menu VDR: Menú timer" msgid "VDR Menu: Recordings Menu" msgstr "Menu VDR: Menu gravacions" +msgid "VDR Menu: Detailed EPG & Recordings View" +msgstr "" + msgid "Channel Switching" msgstr "Canvi de canal" @@ -383,18 +386,6 @@ msgstr "Alçada logo capçalera" msgid "Adjust Font Size - Menu Items" msgstr "Ajusta mida de la font - Elements de menú" -msgid "never" -msgstr "mai" - -msgid "if exists" -msgstr "si existeix" - -msgid "always" -msgstr "sempre" - -msgid "only if no tvscraper media available" -msgstr "Sols si tvscraper media no disponible" - msgid "window" msgstr "finestre" @@ -422,42 +413,6 @@ msgstr "Velocitat desplaçament text finestra EPG" msgid "Height of EPG Info Window (Percent of OSD Height)" msgstr "Alçada Finestra Info EPG (% alçada OSD)" -msgid "Border around detailed EPG view" -msgstr "Vora al voltant de vista detallada EPG" - -msgid "Detailed EPG view Scroll Speed (number of lines)" -msgstr "" - -msgid "Header Height detailed EPG view (Perc. of OSD Height)" -msgstr "" - -msgid "Display Reruns in detailed EPG View" -msgstr "Mostra Reemissions a vista detallada EPG" - -msgid "Number of reruns to display" -msgstr "Nombre de reemissions a mostrar" - -msgid "Use Subtitle for reruns" -msgstr "Utilitza subtítols a les reemissions" - -msgid "Display additional EPG Pictures in detailed EPG View" -msgstr "Mostra imatges addicionals a vista detallada EPG" - -msgid "Number of EPG pictures to display" -msgstr "Nombre d'imatges EPG a mostrar" - -msgid "Detail EPG View EPG Image Width" -msgstr "Amplada imatges a vista detallada EPG" - -msgid "Detail EPG View EPG Image Height" -msgstr "Alçada imatges a vista detallada EPG" - -msgid "Detail EPG View additional EPG Image Width" -msgstr "Amplada imatges addicionals a vista detallada EPG" - -msgid "Detail EPG View additional EPG Image Height" -msgstr "Alçada imatges addicionals a vista detallada EPG" - msgid "Adjust Font Size - Menu Item" msgstr "Ajusta mida de la Font - Element de menú" @@ -488,18 +443,21 @@ msgstr "Veure horaris amb informació en temps" msgid "Number of EPG Entries in Schedules Info Window" msgstr "Nombre d'entrades EPG a la Finestra de Programació" +msgid "never" +msgstr "mai" + +msgid "always" +msgstr "sempre" + +msgid "only if no tvscraper media available" +msgstr "Sols si tvscraper media no disponible" + msgid "Mode of recording Window" msgstr "Mode de gravació" msgid "Border around detailed recording view" msgstr "Vora al voltant de vista registre detallat" -msgid "Header Height detailed recording view (Perc. of OSD Height)" -msgstr "" - -msgid "Display additional EPG Pictures in detailed recording View" -msgstr "Mostra imatges EPG addicionals a vista detallada gravacions" - msgid "Use folder poster if available" msgstr "Utilitzeu carpeta cartell si està disponible" @@ -509,6 +467,39 @@ msgstr "Ample del cartell de gravació ajustat manualment" msgid "Height of manually set recording poster" msgstr "Alçada del cartell de gravació ajustat manualment" +msgid "if exists" +msgstr "si existeix" + +msgid "Border around view" +msgstr "" + +msgid "Scroll Speed with up / down (number of lines)" +msgstr "" + +msgid "Header Height detailed EPG view (Perc. of OSD Height)" +msgstr "" + +msgid "Header Height detailed recording view (Perc. of OSD Height)" +msgstr "" + +msgid "Number of reruns to display" +msgstr "Nombre de reemissions a mostrar" + +msgid "Use Subtitle for reruns" +msgstr "Utilitza subtítols a les reemissions" + +msgid "EPG Image Width" +msgstr "" + +msgid "EPG Image Height" +msgstr "" + +msgid "Large EPG Image Width" +msgstr "" + +msgid "Large EPG Image Height" +msgstr "" + msgid "transparent channel logo" msgstr "Logo del canal transparent" @@ -662,6 +653,33 @@ msgstr "conflicte" msgid "conflicts" msgstr "conflictes" +#~ msgid "Display additional EPG Pictures in detailed recording View" +#~ msgstr "Mostra imatges EPG addicionals a vista detallada gravacions" + +#~ msgid "Number of EPG pictures to display" +#~ msgstr "Nombre d'imatges EPG a mostrar" + +#~ msgid "Border around detailed EPG view" +#~ msgstr "Vora al voltant de vista detallada EPG" + +#~ msgid "Display Reruns in detailed EPG View" +#~ msgstr "Mostra Reemissions a vista detallada EPG" + +#~ msgid "Display additional EPG Pictures in detailed EPG View" +#~ msgstr "Mostra imatges addicionals a vista detallada EPG" + +#~ msgid "Detail EPG View EPG Image Width" +#~ msgstr "Amplada imatges a vista detallada EPG" + +#~ msgid "Detail EPG View EPG Image Height" +#~ msgstr "Alçada imatges a vista detallada EPG" + +#~ msgid "Detail EPG View additional EPG Image Width" +#~ msgstr "Amplada imatges addicionals a vista detallada EPG" + +#~ msgid "Detail EPG View additional EPG Image Height" +#~ msgstr "Alçada imatges addicionals a vista detallada EPG" + #~ msgid "RERUNS OF THIS SHOW" #~ msgstr "REEMISSIONS" diff --git a/po/de_DE.po b/po/de_DE.po index 365a4ef..0042455 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 14:25+0200\n" +"POT-Creation-Date: 2014-04-27 15:27+0200\n" "PO-Revision-Date: 2012-11-11 17:49+0200\n" "Last-Translator: louis\n" "Language-Team: \n" @@ -194,6 +194,9 @@ msgstr "VDR Menü: Timer Menü" msgid "VDR Menu: Recordings Menu" msgstr "VDR Menü: Aufzeichnungs Menü" +msgid "VDR Menu: Detailed EPG & Recordings View" +msgstr "Detaillierte EPG- & Aufnahmeansicht" + msgid "Channel Switching" msgstr "Kanalwechsel" @@ -380,18 +383,6 @@ msgstr "Header Logo Höhe" msgid "Adjust Font Size - Menu Items" msgstr "Schriftgröße anpassen - Menüelemente" -msgid "never" -msgstr "nie" - -msgid "if exists" -msgstr "falls vorhanden" - -msgid "always" -msgstr "immer" - -msgid "only if no tvscraper media available" -msgstr "falls keine tvscraper medien verfügbar" - msgid "window" msgstr "Fenster" @@ -419,42 +410,6 @@ msgstr "Text Scroll Geschwindigkeit des EPG Fensters" msgid "Height of EPG Info Window (Percent of OSD Height)" msgstr "Höhe des EPG Info Fensters (% der OSD Höhe)" -msgid "Border around detailed EPG view" -msgstr "Rahmen um detailierte EPG Ansicht" - -msgid "Detailed EPG view Scroll Speed (number of lines)" -msgstr "" - -msgid "Header Height detailed EPG view (Perc. of OSD Height)" -msgstr "Header Höhe im det. EPG Ansicht (% OSD Höhe)" - -msgid "Display Reruns in detailed EPG View" -msgstr "Wiederholungen in der detailierten EPG Ansicht anzeigen" - -msgid "Number of reruns to display" -msgstr "Anzahl der dargestellten Wiederholungen" - -msgid "Use Subtitle for reruns" -msgstr "Untertitel für Wiederholungssuche nutzen" - -msgid "Display additional EPG Pictures in detailed EPG View" -msgstr "Weitere EPG Bilder in der detaillierten EPG Ansicht anzeigen" - -msgid "Number of EPG pictures to display" -msgstr "Anzahl der zusätzlichen EPG Bilder" - -msgid "Detail EPG View EPG Image Width" -msgstr "Breite der EPG Bilder in der EPG Detailanzeige" - -msgid "Detail EPG View EPG Image Height" -msgstr "Höhe der EPG Bilder in der EPG Detailanzeige" - -msgid "Detail EPG View additional EPG Image Width" -msgstr "Breite der zusätzlichen EPG Bilder" - -msgid "Detail EPG View additional EPG Image Height" -msgstr "Höhe der zusätzlichen EPG Bilder" - msgid "Adjust Font Size - Menu Item" msgstr "Schriftgröße anpassen - Menüelement" @@ -485,18 +440,21 @@ msgstr "Programm mit Zeitinformation anzeigen" msgid "Number of EPG Entries in Schedules Info Window" msgstr "Anzahl der EPG Einträge im Programm Info Fenster" +msgid "never" +msgstr "nie" + +msgid "always" +msgstr "immer" + +msgid "only if no tvscraper media available" +msgstr "falls keine tvscraper medien verfügbar" + msgid "Mode of recording Window" msgstr "Aufnahme Fenster Modus" msgid "Border around detailed recording view" msgstr "Rahmen um detailierte Aufnahmeansicht" -msgid "Header Height detailed recording view (Perc. of OSD Height)" -msgstr "Header Höhe in der det. Aufnahmeansicht (% der OSD Höhe)" - -msgid "Display additional EPG Pictures in detailed recording View" -msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen" - msgid "Use folder poster if available" msgstr "Zeige Poster für Ordner falls verfügbar" @@ -506,6 +464,39 @@ msgstr "Breite der manuell gesetzen Poster" msgid "Height of manually set recording poster" msgstr "Höhe der manuell gesetzten Poster" +msgid "if exists" +msgstr "falls vorhanden" + +msgid "Border around view" +msgstr "Rahmen um Ansicht" + +msgid "Scroll Speed with up / down (number of lines)" +msgstr "Scroll Geschwindigkeit mit hoch / runter (Anz. Zeilen)" + +msgid "Header Height detailed EPG view (Perc. of OSD Height)" +msgstr "Header Höhe in det. EPG Ansicht (% OSD Höhe)" + +msgid "Header Height detailed recording view (Perc. of OSD Height)" +msgstr "Header Höhe in det. Aufnahmeansicht (% der OSD Höhe)" + +msgid "Number of reruns to display" +msgstr "Anzahl der dargestellten Wiederholungen" + +msgid "Use Subtitle for reruns" +msgstr "Untertitel für Wiederholungssuche nutzen" + +msgid "EPG Image Width" +msgstr "EPG Bild Breite" + +msgid "EPG Image Height" +msgstr "EPG Bild Höhe" + +msgid "Large EPG Image Width" +msgstr "Großes EPG Bild Breite" + +msgid "Large EPG Image Height" +msgstr "Großes EPG Bild Höhe" + msgid "transparent channel logo" msgstr "Kanallogo transparent" @@ -659,6 +650,33 @@ msgstr "Konflikt" msgid "conflicts" msgstr "Konflikte" +#~ msgid "Display additional EPG Pictures in detailed recording View" +#~ msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen" + +#~ msgid "Number of EPG pictures to display" +#~ msgstr "Anzahl der zusätzlichen EPG Bilder" + +#~ msgid "Border around detailed EPG view" +#~ msgstr "Rahmen um detailierte EPG Ansicht" + +#~ msgid "Display Reruns in detailed EPG View" +#~ msgstr "Wiederholungen in der detailierten EPG Ansicht anzeigen" + +#~ msgid "Display additional EPG Pictures in detailed EPG View" +#~ msgstr "Weitere EPG Bilder in der detaillierten EPG Ansicht anzeigen" + +#~ msgid "Detail EPG View EPG Image Width" +#~ msgstr "Breite der EPG Bilder in der EPG Detailanzeige" + +#~ msgid "Detail EPG View EPG Image Height" +#~ msgstr "Höhe der EPG Bilder in der EPG Detailanzeige" + +#~ msgid "Detail EPG View additional EPG Image Width" +#~ msgstr "Breite der zusätzlichen EPG Bilder" + +#~ msgid "Detail EPG View additional EPG Image Height" +#~ msgstr "Höhe der zusätzlichen EPG Bilder" + #~ msgid "RERUNS OF THIS SHOW" #~ msgstr "Wiederholungen dieser Sendung" diff --git a/po/it_IT.po b/po/it_IT.po index ba64246..9e602f5 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: skinnopacity 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 14:25+0200\n" +"POT-Creation-Date: 2014-04-27 15:27+0200\n" "PO-Revision-Date: 2013-03-19 22:56+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -197,6 +197,9 @@ msgstr "Menu VDR: Menu timer" msgid "VDR Menu: Recordings Menu" msgstr "Menu VDR: Menu registrazioni" +msgid "VDR Menu: Detailed EPG & Recordings View" +msgstr "" + msgid "Channel Switching" msgstr "Cambio canale" @@ -383,18 +386,6 @@ msgstr "Altezza logo intestazione" msgid "Adjust Font Size - Menu Items" msgstr "Adatta dim. caratteri - Voci menu" -msgid "never" -msgstr "mai" - -msgid "if exists" -msgstr "se esiste" - -msgid "always" -msgstr "sempre" - -msgid "only if no tvscraper media available" -msgstr "" - msgid "window" msgstr "" @@ -422,42 +413,6 @@ msgstr "Velocità scorrimento testo finestra EPG" msgid "Height of EPG Info Window (Percent of OSD Height)" msgstr "Altezza di Finestra info EPG (% altezza OSD)" -msgid "Border around detailed EPG view" -msgstr "" - -msgid "Detailed EPG view Scroll Speed (number of lines)" -msgstr "" - -msgid "Header Height detailed EPG view (Perc. of OSD Height)" -msgstr "" - -msgid "Display Reruns in detailed EPG View" -msgstr "Mostra repliche in vista dettagli EPG" - -msgid "Number of reruns to display" -msgstr "Numero di repliche da mostrare" - -msgid "Use Subtitle for reruns" -msgstr "Usa sottotitoli per repliche" - -msgid "Display additional EPG Pictures in detailed EPG View" -msgstr "Mostra immagini EPG aggiuntivo in vista dettagli EPG" - -msgid "Number of EPG pictures to display" -msgstr "Numero di immagini EPG da mostrare" - -msgid "Detail EPG View EPG Image Width" -msgstr "Larghezza immagine vista dettagli EPG" - -msgid "Detail EPG View EPG Image Height" -msgstr "Altezza immagine vista dettagli EPG" - -msgid "Detail EPG View additional EPG Image Width" -msgstr "Larghezza immagine EPG aggiuntivo vista dettagli EPG" - -msgid "Detail EPG View additional EPG Image Height" -msgstr "Altezza immagine EPG aggiuntivo vista dettagli EPG" - msgid "Adjust Font Size - Menu Item" msgstr "Adatta dim. caratteri - Voce menu" @@ -488,25 +443,61 @@ msgstr "" msgid "Number of EPG Entries in Schedules Info Window" msgstr "" +msgid "never" +msgstr "mai" + +msgid "always" +msgstr "sempre" + +msgid "only if no tvscraper media available" +msgstr "" + msgid "Mode of recording Window" msgstr "" msgid "Border around detailed recording view" msgstr "" +msgid "Use folder poster if available" +msgstr "" + +msgid "Width of manually set recording poster" +msgstr "" + +msgid "Height of manually set recording poster" +msgstr "" + +msgid "if exists" +msgstr "se esiste" + +msgid "Border around view" +msgstr "" + +msgid "Scroll Speed with up / down (number of lines)" +msgstr "" + +msgid "Header Height detailed EPG view (Perc. of OSD Height)" +msgstr "" + msgid "Header Height detailed recording view (Perc. of OSD Height)" msgstr "" -msgid "Display additional EPG Pictures in detailed recording View" -msgstr "Mostra immagini EPG aggiuntivo nella vista dettagli registrazione" +msgid "Number of reruns to display" +msgstr "Numero di repliche da mostrare" -msgid "Use folder poster if available" +msgid "Use Subtitle for reruns" +msgstr "Usa sottotitoli per repliche" + +msgid "EPG Image Width" msgstr "" -msgid "Width of manually set recording poster" +msgid "EPG Image Height" msgstr "" -msgid "Height of manually set recording poster" +msgid "Large EPG Image Width" +msgstr "" + +msgid "Large EPG Image Height" msgstr "" msgid "transparent channel logo" @@ -662,5 +653,29 @@ msgstr "conflitto" msgid "conflicts" msgstr "conflitti" +#~ msgid "Display additional EPG Pictures in detailed recording View" +#~ msgstr "Mostra immagini EPG aggiuntivo nella vista dettagli registrazione" + +#~ msgid "Number of EPG pictures to display" +#~ msgstr "Numero di immagini EPG da mostrare" + +#~ msgid "Display Reruns in detailed EPG View" +#~ msgstr "Mostra repliche in vista dettagli EPG" + +#~ msgid "Display additional EPG Pictures in detailed EPG View" +#~ msgstr "Mostra immagini EPG aggiuntivo in vista dettagli EPG" + +#~ msgid "Detail EPG View EPG Image Width" +#~ msgstr "Larghezza immagine vista dettagli EPG" + +#~ msgid "Detail EPG View EPG Image Height" +#~ msgstr "Altezza immagine vista dettagli EPG" + +#~ msgid "Detail EPG View additional EPG Image Width" +#~ msgstr "Larghezza immagine EPG aggiuntivo vista dettagli EPG" + +#~ msgid "Detail EPG View additional EPG Image Height" +#~ msgstr "Altezza immagine EPG aggiuntivo vista dettagli EPG" + #~ msgid "RERUNS OF THIS SHOW" #~ msgstr "REPLICHE DI QUESTO SPETTACOLO" diff --git a/po/sk_SK.po b/po/sk_SK.po index 98fc397..dc93035 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinnopacity\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-27 14:25+0200\n" +"POT-Creation-Date: 2014-04-27 15:27+0200\n" "PO-Revision-Date: 2013-11-11 20:52+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -194,6 +194,9 @@ msgstr "VDR ponuka: Pl msgid "VDR Menu: Recordings Menu" msgstr "VDR ponuka: Nahrávky" +msgid "VDR Menu: Detailed EPG & Recordings View" +msgstr "" + msgid "Channel Switching" msgstr "Prepínanie kanálu" @@ -380,18 +383,6 @@ msgstr "V msgid "Adjust Font Size - Menu Items" msgstr "Nastavenie veµkosti písma - Polo¾ky menu" -msgid "never" -msgstr "nikdy" - -msgid "if exists" -msgstr "ak je k dispozícii" - -msgid "always" -msgstr "v¾dy" - -msgid "only if no tvscraper media available" -msgstr "iba ak je tvscraper dostupný" - msgid "window" msgstr "v okienku" @@ -419,42 +410,6 @@ msgstr "R msgid "Height of EPG Info Window (Percent of OSD Height)" msgstr "Vý¹ka informaèného EPG okna (Percent z OSD vý¹ky)" -msgid "Border around detailed EPG view" -msgstr "Okraj okolo podrobného zobrazenia EPG" - -msgid "Detailed EPG view Scroll Speed (number of lines)" -msgstr "" - -msgid "Header Height detailed EPG view (Perc. of OSD Height)" -msgstr "" - -msgid "Display Reruns in detailed EPG View" -msgstr "Zobrazi» reprízy v podrobnostiach EPG" - -msgid "Number of reruns to display" -msgstr "Poèet repríz na zobrazenie" - -msgid "Use Subtitle for reruns" -msgstr "Pou¾i» titulky pre reprízu" - -msgid "Display additional EPG Pictures in detailed EPG View" -msgstr "Zobrazi» viac obrázkov v podrobnostiach EPG" - -msgid "Number of EPG pictures to display" -msgstr "Poèet EPG obrázkov na obrazovke" - -msgid "Detail EPG View EPG Image Width" -msgstr "©írka obrázku v podrobnom zobrazení EPG" - -msgid "Detail EPG View EPG Image Height" -msgstr "Vý¹ka obrázku v podrobnom zobrazení EPG" - -msgid "Detail EPG View additional EPG Image Width" -msgstr "©írka ïal¹ieho obrázku v podrobnom zobrazení EPG" - -msgid "Detail EPG View additional EPG Image Height" -msgstr "Vý¹ka ïal¹ieho obrázku v podrobnom zobrazení EPG" - msgid "Adjust Font Size - Menu Item" msgstr "Nastavenie veµkosti písma - polo¾ky ponuky" @@ -485,18 +440,21 @@ msgstr "Zobrazi msgid "Number of EPG Entries in Schedules Info Window" msgstr "Poèet EPG polo¾iek v okne TV programu" +msgid "never" +msgstr "nikdy" + +msgid "always" +msgstr "v¾dy" + +msgid "only if no tvscraper media available" +msgstr "iba ak je tvscraper dostupný" + msgid "Mode of recording Window" msgstr "Spôsob zobrazenia okna nahrávok" msgid "Border around detailed recording view" msgstr "Okraj okolo podrobného zobrazenia nahrávky" -msgid "Header Height detailed recording view (Perc. of OSD Height)" -msgstr "" - -msgid "Display additional EPG Pictures in detailed recording View" -msgstr "Zobrazi» ïal¹ie EPG obrázky v podrobnom zobrazení nahrávky" - msgid "Use folder poster if available" msgstr "Pou¾i» zlo¾ku plagát ak je k dispozícii" @@ -506,6 +464,39 @@ msgstr "Ru msgid "Height of manually set recording poster" msgstr "Ruène nastavi» vý¹ku plagátov nahrávok" +msgid "if exists" +msgstr "ak je k dispozícii" + +msgid "Border around view" +msgstr "" + +msgid "Scroll Speed with up / down (number of lines)" +msgstr "" + +msgid "Header Height detailed EPG view (Perc. of OSD Height)" +msgstr "" + +msgid "Header Height detailed recording view (Perc. of OSD Height)" +msgstr "" + +msgid "Number of reruns to display" +msgstr "Poèet repríz na zobrazenie" + +msgid "Use Subtitle for reruns" +msgstr "Pou¾i» titulky pre reprízu" + +msgid "EPG Image Width" +msgstr "" + +msgid "EPG Image Height" +msgstr "" + +msgid "Large EPG Image Width" +msgstr "" + +msgid "Large EPG Image Height" +msgstr "" + msgid "transparent channel logo" msgstr "priesvitné logo kanálu" @@ -659,6 +650,33 @@ msgstr "konflikt" msgid "conflicts" msgstr "konflikty" +#~ msgid "Display additional EPG Pictures in detailed recording View" +#~ msgstr "Zobrazi» ïal¹ie EPG obrázky v podrobnom zobrazení nahrávky" + +#~ msgid "Number of EPG pictures to display" +#~ msgstr "Poèet EPG obrázkov na obrazovke" + +#~ msgid "Border around detailed EPG view" +#~ msgstr "Okraj okolo podrobného zobrazenia EPG" + +#~ msgid "Display Reruns in detailed EPG View" +#~ msgstr "Zobrazi» reprízy v podrobnostiach EPG" + +#~ msgid "Display additional EPG Pictures in detailed EPG View" +#~ msgstr "Zobrazi» viac obrázkov v podrobnostiach EPG" + +#~ msgid "Detail EPG View EPG Image Width" +#~ msgstr "©írka obrázku v podrobnom zobrazení EPG" + +#~ msgid "Detail EPG View EPG Image Height" +#~ msgstr "Vý¹ka obrázku v podrobnom zobrazení EPG" + +#~ msgid "Detail EPG View additional EPG Image Width" +#~ msgstr "©írka ïal¹ieho obrázku v podrobnom zobrazení EPG" + +#~ msgid "Detail EPG View additional EPG Image Height" +#~ msgstr "Vý¹ka ïal¹ieho obrázku v podrobnom zobrazení EPG" + #~ msgid "RERUNS OF THIS SHOW" #~ msgstr "Repríza" diff --git a/setup.c b/setup.c index d7c219a..d05be4e 100644 --- a/setup.c +++ b/setup.c @@ -29,6 +29,7 @@ void cNopacitySetup::Setup(void) { Add(new cOsdItem(tr("VDR Menu: Channels Menu"))); Add(new cOsdItem(tr("VDR Menu: Timers Menu"))); Add(new cOsdItem(tr("VDR Menu: Recordings Menu"))); + Add(new cOsdItem(tr("VDR Menu: Detailed EPG & Recordings View"))); Add(new cOsdItem(tr("Channel Switching"))); Add(new cOsdItem(tr("Replay"))); Add(new cOsdItem(tr("Audio Tracks"))); @@ -59,6 +60,8 @@ eOSState cNopacitySetup::ProcessKey(eKeys Key) { state = AddSubMenu(new cNopacitySetupMenuDisplayTimers(&tmpConf)); if (strcmp(ItemText, tr("VDR Menu: Recordings Menu")) == 0) state = AddSubMenu(new cNopacitySetupMenuDisplayRecordings(&tmpConf)); + if (strcmp(ItemText, tr("VDR Menu: Detailed EPG & Recordings View")) == 0) + state = AddSubMenu(new cNopacitySetupDetailedView(&tmpConf)); if (strcmp(ItemText, tr("Channel Switching")) == 0) state = AddSubMenu(new cNopacitySetupChannelDisplay(&tmpConf)); if (strcmp(ItemText, tr("Replay")) == 0) @@ -222,16 +225,10 @@ void cNopacitySetupMenuDisplayMain::Set(void) { //-----MenuDisplay Schedules Menu ------------------------------------------------------------------------------------------------------------- cNopacitySetupMenuDisplaySchedules::cNopacitySetupMenuDisplaySchedules(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Schedules Menu"), data) { - useSubtitleRerunTexts[0] = tr("never"); - useSubtitleRerunTexts[1] = tr("if exists"); - useSubtitleRerunTexts[2] = tr("always"); scrollSpeed[0] = tr("off"); scrollSpeed[1] = tr("slow"); scrollSpeed[2] = tr("medium"); scrollSpeed[3] = tr("fast"); - displayEPGPictures[0] = tr("never"); - displayEPGPictures[1] = tr("always"); - displayEPGPictures[2] = tr("only if no tvscraper media available"); windowMode[0] = tr("window"); windowMode[1] = tr("full screen"); Set(); @@ -251,21 +248,6 @@ void cNopacitySetupMenuDisplaySchedules::Set(void) { Add(new cMenuEditIntItem(tr("EPG Window Scroll Delay in s"), tmpConf->GetValueRef("menuInfoScrollDelay"), 0, 10)); Add(new cMenuEditStraItem(tr("EPG Window Text Scrolling Speed"), tmpConf->GetValueRef("menuInfoScrollSpeed"), 4, scrollSpeed)); Add(new cMenuEditIntItem(tr("Height of EPG Info Window (Percent of OSD Height)"), tmpConf->GetValueRef("menuHeightInfoWindow"), 10, 100)); - Add(new cMenuEditIntItem(tr("Border around detailed EPG view"), tmpConf->GetValueRef("borderDetailedEPG"), 1, 300)); - Add(new cMenuEditIntItem(tr("Detailed EPG view Scroll Speed (number of lines)"), tmpConf->GetValueRef("detailedViewScrollStep"), 1, 30)); - Add(new cMenuEditIntItem(tr("Header Height detailed EPG view (Perc. of OSD Height)"), tmpConf->GetValueRef("headerDetailedEPG"), 10, 50)); - Add(new cMenuEditBoolItem(tr("Display Reruns in detailed EPG View"), tmpConf->GetValueRef("displayRerunsDetailEPGView"))); - if (tmpConf->GetValue("displayRerunsDetailEPGView")) { - Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of reruns to display")), tmpConf->GetValueRef("numReruns"), 1, 10)); - Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Use Subtitle for reruns")), tmpConf->GetValueRef("useSubtitleRerun"), 3, useSubtitleRerunTexts)); - } - Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed EPG View"), tmpConf->GetValueRef("displayAdditionalEPGPictures"), 3, displayEPGPictures)); - if (tmpConf->GetValue("displayAdditionalEPGPictures")) - Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), tmpConf->GetValueRef("numAdditionalEPGPictures"), 1, 9)); - Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Width"), tmpConf->GetValueRef("epgImageWidth"), 30, 500)); - Add(new cMenuEditIntItem(tr("Detail EPG View EPG Image Height"), tmpConf->GetValueRef("epgImageHeight"), 30, 500)); - Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Width"), tmpConf->GetValueRef("epgImageWidthLarge"), 100, 800)); - Add(new cMenuEditIntItem(tr("Detail EPG View additional EPG Image Height"), tmpConf->GetValueRef("epgImageHeightLarge"), 100, 800)); Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), tmpConf->GetValueRef("fontMenuitemSchedule"), -20, 20)); Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item Small"), tmpConf->GetValueRef("fontMenuitemScheduleSmall"), -20, 20)); Add(new cMenuEditIntItem(tr("Adjust Font Size - EPG Info Window"), tmpConf->GetValueRef("fontEPGInfoWindow"), -20, 20)); @@ -347,10 +329,6 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) { Add(new cMenuEditIntItem(tr("Number of entires per page"), tmpConf->GetValueRef("numRecordingsMenuItems"), 3, 20)); Add(new cMenuEditStraItem(tr("Mode of recording Window"), tmpConf->GetValueRef("menuRecordingsWindowMode"), 2, windowMode)); Add(new cMenuEditIntItem(tr("Border around detailed recording view"), tmpConf->GetValueRef("borderDetailedRecordings"), 1, 300)); - Add(new cMenuEditIntItem(tr("Header Height detailed recording view (Perc. of OSD Height)"), tmpConf->GetValueRef("headerDetailedRecordings"), 10, 50)); - Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed recording View"), tmpConf->GetValueRef("displayAdditionalRecEPGPictures"), 3, displayEPGPictures)); - if (tmpConf->GetValue("displayAdditionalRecEPGPictures")) - Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), tmpConf->GetValueRef("numAdditionalRecEPGPictures"), 1, 9)); Add(new cMenuEditBoolItem(tr("Use folder poster if available"), tmpConf->GetValueRef("useFolderPoster"))); Add(new cMenuEditIntItem(tr("Width of manually set recording poster"), tmpConf->GetValueRef("posterWidth"), 100, 1000)); Add(new cMenuEditIntItem(tr("Height of manually set recording poster"), tmpConf->GetValueRef("posterHeight"), 100, 1000)); @@ -361,6 +339,34 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) { Display(); } +//-----MenuDisplay Detailed EPG & Recordings View ------------------------------------------------------------------------------------------------------------- + +cNopacitySetupDetailedView::cNopacitySetupDetailedView(cNopacityConfig* data) : cMenuSetupSubMenu(tr("VDR Menu: Detailed EPG & Recordings View"), data) { + useSubtitleRerunTexts[0] = tr("never"); + useSubtitleRerunTexts[1] = tr("if exists"); + useSubtitleRerunTexts[2] = tr("always"); + Set(); +} + +void cNopacitySetupDetailedView::Set(void) { + int currentItem = Current(); + Clear(); + + Add(new cMenuEditIntItem(tr("Border around view"), tmpConf->GetValueRef("borderDetailedEPG"), 1, 300)); + Add(new cMenuEditIntItem(tr("Scroll Speed with up / down (number of lines)"), tmpConf->GetValueRef("detailedViewScrollStep"), 1, 30)); + Add(new cMenuEditIntItem(tr("Header Height detailed EPG view (Perc. of OSD Height)"), tmpConf->GetValueRef("headerDetailedEPG"), 10, 50)); + Add(new cMenuEditIntItem(tr("Header Height detailed recording view (Perc. of OSD Height)"), tmpConf->GetValueRef("headerDetailedRecordings"), 10, 50)); + Add(new cMenuEditIntItem(tr("Number of reruns to display"), tmpConf->GetValueRef("numReruns"), 1, 10)); + Add(new cMenuEditStraItem(tr("Use Subtitle for reruns"), tmpConf->GetValueRef("useSubtitleRerun"), 3, useSubtitleRerunTexts)); + Add(new cMenuEditIntItem(tr("EPG Image Width"), tmpConf->GetValueRef("epgImageWidth"), 30, 500)); + Add(new cMenuEditIntItem(tr("EPG Image Height"), tmpConf->GetValueRef("epgImageHeight"), 30, 500)); + Add(new cMenuEditIntItem(tr("Large EPG Image Width"), tmpConf->GetValueRef("epgImageWidthLarge"), 100, 800)); + Add(new cMenuEditIntItem(tr("Large EPG Image Height"), tmpConf->GetValueRef("epgImageHeightLarge"), 100, 800)); + + SetCurrent(Get(currentItem)); + Display(); +} + //----ChannelDisplay-------------------------------------------------------------------------------------------------------------- cNopacitySetupChannelDisplay::cNopacitySetupChannelDisplay(cNopacityConfig* data) : cMenuSetupSubMenu(tr("Channel Switching"), data) { diff --git a/setup.h b/setup.h index 6b5dc8a..081f716 100644 --- a/setup.h +++ b/setup.h @@ -54,9 +54,7 @@ class cNopacitySetupMenuDisplayMain : public cMenuSetupSubMenu { class cNopacitySetupMenuDisplaySchedules : public cMenuSetupSubMenu { protected: - const char *useSubtitleRerunTexts[3]; const char *scrollSpeed[4]; - const char *displayEPGPictures[3]; const char *windowMode[2]; void Set(void); public: @@ -88,6 +86,14 @@ class cNopacitySetupMenuDisplayRecordings : public cMenuSetupSubMenu { cNopacitySetupMenuDisplayRecordings(cNopacityConfig *data); }; +class cNopacitySetupDetailedView : public cMenuSetupSubMenu { + protected: + const char *useSubtitleRerunTexts[3]; + void Set(void); + public: + cNopacitySetupDetailedView(cNopacityConfig *data); +}; + class cNopacitySetupChannelDisplay : public cMenuSetupSubMenu { protected: const char *logoPos[3]; -- cgit v1.2.3