diff --git a/data/cables.xml b/data/cables.xml index dd193583c..e3963efc7 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -22,6 +22,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -510,6 +592,7 @@ + @@ -520,7 +603,7 @@ - + @@ -537,6 +620,7 @@ + @@ -1128,7 +1212,7 @@ - + @@ -1173,5 +1257,5 @@ - + diff --git a/data/locale/bayrisch.locale b/data/locale/bayrisch.locale index 2b6bf9c1d..76c8cb6a5 100644 --- a/data/locale/bayrisch.locale +++ b/data/locale/bayrisch.locale @@ -406,13 +406,10 @@ movieplayer.bookmark Vormerka movieplayer.bookmarkname Merkal Nama movieplayer.bookmarkname_hint1 Bitte gems den Nama fürs neie Merkal o. movieplayer.bookmarkname_hint2 movieplayer.skipping Umsortiern bitte wartn -movieplayer.dvdplayback DVD movieplayer.fileplayback Fuim mim VLC movieplayer.head Fuimspuia -movieplayer.pesplayback PES Abspuin (Experiment) movieplayer.toomanybookmarks Sie ham scho zvui Merkal oglegt.\nEs muas erst a andas glöscht wern. movieplayer.tsplayback TS Abspuin -movieplayer.vcdplayback (S)VCD movieplayer.vlchelp ROT/Hoam Stop\nGREA Resync\nGELB Pause/Weida\nBLAU Merkal setzn\n1 ca. 1 Minutn zruck\n3 ca. 1 Minutn viri\n4 ca. 5 Minutn zruck\n6 ca. 5 Minutn viri\n7 ca. 10 Minutn zruck\n9 ca. 10 Minutn viri\nHuif: http://www.giggo.de/dbox2/movieplayer.html\n networkmenu.broadcast Broadcast networkmenu.gateway Standard Gateway diff --git a/data/locale/bosanski.locale b/data/locale/bosanski.locale index 68f41d46e..f4fae5519 100644 --- a/data/locale/bosanski.locale +++ b/data/locale/bosanski.locale @@ -412,13 +412,10 @@ movieplayer.bookmark oznaka movieplayer.bookmarkname ime zapamcenog mjesta movieplayer.bookmarkname_hint1 Imenujte novo zapamceno mjesto movieplayer.bookmarkname_hint2 -movieplayer.dvdplayback dvd movieplayer.fileplayback datoteka preko vlcea movieplayer.head promatrač filmova -movieplayer.pesplayback odigrati pes (eksperimentalno) movieplayer.toomanybookmarks Previse mjesta su zapamcena.\nMora se prvo jedno drugo izbrisati. movieplayer.tsplayback odigrati ts -movieplayer.vcdplayback (s)vcd movieplayer.vlchelp crveno/kuci stop\nzeleno resync\nzuto pausa/dalje\nplavo zapamtiti mjesto\n1 oko 1 minuta nazad\n3 oko 1 minuta naprijed\n4 oko 5 minuta nazad\n6 oko5 minuta naprijed\n7 oko 10 minuta nazad\n9 oko 10 minuta naprijed\npomoc:http://www.giggo.de/dbox2/movieplayer.html\n networkmenu.broadcast broadcast networkmenu.gateway standard gateway diff --git a/data/locale/ch-baslerdeutsch.locale b/data/locale/ch-baslerdeutsch.locale index 18804c227..f8dc48a35 100644 --- a/data/locale/ch-baslerdeutsch.locale +++ b/data/locale/ch-baslerdeutsch.locale @@ -412,13 +412,10 @@ movieplayer.bookmark Bookmarks movieplayer.bookmarkname Bookmark Name movieplayer.bookmarkname_hint1 Gib de Name für's neue Bookmark ii movieplayer.bookmarkname_hint2 -movieplayer.dvdplayback DVD movieplayer.fileplayback Datei via VLC movieplayer.head Movieplayer -movieplayer.pesplayback PES Abspiele (Experimendell) movieplayer.toomanybookmarks D'hesch bereits z'viel Bookmarks a'glegt.\nEs mueß erscht e anderes g'löscht werde. movieplayer.tsplayback TS Abspiele -movieplayer.vcdplayback (S)VCD movieplayer.vlchelp ROT/Home Stop\nGRÜN Resync\nGELB Paus/Widdr\nBLAU Bookmark setze\nd-box Ziit iiblände\nv Sprung\n1 ca. 1 Minute zruck\n3 ca. 1 Minute vor\n4 ca. 5 Minute zruck\n6 ca. 5 Minute vor\n7 ca. 10 Minute zruck\n9 ca. 10 Minute vor\nHilfe: http://www.giggo.de/dbox2/movieplayer.html\n networkmenu.broadcast Broadcast networkmenu.gateway Standard Gateway diff --git a/data/locale/ch-berndeutsch.locale b/data/locale/ch-berndeutsch.locale index 1b48de70b..9c09925f5 100644 --- a/data/locale/ch-berndeutsch.locale +++ b/data/locale/ch-berndeutsch.locale @@ -460,7 +460,6 @@ movieplayer.bookmarkname Bookmark Name movieplayer.bookmarkname_hint1 Gib ä Name für's nöie Bookmark i. movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Datei via VLC movieplayer.head Movieplayer movieplayer.toomanybookmarks Du hesch scho zviu Bookmarks aagleit.\nEs muess zersch äs Angers glöscht wärde. @@ -478,7 +477,6 @@ movieplayer.tshelp8 ca. 5 Minute zrugg movieplayer.tshelp9 ca. 5 Minute vor movieplayer.tsplayback TS Abschpile movieplayer.tsplayback_pc TS Abschpiele mit PIN -movieplayer.vcdplayback (S)VCD networkmenu.broadcast Broadcast networkmenu.dhcp DHCP networkmenu.gateway Schtandard Gateway diff --git a/data/locale/czech.locale b/data/locale/czech.locale index 69c6d74e1..9c22e56a9 100644 --- a/data/locale/czech.locale +++ b/data/locale/czech.locale @@ -691,10 +691,8 @@ movieplayer.bookmarkname Název záložky movieplayer.bookmarkname_hint1 Vložení názvu movieplayer.bookmarkname_hint2 nové záložky? movieplayer.defplugin Startovací PLUGIN -movieplayer.dvdplayback DVD movieplayer.fileplayback Soubor přes VLC movieplayer.head Tvoření filmů -movieplayer.pesplayback Přehrávání PES movieplayer.toomanybookmarks Mnoho záložek.\nNejprve je potřebné jednu vymazat. movieplayer.tshelp1 Zastavení movieplayer.tshelp10 asi 10 min dozadu @@ -709,7 +707,6 @@ movieplayer.tshelp7 asi 1 min dopředu movieplayer.tshelp8 asi 5 min dozadu movieplayer.tshelp9 asi 5 min dopředu movieplayer.tsplayback Přehrát TS -movieplayer.vcdplayback (S)VCD networkmenu.broadcast Vysílání networkmenu.dhcp Převzetí z DHCP networkmenu.gateway Předvolená brána diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 9df964e96..2bc9bdebf 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -332,6 +332,7 @@ extra.fec_s2_qpsk_5_6 5/6 S2_QPSK extra.fec_s2_qpsk_7_8 7/8 S2_QPSK extra.fec_s2_qpsk_8_9 8/9 S2_QPSK extra.fec_s2_qpsk_9_10 9/10 S2_QPSK +extra.key_current_transponder Aktuelle Transponder Taste extra.key_list_end Listenende extra.key_list_start Listenanfang extra.key_plugin One-touch-Plugin @@ -892,10 +893,8 @@ movieplayer.bookmarkname Bookmark Name movieplayer.bookmarkname_hint1 Geben Sie den Namen für das neue Lesezeichen ein movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Abspielen (Multiformat) movieplayer.head Movieplayer -movieplayer.pesplayback PES Abspielen (experimentell) movieplayer.toomanybookmarks Sie haben bereits zu viele Lesezeichen angelegt.\nEs muß erst ein anderes gelöscht werden. movieplayer.tshelp1 Stopp movieplayer.tshelp10 ca. 10 Minuten zurück @@ -910,7 +909,6 @@ movieplayer.tshelp7 ca. 1 Minute vor movieplayer.tshelp8 ca. 5 Minuten zurück movieplayer.tshelp9 ca. 5 Minuten vor movieplayer.tsplayback TS Abspielen -movieplayer.vcdplayback (S)VCD mpkey.audio Audiotrack mpkey.bookmark Speichere Lesezeichen mpkey.forward Vorlauf @@ -1024,7 +1022,8 @@ personalize.menudisabledhint Das angeforderte Menü ist nicht aktiviert!\nNutzen personalize.notprotected nein personalize.notvisible nicht sichtbar personalize.pin PIN -personalize.pincode PIN Code +personalize.pin_in_use PIN-Zugang für Personalisierung +personalize.pincode Personalisierungs PIN personalize.pinhint Personalisierungs PIN Code eingeben personalize.pinprotect ja personalize.pinstatus mit PIN @@ -1191,7 +1190,15 @@ scrambled_channel Verschlüsselung aktiv screensetup.lowerright grün = Bildrand unten, rechts screensetup.upperleft rot = Bildrand oben, links screenshot.count Screenshot Anzahl +screenshot.cover Film Cover +screenshot.defdir Screenshot Dir. screenshot.format Screenshot Format +screenshot.info Screenshot Taste ist nicht belegt +screenshot.menu Screenshot +screenshot.osd OSD Auflösung +screenshot.scale Scale +screenshot.tv TV Auflösung +screenshot.video Screenshot mit Video Hintergrund servicemenu.getplugins Plugins neu laden servicemenu.getplugins_hint Plugins werden neu geladen,\nbitte warten... servicemenu.head Service diff --git a/data/locale/dutch.locale b/data/locale/dutch.locale index 60d0d9563..3f0f0f96f 100644 --- a/data/locale/dutch.locale +++ b/data/locale/dutch.locale @@ -499,13 +499,10 @@ movieplayer.bookmark Bookmarks movieplayer.bookmarkname Bookmarknaam movieplayer.bookmarkname_hint1 Geef een naam in voor je nieuwe bookmark movieplayer.bookmarkname_hint2 -movieplayer.dvdplayback DVD movieplayer.fileplayback File via VLC movieplayer.head Filmspeler -movieplayer.pesplayback Speel PES (Experimenteel) movieplayer.toomanybookmarks Er zijn teveel bookmarks.\nWis er eerst een van. movieplayer.tsplayback Speel TS -movieplayer.vcdplayback (S)VCD networkmenu.broadcast Broadcast networkmenu.dhcp DHCP networkmenu.gateway default gateway diff --git a/data/locale/english.locale b/data/locale/english.locale index 0eff7ef9d..bca36159c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -333,6 +333,7 @@ extra.fec_s2_qpsk_5_6 5/6 s2 qpsk extra.fec_s2_qpsk_7_8 7/8 s2 qpsk extra.fec_s2_qpsk_8_9 8/9 s2 qpsk extra.fec_s2_qpsk_9_10 9/10 s2 qpsk +extra.key_current_transponder Current Transponder Key extra.key_list_end end extra.key_list_start home extra.key_plugin One touch plugin @@ -893,10 +894,8 @@ movieplayer.bookmarkname Bookmarkname movieplayer.bookmarkname_hint1 Enter a name for your new bookmark movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback File play movieplayer.head Movieplayer -movieplayer.pesplayback Play PES (Experimental) movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first. movieplayer.tshelp1 Stop movieplayer.tshelp10 approx. 10 minutes back @@ -911,7 +910,6 @@ movieplayer.tshelp7 skip approx. 1 minute movieplayer.tshelp8 approx. 5 minutes back movieplayer.tshelp9 skip approx. 5 minutes movieplayer.tsplayback Play TS -movieplayer.vcdplayback (S)VCD mpkey.audio Audio track mpkey.bookmark save bookmark mpkey.forward Forward @@ -1025,7 +1023,8 @@ personalize.menudisabledhint The requested menu is currently disabled!\nFor acti personalize.notprotected No personalize.notvisible Not Visible personalize.pin PIN -personalize.pincode PIN Code +personalize.pin_in_use PIN access for personalize setup +personalize.pincode Personalization PIN personalize.pinhint Enter the Personalization PIN Code personalize.pinprotect Yes personalize.pinstatus Require PIN @@ -1193,7 +1192,15 @@ scrambled_channel Scrambled channel screensetup.lowerright green = setup lower right screensetup.upperleft red = setup upper left screenshot.count Screenshot count +screenshot.cover Movie Cover +screenshot.defdir Screenshot dir. screenshot.format Screenshot format +screenshot.info Screenshot Key is not used +screenshot.menu Screenshot +screenshot.osd OSD resolution +screenshot.scale Scale +screenshot.tv TV resolution +screenshot.video Screenshot with Video background servicemenu.getplugins Reload plugins servicemenu.getplugins_hint Reloading plugins,\nplease be patient. servicemenu.head Service diff --git a/data/locale/francais.locale b/data/locale/francais.locale index 1826554e0..3f3c8519d 100644 --- a/data/locale/francais.locale +++ b/data/locale/francais.locale @@ -451,14 +451,11 @@ movieplayer.bookmark Signet movieplayer.bookmarkname Nom du signet movieplayer.bookmarkname_hint1 Entrer un nom pour votre nouveau signet movieplayer.bookmarkname_hint2 -movieplayer.dvdplayback DVD movieplayer.fileplayback Fichier via VLC movieplayer.head Lecteur vidéo -movieplayer.pesplayback Lecture PES (Expérimental) movieplayer.toomanybookmarks Il y'a plusieurs signets.\nVous avez à éffacer l'un d'eux avant. movieplayer.tshelp Rouge/LAME(Exit)! Stop\nVERT Sélection piste audio\nJAUNE Pause/Continu\nBLEU Créer signet\nRécepteur montre progression\n1 approx. 1 minute arrière\n3 saut approx. 1 minute\n4 approx. 5 minutes arrière\n6 saut approx. 5 minutes\n7 approx. 10 minutes arrière\n9 skip approx. 10 minutes\nHelp: http://www.giggo.de/dbox2/movieplayer.html\n movieplayer.tsplayback Lecture TS -movieplayer.vcdplayback (S)VCD movieplayer.vlchelp Rouge/LAME(Exit)! Stop\nVERT Resync\nJAUNE Pause/Continu\nBLEU Créer signet\nRécepteur montre Progression\n1 approx. 1 minute arrière\n3 saut approx. 1 minute\n4 approx. 5 minutes arrière\n6 saut approx. 5 minutes\n7 approx. 10 minutes arrière\n9 saut approx. 10 minutes\nHelp: http://www.giggo.de/dbox2/movieplayer.html\n networkmenu.broadcast Transmisson networkmenu.dhcp DHCP diff --git a/data/locale/french.locale b/data/locale/french.locale index a13affd1c..ffc46481e 100644 --- a/data/locale/french.locale +++ b/data/locale/french.locale @@ -690,10 +690,8 @@ movieplayer.bookmarkname Nom du signet movieplayer.bookmarkname_hint1 Entrer un nom pour votre nouveau signet movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Fichier via VLC movieplayer.head Lecteur vidéo -movieplayer.pesplayback Lecture PES (Expérimental) movieplayer.toomanybookmarks Il y'a plusieurs signets.\nVous avez à éffacer l'un d'eux avant. movieplayer.tshelp1 Stop movieplayer.tshelp10 approx. 10 minutes back @@ -708,7 +706,6 @@ movieplayer.tshelp7 skip approx. 1 minute movieplayer.tshelp8 approx. 5 minutes back movieplayer.tshelp9 skip approx. 5 minutes movieplayer.tsplayback Lecture TS -movieplayer.vcdplayback (S)VCD mpkey.audio Audio track mpkey.bookmark save bookmark mpkey.forward Forward diff --git a/data/locale/hungarian.locale b/data/locale/hungarian.locale index e5e123754..6a79a5b89 100644 --- a/data/locale/hungarian.locale +++ b/data/locale/hungarian.locale @@ -850,10 +850,8 @@ movieplayer.bookmarkname könyvjelző neve movieplayer.bookmarkname_hint1 Kérem adjon nevet az új könyvjelzőnek! movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Fájlok lejátszása movieplayer.head Filmböngésző -movieplayer.pesplayback PES lejátszása (kísérleti) movieplayer.toomanybookmarks Túl sok könyvjelző.\nElőbb törölni kell egyet. movieplayer.tshelp1 Stop movieplayer.tshelp10 approx. 10 minutes back @@ -868,7 +866,6 @@ movieplayer.tshelp7 skip approx. 1 minute movieplayer.tshelp8 approx. 5 minutes back movieplayer.tshelp9 skip approx. 5 minutes movieplayer.tsplayback TS lejátszása -movieplayer.vcdplayback (S)VCD mpkey.audio Hangsáv mpkey.bookmark Könyvjelző mentése mpkey.forward Előre diff --git a/data/locale/italiano.locale b/data/locale/italiano.locale index f06909455..117e5dd86 100644 --- a/data/locale/italiano.locale +++ b/data/locale/italiano.locale @@ -787,10 +787,8 @@ movieplayer.bookmarkname Nome Bookmark movieplayer.bookmarkname_hint1 Inserire nome del nuovo bookmark movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback File play movieplayer.head Movieplayer -movieplayer.pesplayback Play PES (Experimental) movieplayer.toomanybookmarks Ci sono troppi bookmarks.\nDevi prima cancellarne altri. movieplayer.tshelp1 Stop movieplayer.tshelp10 appross. 10 minuti indietro @@ -805,7 +803,6 @@ movieplayer.tshelp7 salta appross 1 minuto movieplayer.tshelp8 appross 5 minuti indietro movieplayer.tshelp9 salta appross 5 minuti movieplayer.tsplayback Play TS -movieplayer.vcdplayback (S)VCD mpkey.audio Traccia audio mpkey.bookmark salva segnalibro mpkey.forward Forward diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index c3d8a66b0..b23984063 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -426,14 +426,11 @@ movieplayer.bookmark Favorieten movieplayer.bookmarkname Bookmark Naam movieplayer.bookmarkname_hint1 Geef de naam voor de movieplayer.bookmarkname_hint2 nieuwe favoriet in -movieplayer.dvdplayback DVD movieplayer.fileplayback Bestand via VLC movieplayer.head Filmplayer -movieplayer.pesplayback PES Afspelen (Experiment) movieplayer.toomanybookmarks U heeft te veel favorieten.\nEr moet een andere favoriet gewist worden. movieplayer.tshelp Rood/Home Stop\nGROEN Kies audio track\nGEEL Pause/Continue\nBLUE Create bookmark\nd-box Show progress\n1 approx. 1 minute back\n3 skip approx. 1 minute\n4 approx. 5 minuten terug\n6 sla over ongeveer 5 minuten\n7 ongeveer 10 minuten terug\n9 sla ongeveer 10 minutes\nHelp: http://www.giggo.de/dbox2/movieplayer.html\n movieplayer.tsplayback Speel TS -movieplayer.vcdplayback (S)VCD movieplayer.vlchelp ROOD/Home Stop\nGROEN Resync\nGEEL Pause/verder\nBLAUW Favoriet instellen\n1 ca. 1 Minuut terug\n3 ca. 1 Minuut vooruit\n4 ca. 5 Minuten terug\n6 ca. 5 Minuten vooruit\n7 ca. 10 Minuten terug\n9 ca. 10 Minuten vooruit\nHelp: http://www.giggo.de/dbox2/movieplayer.html\n networkmenu.broadcast Broadcast networkmenu.dhcp DHCP diff --git a/data/locale/polski.locale b/data/locale/polski.locale index f2abfa44a..9c44e795b 100644 --- a/data/locale/polski.locale +++ b/data/locale/polski.locale @@ -841,10 +841,8 @@ movieplayer.bookmark Zakładki movieplayer.bookmarkname Nazwa zakładki movieplayer.bookmarkname_hint1 Podaj nazwę nowej zakładki movieplayer.bookmarkname_hint2 Podaj nazwę nowej zakładki -movieplayer.dvdplayback DVD movieplayer.fileplayback Odtwórz plik... movieplayer.head Odtwarzacz filmów -movieplayer.pesplayback Odtwarzaj PES movieplayer.toomanybookmarks Za dużo zakładek. Aby dodać\nkolejną musisz jedną usunąć. movieplayer.tshelp1 Stop movieplayer.tshelp10 przesuń 10 min do tyłu @@ -859,7 +857,6 @@ movieplayer.tshelp7 przesuń 1 min do przodu movieplayer.tshelp8 przesuń 5 min do tyłu movieplayer.tshelp9 przesuń 5 min do przodu movieplayer.tsplayback Odtwarzaj TS -movieplayer.vcdplayback (S)VCD mpkey.audio Utwór audio mpkey.bookmark zapisz zakładkę mpkey.forward Do przodu diff --git a/data/locale/portugues.locale b/data/locale/portugues.locale index 8d65f8af5..e0d8c2521 100644 --- a/data/locale/portugues.locale +++ b/data/locale/portugues.locale @@ -744,10 +744,8 @@ movieplayer.bookmarkname Nome da lista movieplayer.bookmarkname_hint1 Introduzir um nome para a nova lista movieplayer.bookmarkname_hint2 movieplayer.defplugin Start-Plugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Ficheiro via VLC movieplayer.head Movieplayer -movieplayer.pesplayback Play PES (Experimental) movieplayer.toomanybookmarks Tem demasiadas lista de favoritos.\nNecessita primeiro apagar alguma(s) dela(s). movieplayer.tshelp1 Stop movieplayer.tshelp10 approx. 10 minutes back @@ -762,7 +760,6 @@ movieplayer.tshelp7 skip approx. 1 minute movieplayer.tshelp8 approx. 5 minutes back movieplayer.tshelp9 skip approx. 5 minutes movieplayer.tsplayback Play TS -movieplayer.vcdplayback (S)VCD mpkey.audio Audio track mpkey.bookmark save bookmark mpkey.forward Forward diff --git a/data/locale/russkij.locale b/data/locale/russkij.locale index 9e9a1bf26..5ab66188f 100644 --- a/data/locale/russkij.locale +++ b/data/locale/russkij.locale @@ -693,10 +693,8 @@ movieplayer.bookmarkname Название закладки movieplayer.bookmarkname_hint1 Введите название movieplayer.bookmarkname_hint2 для новой закладки movieplayer.defplugin Старт плагина -movieplayer.dvdplayback Просмотр DVD (VLC) movieplayer.fileplayback Просмотр файлов (VLC) movieplayer.head Видеоплеер -movieplayer.pesplayback Просмотр PES-файлов movieplayer.toomanybookmarks Слишком много закладок.\n Удалите одну из уже существующих. movieplayer.tshelp1 стоп movieplayer.tshelp10 назад на 10 мин. @@ -711,7 +709,6 @@ movieplayer.tshelp7 вперед на 1 мин. movieplayer.tshelp8 назад на 5 мин. movieplayer.tshelp9 вперед на 5 мин. movieplayer.tsplayback Просмотр TS-файлов -movieplayer.vcdplayback Просмотр (S)VCD (VLC) mpkey.audio Audio track mpkey.bookmark save bookmark mpkey.forward Forward diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 60680df42..8a37b0b60 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -833,10 +833,8 @@ movieplayer.bookmarkname Názov záložky movieplayer.bookmarkname_hint1 Vložienie názvu movieplayer.bookmarkname_hint2 novej záložky? movieplayer.defplugin Štarovací PLUGIN -movieplayer.dvdplayback DVD movieplayer.fileplayback Súbor cez VLC movieplayer.head Tvorenie filmov -movieplayer.pesplayback Prehrávanie PES movieplayer.toomanybookmarks Veľa záložiek.\nJe potrebné vymazať jednu najprv. movieplayer.tshelp1 Zastavenie movieplayer.tshelp10 asi 10 min dozadu @@ -851,7 +849,6 @@ movieplayer.tshelp7 asi 1 min dopredu movieplayer.tshelp8 asi 5 min dozadu movieplayer.tshelp9 asi 5 min dopredu movieplayer.tsplayback Prehrť TS -movieplayer.vcdplayback (S)VCD mpkey.audio Zvuková stpopa mpkey.bookmark Ulož záložku mpkey.forward Dopredu diff --git a/data/locale/suomi.locale b/data/locale/suomi.locale index 0fd2d2876..92f569fcd 100644 --- a/data/locale/suomi.locale +++ b/data/locale/suomi.locale @@ -586,7 +586,6 @@ movieplayer.bookmarkname Kirjanmerkki movieplayer.bookmarkname_hint1 Syötä nimi uudelle kirjanmerkille movieplayer.bookmarkname_hint2 movieplayer.defplugin Oletuslaajennos -movieplayer.dvdplayback DVD movieplayer.fileplayback Toisto VLC:n kautta movieplayer.head Mediasoitin movieplayer.toomanybookmarks Liian monta kirjanmerkkiä.\nPoista vähintään yksi ensin. @@ -604,7 +603,6 @@ movieplayer.tshelp8 n. 5 minuuttia taaksepäin movieplayer.tshelp9 n. 5 minuuttia eteenpäin movieplayer.tsplayback Toista tiedosto movieplayer.tsplayback_pc Toista tiedosto (PIN-koodattu) -movieplayer.vcdplayback (S)VCD networkmenu.broadcast Broadcast-osoite networkmenu.dhcp DHCP networkmenu.gateway Yhdyskäytävä diff --git a/data/locale/svenska.locale b/data/locale/svenska.locale index a2e031722..71fcbdac8 100644 --- a/data/locale/svenska.locale +++ b/data/locale/svenska.locale @@ -489,7 +489,6 @@ movieplayer.bookmarkname Bokmärkesnamn movieplayer.bookmarkname_hint1 Ange ett namn för ditt nya bokmärke movieplayer.bookmarkname_hint2 movieplayer.defplugin Startplugin -movieplayer.dvdplayback DVD movieplayer.fileplayback Fil via VLC movieplayer.head Filmspelare movieplayer.toomanybookmarks Det finns för många bokmärken.\nDu måste ta bort en av dom först. @@ -507,7 +506,6 @@ movieplayer.tshelp8 ungefär 5 min tillbaks movieplayer.tshelp9 hoppa ungefär 5 min movieplayer.tsplayback Spela TS movieplayer.tsplayback_pc Spela TS med PIN-lås -movieplayer.vcdplayback (S)VCD networkmenu.broadcast Broadcast networkmenu.dhcp DHCP networkmenu.gateway Default Gateway diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 76bdd0645..12afd80b5 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1474,6 +1474,8 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key) return "analog on"; case RC_analog_off: return "analog off"; + case RC_www: + return "window print"; default: printf("unknown key: %d (0x%x) \n", key, key); return "unknown"; diff --git a/src/driver/record.cpp b/src/driver/record.cpp index c2f9d29bf..d77fe72b7 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1191,7 +1191,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_ASK_STOP_ALL)); snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records); if(ShowMsgUTF(LOCALE_SHUTDOWN_RECODING_QUERY, rec_msg, - CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) + CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) { snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_INFO_STOP_ALL)); // focus: i think no sense for 2 loops, because this code run in the same thread as neutrino, @@ -1348,9 +1348,15 @@ bool CRecordManager::ShowMenu(void) mode_icon = NEUTRINO_ICON_AUTO_SHIFT; sprintf(cnt, "%d", i); - item = new CMenuForwarderNonLocalized(title.c_str(), true, NULL, - selector, cnt, CRCInput::convertDigitToKey((rec_count == 1) ? 0 : shortcut++), NULL, mode_icon); - item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); + //define stop key if only one record is running, otherwise define shortcuts + neutrino_msg_t rc_key = CRCInput::convertDigitToKey(shortcut++); + std::string btn_icon = NEUTRINO_ICON_BUTTON_OKAY; + if (rec_count == 1){ + rc_key = CRCInput::RC_stop; + btn_icon = NEUTRINO_ICON_BUTTON_STOP; + } + item = new CMenuForwarderNonLocalized(title.c_str(), true, NULL, selector, cnt, rc_key, NULL, mode_icon); + item->setItemButton(btn_icon, true); //if only one recording is running, set the focus to this menu item menu.addItem(item, rec_count == 1 ? true: false); @@ -1362,8 +1368,8 @@ bool CRecordManager::ShowMenu(void) { menu.addItem(GenericMenuSeparatorLine); iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL, true, NULL, - this, "StopAll", CRCInput::convertDigitToKey(0)); - iteml->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); + this, "StopAll", CRCInput::RC_stop); + iteml->setItemButton(NEUTRINO_ICON_BUTTON_STOP, true); //if more than one recording is running, set the focus to menu item 'stopp all records' menu.addItem(iteml, rec_count > 1 ? true: false); @@ -1677,6 +1683,20 @@ bool CRecordManager::MountDirectory(const char *recordingDir) return ret; } +bool CRecordManager::IsFileRecord(std::string file) +{ + mutex.lock(); + for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++) { + CRecordInstance * inst = it->second; + if ((((std::string)inst->GetFileName()) + ".ts") == file) { + mutex.unlock(); + return true; + } + } + mutex.unlock(); + return false; +} + #if 0 // not used, saved in case we needed it extern bool autoshift_delete; bool CRecordManager::LinkTimeshift() diff --git a/src/driver/record.h b/src/driver/record.h index e4e5367e9..bb1df82bb 100644 --- a/src/driver/record.h +++ b/src/driver/record.h @@ -216,5 +216,6 @@ class CRecordManager : public CMenuTarget, public CChangeObserver bool IsTimeshift(t_channel_id channel_id=0); void StartTimeshift(); int GetRecordMode(const t_channel_id channel_id=0); + bool IsFileRecord(std::string file); }; #endif diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp index 985af7f92..46e912a68 100644 --- a/src/driver/screenshot.cpp +++ b/src/driver/screenshot.cpp @@ -59,9 +59,9 @@ CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt) fd = NULL; xres = 0; yres = 0; - get_video = true; - get_osd = false; - scale_to_video = false; + get_video = g_settings.screenshot_video; + get_osd = g_settings.screenshot_mode; + scale_to_video = g_settings.screenshot_scale; } CScreenShot::~CScreenShot() @@ -355,9 +355,7 @@ void CScreenShot::MakeFileName(const t_channel_id channel_id) CEPGData epgData; unsigned int pos = 0; - //TODO settings to select screenshot dir ? - sprintf(fname, "%s/", g_settings.network_nfs_recordingdir); - + snprintf(fname, sizeof(fname), "%s/", g_settings.screenshot_dir.c_str()); pos = strlen(fname); channel_name = g_Zapit->getChannelName(channel_id); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 26ad63770..318d78a36 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -615,6 +615,7 @@ int CChannelList::show() if(!CRecordManager::getInstance()->RecordingStatus(chanlist[selected]->channel_id)) { printf("[neutrino channellist] start direct recording...\n"); + hide(); if (CRecordManager::getInstance()->Record(chanlist[selected]->channel_id)) { if(SameTP()) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 586abedf0..0bcf2605b 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -852,7 +852,10 @@ void CInfoViewer::loop(bool show_dot) while (!(res & (messages_return::cancel_info | messages_return::cancel_all))) { g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd); - if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { + if (msg == (neutrino_msg_t) g_settings.key_screenshot) { + res = CNeutrinoApp::getInstance()->handleMsg(msg, data); + + } else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { g_RCInput->postMsg (msg, 0); res = messages_return::cancel_info; } diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index abb70d9b9..2dd9cb819 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -146,14 +146,6 @@ const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDI { 2, LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK } }; -#define KEYBINDINGMENU_SCREENSHOT_FMT_OPTION_COUNT 3 -const CMenuOptionChooser::keyval_ext KEYBINDINGMENU_SCREENSHOT_FMT_OPTIONS[KEYBINDINGMENU_SCREENSHOT_FMT_OPTION_COUNT] = -{ - { CScreenShot::FORMAT_PNG, NONEXISTANT_LOCALE, "PNG" }, - { CScreenShot::FORMAT_JPG, NONEXISTANT_LOCALE, "JPEG" }, - { CScreenShot::FORMAT_BMP, NONEXISTANT_LOCALE, "BMP" } -}; - typedef struct key_settings_t { const neutrino_locale_t keydescription; @@ -175,6 +167,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_KEYBINDINGMENU_ADDREMIND, &g_settings.key_channelList_addremind, }, {LOCALE_KEYBINDINGMENU_BOUQUETUP, &g_settings.key_bouquet_up, }, {LOCALE_KEYBINDINGMENU_BOUQUETDOWN, &g_settings.key_bouquet_down, }, + {LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER, &g_settings.key_current_transponder, }, {LOCALE_KEYBINDINGMENU_CHANNELUP, &g_settings.key_quickzap_up, }, {LOCALE_KEYBINDINGMENU_CHANNELDOWN, &g_settings.key_quickzap_down, }, {LOCALE_KEYBINDINGMENU_SUBCHANNELUP, &g_settings.key_subchannel_up, }, @@ -193,7 +186,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_MPKEY_PLUGIN, &g_settings.mpkey_plugin, }, {LOCALE_EXTRA_KEY_PLUGIN, &g_settings.key_plugin, }, {LOCALE_EXTRA_KEY_UNLOCK, &g_settings.key_unlock, }, - {LOCALE_EXTRA_KEY_SCREENSHOT, &g_settings.key_screenshot, }, + {LOCALE_EXTRA_KEY_SCREENSHOT, &g_settings.key_screenshot, } }; @@ -289,8 +282,6 @@ void CKeybindSetup::showKeyBindSetup(CMenuWidget *bindSettings) //bindSettings->addItem(new CMenuForwarder(keydescription[KEY_PLUGIN], true, NULL, keychooser[KEY_PLUGIN])); bindSettings->addItem(new CMenuForwarder(key_settings[KEY_UNLOCK].keydescription, true, keychooser[KEY_UNLOCK]->getKeyName(), keychooser[KEY_UNLOCK])); bindSettings->addItem(new CMenuForwarder(key_settings[KEY_SCREENSHOT].keydescription, true, keychooser[KEY_SCREENSHOT]->getKeyName(), keychooser[KEY_SCREENSHOT])); - bindSettings->addItem(new CMenuOptionNumberChooser(LOCALE_SCREENSHOT_COUNT, &g_settings.screenshot_count, true, 1, 5, NULL)); - bindSettings->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_FORMAT, &g_settings.screenshot_format, KEYBINDINGMENU_SCREENSHOT_FMT_OPTIONS, KEYBINDINGMENU_SCREENSHOT_FMT_OPTION_COUNT, true)); //bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_MENU_LEFT_EXIT, &g_settings.menu_left_exit, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); bindSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_AUDIO_RUN_PLAYER, &g_settings.audio_run_player, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); @@ -311,7 +302,7 @@ void CKeybindSetup::showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_BOUQUETHANDLING, &g_settings.bouquetlist_mode, KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS, KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT, true ); bindSettings_chlist->addItem(oj); - for (int i = KEY_PAGE_UP; i <= KEY_BOUQUET_DOWN; i++) + for (int i = KEY_PAGE_UP; i <= KEY_CURRENT_TRANSPONDER; i++) bindSettings_chlist->addItem(new CMenuForwarder(key_settings[i].keydescription, true, keychooser[i]->getKeyName(), keychooser[i])); bindSettings_chlist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_SMS_CHANNEL, &g_settings.sms_channel, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index 16854b7af..7f0a1b223 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -56,6 +56,7 @@ class CKeybindSetup : public CMenuTarget KEY_ADD_REMIND, KEY_BOUQUET_UP, KEY_BOUQUET_DOWN, + KEY_CURRENT_TRANSPONDER, KEY_CHANNEL_UP, KEY_CHANNEL_DOWN, KEY_SUBCHANNEL_UP, diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 020c5bb1a..655072405 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -67,6 +67,7 @@ #include #include #include +#include extern CPictureViewer * g_PicViewer; static CProgressBar *timescale; @@ -515,6 +516,7 @@ void CMovieBrowser::init(void) refreshBrowserList(); refreshFilterList(); g_PicViewer->getSupportedImageFormats(PicExts); + IsRecord = false; #if 0 TRACE_1("Frames\r\n\tScren:\t%3d,%3d,%3d,%3d\r\n\tMain:\t%3d,%3d,%3d,%3d\r\n\tTitle:\t%3d,%3d,%3d,%3d \r\n\tBrowsr:\t%3d,%3d,%3d,%3d \r\n\tPlay:\t%3d,%3d,%3d,%3d \r\n\tRecord:\t%3d,%3d,%3d,%3d\r\n\r\n", g_settings.screen_StartX, @@ -1208,13 +1210,18 @@ void CMovieBrowser::refreshMovieInfo(void) m_pcInfo->setText(&emptytext); return; } - if (m_movieSelectionHandler == NULL) - { + if (m_movieSelectionHandler == NULL) { // There is no selected element, clear LCD m_pcInfo->setText(&emptytext); } - else - { + else { + // Is record? + bool tmp = CRecordManager::getInstance()->IsFileRecord(m_movieSelectionHandler->file.Name); + if (tmp != IsRecord) { + IsRecord = tmp; + refreshFoot(); + } + bool logo_ok = false; int picw = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight); int pich = m_cBoxFrameInfo.iHeight; @@ -1615,10 +1622,13 @@ void CMovieBrowser::refreshFoot(void) m_pcWindow->getIconSize(NEUTRINO_ICON_BUTTON_OKAY, &iw, &ih); m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_OKAY, m_cBoxFrame.iX+xpos1+width*2, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY, m_cBoxFrameFootRel.iHeight+ 6); m_pcFontFoot->RenderString(m_cBoxFrame.iX+xpos1+width*2 + 10 + iw, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + 4 , width-30, ok_text.c_str(), (CFBWindow::color_t)color, 0, true); // UTF-8 - //delte icon - m_pcWindow->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_SMALL, &iw, &ih); - m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_MUTE_SMALL, m_cBoxFrame.iX+xpos1+width*3, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY, m_cBoxFrameFootRel.iHeight+ 6); - m_pcFontFoot->RenderString(m_cBoxFrame.iX+xpos1+width*3 + 10 + iw , m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + 4 , width-30, g_Locale->getText(LOCALE_FILEBROWSER_DELETE), (CFBWindow::color_t)color, 0, true); // UTF-8 + + if (IsRecord == false) { + //delte icon + m_pcWindow->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_SMALL, &iw, &ih); + m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_MUTE_SMALL, m_cBoxFrame.iX+xpos1+width*3, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY, m_cBoxFrameFootRel.iHeight+ 6); + m_pcFontFoot->RenderString(m_cBoxFrame.iX+xpos1+width*3 + 10 + iw , m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + 4 , width-30, g_Locale->getText(LOCALE_FILEBROWSER_DELETE), (CFBWindow::color_t)color, 0, true); // UTF-8 + } } @@ -1714,13 +1724,8 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } else if (msg == CRCInput::RC_spkr) { - if(m_vMovieInfo.size() > 0) - { - if(m_movieSelectionHandler != NULL) - { - onDeleteFile(*m_movieSelectionHandler); - } - } + if ((m_vMovieInfo.size() > 0) && (m_movieSelectionHandler != NULL) && (IsRecord == false)) + onDeleteFile(*m_movieSelectionHandler); } else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) { diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h index 66045e041..8f751f0e2 100644 --- a/src/gui/moviebrowser.h +++ b/src/gui/moviebrowser.h @@ -294,6 +294,8 @@ class CMovieBrowser : public CMenuTarget MB_SETTINGS m_settings; std::vector m_dir; + bool IsRecord; + int movieInfoUpdateAll[MB_INFO_MAX_NUMBER]; int movieInfoUpdateAllIfDestEmptyOnly; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 04b3d7c49..017340eff 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -586,18 +586,33 @@ void CMoviePlayerGui::PlayFile(void) if(restore) FileTime.show(position); } else if (msg == (neutrino_msg_t) g_settings.key_screenshot) { + + char ending[(sizeof(int)*2) + 6] = ".jpg"; + if(!g_settings.screenshot_cover) + snprintf(ending, sizeof(ending) - 1, "_%x.jpg", position); + std::string fname = full_name; std::string::size_type pos = fname.find_last_of('.'); if(pos != std::string::npos) { - fname.replace(pos, fname.length(), ".jpg"); + fname.replace(pos, fname.length(), ending); } else - fname += ".jpg"; + fname += ending; + + if(!g_settings.screenshot_cover){ + pos = fname.find_last_of('/'); + if(pos != std::string::npos) { + std::string fname_scr=fname; + fname.replace(0, pos, g_settings.screenshot_dir); + } + } #if 0 // TODO disable overwrite ? if(!access(fname.c_str(), F_OK)) { } #endif CScreenShot * sc = new CScreenShot(fname); + if(g_settings.screenshot_cover && !g_settings.screenshot_video) + sc->EnableVideo(true); sc->Start(); } else if ( msg == NeutrinoMessages::ANNOUNCE_RECORD || diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 2bebb555e..376a9248c 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -52,6 +52,7 @@ #include #include +#include #include @@ -257,6 +258,11 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) chooserDir(g_settings.logo_hdd_dir, false, action_str); return menu_return::RETURN_REPAINT; } + else if(actionKey=="screenshot_dir") { + const char *action_str = "screenshot"; + chooserDir(g_settings.screenshot_dir, true, action_str); + return menu_return::RETURN_REPAINT; + } else if(strncmp(actionKey.c_str(), "fontsize.d", 10) == 0) { for (int i = 0; i < 6; i++) { if (actionKey == font_sizes_groups[i].actionkey) { @@ -413,6 +419,11 @@ int COsdSetup::showOsdSetup() showOsdChanlistSetup(osd_menu_chanlist); osd_menu->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, osd_menu_chanlist, NULL, CRCInput::RC_2)); + //screenshot + CMenuWidget *osd_menu_screenshot = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT); + showOsdScreenshottSetup(osd_menu_screenshot); + osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, osd_menu_screenshot, NULL, CRCInput::RC_3)); + //monitor //CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); //osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify)); @@ -619,9 +630,9 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) { menu_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST); - menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true)); - menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, true)); + menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true)); + menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, true)); menu_chanlist->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, &g_settings.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true)); } @@ -696,3 +707,34 @@ int COsdSetup::showContextChanlistMenu() delete menu_chanlist; return res; } + +//screenshot +#define SCREENSHOT_FMT_OPTION_COUNT 3 +const CMenuOptionChooser::keyval_ext SCREENSHOT_FMT_OPTIONS[SCREENSHOT_FMT_OPTION_COUNT] = +{ + { CScreenShot::FORMAT_PNG, NONEXISTANT_LOCALE, "PNG" }, + { CScreenShot::FORMAT_JPG, NONEXISTANT_LOCALE, "JPEG" }, + { CScreenShot::FORMAT_BMP, NONEXISTANT_LOCALE, "BMP" } +}; +#define SCREENSHOT_OPTION_COUNT 2 +const CMenuOptionChooser::keyval SCREENSHOT_OPTIONS[SCREENSHOT_OPTION_COUNT] = +{ + { 0, LOCALE_SCREENSHOT_TV }, + { 1, LOCALE_SCREENSHOT_OSD } +}; + +void COsdSetup::showOsdScreenshottSetup(CMenuWidget *menu_screenshot) +{ + menu_screenshot->addIntroItems(LOCALE_SCREENSHOT_MENU); + if((uint)g_settings.key_screenshot == CRCInput::RC_nokey) + menu_screenshot->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCREENSHOT_INFO)); + menu_screenshot->addItem(new CMenuOptionNumberChooser(LOCALE_SCREENSHOT_COUNT, &g_settings.screenshot_count, true, 1, 5, NULL)); + menu_screenshot->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_FORMAT, &g_settings.screenshot_format, SCREENSHOT_FMT_OPTIONS, SCREENSHOT_FMT_OPTION_COUNT, true)); + menu_screenshot->addItem(new CMenuForwarder(LOCALE_SCREENSHOT_DEFDIR, true, g_settings.screenshot_dir, this, "screenshot_dir")); + menu_screenshot->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_MENU, &g_settings.screenshot_mode, SCREENSHOT_OPTIONS, SCREENSHOT_OPTION_COUNT, true)); + menu_screenshot->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_VIDEO, &g_settings.screenshot_video, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); +// menu_screenshot->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_SCALE, &g_settings.screenshot_scale, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + menu_screenshot->addItem(new CMenuOptionChooser(LOCALE_SCREENSHOT_COVER, &g_settings.screenshot_cover, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + + +} diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index f58652a0d..7d6567990 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -57,6 +57,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver void showOsdTimeoutSetup(CMenuWidget *menu_timeout); void showOsdInfobarSetup(CMenuWidget *menu_infobar); void showOsdChanlistSetup(CMenuWidget *menu_chanlist); + void showOsdScreenshottSetup(CMenuWidget *menu_screenshot); void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry); diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 7cec2bbb7..d5890e017 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -198,7 +198,7 @@ const CMenuOptionChooser::keyval PERSONALIZE_PROTECT_MODE_OPTIONS[CPersonalizeGu -CPersonalizeGui::CPersonalizeGui() +CPersonalizeGui::CPersonalizeGui() : CPINProtection(g_settings.personalize_pincode) { width = 0; widget_count = 0; @@ -206,6 +206,7 @@ CPersonalizeGui::CPersonalizeGui() show_usermenu = false; show_pin_setup = false; user_menu_notifier = NULL; + pin_setup_notifier = NULL; fkeyMenu = NULL; plMenu = NULL; tmpW = NULL; @@ -250,8 +251,22 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey) return menu_return::RETURN_EXIT_ALL; } - res = ShowPersonalizationMenu(); // Show main Personalization Menu - SaveAndExit(); + //also handle pin access + handleSetting(&g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]); + + //pin protected access to personalize menu also if found any pin protected items + bool is_pin_protected = g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]; + + if ( is_pin_protected || hasPinItems()){ + setHint(LOCALE_PERSONALIZE_PINHINT); //from CPINProtection + if (check()) + is_pin_protected = false; + } + if (!is_pin_protected){ + res = ShowPersonalizationMenu(); // Show main Personalization Menu + SaveAndExit(); + } + return res; } @@ -317,6 +332,7 @@ int CPersonalizeGui::ShowPersonalizationMenu() delete plMenu; v_userMenuSetup.clear(); delete user_menu_notifier; + delete pin_setup_notifier; return res; } @@ -325,7 +341,14 @@ int CPersonalizeGui::ShowPersonalizationMenu() void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget) { pin_widget = new CPINChangeWidget(LOCALE_PERSONALIZE_PINCODE, g_settings.personalize_pincode, 4, LOCALE_PERSONALIZE_PINHINT); - p_widget->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_PINCODE, true, g_settings.personalize_pincode, pin_widget, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); + + CMenuForwarder * fw_pin_setup = new CMenuForwarder(LOCALE_PERSONALIZE_PINCODE, true, g_settings.personalize_pincode, pin_widget, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + pin_setup_notifier = new CPinSetupNotifier(fw_pin_setup); + p_widget->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_PIN_IN_USE, &g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, pin_setup_notifier)); + + fw_pin_setup->setActive(pin_setup_notifier->changeNotify()); + p_widget->addItem(fw_pin_setup); + p_widget->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_PERSONALIZE_MENUCONFIGURATION)); } @@ -892,3 +915,15 @@ bool CUserMenuNotifier::changeNotify(const neutrino_locale_t, void *) return true; } +//helper class to enable/disable pin setup +CPinSetupNotifier::CPinSetupNotifier( CMenuItem* item) +{ + toDisable=item; +} + +bool CPinSetupNotifier::changeNotify(const neutrino_locale_t, void *) +{ + toDisable->setActive(g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]); + + return g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]; +} diff --git a/src/gui/personalize.h b/src/gui/personalize.h index 6c9b79045..869216b45 100644 --- a/src/gui/personalize.h +++ b/src/gui/personalize.h @@ -74,6 +74,16 @@ class CUserMenuNotifier : public CChangeObserver bool changeNotify(const neutrino_locale_t = NONEXISTANT_LOCALE, void *data = NULL); }; +//helper class to enable/disable pin setup +class CPinSetupNotifier : public CChangeObserver +{ + private: + CMenuItem* toDisable; + public: + CPinSetupNotifier( CMenuItem*); + bool changeNotify(const neutrino_locale_t = NONEXISTANT_LOCALE, void *data = NULL); +}; + //some required typedefs typedef struct mn_widget_t @@ -122,10 +132,14 @@ typedef struct personalize_settings_t } personalize_settings_struct_t; -class CPersonalizeGui : public CMenuTarget, public CChangeObserver +class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINProtection { + protected: + virtual CMenuTarget* getParent() { return( NULL);}; + private: CUserMenuNotifier *user_menu_notifier; + CPinSetupNotifier *pin_setup_notifier; CMenuWidget* fkeyMenu; CMenuWidget* plMenu; CMenuWidget* tmpW; diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 677b8c765..54c14aee9 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -55,7 +55,7 @@ CThemes::CThemes() : themefile('\t') { width = w_max (40, 10); - + notifier = NULL; hasThemeChanged = false; } diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 1e59c7b46..21b801604 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -54,6 +54,7 @@ #include "gui/imageinfo.h" #include "gui/dboxinfo.h" #include "gui/cam_menu.h" +#include "gui/pluginlist.h" #include #include @@ -125,6 +126,8 @@ bool CUserMenu::showUserMenu(int button) CImageInfo *imageinfo = NULL; CDBoxInfoWidget *boxinfo = NULL; CNeutrinoApp * neutrino = NULL; + CPluginList * games = NULL; + CPluginList * scripts = NULL; std::string txt = g_settings.usermenu_text[button]; neutrino_locale_t caption = user_menu[button].caption; @@ -288,6 +291,22 @@ bool CUserMenu::showUserMenu(int button) menu_item = new CMenuForwarder(LOCALE_EPGMENU_STREAMINFO, true, NULL, streamInfo, "-1", key, icon ); menu->addItem(menu_item, false); break; + case SNeutrinoSettings::ITEM_GAMES: + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_GAMES; + games = new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME); + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, games, "-1", key, icon ); + menu->addItem(menu_item, false); + break; + case SNeutrinoSettings::ITEM_SCRIPTS: + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_SCRIPTS; + scripts = new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT); + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, scripts, "-1", key, icon ); + menu->addItem(menu_item, false); + break; case SNeutrinoSettings::ITEM_PLUGIN: { char id[5]; @@ -434,6 +453,8 @@ bool CUserMenu::showUserMenu(int button) if (StreamFeaturesChanger) delete StreamFeaturesChanger; if (imageinfo) delete imageinfo; if (boxinfo) delete boxinfo; + if (games) delete games; + if (scripts) delete scripts; if (menu) delete menu; return 0; } diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index e69a25f52..2f14b2c87 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -89,7 +89,9 @@ const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUN { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO }, { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO }, { SNeutrinoSettings::ITEM_CAM, LOCALE_CI_SETTINGS }, - { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON } + { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON }, + { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES }, + { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS } }; int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &) diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index c8b9228a7..07b9a8b81 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -456,8 +456,8 @@ class CMenuWidget : public CMenuTarget virtual void hide(); virtual int exec(CMenuTarget* parent, const std::string & actionKey); virtual std::string getName(); - virtual void setSelected(const int &Preselected){ preselected = Preselected; }; - virtual int getSelected(){ return selected; }; + void setSelected(const int &Preselected){ preselected = Preselected; }; + int getSelected(){ return selected; }; void move(int xoff, int yoff); int getSelectedLine(void){return exit_pressed ? -1 : selected;}; void setWizardMode(bool _from_wizard) { from_wizard = _from_wizard;}; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9970cf152..731d38116 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -588,6 +588,12 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.screenshot_count = configfile.getInt32( "screenshot_count", 1); g_settings.screenshot_format = configfile.getInt32( "screenshot_format", 1); + g_settings.screenshot_cover = configfile.getInt32( "screenshot_cover", 0); + g_settings.screenshot_mode = configfile.getInt32( "screenshot_mode", 0); + g_settings.screenshot_video = configfile.getInt32( "screenshot_video", 1); + g_settings.screenshot_scale = configfile.getInt32( "screenshot_scale", 0); + + g_settings.screenshot_dir = configfile.getString( "screenshot_dir", "/media/sda1/movies" ); g_settings.cacheTXT = configfile.getInt32( "cacheTXT", 0); g_settings.minimode = configfile.getInt32( "minimode", 0); g_settings.mode_clock = configfile.getInt32( "mode_clock", 0); @@ -698,8 +704,8 @@ int CNeutrinoApp::loadSetup(const char * fname) const char* usermenu_default[SNeutrinoSettings::BUTTON_MAX]={ "2,3,4,13", // RED "6", // GREEN - "7", // YELLOW - "12,10,11,19,14,15" // BLUE + "7", // YELLOW + "12,10,11,20,21,19,14,15" // BLUE }; char txt1[81]; std::string txt2; @@ -999,6 +1005,12 @@ void CNeutrinoApp::saveSetup(const char * fname) //printf("set: key_unlock =============== %d\n", g_settings.key_unlock); configfile.setInt32( "screenshot_count", g_settings.screenshot_count ); configfile.setInt32( "screenshot_format", g_settings.screenshot_format ); + configfile.setInt32( "screenshot_cover", g_settings.screenshot_cover ); + configfile.setInt32( "screenshot_mode", g_settings.screenshot_mode ); + configfile.setInt32( "screenshot_video", g_settings.screenshot_video ); + configfile.setInt32( "screenshot_scale", g_settings.screenshot_scale ); + + configfile.setString( "screenshot_dir", g_settings.screenshot_dir); configfile.setInt32( "cacheTXT", g_settings.cacheTXT ); configfile.setInt32( "minimode", g_settings.minimode ); configfile.setInt32( "mode_clock", g_settings.mode_clock ); @@ -1202,7 +1214,7 @@ void CNeutrinoApp::channelsInit(bool bOnly) for(zapit_list_it_t it = zapitList.begin(); it != zapitList.end(); it++) RADIOchannelList->putChannel(*it); - CBouquet* hdBouquet; + CBouquet* hdBouquet = NULL; /* all HD channels */ if(g_settings.make_hd_list) { hdBouquet = new CBouquet(0, (char *) "HD", false); @@ -1301,8 +1313,12 @@ void CNeutrinoApp::channelsInit(bool bOnly) TIMER_STOP("[neutrino] tv took"); - if(g_settings.make_hd_list && hi) - TVfavList->Bouquets.push_back(hdBouquet); + if(g_settings.make_hd_list) { + if(hi) + TVfavList->Bouquets.push_back(hdBouquet); + else + delete hdBouquet; + } /* Favorites and provides RADIO bouquets */ bnum = 0; @@ -2088,7 +2104,7 @@ INFO("cCA::GetInstance()->Ready\n"); else if(msg == (neutrino_msg_t) g_settings.key_timeshift) { CRecordManager::getInstance()->StartTimeshift(); } - else if (msg == CRCInput::RC_games){ + else if (msg == (neutrino_msg_t) g_settings.key_current_transponder){ StopSubtitles(); int res = channelList->numericZap( msg ); StartSubtitles(res < 0); @@ -3770,6 +3786,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_plugin = configfile.getInt32( "key_plugin", CRCInput::RC_nokey ); g_settings.key_unlock = configfile.getInt32( "key_unlock", CRCInput::RC_setup ); g_settings.key_screenshot = configfile.getInt32( "key_screenshot", CRCInput::RC_nokey ); + g_settings.key_current_transponder = configfile.getInt32( "key_current_transponder", CRCInput::RC_nokey ); g_settings.key_quickzap_up = tconfig.getInt32( "key_quickzap_up", CRCInput::RC_up ); g_settings.key_quickzap_down = tconfig.getInt32( "key_quickzap_down", CRCInput::RC_down ); @@ -3823,6 +3840,7 @@ void CNeutrinoApp::saveKeys(const char * fname) tconfig.setInt32( "key_plugin", g_settings.key_plugin ); tconfig.setInt32( "key_unlock", g_settings.key_unlock ); tconfig.setInt32( "key_screenshot", g_settings.key_screenshot ); + tconfig.setInt32( "key_current_transponder", g_settings.key_current_transponder ); tconfig.setInt32( "key_quickzap_up", g_settings.key_quickzap_up ); tconfig.setInt32( "key_quickzap_down", g_settings.key_quickzap_down ); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 3afa108cc..c1ae615ae 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -233,11 +233,22 @@ void CNeutrinoApp::InitMenuSettings() int show = CPersonalizeGui::PERSONALIZE_MODE_VISIBLE; personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); - // separator line - personalize.addItem(MENU_SETTINGS, GenericMenuSeparatorLine, NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); + // settings manager + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN), &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); + + // personalize + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_LOCK), &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); + + // miscSettings + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE), &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); + + //separator + personalize.addSeparator(MENU_SETTINGS); //1st section*************************************************************************************************** + //use only 10 shortcuts (1-9, 0), >9 means -> no shortcut + // video. personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings), &g_settings.personalize[SNeutrinoSettings::P_MSET_VIDEO]); @@ -271,31 +282,12 @@ void CNeutrinoApp::InitMenuSettings() // cisettings personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler), &g_settings.personalize[SNeutrinoSettings::P_MSET_CISETTINGS]); - //separator - personalize.addSeparator(MENU_SETTINGS); - - //*************************************************************************************************** - //10. -- only 10 shortcuts (1-9, 0), the next could be the last also!(10. => 0) - // settings manager - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager()), &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - - // personalize - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize), &g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION); - - // separator - personalize.addSeparator(MENU_SETTINGS); - - //*************************************************************************************************** - // keybindings - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN), &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]); + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup()), &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]); // audioplayer/pictureviewer settings - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, true, NULL, new CMediaPlayerSetup(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW), &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]); + personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, true, NULL, new CMediaPlayerSetup()), &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]); - // miscSettings - personalize.addItem(MENU_SETTINGS, new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE), &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]); - } @@ -327,6 +319,9 @@ void CNeutrinoApp::InitMenuService() CDataResetNotifier *resetNotifier = new CDataResetNotifier(); personalize.addItem(MENU_SERVICE, new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) , &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]); + //separator + personalize.addSeparator(MENU_SERVICE); + //restart neutrino personalize.addItem(MENU_SERVICE, new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER) , &g_settings.personalize[SNeutrinoSettings::P_MSER_RESTART]); diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index 86c872082..130331581 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -60,6 +60,7 @@ enum MN_WIDGET_ID MN_WIDGET_ID_OSDSETUP_INFOBAR, MN_WIDGET_ID_OSDSETUP_MENUCOLORS, MN_WIDGET_ID_OSDSETUP_TIMEOUT, + MN_WIDGET_ID_OSDSETUP_SCREENSHOT, //actually it does not matter, but these 6 entries must be the same order as in menu MN_WIDGET_ID_OSDSETUP_FONTSIZE_MENU, MN_WIDGET_ID_OSDSETUP_FONTSIZE_CHANNELLIST, diff --git a/src/system/locals.h b/src/system/locals.h index c420f313d..5bee7dd17 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -360,6 +360,7 @@ typedef enum LOCALE_EXTRA_FEC_S2_QPSK_7_8, LOCALE_EXTRA_FEC_S2_QPSK_8_9, LOCALE_EXTRA_FEC_S2_QPSK_9_10, + LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER, LOCALE_EXTRA_KEY_LIST_END, LOCALE_EXTRA_KEY_LIST_START, LOCALE_EXTRA_KEY_PLUGIN, @@ -920,10 +921,8 @@ typedef enum LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1, LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT2, LOCALE_MOVIEPLAYER_DEFPLUGIN, - LOCALE_MOVIEPLAYER_DVDPLAYBACK, LOCALE_MOVIEPLAYER_FILEPLAYBACK, LOCALE_MOVIEPLAYER_HEAD, - LOCALE_MOVIEPLAYER_PESPLAYBACK, LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS, LOCALE_MOVIEPLAYER_TSHELP1, LOCALE_MOVIEPLAYER_TSHELP10, @@ -938,7 +937,6 @@ typedef enum LOCALE_MOVIEPLAYER_TSHELP8, LOCALE_MOVIEPLAYER_TSHELP9, LOCALE_MOVIEPLAYER_TSPLAYBACK, - LOCALE_MOVIEPLAYER_VCDPLAYBACK, LOCALE_MPKEY_AUDIO, LOCALE_MPKEY_BOOKMARK, LOCALE_MPKEY_FORWARD, @@ -1052,6 +1050,7 @@ typedef enum LOCALE_PERSONALIZE_NOTPROTECTED, LOCALE_PERSONALIZE_NOTVISIBLE, LOCALE_PERSONALIZE_PIN, + LOCALE_PERSONALIZE_PIN_IN_USE, LOCALE_PERSONALIZE_PINCODE, LOCALE_PERSONALIZE_PINHINT, LOCALE_PERSONALIZE_PINPROTECT, @@ -1230,7 +1229,15 @@ typedef enum LOCALE_SCREENSETUP_LOWERRIGHT, LOCALE_SCREENSETUP_UPPERLEFT, LOCALE_SCREENSHOT_COUNT, + LOCALE_SCREENSHOT_COVER, + LOCALE_SCREENSHOT_DEFDIR, LOCALE_SCREENSHOT_FORMAT, + LOCALE_SCREENSHOT_INFO, + LOCALE_SCREENSHOT_MENU, + LOCALE_SCREENSHOT_OSD, + LOCALE_SCREENSHOT_SCALE, + LOCALE_SCREENSHOT_TV, + LOCALE_SCREENSHOT_VIDEO, LOCALE_SERVICEMENU_GETPLUGINS, LOCALE_SERVICEMENU_GETPLUGINS_HINT, LOCALE_SERVICEMENU_HEAD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d925dc3ea..08ceee983 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -360,6 +360,7 @@ const char * locale_real_names[] = "extra.fec_s2_qpsk_7_8", "extra.fec_s2_qpsk_8_9", "extra.fec_s2_qpsk_9_10", + "extra.key_current_transponder", "extra.key_list_end", "extra.key_list_start", "extra.key_plugin", @@ -920,10 +921,8 @@ const char * locale_real_names[] = "movieplayer.bookmarkname_hint1", "movieplayer.bookmarkname_hint2", "movieplayer.defplugin", - "movieplayer.dvdplayback", "movieplayer.fileplayback", "movieplayer.head", - "movieplayer.pesplayback", "movieplayer.toomanybookmarks", "movieplayer.tshelp1", "movieplayer.tshelp10", @@ -938,7 +937,6 @@ const char * locale_real_names[] = "movieplayer.tshelp8", "movieplayer.tshelp9", "movieplayer.tsplayback", - "movieplayer.vcdplayback", "mpkey.audio", "mpkey.bookmark", "mpkey.forward", @@ -1052,6 +1050,7 @@ const char * locale_real_names[] = "personalize.notprotected", "personalize.notvisible", "personalize.pin", + "personalize.pin_in_use", "personalize.pincode", "personalize.pinhint", "personalize.pinprotect", @@ -1230,7 +1229,15 @@ const char * locale_real_names[] = "screensetup.lowerright", "screensetup.upperleft", "screenshot.count", + "screenshot.cover", + "screenshot.defdir", "screenshot.format", + "screenshot.info", + "screenshot.menu", + "screenshot.osd", + "screenshot.scale", + "screenshot.tv", + "screenshot.video", "servicemenu.getplugins", "servicemenu.getplugins_hint", "servicemenu.head", diff --git a/src/system/settings.cpp b/src/system/settings.cpp index c6e258df3..53513e92e 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -44,8 +44,8 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, + {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, + {"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, {"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_sleeptimer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, diff --git a/src/system/settings.h b/src/system/settings.h index 947f8cba1..16cb6f131 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -372,9 +372,17 @@ struct SNeutrinoSettings int key_plugin; int key_unlock; + int key_screenshot; int screenshot_count; int screenshot_format; + int screenshot_cover; + int screenshot_mode; + int screenshot_video; + int screenshot_scale; + std::string screenshot_dir; + + int key_current_transponder; int cacheTXT; int minimode; @@ -569,6 +577,8 @@ struct SNeutrinoSettings ITEM_BOXINFO = 17, ITEM_CAM = 18, ITEM_CLOCK = 19, + ITEM_GAMES = 20, + ITEM_SCRIPTS = 21, #if 0 ITEM_MOVIEPLAYER_TS, #endif