From 3f9cdb5468a8c15ffbc8f4cd5361f69083bd7fba Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Tue, 19 Jan 2010 10:48:50 +0000 Subject: [PATCH] *Revert to R883 and only keeping the new game directory layouts commited by r-win *Moved R896 to the branch --- HBC/META.XML | 4 +- Languages/czech.lang | 129 +- Languages/danish.lang | 130 +- Languages/dutch.lang | 160 +- Languages/english.lang | 71 +- Languages/finnish.lang | 113 +- Languages/french.lang | 146 +- Languages/german.lang | 144 +- Languages/hungarian.lang | 183 +- Languages/italian.lang | 162 +- Languages/japanese.lang | 164 +- Languages/korean.lang | 117 +- Languages/norwegian.lang | 129 +- Languages/polish.lang | 113 +- Languages/portuguese_br.lang | 136 +- Languages/portuguese_pt.lang | 144 +- Languages/russian.lang | 425 ++- Languages/schinese.lang | 117 +- Languages/spanish.lang | 153 +- Languages/swedish.lang | 151 +- Languages/tchinese.lang | 134 +- Languages/thai.lang | 153 +- Languages/turkish.lang | 139 +- gui.pnproj | 2 +- source/banner/gui_banner.cpp | 215 +- source/banner/gui_banner.h | 4 +- source/banner/openingbnr.h | 2 - source/bannersound.h | 12 +- source/cheats/cheatmenu.cpp | 6 +- source/homebrewboot/HomebrewBrowse.cpp | 36 +- source/input.cpp | 37 - source/input.h | 1 - source/libwiigui/GuiBGM.cpp | 250 -- source/libwiigui/GuiBGM.h | 45 - source/libwiigui/gui.h | 4 +- source/libwiigui/gui_gamebrowser.cpp | 1281 +++++---- source/main.cpp | 467 +++- source/menu.cpp | 353 ++- source/menu.h | 5 +- source/menu/device_check.cpp | 205 -- source/menu/menu_check.cpp | 164 ++ source/menu/menu_disclist.cpp | 3278 ++++++++++++------------ source/menu/menu_format.cpp | 381 ++- source/menu/menu_install.cpp | 9 + source/menu/menus.h | 56 +- source/prompts/DiscBrowser.cpp | 126 +- source/prompts/ProgressWindow.cpp | 4 + source/prompts/PromptWindows.cpp | 101 +- source/prompts/TitleBrowser.cpp | 38 +- source/prompts/filebrowser.cpp | 19 +- source/prompts/gameinfo.cpp | 42 +- source/settings/Settings.cpp | 157 +- source/settings/SettingsPrompts.cpp | 336 ++- source/settings/SettingsPrompts.h | 2 +- source/settings/cfg.c | 16 +- source/settings/cfg.h | 6 +- source/sys.cpp | 178 +- source/sys.h | 2 - source/themes/Theme_Downloader.cpp | 18 +- source/usbloader/getentries.cpp | 157 +- source/video.cpp | 83 +- source/video.h | 1 - source/wad/wad.cpp | 17 +- source/xml/xml.c | 46 +- 64 files changed, 5503 insertions(+), 5976 deletions(-) delete mode 100644 source/libwiigui/GuiBGM.cpp delete mode 100644 source/libwiigui/GuiBGM.h delete mode 100644 source/menu/device_check.cpp create mode 100644 source/menu/menu_check.cpp diff --git a/HBC/META.XML b/HBC/META.XML index ea87a946..1fd8a0de 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 1.0 r894 - 201001101903 + 1.0 r1 + 201001191022 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. diff --git a/Languages/czech.lang b/Languages/czech.lang index d8f28633..98a7b4f5 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Language-Team: r823 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n" @@ -182,9 +182,15 @@ msgstr "Zpet do HBC nebo Wii nabídky" msgid "Back to Loader" msgstr "Zpet do spouštece" +msgid "Back to Wii Menu" +msgstr "Zpet do Wii nabídky" + msgid "Backgroundmusic" msgstr "Hudba na pozadí" +msgid "Backgroundmusic Path changed." +msgstr "Cesta pro hudbu na pozadí zmenena" + msgid "Big thanks to:" msgstr "Velké díky pro:" @@ -215,9 +221,6 @@ msgstr "Nelze smazat:" msgid "Cancel" msgstr "Zrušit" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanály" @@ -285,6 +288,9 @@ msgstr "Nelze vytvorit GCT soubor" msgid "Could not find a WBFS partition." msgstr "Nemohu nalézt WBFS oddíl." +msgid "Could not initialize DIP module!" +msgstr "Nelze inicializovat DIP modul!" + msgid "Could not initialize network!" msgstr "Nelze inicializovat sítové pripojení" @@ -414,6 +420,9 @@ msgstr "Prejete si stáhnout toto téma?" msgid "Do you want to format:" msgstr "Prejete si formátovat" +msgid "Do you want to retry for 30 secs?" +msgstr "Chcete to zkusit znovu za 30 sekund?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Prejete si použít jiný DOL, který je správný?" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "Síla" +msgid "Format" +msgstr "Formát" + msgid "Formatting, please wait..." msgstr "Formátuji, cekejte prosím ..." @@ -762,9 +774,6 @@ msgstr "Nejspíše má velikost, která není delitelná 4." msgid "Mount DVD drive" msgstr "Pripojit DVD mechaniku" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Hlasitost hudby" @@ -798,6 +807,15 @@ msgstr "Žádné oblíbené" msgid "No SD-Card inserted!" msgstr "Není vložena SD karta" +msgid "No USB Device" +msgstr "Žádné zarízení USB" + +msgid "No USB Device found." +msgstr "Nebylo nalezeno zarízení USB" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Nebyly vybrány žádné cheaty" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Oddíl" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Heslo" @@ -900,15 +915,6 @@ msgstr "Vyberte ze seznamu" msgid "Play Count" msgstr "Spušteno" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Cekejte prosím..." @@ -942,15 +948,9 @@ msgstr "Znovunactení SD" msgid "Rename Game on WBFS" msgstr "Prejmenovat hru na WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Vynulovat cítac spuštení" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Restartuji..." @@ -987,6 +987,9 @@ msgstr "Uloženo" msgid "Screensaver" msgstr "Sporic obrazovky" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "Vyberte DOL" @@ -999,6 +1002,9 @@ msgstr "Zárí" msgid "Set Search-Filter" msgstr "Nastavit vyhledávací filtr" +msgid "Set as backgroundmusic?" +msgstr "Nastavit jako hudbu na pozadí?" + msgid "Settings" msgstr "Nastavení" @@ -1114,6 +1120,9 @@ msgstr "Popisky" msgid "Transfer failed." msgstr "Prenos selhal" +msgid "USB Device not found" +msgstr "USB zarízení nenalezeno" + msgid "USB Loader GX is protected" msgstr "USB Loader GX je zabezpecen" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Odemknete konzoli pro tuto akci." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Odemceno" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Cekám na zarízení USB" + msgid "Waiting..." msgstr "Cekám..." @@ -1254,15 +1263,15 @@ msgstr "Vybíráte zobrazení oblíbených, ale žádné jste dosud nevybral" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Pokusili jste se nahrát špatný obraz" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Vaše URL bylo uloženo v %sWiiTDB_URL.txt." @@ -1333,53 +1342,23 @@ msgstr "z " msgid "seconds left" msgstr "sekund zbývá" -msgid "Backgroundmusic Path changed." -msgstr "Cesta pro hudbu na pozadí zmenena" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Nelze dekomprimovat LZ77" -msgid "Set as backgroundmusic?" -msgstr "Nastavit jako hudbu na pozadí?" +#~ msgid "Can't find disc" +#~ msgstr "Nelze nalézt disc" -msgid "Back to Wii Menu" -msgstr "Zpet do Wii nabídky" +#~ msgid "IMD5 Header not right." +#~ msgstr "Hlavička IMD5 není správná." -msgid "Could not initialize DIP module!" -msgstr "Nelze inicializovat DIP modul!" +#~ msgid "IMET Header wrong." +#~ msgstr "Hlavička IMET není správná." -msgid "Do you want to retry for 30 secs?" -msgstr "Chcete to zkusit znovu za 30 sekund?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Ukoncit USB Loader GX?" -msgid "Format" -msgstr "Formát" +#~ msgid "No WBFS partition found" +#~ msgstr "Nebyl nalezen oddíl WBFS" -msgid "No USB Device" -msgstr "Žádné zarízení USB" - -msgid "No USB Device found." -msgstr "Nebylo nalezeno zarízení USB" - -msgid "USB Device not found" -msgstr "USB zarízení nenalezeno" - -msgid "Waiting for USB Device" -msgstr "Cekám na zarízení USB" - -msgid "Can't decompress LZ77" -msgstr "Nelze dekomprimovat LZ77" - -msgid "Can't find disc" -msgstr "Nelze nalézt disc" - -msgid "IMD5 Header not right." -msgstr "Hlavička IMD5 není správná." - -msgid "IMET Header wrong." -msgstr "Hlavička IMET není správná." - -msgid "Exit USB Loader GX?" -msgstr "Ukoncit USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "Nebyl nalezen oddíl WBFS" - -msgid "You need to format a partition" -msgstr "Musíte naformátovat oddíl" +#~ msgid "You need to format a partition" +#~ msgstr "Musíte naformátovat oddíl" diff --git a/Languages/danish.lang b/Languages/danish.lang index 4e917733..ad96b4de 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: dorf[dk]\n" "Language-Team: dorf[dk]\n" @@ -182,9 +182,15 @@ msgstr "Tilbage til HBC eller Wii-menuen" msgid "Back to Loader" msgstr "Tilbage til Loaderen" +msgid "Back to Wii Menu" +msgstr "Tilbage til HBC" + msgid "Backgroundmusic" msgstr "Baggrundsmusik" +msgid "Backgroundmusic Path changed." +msgstr "Sti til baggrundsmusik ændret" + msgid "Big thanks to:" msgstr "En stor tak til:" @@ -215,9 +221,6 @@ msgstr "Kan ikke slettes:" msgid "Cancel" msgstr "Annullér" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanaler" @@ -285,6 +288,9 @@ msgstr "Kunne ikke oprette GCT-fil" msgid "Could not find a WBFS partition." msgstr "Kunne ikke finde en WBFS-partition." +msgid "Could not initialize DIP module!" +msgstr "Kunne ikke initialisere DIP-modul!" + msgid "Could not initialize network!" msgstr "Kunne ikke initialisere netforbindelse!" @@ -414,6 +420,9 @@ msgstr "Skal dette tema downloades?" msgid "Do you want to format:" msgstr "Vil du formatere:" +msgid "Do you want to retry for 30 secs?" +msgstr "Forsøg igen (i 30 sek.)?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Skal den alternative DOL, der med sikkerhed er korrekt, bruges?" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "Tving" +msgid "Format" +msgstr "Formater" + msgid "Formatting, please wait..." msgstr "Formaterer, vent venligst..." @@ -762,9 +774,6 @@ msgstr "Sandsynligvis har det dimensioner, der ikke er delelige med fire." msgid "Mount DVD drive" msgstr "Mount DVD-drev" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Lydstyrke" @@ -798,6 +807,15 @@ msgstr "Ingen favoritter" msgid "No SD-Card inserted!" msgstr "Intet SD-kort fundet!" +msgid "No USB Device" +msgstr "Ingen USB-enhed tilsluttet" + +msgid "No USB Device found." +msgstr "Ingen USB-enhed fundet." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Der blev ikke fundet en WBFS- eller FAT/NTFS-partition" + msgid "No cheats were selected" msgstr "Der blev ikke valgt nogle cheats" @@ -876,9 +894,6 @@ msgstr "Børnelåsen er slået fra" msgid "Partition" msgstr "Partition" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Password" @@ -900,15 +915,6 @@ msgstr "Vælg fra en liste" msgid "Play Count" msgstr "Spiltæller" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Vent venligst..." @@ -942,15 +948,9 @@ msgstr "Genindlæs SD" msgid "Rename Game on WBFS" msgstr "Omdøb spil på WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Nulstil spiltæller" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Genstarter..." @@ -987,6 +987,9 @@ msgstr "Gemt" msgid "Screensaver" msgstr "Screensaver" +msgid "Select" +msgstr "Vælg" + msgid "Select a DOL" msgstr "Vælg en DOL" @@ -999,6 +1002,9 @@ msgstr "" msgid "Set Search-Filter" msgstr "Søgefilter" +msgid "Set as backgroundmusic?" +msgstr "Indstil som baggrundsmusik?" + msgid "Settings" msgstr "Indstillinger" @@ -1114,6 +1120,9 @@ msgstr "Værktøjstips" msgid "Transfer failed." msgstr "Overførslen mislykkedes" +msgid "USB Device not found" +msgstr "USB-enhed ikke fundet" + msgid "USB Loader GX is protected" msgstr "USB Loader GX er beskyttet" @@ -1142,9 +1151,6 @@ msgstr "Lås børnelåsen op" msgid "Unlock console to use this option." msgstr "Lås op for konsollen for at benytte denne indstilling." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Låst op" @@ -1209,6 +1215,9 @@ msgstr "Sti til WIP patches" msgid "WIP Patches Path changed" msgstr "Sti til WIP patches ændret" +msgid "Waiting for USB Device" +msgstr "Venter på USB-enhed" + msgid "Waiting..." msgstr "Venter..." @@ -1254,15 +1263,15 @@ msgstr "Du har valgt at vise favoritter, men ingen spil er markerede som favorit msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "Der bruges et NTFS filsystem. Da der kan forekomme skrivefejl på NTFS-partitioner, kan der ikke installeres spil." -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Børnelåsen er ikke slået til. Hvis børnelåsen skal bruges, skal den slås til i Wiiens indstillinger." msgid "You have attempted to load a bad image" msgstr "Du har forsøgt at indlæse et dårligt billede" +msgid "You need to select or format a partition" +msgstr "Du skal vælge eller formattere en partition" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "URLen er blevet gemt som %sWiiTDB_URL.txt." @@ -1333,56 +1342,17 @@ msgstr "af" msgid "seconds left" msgstr "sekunder tilbage" -msgid "Backgroundmusic Path changed." -msgstr "Sti til baggrundsmusik ændret" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Kan ikke udpakke LZ77" -msgid "Set as backgroundmusic?" -msgstr "Indstil som baggrundsmusik?" +#~ msgid "Can't find disc" +#~ msgstr "Kan ikke finde disk" -msgid "Back to Wii Menu" -msgstr "Tilbage til HBC" +#~ msgid "IMD5 Header not right." +#~ msgstr "Fejl i IMD5 header." -msgid "Could not initialize DIP module!" -msgstr "Kunne ikke initialisere DIP-modul!" +#~ msgid "IMET Header wrong." +#~ msgstr "Fejl i IMET header." -msgid "Do you want to retry for 30 secs?" -msgstr "Forsøg igen (i 30 sek.)?" - -msgid "Format" -msgstr "Formater" - -msgid "No USB Device" -msgstr "Ingen USB-enhed tilsluttet" - -msgid "No USB Device found." -msgstr "Ingen USB-enhed fundet." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Der blev ikke fundet en WBFS- eller FAT/NTFS-partition" - -msgid "Select" -msgstr "Vælg" - -msgid "USB Device not found" -msgstr "USB-enhed ikke fundet" - -msgid "Waiting for USB Device" -msgstr "Venter på USB-enhed" - -msgid "You need to select or format a partition" -msgstr "Du skal vælge eller formattere en partition" - -msgid "Can't decompress LZ77" -msgstr "Kan ikke udpakke LZ77" - -msgid "Can't find disc" -msgstr "Kan ikke finde disk" - -msgid "IMD5 Header not right." -msgstr "Fejl i IMD5 header." - -msgid "IMET Header wrong." -msgstr "Fejl i IMET header." - -msgid "Exit USB Loader GX?" -msgstr "Afslut USB Loader GX?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Afslut USB Loader GX?" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 37d3d91b..a89d61e3 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# dutch.lang - r885 +# dutch.lang - r874 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" @@ -23,7 +23,7 @@ msgid " could not be downloaded." msgstr " kon niet worden gedownload." msgid " has been Saved. The text has not been verified. Some of the code may not work right with each other. If you experience trouble, open the text in a real text editor for more information." -msgstr " is opgeslagen. De tekst is niet gecontroleerd. Delen van de code kunnen elkaar tegenwerken. Als je moeilijkheden ondervind, open de tekst in een echte tekstverwerker voor meer informatie." +msgstr " is opgeslagen. De tekst is niet gecontroleerd. Delen van de code kunnen elkaar tegenwerken. Als je moeilijkheden ondervind, open het bestand in een echte tekstverwerker voor meer informatie." msgid " is not on the server." msgstr " staat niet op de server." @@ -182,9 +182,15 @@ msgstr "Terug naar HBC of Wii Menu" msgid "Back to Loader" msgstr "Terug naar lader" +msgid "Back to Wii Menu" +msgstr "Terug naar Wii Menu" + msgid "Backgroundmusic" msgstr "Achtergrondmuziek" +msgid "Backgroundmusic Path changed." +msgstr "Locatie achtergrondmuziek gewijzigd." + msgid "Big thanks to:" msgstr "Grote dank aan:" @@ -215,9 +221,6 @@ msgstr "Kan niet verwijderen:" msgid "Cancel" msgstr "Annuleren" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanalen" @@ -285,6 +288,9 @@ msgstr "Kan GCT bestand niet aanmaken" msgid "Could not find a WBFS partition." msgstr "Kan geen WBFS partitie vinden." +msgid "Could not initialize DIP module!" +msgstr "Kan DIP module niet initialiseren!" + msgid "Could not initialize network!" msgstr "Kan netwerk niet initialiseren!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "Wil je echt verwijderen:" msgid "Do you want to apply it now?" -msgstr "Wil je dit nu toepassen?" +msgstr "" msgid "Do you want to change language?" msgstr "Wil je de taal wijzigen?" @@ -414,6 +420,9 @@ msgstr "Wil je dit thema downloaden?" msgid "Do you want to format:" msgstr "Wil je formatteren:" +msgid "Do you want to retry for 30 secs?" +msgstr "Wil je 30 sec. lang opnieuw proberen?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Wil je de alt DOL gebruiken waarvan is bevestigd dat deze werkt?" @@ -466,7 +475,7 @@ msgid "ERROR:" msgstr "FOUT:" msgid "ERROR: Can't set up theme." -msgstr "FOUT: Kan thema niet instellen" +msgstr "" msgid "Enable Parental Control" msgstr "Ouderlijk toezicht inschakelen" @@ -525,6 +534,9 @@ msgstr "X omwisselen" msgid "Force" msgstr "Forceer" +msgid "Format" +msgstr "Formatteer" + msgid "Formatting, please wait..." msgstr "Bezig met formatteren..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "Menu opties" msgid "GXtheme.cfg not found in any subfolder." -msgstr "GXtheme.cfg in geen enkele submap gevonden." +msgstr "" msgid "Game ID" msgstr "Spel ID" @@ -762,9 +774,6 @@ msgstr "Waarschijnlijk zijn de afmetingen niet deelbaar door 4." msgid "Mount DVD drive" msgstr "DVD Laden" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Muziekvolume" @@ -798,6 +807,15 @@ msgstr "Geen favorieten" msgid "No SD-Card inserted!" msgstr "Geen SD kaart gevonden!" +msgid "No USB Device" +msgstr "Geen USB apparaat" + +msgid "No USB Device found." +msgstr "Geen USB apparaat gevonden." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Geen WBFS of FAT/NTFS partitie gevonden" + msgid "No cheats were selected" msgstr "Geen cheats geselecteerd" @@ -876,9 +894,6 @@ msgstr "Ouderlijk toezicht uitgeschakeld" msgid "Partition" msgstr "Partitie" -msgid "Partition Format Menu" -msgstr "Partitie Formatteer Menu" - msgid "Password" msgstr "Wachtwoord" @@ -900,15 +915,6 @@ msgstr "Kiezen van lijst" msgid "Play Count" msgstr "Gespeeld" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Even geduld..." @@ -942,15 +948,9 @@ msgstr "SD herladen" msgid "Rename Game on WBFS" msgstr "Spel hernoemen op WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Speeltellers resetten" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Herstarten..." @@ -987,6 +987,9 @@ msgstr "Opgeslagen" msgid "Screensaver" msgstr "Schermbeveiliging" +msgid "Select" +msgstr "Selecteer" + msgid "Select a DOL" msgstr "Kies een DOL" @@ -999,6 +1002,9 @@ msgstr "Sep" msgid "Set Search-Filter" msgstr "Zoekfilter instellen" +msgid "Set as backgroundmusic?" +msgstr "Instellen als achtergrondmuziek?" + msgid "Settings" msgstr "Instellingen" @@ -1114,6 +1120,9 @@ msgstr "Knopinfo" msgid "Transfer failed." msgstr "Overdracht mislukt." +msgid "USB Device not found" +msgstr "USB Apparaat niet gevonden" + msgid "USB Loader GX is protected" msgstr "USB Loader GX is vergrendeld" @@ -1142,9 +1151,6 @@ msgstr "Ontgrendel ouderlijk toezicht" msgid "Unlock console to use this option." msgstr "Console moet worden vrijgegeven." -msgid "Unlock the app first." -msgstr "Geef app eerst vrij." - msgid "Unlocked" msgstr "Vrijgegeven" @@ -1209,6 +1215,9 @@ msgstr "Locatie WIP patches" msgid "WIP Patches Path changed" msgstr "Locatie WIP Patches gewijzigd" +msgid "Waiting for USB Device" +msgstr "Wachten op USB apparaat" + msgid "Waiting..." msgstr "Wachten..." @@ -1254,15 +1263,15 @@ msgstr "Je wilt favorieten tonen, maar je hebt er geen ingesteld." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "Je gebruikt het NTFS bestandssysteem. Door mogelijke schrijffouten naar een NTFS partitie, is een spel installeren niet mogelijk." -msgid "You can't access this menu!" -msgstr "Je hebt geen toegang tot dit menu!" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Je hebt ouderlijk toezicht niet ingeschakeld. Als je ouderlijk toezicht wilt gebruiken, zet het dan aan in de Wii instellingen." msgid "You have attempted to load a bad image" msgstr "Je probeerde een slechte afbeelding te laden" +msgid "You need to select or format a partition" +msgstr "Je moet een partitie selecteren of formatteren" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Je URL is opgeslagen in %sWiiTDB_URL.txt." @@ -1333,71 +1342,32 @@ msgstr "van" msgid "seconds left" msgstr "seconden over" -msgid "Backgroundmusic Path changed." -msgstr "Locatie achtergrondmuziek gewijzigd." +#~ msgid "Can't decompress LZ77" +#~ msgstr "Kan LZ77 niet uitpakken" -msgid "Set as backgroundmusic?" -msgstr "Instellen als achtergrondmuziek?" +#~ msgid "Can't find disc" +#~ msgstr "Kan disk niet vinden" -msgid "Back to Wii Menu" -msgstr "Terug naar Wii Menu" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 Header niet correct." -msgid "Could not initialize DIP module!" -msgstr "Kan DIP module niet initialiseren!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMET Header niet correct." -msgid "Do you want to retry for 30 secs?" -msgstr "Wil je 30 sec. lang opnieuw proberen?" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Uitpakken opening.bnr mislukt" -msgid "Format" -msgstr "Formatteer" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew Kanaal" -msgid "No USB Device" -msgstr "Geen USB apparaat" +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "FOUT: USB apparaat kon niet geladen worden!" -msgid "No USB Device found." -msgstr "Geen USB apparaat gevonden." +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "FOUT: cIOS kon niet geladen worden!" -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Geen WBFS of FAT/NTFS partitie gevonden" +#~ msgid "Loading..." +#~ msgstr "Laden..." -msgid "Select" -msgstr "Selecteer" - -msgid "USB Device not found" -msgstr "USB Apparaat niet gevonden" - -msgid "Waiting for USB Device" -msgstr "Wachten op USB apparaat" - -msgid "You need to select or format a partition" -msgstr "Je moet een partitie selecteren of formatteren" - -msgid "Can't decompress LZ77" -msgstr "Kan LZ77 niet uitpakken" - -msgid "Can't find disc" -msgstr "Kan disk niet vinden" - -msgid "IMD5 Header not right." -msgstr "IMD5 Header niet correct." - -msgid "IMET Header wrong." -msgstr "IMET Header niet correct." - -msgid "Failed to extract opening.bnr" -msgstr "Uitpakken opening.bnr mislukt" - -msgid "Homebrew Channel" -msgstr "Homebrew Kanaal" - -msgid "ERROR: USB device could not be loaded!" -msgstr "FOUT: USB apparaat kon niet geladen worden!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "FOUT: cIOS kon niet geladen worden!" - -msgid "Loading..." -msgstr "Laden..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Wachten op traag USB apparaat: %i sec..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Wachten op traag USB apparaat: %i sec..." diff --git a/Languages/english.lang b/Languages/english.lang index 06f93473..3eeb5748 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -182,9 +182,15 @@ msgstr "" msgid "Back to Loader" msgstr "" +msgid "Back to Wii Menu" +msgstr "" + msgid "Backgroundmusic" msgstr "" +msgid "Backgroundmusic Path changed." +msgstr "" + msgid "Big thanks to:" msgstr "" @@ -215,9 +221,6 @@ msgstr "" msgid "Cancel" msgstr "" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "" @@ -285,6 +288,9 @@ msgstr "" msgid "Could not find a WBFS partition." msgstr "" +msgid "Could not initialize DIP module!" +msgstr "" + msgid "Could not initialize network!" msgstr "" @@ -414,6 +420,9 @@ msgstr "" msgid "Do you want to format:" msgstr "" +msgid "Do you want to retry for 30 secs?" +msgstr "" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "" +msgid "Format" +msgstr "" + msgid "Formatting, please wait..." msgstr "" @@ -762,9 +774,6 @@ msgstr "" msgid "Mount DVD drive" msgstr "" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "" @@ -798,6 +807,15 @@ msgstr "" msgid "No SD-Card inserted!" msgstr "" +msgid "No USB Device" +msgstr "" + +msgid "No USB Device found." +msgstr "" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "" @@ -900,15 +915,6 @@ msgstr "" msgid "Play Count" msgstr "" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "" @@ -942,15 +948,9 @@ msgstr "" msgid "Rename Game on WBFS" msgstr "" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "" @@ -987,6 +987,9 @@ msgstr "" msgid "Screensaver" msgstr "" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "" @@ -999,6 +1002,9 @@ msgstr "" msgid "Set Search-Filter" msgstr "" +msgid "Set as backgroundmusic?" +msgstr "" + msgid "Settings" msgstr "" @@ -1114,6 +1120,9 @@ msgstr "" msgid "Transfer failed." msgstr "" +msgid "USB Device not found" +msgstr "" + msgid "USB Loader GX is protected" msgstr "" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "" + msgid "Waiting..." msgstr "" @@ -1254,15 +1263,15 @@ msgstr "" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 3db05c6f..b121bbd0 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -182,9 +182,15 @@ msgstr "Takaisin HBC:hen tai Wii Menuun" msgid "Back to Loader" msgstr "HBC" +msgid "Back to Wii Menu" +msgstr "Takaisin Wii Menuun" + msgid "Backgroundmusic" msgstr "Taustamusiikki" +msgid "Backgroundmusic Path changed." +msgstr "Taustamusiikin polku muutettu" + msgid "Big thanks to:" msgstr "Isot kiitokset:" @@ -215,9 +221,6 @@ msgstr "Ei voida poistaa:" msgid "Cancel" msgstr "Peruuta" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "" @@ -285,6 +288,9 @@ msgstr "GCT tiedostoa ei voitu luoda" msgid "Could not find a WBFS partition." msgstr "WBFS osiota ei löytynyt." +msgid "Could not initialize DIP module!" +msgstr "DIP Moduulia ei voitu alustaa!" + msgid "Could not initialize network!" msgstr "Verkkoon ei voitu yhdistää!" @@ -414,6 +420,9 @@ msgstr "" msgid "Do you want to format:" msgstr "Haluatko formatoida:" +msgid "Do you want to retry for 30 secs?" +msgstr "Haluatko odottaa 30 sekuntia?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Haluatko käyttää vaihtoehtoista DOL tiedostoa jonka tiedetään toimivan?" @@ -525,6 +534,9 @@ msgstr "Käännä-X" msgid "Force" msgstr "Pakota" +msgid "Format" +msgstr "Formatoi" + msgid "Formatting, please wait..." msgstr "Formatoi, odota..." @@ -762,9 +774,6 @@ msgstr "Todennäköisesti sisältää ulottuvuuksia jotka eivät ole jaollisia n msgid "Mount DVD drive" msgstr "" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Voimakkuus" @@ -798,6 +807,15 @@ msgstr "Ei suosikkeja" msgid "No SD-Card inserted!" msgstr "SD-korttia ei ole asetettu wiihin!" +msgid "No USB Device" +msgstr "Ei USB-laitetta" + +msgid "No USB Device found." +msgstr "USB-laitetta ei löytynyt." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Osio" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Salasana" @@ -900,15 +915,6 @@ msgstr "Valitse listasta" msgid "Play Count" msgstr "Pelauksen määrä" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "" @@ -942,15 +948,9 @@ msgstr "Uudelleenlataa SD" msgid "Rename Game on WBFS" msgstr "Uudelleennimeä peli" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Resetoi pelauksen määrä" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Boottaa..." @@ -987,6 +987,9 @@ msgstr "" msgid "Screensaver" msgstr "Näytönsäästäjä" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "Valitse DOL" @@ -999,6 +1002,9 @@ msgstr "syys" msgid "Set Search-Filter" msgstr "" +msgid "Set as backgroundmusic?" +msgstr "Aseta taustamusiikiksi?" + msgid "Settings" msgstr "Asetukset" @@ -1114,6 +1120,9 @@ msgstr "Vinkit" msgid "Transfer failed." msgstr "" +msgid "USB Device not found" +msgstr "USB-laitetta ei löytynyt" + msgid "USB Loader GX is protected" msgstr "USB Loader GX on suojattu." @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Avaa konsoli käyttääksesi tätä vaihtoehtoa" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Avattu" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Odottaa USB-laitetta..." + msgid "Waiting..." msgstr "Odottaa..." @@ -1254,15 +1263,15 @@ msgstr "Olet valinnut näyttääksesi suosikit mutta sinulla ei ole valittuna yh msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Yritit ladata huonoa levykuvaa" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "URL:si on tallennettu %WiiTDB_URL.txt." @@ -1333,41 +1342,11 @@ msgstr "josta" msgid "seconds left" msgstr "sekuntia jäljellä" -msgid "Backgroundmusic Path changed." -msgstr "Taustamusiikin polku muutettu" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Poistu USB Loader GX:stä?" -msgid "Set as backgroundmusic?" -msgstr "Aseta taustamusiikiksi?" +#~ msgid "No WBFS partition found" +#~ msgstr "Ei WBFS-osioita löytynyt" -msgid "Back to Wii Menu" -msgstr "Takaisin Wii Menuun" - -msgid "Could not initialize DIP module!" -msgstr "DIP Moduulia ei voitu alustaa!" - -msgid "Do you want to retry for 30 secs?" -msgstr "Haluatko odottaa 30 sekuntia?" - -msgid "Format" -msgstr "Formatoi" - -msgid "No USB Device" -msgstr "Ei USB-laitetta" - -msgid "No USB Device found." -msgstr "USB-laitetta ei löytynyt." - -msgid "USB Device not found" -msgstr "USB-laitetta ei löytynyt" - -msgid "Waiting for USB Device" -msgstr "Odottaa USB-laitetta..." - -msgid "Exit USB Loader GX?" -msgstr "Poistu USB Loader GX:stä?" - -msgid "No WBFS partition found" -msgstr "Ei WBFS-osioita löytynyt" - -msgid "You need to format a partition" -msgstr "Sinun täytyy formatoida osio" +#~ msgid "You need to format a partition" +#~ msgstr "Sinun täytyy formatoida osio" diff --git a/Languages/french.lang b/Languages/french.lang index 09c91228..fa8475f2 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# French V12.3 r886 +# French V12.1 r878 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -182,9 +182,15 @@ msgstr "Retour HBC / Menu Wii" msgid "Back to Loader" msgstr "Chaîne Homebrew" +msgid "Back to Wii Menu" +msgstr "Retour Menu Wii" + msgid "Backgroundmusic" msgstr "Fond sonore" +msgid "Backgroundmusic Path changed." +msgstr "Dossier fond sonore modifié." + msgid "Big thanks to:" msgstr "Grand merci à:" @@ -215,9 +221,6 @@ msgstr "Impossible de supprimer:" msgid "Cancel" msgstr "Annuler" -msgid "Change Play Path" -msgstr "Changer Dossier" - msgid "Channels" msgstr "Chaînes" @@ -285,6 +288,9 @@ msgstr "Impossible de créer le fichier GCT" msgid "Could not find a WBFS partition." msgstr "Impossible de trouver une partition WBFS." +msgid "Could not initialize DIP module!" +msgstr "Initialisation module DIP impossible !" + msgid "Could not initialize network!" msgstr "Initialisation réseau impossible !" @@ -414,6 +420,9 @@ msgstr "Voulez-vous télécharger ce thème ?" msgid "Do you want to format:" msgstr "Voulez-vous formater ?" +msgid "Do you want to retry for 30 secs?" +msgstr "Réessayer pendant 30 sec. ?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Voulez-vous utiliser le DOL Alternatif actuellement connu comme correct ?" @@ -525,6 +534,9 @@ msgstr "Inversion-X" msgid "Force" msgstr "Forcer" +msgid "Format" +msgstr "Formater" + msgid "Formatting, please wait..." msgstr "Formatage en cours, veuillez patienter..." @@ -762,9 +774,6 @@ msgstr "Il est fort probable que les dimensions ne soient pas des multiples de 4 msgid "Mount DVD drive" msgstr "Lancer DVD" -msgid "Music Loop Mode" -msgstr "Mode Boucle Musique" - msgid "Music Volume" msgstr "Volume Musique" @@ -798,6 +807,15 @@ msgstr "Pas de favoris" msgid "No SD-Card inserted!" msgstr "Aucune carte SD insérée !" +msgid "No USB Device" +msgstr "Aucun périphérique USB" + +msgid "No USB Device found." +msgstr "Aucun périphérique USB trouvé." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Aucune partition WBFS ou FAT/NTFS trouvée" + msgid "No cheats were selected" msgstr "Aucune selection de triche" @@ -876,9 +894,6 @@ msgstr "Contrôle Parental désactivé" msgid "Partition" msgstr "" -msgid "Partition Format Menu" -msgstr "Menu Formatage Partition" - msgid "Password" msgstr "Mot de passe" @@ -900,15 +915,6 @@ msgstr "Sélectionner" msgid "Play Count" msgstr "Utilisation" -msgid "Play Next" -msgstr "Jouer Suiv." - -msgid "Play Previous" -msgstr "Jouer Précéd." - -msgid "Playing Music:" -msgstr "Musique Actuelle:" - msgid "Please wait..." msgstr "Veuillez patienter..." @@ -942,15 +948,9 @@ msgstr "Recharger la SD" msgid "Rename Game on WBFS" msgstr "Renommer un jeu" -msgid "Reset BG Music" -msgstr "Reset" - msgid "Reset Playcounter" msgstr "Reset Utilisation du Jeu" -msgid "Reset to standard BGM?" -msgstr "Restaurer fond sonore standard ?" - msgid "Restarting..." msgstr "Redémarrage..." @@ -987,6 +987,9 @@ msgstr "Sauvegardé" msgid "Screensaver" msgstr "Économiseur d'écran" +msgid "Select" +msgstr "Choisir" + msgid "Select a DOL" msgstr "Choisir un DOL" @@ -999,6 +1002,9 @@ msgstr "" msgid "Set Search-Filter" msgstr "Filtre de Recherche" +msgid "Set as backgroundmusic?" +msgstr "Utiliser comme fond sonore ?" + msgid "Settings" msgstr "Paramètres" @@ -1114,6 +1120,9 @@ msgstr "Info-bulles" msgid "Transfer failed." msgstr "Echec Transfert" +msgid "USB Device not found" +msgstr "Périphérique USB introuvable" + msgid "USB Loader GX is protected" msgstr "USB Loader GX est verrouillé" @@ -1142,9 +1151,6 @@ msgstr "Déverrouiller Contrôle Parental" msgid "Unlock console to use this option." msgstr "Cette option requiert le déverrouillage de l'interface." -msgid "Unlock the app first." -msgstr "Déverrouillage nécessaire." - msgid "Unlocked" msgstr "Clic pour verrouiller" @@ -1209,6 +1215,9 @@ msgstr "Dossier Patchs WIP" msgid "WIP Patches Path changed" msgstr "Dossier Patchs WIP modifié" +msgid "Waiting for USB Device" +msgstr "Attente d'un périphérique USB" + msgid "Waiting..." msgstr "En attente..." @@ -1254,15 +1263,15 @@ msgstr "Vous choisissez d'afficher des favoris alors que vous n'en avez aucun." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "Le système de fichier NTFS est utilisé. En raison à de possibles erreurs d'écriture sur une partition de NTFS, l'installation d'un jeu est impossible." -msgid "You can't access this menu!" -msgstr "Accès à ce menu refusé!" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Contrôle Parental désactivé. Si vous voulez l'utiliser, activez-le dans les Paramètres de votre Wii." msgid "You have attempted to load a bad image" msgstr "Vous avez tenté de charger une image érronée" +msgid "You need to select or format a partition" +msgstr "Vous devez choisir ou formater une partition" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Sauvegarde de l'URL sous %sWiiTDB_URL.txt." @@ -1333,65 +1342,32 @@ msgstr "sur" msgid "seconds left" msgstr "secondes restantes" -msgid "Back to Wii Menu" -msgstr "Retour Menu Wii" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Décompression LZ77 Impossible" -msgid "Could not initialize DIP module!" -msgstr "Initialisation module DIP impossible !" +#~ msgid "Can't find disc" +#~ msgstr "Disque non trouvé" -msgid "Do you want to retry for 30 secs?" -msgstr "Réessayer pendant 30 sec. ?" +#~ msgid "IMD5 Header not right." +#~ msgstr "En-tête IMD5 erronée" -msgid "Format" -msgstr "Formater" +#~ msgid "IMET Header wrong." +#~ msgstr "En-tête IMET erronée" -msgid "No USB Device" -msgstr "Aucun périphérique USB" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Extraction opening.bnr échouée" -msgid "No USB Device found." -msgstr "Aucun périphérique USB trouvé." +#~ msgid "You need to start this game one time to create a save file, then exit and start it again." +#~ msgstr "Vous devez lancer ce jeu une fois pour créer une sauvegarde, puis éteindre et le lancer à nouveau." -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Aucune partition WBFS ou FAT/NTFS trouvée" +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "ERREUR: Impossible de charger le périph. USB!" -msgid "Select" -msgstr "Choisir" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "ERREUR: Impossible de charger le cIOS!" -msgid "USB Device not found" -msgstr "Périphérique USB introuvable" +#~ msgid "Loading..." +#~ msgstr "Chargement..." -msgid "Waiting for USB Device" -msgstr "Attente d'un périphérique USB" - -msgid "You need to select or format a partition" -msgstr "Vous devez choisir ou formater une partition" - -msgid "Can't decompress LZ77" -msgstr "Décompression LZ77 Impossible" - -msgid "Can't find disc" -msgstr "Disque non trouvé" - -msgid "IMD5 Header not right." -msgstr "En-tête IMD5 erronée" - -msgid "IMET Header wrong." -msgstr "En-tête IMET erronée" - -msgid "Failed to extract opening.bnr" -msgstr "Extraction opening.bnr échouée" - -msgid "You need to start this game one time to create a save file, then exit and start it again." -msgstr "Vous devez lancer ce jeu une fois pour créer une sauvegarde, puis éteindre et le lancer à nouveau." - -msgid "ERROR: USB device could not be loaded!" -msgstr "ERREUR: Impossible de charger le périph. USB!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "ERREUR: Impossible de charger le cIOS!" - -msgid "Loading..." -msgstr "Chargement..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Attente de votre périphérique USB: %i secs..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Attente de votre périphérique USB: %i secs..." diff --git a/Languages/german.lang b/Languages/german.lang index 54c62133..092f1321 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# german.lang - r885 +# german.lang - r876 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ZEN.13\n" "Language-Team: Snoozer, wishmasterf, Bertilax, ZEN.13\n" @@ -182,9 +182,15 @@ msgstr "zum Homebrew Kanal oder Wii Menü" msgid "Back to Loader" msgstr "Homebrew Kanal" +msgid "Back to Wii Menu" +msgstr "Wii Menü" + msgid "Backgroundmusic" msgstr "Hintergrundmusik" +msgid "Backgroundmusic Path changed." +msgstr "Pfad geändert" + msgid "Big thanks to:" msgstr "Großen Dank an:" @@ -201,7 +207,7 @@ msgid "Both" msgstr "Beides (ID und Region)" msgid "Can't be formatted" -msgstr "Kann nicht formatiert werden" +msgstr "Konnte nicht formatiert werden" msgid "Can't create directory" msgstr "Verzeichnis konnte nicht erstellt werden" @@ -215,9 +221,6 @@ msgstr "Löschen fehlgeschlagen:" msgid "Cancel" msgstr "Abbrechen" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanäle" @@ -285,6 +288,9 @@ msgstr "Die GCT Datei konnte nicht erstellt werden." msgid "Could not find a WBFS partition." msgstr "Es keine WBFS Partition gefunden." +msgid "Could not initialize DIP module!" +msgstr "DIP Modul konnte nicht initialisiert werden!" + msgid "Could not initialize network!" msgstr "Netzwerk konnte nicht initialisiert werden!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "Löschvorgang bestätigen:" msgid "Do you want to apply it now?" -msgstr "Möchtest du es jetzt übernehmen?" +msgstr "" msgid "Do you want to change language?" msgstr "Möchtest du die Sprache ändern?" @@ -414,6 +420,9 @@ msgstr "Dieses Theme herunterladen?" msgid "Do you want to format:" msgstr "Möchtest du formatieren:" +msgid "Do you want to retry for 30 secs?" +msgstr "30 Sekunden lang erneut versuchen?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Möchtest du die als richtig bekannte Alternative DOL verwenden?" @@ -466,7 +475,7 @@ msgid "ERROR:" msgstr "FEHLER:" msgid "ERROR: Can't set up theme." -msgstr "FEHLER: Theme kann nicht konfiguriert werden." +msgstr "" msgid "Enable Parental Control" msgstr "Altersbeschränkung aktivieren" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "Erzwinge" +msgid "Format" +msgstr "Formatieren" + msgid "Formatting, please wait..." msgstr "Formatiere, bitte warten..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "GUI Einstellungen" msgid "GXtheme.cfg not found in any subfolder." -msgstr "GXtheme.cfg in keinem Unterordner gefunden." +msgstr "" msgid "Game ID" msgstr "Spiel ID" @@ -762,9 +774,6 @@ msgstr "Höchstwahrscheinlich sind Breite und Höhe keine Vielfachen von 4." msgid "Mount DVD drive" msgstr "Spiel im Laufwerk starten" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Musik Lautstärke" @@ -798,6 +807,15 @@ msgstr "keine Favoriten" msgid "No SD-Card inserted!" msgstr "Keine SD Karte eingelegt!" +msgid "No USB Device" +msgstr "Kein USB Gerät" + +msgid "No USB Device found." +msgstr "Kein USB Gerät gefunden." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Keine WBFS oder FAT/NTFS Partition gefunden" + msgid "No cheats were selected" msgstr "Es wurden keine Cheats ausgewählt" @@ -876,9 +894,6 @@ msgstr "Altersbeschränkung ausgeschaltet" msgid "Partition" msgstr "" -msgid "Partition Format Menu" -msgstr "Partition Formatieren Menü" - msgid "Password" msgstr "Passwort" @@ -900,15 +915,6 @@ msgstr "Wähle aus Liste" msgid "Play Count" msgstr "Spielzähler" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Bitte warten..." @@ -942,15 +948,9 @@ msgstr "SD erneut laden" msgid "Rename Game on WBFS" msgstr "Spiel umbenennen" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Spielzähler zurücksetzen" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Damit die neue Version benutzt werden kann, muss der Loader neu gestartet werden." @@ -987,6 +987,9 @@ msgstr "Gespeichert" msgid "Screensaver" msgstr "Bildschirmschoner" +msgid "Select" +msgstr "Auswählen" + msgid "Select a DOL" msgstr "wähle eine DOL" @@ -999,6 +1002,9 @@ msgstr "September" msgid "Set Search-Filter" msgstr "Suche" +msgid "Set as backgroundmusic?" +msgstr "Als Hintergrundmusik verwenden?" + msgid "Settings" msgstr "Einstellungen" @@ -1114,6 +1120,9 @@ msgstr "ToolTips" msgid "Transfer failed." msgstr "Übertragung fehlgeschlagen." +msgid "USB Device not found" +msgstr "USB Gerät nicht gefunden" + msgid "USB Loader GX is protected" msgstr "USB Loader GX ist jetzt geschützt" @@ -1142,9 +1151,6 @@ msgstr "Altersbeschränkung deaktivieren" msgid "Unlock console to use this option." msgstr "Entsperre den Loader, um diese Option zu nutzen." -msgid "Unlock the app first." -msgstr "Entsperre zuerst den Loader." - msgid "Unlocked" msgstr "entsperrt" @@ -1209,6 +1215,9 @@ msgstr "WIP Patches" msgid "WIP Patches Path changed" msgstr "Pfad geändert" +msgid "Waiting for USB Device" +msgstr "Warte auf USB Gerät" + msgid "Waiting..." msgstr "Warte..." @@ -1254,15 +1263,15 @@ msgstr "Du willst Favoriten anzeigen, hast aber keine ausgewählt." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "Du benutzt das NTFS Dateisystem. Wegen möglicher Schreibfehler auf einer NTFS Partition, ist das Installieren eines Spiels nicht möglich." -msgid "You can't access this menu!" -msgstr "Du kannst nicht auf dieses Menü zugreifen!" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Du hast die Altersbeschränkung nicht aktiviert. Wenn du sie nutzen möchtest, aktiviere sie in den Wii-Systemeinstellungen." msgid "You have attempted to load a bad image" msgstr "Du hast versucht ein 'schlechtes Bild' zu laden." +msgid "You need to select or format a partition" +msgstr "Du must eine Partition auswählen oder formatieren" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Deine URL wurde in %sWiiTDB_URL.txt gespeichert." @@ -1333,59 +1342,20 @@ msgstr "von" msgid "seconds left" msgstr "Sekunden verbleiben" -msgid "Backgroundmusic Path changed." -msgstr "Pfad geändert" +#~ msgid "Can't decompress LZ77" +#~ msgstr "LZ77 konnte nicht entpackt werden" -msgid "Set as backgroundmusic?" -msgstr "Als Hintergrundmusik verwenden?" +#~ msgid "Can't find disc" +#~ msgstr "Keine Disc gefunden" -msgid "Back to Wii Menu" -msgstr "Wii Menü" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 Header falsch." -msgid "Could not initialize DIP module!" -msgstr "DIP Modul konnte nicht initialisiert werden!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMET Header falsch." -msgid "Do you want to retry for 30 secs?" -msgstr "30 Sekunden lang erneut versuchen?" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew Kanal" -msgid "Format" -msgstr "Formatieren" - -msgid "No USB Device" -msgstr "Kein USB Gerät" - -msgid "No USB Device found." -msgstr "Kein USB Gerät gefunden." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Keine WBFS oder FAT/NTFS Partition gefunden" - -msgid "Select" -msgstr "Auswählen" - -msgid "USB Device not found" -msgstr "USB Gerät nicht gefunden" - -msgid "Waiting for USB Device" -msgstr "Warte auf USB Gerät" - -msgid "You need to select or format a partition" -msgstr "Du must eine Partition auswählen oder formatieren" - -msgid "Can't decompress LZ77" -msgstr "LZ77 konnte nicht entpackt werden" - -msgid "Can't find disc" -msgstr "Keine Disc gefunden" - -msgid "IMD5 Header not right." -msgstr "IMD5 Header falsch." - -msgid "IMET Header wrong." -msgstr "IMET Header falsch." - -msgid "Homebrew Channel" -msgstr "Homebrew Kanal" - -msgid "You need to start this game one time to create a save file, then exit and start it again." -msgstr "Sie müssen dieses Spiel einmal starten um einen Speicherstand zu erstellen, dann verlassen und es neustarten." +#~ msgid "You need to start this game one time to create a save file, then exit and start it again." +#~ msgstr "Sie müssen dieses Spiel einmal starten um einen Speicherstand zu erstellen, dann verlassen und es neustarten." diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index e840dae3..723a81f5 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -1,12 +1,12 @@ # USB Loader GX language source file. -# hungarian.lang - r878 +# hungarian.lang - r839 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" -"PO-Revision-Date: 2009-12-29 11:05+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" +"PO-Revision-Date: 2009-12-01 13:23+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgid "AUTO" msgstr "" msgid "All partitions" -msgstr "Minden partíció" +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Az USB Loader GX minden funkciója elérhetõ." @@ -144,10 +144,10 @@ msgid "App Language" msgstr "Nyelv" msgid "Apr" -msgstr "Ápr" +msgstr "" msgid "Are you sure you want to enable Parent Control?" -msgstr "Szülõi felügyelet bekapcsolása?" +msgstr "" msgid "Are you sure?" msgstr "Biztos vagy benne?" @@ -165,13 +165,13 @@ msgid "AutoPatch" msgstr "" msgid "BCA Codes Path" -msgstr "BCA kód útvonal" +msgstr "" msgid "BCA Codes Path changed" -msgstr "BCA kód útvonal megváltozott" +msgstr "" msgid "BETA revisions" -msgstr "Béta változatok" +msgstr "" msgid "Back" msgstr "Vissza" @@ -182,9 +182,15 @@ msgstr "Visszatérés a HBC-be vagy Wii Menübe" msgid "Back to Loader" msgstr "HBC" +msgid "Back to Wii Menu" +msgstr "Visszatérés a Wii Menübe" + msgid "Backgroundmusic" msgstr "Háttérzene" +msgid "Backgroundmusic Path changed." +msgstr "Háttérzene útvonala megváltozott." + msgid "Big thanks to:" msgstr "Köszönet:" @@ -215,9 +221,6 @@ msgstr "Nem törölhetõ" msgid "Cancel" msgstr "Mégse" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Csatornák" @@ -256,7 +259,7 @@ msgid "Confirm" msgstr "Megerõsítés" msgid "Connection lost..." -msgstr "A kapcsolat megszakadt..." +msgstr "" msgid "Console" msgstr "Konzol" @@ -285,6 +288,9 @@ msgstr "Nem hozható létre GCT fájl" msgid "Could not find a WBFS partition." msgstr "WBFS partíció nem található." +msgid "Could not initialize DIP module!" +msgstr "DIP modul nem tölthetõ be!" + msgid "Could not initialize network!" msgstr "Kapcsolat nem hozható létre!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "Biztosan törlöd?" msgid "Do you want to apply it now?" -msgstr "Alkalmazás most?" +msgstr "" msgid "Do you want to change language?" msgstr "Nyelv megváltoztatása?" @@ -414,6 +420,9 @@ msgstr "Téma letöltése?" msgid "Do you want to format:" msgstr "Formázás?" +msgid "Do you want to retry for 30 secs?" +msgstr "30 másodpercig szeretnéd még tovább próbálni?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Köztudottan működõ alternatív DOL használata?" @@ -466,10 +475,10 @@ msgid "ERROR:" msgstr "HIBA:" msgid "ERROR: Can't set up theme." -msgstr "HIBA: Téma nem állítható be" +msgstr "" msgid "Enable Parental Control" -msgstr "Szülői felügyelet bekapcsolása" +msgstr "" msgid "English" msgstr "Angol" @@ -499,7 +508,7 @@ msgid "Extracting files..." msgstr "Fájlok kicsomagolása..." msgid "FAT: Use directories" -msgstr "FAT: könyvtárak használata" +msgstr "" msgid "Failed formating" msgstr "Formázás sikertelen" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "Kényszerítés" +msgid "Format" +msgstr "Formázás" + msgid "Formatting, please wait..." msgstr "Formatálás folyamatban, kérlek várj..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "Kezelõfelület" msgid "GXtheme.cfg not found in any subfolder." -msgstr "GXtheme.cfg nem található." +msgstr "" msgid "Game ID" msgstr "Játék ID" @@ -577,7 +589,7 @@ msgid "Game is already installed:" msgstr "A játék már fel van telepítve:" msgid "Game partition" -msgstr "Játék partíció" +msgstr "" msgid "Games" msgstr "Játékok" @@ -642,7 +654,7 @@ msgid "Install" msgstr "Telepítés" msgid "Install 1:1 Copy" -msgstr "1:1 másolat telepítése" +msgstr "" msgid "Install Error!" msgstr "Telepítési Hiba!" @@ -651,10 +663,10 @@ msgid "Install a game" msgstr "Játék telepítése" msgid "Install not possible" -msgstr "A telepítés nem lehetséges" +msgstr "" msgid "Install partitions" -msgstr "Partíciók telepítése" +msgstr "" msgid "Installing content... Ok!" msgstr "Tartalom telepítése... Ok!" @@ -672,7 +684,7 @@ msgid "Installing wad" msgstr "Wad telepítése" msgid "Invalid PIN code" -msgstr "Hibás PIN kód" +msgstr "" msgid "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." msgstr "Számunkra segítõ információid lehetnek - kérlek továbbítsd ezeket a fejlesztõi csapat felé." @@ -762,9 +774,6 @@ msgstr "Vélhetõen méretei nem oszhatók 4-gyel." msgid "Mount DVD drive" msgstr "DVD meghajtó felcsatolása" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Zene Hangerõ" @@ -798,6 +807,15 @@ msgstr "Nincsenek kedvencek" msgid "No SD-Card inserted!" msgstr "Nincs SD kártya behelyezve!" +msgid "No USB Device" +msgstr "Nincs USB meghajtó" + +msgid "No USB Device found." +msgstr "Nincs USB meghajtó csatlakoztatva." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Nincsenek kiválasztott cheat-ek" @@ -871,14 +889,11 @@ msgid "Parental Control" msgstr "Szülõi Felügyelet" msgid "Parental Control disabled" -msgstr "Szülõi felügyelet kikapcsolva" +msgstr "" msgid "Partition" msgstr "Partició" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Jelszó" @@ -900,15 +915,6 @@ msgstr "Válassz a listából" msgid "Play Count" msgstr "Indítások" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Kérlek várj..." @@ -942,15 +948,9 @@ msgstr "SD Újratöltése" msgid "Rename Game on WBFS" msgstr "WBFS játék átnevezése" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Elindítások nullázása" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Újraindítás..." @@ -987,6 +987,9 @@ msgstr "Elmentve" msgid "Screensaver" msgstr "Képernyõkimélõ" +msgid "Select" +msgstr "Válassz" + msgid "Select a DOL" msgstr "DOL kiválasztása" @@ -999,6 +1002,9 @@ msgstr "Szep" msgid "Set Search-Filter" msgstr "Keresés" +msgid "Set as backgroundmusic?" +msgstr "Beállítod háttérzenének?" + msgid "Settings" msgstr "Beállítások" @@ -1114,6 +1120,9 @@ msgstr "Súgók" msgid "Transfer failed." msgstr "Átviteli hiba." +msgid "USB Device not found" +msgstr "USB Meghajtó nem található" + msgid "USB Loader GX is protected" msgstr "USB Loader GX levédve" @@ -1137,14 +1146,11 @@ msgid "Uninstalling wad" msgstr "Wad törlése" msgid "Unlock Parental Control" -msgstr "Szülõi felügyelet feloldása" +msgstr "" msgid "Unlock console to use this option." msgstr "Zárolva a program, ezt nem használhatod." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Feloldva" @@ -1204,10 +1210,13 @@ msgid "Video Mode" msgstr "Videó Mód" msgid "WIP Patches Path" -msgstr "WIP Patch útvonal" +msgstr "" msgid "WIP Patches Path changed" -msgstr "WIP Patch útvonal megváltozott" +msgstr "" + +msgid "Waiting for USB Device" +msgstr "Várakozás az USB Meghajtóra" msgid "Waiting..." msgstr "Várakozás..." @@ -1252,17 +1261,17 @@ msgid "You are choosing to display favorites and you do not have any selected." msgstr "A Kedvencek megjelenítését választottad, de egy játék sincs így megjelölve." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." -msgstr "NTFS fájlrendszert használata esetén a lehetséges írási hibák miatt játékok telepítése nem lehetséges." - -msgid "You can't access this menu!" msgstr "" msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." -msgstr "A szülõi felügyelet nincs bekapcsolva - bekapcsolható a Wii Beállításokban." +msgstr "" msgid "You have attempted to load a bad image" msgstr "Rossz képfájl próbáltál betõlteni" +msgid "You need to select or format a partition" +msgstr "Választanod vagy formáznod kell egy partíciót" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "URL elmentve itt: %sWiiTDB_URL.txt" @@ -1295,7 +1304,7 @@ msgid "files not found on the server!" msgstr "fájl nem található a szerveren" msgid "for FAT/NTFS support" -msgstr "FAT/NTFS támogatás" +msgstr "" msgid "for Ocarina" msgstr ": Ocarina" @@ -1333,56 +1342,26 @@ msgstr "./" msgid "seconds left" msgstr "hátralévõ másodperc" -msgid "Backgroundmusic Path changed." -msgstr "Háttérzene útvonala megváltozott." +#~ msgid "Can't decompress LZ77" +#~ msgstr "LZ77 nem kitömöríthetõ" -msgid "Set as backgroundmusic?" -msgstr "Beállítod háttérzenének?" +#~ msgid "Can't find disc" +#~ msgstr "Lemez nem található" -msgid "Back to Wii Menu" -msgstr "Visszatérés a Wii Menübe" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 Fejléc nem megfelelõ." -msgid "Could not initialize DIP module!" -msgstr "DIP modul nem tölthetõ be!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMET fejléc nem megfelelõ." -msgid "Do you want to retry for 30 secs?" -msgstr "30 másodpercig szeretnéd még tovább próbálni?" +#~ msgid "No WBFS or FAT game partition found" +#~ msgstr "Nem található WBFS vagy FAT partíció" -msgid "Format" -msgstr "Formázás" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Kilépés az USB Loader GX-bõl?" -msgid "No USB Device" -msgstr "Nincs USB meghajtó" +#~ msgid "No WBFS partition found" +#~ msgstr "Nincs WBFS Partició" -msgid "No USB Device found." -msgstr "Nincs USB meghajtó csatlakoztatva." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Nem található WBFS vagy FAT/NTFS partíció" - -msgid "Select" -msgstr "Válassz" - -msgid "USB Device not found" -msgstr "USB Meghajtó nem található" - -msgid "Waiting for USB Device" -msgstr "Várakozás az USB Meghajtóra" - -msgid "You need to select or format a partition" -msgstr "Választanod vagy formáznod kell egy partíciót" - -msgid "Can't decompress LZ77" -msgstr "LZ77 nem kitömöríthetõ" - -msgid "Can't find disc" -msgstr "Lemez nem található" - -msgid "IMD5 Header not right." -msgstr "IMD5 Fejléc nem megfelelõ." - -msgid "IMET Header wrong." -msgstr "IMET fejléc nem megfelelõ." - -msgid "Exit USB Loader GX?" -msgstr "Kilépés az USB Loader GX-bõl?" +#~ msgid "You need to format a partition" +#~ msgstr "Formáznod kell a particiót" diff --git a/Languages/italian.lang b/Languages/italian.lang index ae723a7e..5431561b 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# italian.lang - v57 - r885 +# italian.lang - v55 - r874 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: FoxeJoe, Cambo\n" @@ -182,9 +182,15 @@ msgstr "Torna a HBC/Menu Wii" msgid "Back to Loader" msgstr "Canale HomeBrew" +msgid "Back to Wii Menu" +msgstr "Torna al Menu Wii" + msgid "Backgroundmusic" msgstr "Musica Sottofondo" +msgid "Backgroundmusic Path changed." +msgstr "Percorso Musica modificato" + msgid "Big thanks to:" msgstr "Grazie mille a:" @@ -215,9 +221,6 @@ msgstr "Impossibile eliminare:" msgid "Cancel" msgstr "Annulla" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Canali" @@ -285,6 +288,9 @@ msgstr "Non è stato possibile creare il file GCT" msgid "Could not find a WBFS partition." msgstr "Non è stata trovata alcuna partizione WBFS." +msgid "Could not initialize DIP module!" +msgstr "Non è stato possibile inizializzare il modulo DIP!" + msgid "Could not initialize network!" msgstr "Non è stato possibile inizializzare la rete!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "Vuoi veramente eliminare:" msgid "Do you want to apply it now?" -msgstr "Applicare immediatamente?" +msgstr "" msgid "Do you want to change language?" msgstr "Vuoi cambiare lingua?" @@ -414,6 +420,9 @@ msgstr "Vuoi scaricare questo tema?" msgid "Do you want to format:" msgstr "Vuoi formattare:" +msgid "Do you want to retry for 30 secs?" +msgstr "Vuoi riprovare per 30 sec?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Vuoi utilizzare il DOL alternativo funzionante?" @@ -466,7 +475,7 @@ msgid "ERROR:" msgstr "ERRORE:" msgid "ERROR: Can't set up theme." -msgstr "ERRORE: Impossibile configurare il tema." +msgstr "" msgid "Enable Parental Control" msgstr "Attiva Controllo Genitori" @@ -525,6 +534,9 @@ msgstr "Scorrimento Dischi" msgid "Force" msgstr "Forza" +msgid "Format" +msgstr "Formatta" + msgid "Formatting, please wait..." msgstr "Sto Formattando, prego attendere..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "Impostazioni Loader" msgid "GXtheme.cfg not found in any subfolder." -msgstr "Nessuna sottocartella contiene il file GXtheme.cfg." +msgstr "" msgid "Game ID" msgstr "ID Gioco" @@ -762,9 +774,6 @@ msgstr "Molto probabilmente le dimensioni non sono divisibili per 4." msgid "Mount DVD drive" msgstr "Avvia DVD" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Volume" @@ -798,6 +807,15 @@ msgstr "Nessun Preferito" msgid "No SD-Card inserted!" msgstr "Nessuna scheda SD inserita!" +msgid "No USB Device" +msgstr "Nessun Dispositivo USB" + +msgid "No USB Device found." +msgstr "Nessun Dispositivo USB trovato." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Non è stata trovata alcuna partizione WBFS o FAT/NTFS" + msgid "No cheats were selected" msgstr "Non è stato selezionato alcun trucco" @@ -876,9 +894,6 @@ msgstr "Controllo Genitori disabilitato" msgid "Partition" msgstr "Partizione" -msgid "Partition Format Menu" -msgstr "Menu Formattazione Partizioni" - msgid "Password" msgstr "" @@ -900,15 +915,6 @@ msgstr "Seleziona da un elenco" msgid "Play Count" msgstr "Giocati" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Attendere prego..." @@ -942,15 +948,9 @@ msgstr "Ricarica SD" msgid "Rename Game on WBFS" msgstr "Rinomina Gioco su WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Azzera contatore" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Premere OK per riavviare..." @@ -987,6 +987,9 @@ msgstr "Salvataggio Eseguito" msgid "Screensaver" msgstr "Salvaschermo" +msgid "Select" +msgstr "Seleziona" + msgid "Select a DOL" msgstr "Seleziona un file DOL" @@ -999,6 +1002,9 @@ msgstr "settembre" msgid "Set Search-Filter" msgstr "Cerca Gioco" +msgid "Set as backgroundmusic?" +msgstr "Imposto come Musica Sottofondo?" + msgid "Settings" msgstr "Impostazioni" @@ -1114,6 +1120,9 @@ msgstr "Suggerimenti" msgid "Transfer failed." msgstr "Trasferimento fallito." +msgid "USB Device not found" +msgstr "Dispositivo USB non Trovato" + msgid "USB Loader GX is protected" msgstr "USB Loader GX è Protetto" @@ -1142,9 +1151,6 @@ msgstr "Sblocca Controllo Genitori" msgid "Unlock console to use this option." msgstr "Sblocca la Console per usare questa opzione." -msgid "Unlock the app first." -msgstr "L'applicazione deve essere sbloccata." - msgid "Unlocked" msgstr "Sbloccato" @@ -1209,6 +1215,9 @@ msgstr "Percorso Patch WIP" msgid "WIP Patches Path changed" msgstr "Percorso Patch WIP modificato" +msgid "Waiting for USB Device" +msgstr "Caricamento Dispositivo USB" + msgid "Waiting..." msgstr "Caricamento..." @@ -1254,15 +1263,15 @@ msgstr "Hai scelto di visualizzare i preferiti e non ne hai selezionato nessuno" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "E' in uso una partizione NTFS. Poiché sono possibili errori in scrittura nelle partizioni NTFS, non è possibile installare alcun gioco." -msgid "You can't access this menu!" -msgstr "Non puoi accedere a questo menu!" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Il Controllo Genitori non è attivo. Se vuoi utilizzare il Controllo Genitori abilitalo nelle Impostazioni della Wii." msgid "You have attempted to load a bad image" msgstr "Hai tentato di caricare un'immagine non valida" +msgid "You need to select or format a partition" +msgstr "Occorre selezionare o formattare una partizione" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "L'indirizzo (URL) è stato salvato in %sWiiTDB_URL.txt." @@ -1333,74 +1342,35 @@ msgstr "di" msgid "seconds left" msgstr "secondi mancanti" -msgid "Backgroundmusic Path changed." -msgstr "Percorso Musica modificato" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Impossibile decomprimere LZ77" -msgid "Set as backgroundmusic?" -msgstr "Imposto come Musica Sottofondo?" +#~ msgid "Can't find disc" +#~ msgstr "Impossibile trovare il disco" -msgid "Back to Wii Menu" -msgstr "Torna al Menu Wii" +#~ msgid "IMD5 Header not right." +#~ msgstr "Header IMD5 non corretto." -msgid "Could not initialize DIP module!" -msgstr "Non è stato possibile inizializzare il modulo DIP!" +#~ msgid "IMET Header wrong." +#~ msgstr "Header IMET errato." -msgid "Do you want to retry for 30 secs?" -msgstr "Vuoi riprovare per 30 sec?" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Estrazione opening.bnr fallita" -msgid "Format" -msgstr "Formatta" +#~ msgid "Homebrew Channel" +#~ msgstr "Canale Homebrew" -msgid "No USB Device" -msgstr "Nessun Dispositivo USB" +#~ msgid "You need to start this game one time to create a save file, then exit and start it again." +#~ msgstr "Devi caricare questo gioco almeno una volta per creare un file di salvataggio, quindi esci dal gioco e ricaricalo di nuovo." -msgid "No USB Device found." -msgstr "Nessun Dispositivo USB trovato." +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "ERRORE: non si accede alla periferica USB!" -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Non è stata trovata alcuna partizione WBFS o FAT/NTFS" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "ERRORE: non si carica il cIOS!" -msgid "Select" -msgstr "Seleziona" +#~ msgid "Loading..." +#~ msgstr "Sto caricando..." -msgid "USB Device not found" -msgstr "Dispositivo USB non Trovato" - -msgid "Waiting for USB Device" -msgstr "Caricamento Dispositivo USB" - -msgid "You need to select or format a partition" -msgstr "Occorre selezionare o formattare una partizione" - -msgid "Can't decompress LZ77" -msgstr "Impossibile decomprimere LZ77" - -msgid "Can't find disc" -msgstr "Impossibile trovare il disco" - -msgid "IMD5 Header not right." -msgstr "Header IMD5 non corretto." - -msgid "IMET Header wrong." -msgstr "Header IMET errato." - -msgid "Failed to extract opening.bnr" -msgstr "Estrazione opening.bnr fallita" - -msgid "Homebrew Channel" -msgstr "Canale Homebrew" - -msgid "You need to start this game one time to create a save file, then exit and start it again." -msgstr "Devi caricare questo gioco almeno una volta per creare un file di salvataggio, quindi esci dal gioco e ricaricalo di nuovo." - -msgid "ERROR: USB device could not be loaded!" -msgstr "ERRORE: non si accede alla periferica USB!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "ERRORE: non si carica il cIOS!" - -msgid "Loading..." -msgstr "Sto caricando..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Sto aspettando la tua lenta periferica USB: %i secs..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Sto aspettando la tua lenta periferica USB: %i secs..." diff --git a/Languages/japanese.lang b/Languages/japanese.lang index ceb583a0..a88aac6b 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# japanese.lang - r885 +# japanese.lang - r872 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: hosigumayuugi\n" "Language-Team: hosigumayuugi\n" @@ -33,10 +33,10 @@ msgid "%s : %s May not boot correctly if your System Menu is not up to date." msgstr "%s : %s Wiiが更新されていなければ正常に起動できない可能性があります" msgid "0 (Everyone)" -msgstr "0(セットしない)" +msgstr "A(全年齢対象)" msgid "1 (Child 7+)" -msgstr "1(C以上を制限)" +msgstr "B(12才以上対象)" msgid "1 hour" msgstr "1時間" @@ -45,7 +45,7 @@ msgid "10 min" msgstr "10分" msgid "2 (Teen 12+)" -msgstr "2(D以上を制限)" +msgstr "C(15才以上対象)" msgid "20 min" msgstr "20分" @@ -54,7 +54,7 @@ msgid "2D Cover Path" msgstr "2Dカバーのパス" msgid "3 (Mature 16+)" -msgstr "3(Z以上を制限)" +msgstr "D(17才以上対象)" msgid "3 min" msgstr "3分" @@ -69,7 +69,7 @@ msgid "3D Covers" msgstr "3Dカバー" msgid "4 (Adults Only 18+)" -msgstr "4(Zを制限)" +msgstr "Z(18才以上対象)" msgid "5 min" msgstr "5分" @@ -182,9 +182,15 @@ msgstr "HOMEボタンメニューへ" msgid "Back to Loader" msgstr "HBCへ" +msgid "Back to Wii Menu" +msgstr "Wiiメニューへ" + msgid "Backgroundmusic" msgstr "BGM" +msgid "Backgroundmusic Path changed." +msgstr "BGMのパスを変更しました" + msgid "Big thanks to:" msgstr "協力:" @@ -215,9 +221,6 @@ msgstr "削除できません" msgid "Cancel" msgstr "キャンセル" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "チャンネル" @@ -285,6 +288,9 @@ msgstr "GCTﾌｧｲﾙを作成できませんでした" msgid "Could not find a WBFS partition." msgstr "WBFS領域が見つかりませんでした" +msgid "Could not initialize DIP module!" +msgstr "DIPﾓｼﾞｭｰﾙを初期化できません!" + msgid "Could not initialize network!" msgstr "ﾈｯﾄﾜｰｸを初期化できませんでした!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "本当に削除しますか?" msgid "Do you want to apply it now?" -msgstr "適用しますか?" +msgstr "" msgid "Do you want to change language?" msgstr "言語を変更しますか？" @@ -414,6 +420,9 @@ msgstr "ダウンロードしますか?" msgid "Do you want to format:" msgstr "初期化しますか?" +msgid "Do you want to retry for 30 secs?" +msgstr "再試行しますか？" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "既知の代替DOLを利用しますか？" @@ -466,7 +475,7 @@ msgid "ERROR:" msgstr "エラー：" msgid "ERROR: Can't set up theme." -msgstr "テーマを適用できませんでした" +msgstr "" msgid "Enable Parental Control" msgstr "使用制限機能を有効化" @@ -525,6 +534,9 @@ msgstr "ゲームリストの回転" msgid "Force" msgstr "強制" +msgid "Format" +msgstr "初期化" + msgid "Formatting, please wait..." msgstr "初期化中です、暫くお待ち下さい..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "基本設定" msgid "GXtheme.cfg not found in any subfolder." -msgstr "設定ファイルが見つかりません" +msgstr "" msgid "Game ID" msgstr "IDのみ" @@ -714,7 +726,7 @@ msgid "Left" msgstr "左ボタンで" msgid "Like SysMenu" -msgstr "Wiiメニュー風" +msgstr "システムメニュー風" msgid "Load" msgstr "はじめる" @@ -762,9 +774,6 @@ msgstr "4で割り切れない寸法があります" msgid "Mount DVD drive" msgstr "DVDを起動" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "BGMの音量" @@ -798,6 +807,15 @@ msgstr "お気に入りが選ばれていません" msgid "No SD-Card inserted!" msgstr "SDｶｰﾄﾞが挿入されていません!" +msgid "No USB Device" +msgstr "USB機器がありません" + +msgid "No USB Device found." +msgstr "USB機器が検出されていません" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "WBFS/FAT/NTFS領域が見つかりません" + msgid "No cheats were selected" msgstr "何も選ばれていません" @@ -805,7 +823,7 @@ msgid "No data could be read." msgstr "読み込みに失敗しました" msgid "No file missing!" -msgstr "必要ありません" +msgstr "ファイルがありません" msgid "No new updates." msgstr "更新はありません" @@ -814,7 +832,7 @@ msgid "No themes found on the site." msgstr "テーマが見つかりません" msgid "Normal" -msgstr "ワイド" +msgstr "大きめ" msgid "Normal Covers" msgstr "2Dカバー" @@ -876,9 +894,6 @@ msgstr "使用制限機能を無効にしました" msgid "Partition" msgstr "使用する領域" -msgid "Partition Format Menu" -msgstr "初期化メニュー" - msgid "Password" msgstr "暗証番号" @@ -900,15 +915,6 @@ msgstr "リストから選択" msgid "Play Count" msgstr "プレイ回数" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "しばらくお待ちください" @@ -942,15 +948,9 @@ msgstr "SDを再読み込み" msgid "Rename Game on WBFS" msgstr "WBFS内のゲーム名を変更" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "プレイ回数をリセット" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "再起動します" @@ -987,6 +987,9 @@ msgstr "保存しました" msgid "Screensaver" msgstr "画面焼け軽減機能" +msgid "Select" +msgstr "選択" + msgid "Select a DOL" msgstr "DOLを選択" @@ -999,6 +1002,9 @@ msgstr "9月" msgid "Set Search-Filter" msgstr "検索" +msgid "Set as backgroundmusic?" +msgstr "BGMに設定しますか？" + msgid "Settings" msgstr "設定" @@ -1114,6 +1120,9 @@ msgstr "ヒントバルーン" msgid "Transfer failed." msgstr "転送を失敗しました" +msgid "USB Device not found" +msgstr "USBﾃﾞﾊﾞｲｽを検出できませんでした" + msgid "USB Loader GX is protected" msgstr "USB Loaderは保護されています" @@ -1142,9 +1151,6 @@ msgstr "使用制限機能を解除" msgid "Unlock console to use this option." msgstr "ロックを解除してください" -msgid "Unlock the app first." -msgstr "先にロックを解除してください" - msgid "Unlocked" msgstr "ロックされていません" @@ -1209,6 +1215,9 @@ msgstr "WIPパッチのパス" msgid "WIP Patches Path changed" msgstr "WIPパッチのパスを変更しました" +msgid "Waiting for USB Device" +msgstr "USBﾃﾞﾊﾞｲｽの応答待ち" + msgid "Waiting..." msgstr "待機中…" @@ -1219,7 +1228,7 @@ msgid "WiFi Features" msgstr "ネットワーク対応" msgid "Widescreen Fix" -msgstr "普通" +msgstr "小さめ" msgid "Wii Menu" msgstr "Wiiメニューへ" @@ -1254,15 +1263,15 @@ msgstr "お気に入りの登録がありません" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "NTFS領域にｲﾝｽﾄｰﾙ中にｴﾗｰが発生するとｲﾝｽﾄｰﾙに失敗します" -msgid "You can't access this menu!" -msgstr "このメニューは使用できません" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "Wii本体設定で使用制限機能を有効にしてください" msgid "You have attempted to load a bad image" msgstr "読み込めない画像があります" +msgid "You need to select or format a partition" +msgstr "領域を選択するか初期化してください" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "%sWiiTDB_URL.txtにURLを保存しました" @@ -1333,62 +1342,23 @@ msgstr "中" msgid "seconds left" msgstr "秒で完了" -msgid "Backgroundmusic Path changed." -msgstr "BGMのパスを変更しました" +#~ msgid "Can't decompress LZ77" +#~ msgstr "LZ77を解凍できませんでした" -msgid "Set as backgroundmusic?" -msgstr "BGMに設定しますか？" +#~ msgid "Can't find disc" +#~ msgstr "ディスクが見つかりません" -msgid "Back to Wii Menu" -msgstr "Wiiメニューへ" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5ヘッダが正しくありません" -msgid "Could not initialize DIP module!" -msgstr "DIPﾓｼﾞｭｰﾙを初期化できません!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMETヘッダが間違っています" -msgid "Do you want to retry for 30 secs?" -msgstr "再試行しますか？" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "USBLoaderGXを終了しますか？" -msgid "Format" -msgstr "初期化" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "opening.bnrの抽出に失敗しました" -msgid "No USB Device" -msgstr "USB機器がありません" - -msgid "No USB Device found." -msgstr "USB機器が検出されていません" - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "WBFS/FAT/NTFS領域が見つかりません" - -msgid "Select" -msgstr "選択" - -msgid "USB Device not found" -msgstr "USBﾃﾞﾊﾞｲｽを検出できませんでした" - -msgid "Waiting for USB Device" -msgstr "USBﾃﾞﾊﾞｲｽの応答待ち" - -msgid "You need to select or format a partition" -msgstr "領域を選択するか初期化してください" - -msgid "Can't decompress LZ77" -msgstr "LZ77を解凍できませんでした" - -msgid "Can't find disc" -msgstr "ディスクが見つかりません" - -msgid "IMD5 Header not right." -msgstr "IMD5ヘッダが正しくありません" - -msgid "IMET Header wrong." -msgstr "IMETヘッダが間違っています" - -msgid "Exit USB Loader GX?" -msgstr "USBLoaderGXを終了しますか？" - -msgid "Failed to extract opening.bnr" -msgstr "opening.bnrの抽出に失敗しました" - -msgid "Homebrew Channel" -msgstr "HBCへ" +#~ msgid "Homebrew Channel" +#~ msgstr "HBCへ" diff --git a/Languages/korean.lang b/Languages/korean.lang index 081ad210..88b26fdb 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -182,9 +182,15 @@ msgstr "홈브류 메뉴 또는 Wii 메뉴로" msgid "Back to Loader" msgstr "로더로 돌아감" +msgid "Back to Wii Menu" +msgstr "Wii 메뉴로 놀아가기" + msgid "Backgroundmusic" msgstr "배경음악" +msgid "Backgroundmusic Path changed." +msgstr "배경음악 경로 변경됨." + msgid "Big thanks to:" msgstr "감사 :" @@ -215,9 +221,6 @@ msgstr "삭제할 수 없습니다:" msgid "Cancel" msgstr "취소" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "" @@ -285,6 +288,9 @@ msgstr "GCT 파일을 생성할수 없음" msgid "Could not find a WBFS partition." msgstr "WBFS 파티션이 없어요." +msgid "Could not initialize DIP module!" +msgstr "DIP 모듈 초기화 실패!" + msgid "Could not initialize network!" msgstr "네트워크 초기화 실패!" @@ -414,6 +420,9 @@ msgstr "" msgid "Do you want to format:" msgstr "포맷하겠습니까:" +msgid "Do you want to retry for 30 secs?" +msgstr "30초간 재시도 할까요?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "정말로 Alt. DOL을 사용할까요?" @@ -525,6 +534,9 @@ msgstr "좌/우 설정" msgid "Force" msgstr "강제" +msgid "Format" +msgstr "포맷" + msgid "Formatting, please wait..." msgstr "포맷 중. 기다려 주세요..." @@ -762,9 +774,6 @@ msgstr "대부분 이미지는 4로 나누어져야 되요." msgid "Mount DVD drive" msgstr "" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "음량" @@ -798,6 +807,15 @@ msgstr "즐겨찾기 없음" msgid "No SD-Card inserted!" msgstr "SD카드가 없습니다!" +msgid "No USB Device" +msgstr "USB 장치가 없습니다." + +msgid "No USB Device found." +msgstr "USB 장치가 없습니다." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "파티션" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "비밀번호" @@ -900,15 +915,6 @@ msgstr "리스트로 부터 고르기" msgid "Play Count" msgstr "실행 횟수" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "" @@ -942,15 +948,9 @@ msgstr "SD카드 읽기" msgid "Rename Game on WBFS" msgstr "WBFS에서 게임 이름 변경" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "실행횟수 리셋" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "재시작..." @@ -987,6 +987,9 @@ msgstr "" msgid "Screensaver" msgstr "화면보호기" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "" @@ -999,6 +1002,9 @@ msgstr "9월" msgid "Set Search-Filter" msgstr "" +msgid "Set as backgroundmusic?" +msgstr "벼경음악 설정?" + msgid "Settings" msgstr "설정" @@ -1114,6 +1120,9 @@ msgstr "Tooltips" msgid "Transfer failed." msgstr "" +msgid "USB Device not found" +msgstr "USB 장치가 없습니다." + msgid "USB Loader GX is protected" msgstr "USB 로더 GX 잠김 상태" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "이 옵션을 사용하기 위해 콘솔을 잠금해제" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "잠금해제" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "USB 장치를 기다리는 중" + msgid "Waiting..." msgstr "기다리는 중..." @@ -1254,15 +1263,15 @@ msgstr "즐겨찾기를 선택했으나 선택된 즐겨찾기가 없네요." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "잘못된 이미지를 로딩하여 하군요." +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "당신의 URL은 %sWiiTDB_URL.txt 에 저장되었어요." @@ -1333,44 +1342,14 @@ msgstr "중" msgid "seconds left" msgstr "초 남았습니다" -msgid "Backgroundmusic Path changed." -msgstr "배경음악 경로 변경됨." +#~ msgid "Exit USB Loader GX?" +#~ msgstr "USB로더 GX를 종료할까요?" -msgid "Set as backgroundmusic?" -msgstr "벼경음악 설정?" +#~ msgid "No WBFS partition found" +#~ msgstr "WBFS 파티션이 없습니다." -msgid "Back to Wii Menu" -msgstr "Wii 메뉴로 놀아가기" +#~ msgid "You need to format a partition" +#~ msgstr "파티션을 포맷해야 합니다" -msgid "Could not initialize DIP module!" -msgstr "DIP 모듈 초기화 실패!" - -msgid "Do you want to retry for 30 secs?" -msgstr "30초간 재시도 할까요?" - -msgid "Format" -msgstr "포맷" - -msgid "No USB Device" -msgstr "USB 장치가 없습니다." - -msgid "No USB Device found." -msgstr "USB 장치가 없습니다." - -msgid "USB Device not found" -msgstr "USB 장치가 없습니다." - -msgid "Waiting for USB Device" -msgstr "USB 장치를 기다리는 중" - -msgid "Exit USB Loader GX?" -msgstr "USB로더 GX를 종료할까요?" - -msgid "No WBFS partition found" -msgstr "WBFS 파티션이 없습니다." - -msgid "You need to format a partition" -msgstr "파티션을 포맷해야 합니다" - -msgid "Homebrew Channel" -msgstr "홈브류 채널" +#~ msgid "Homebrew Channel" +#~ msgstr "홈브류 채널" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 6c042fb1..1541f2c6 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -182,9 +182,15 @@ msgstr "Tilbake til HBC eller Wii meny" msgid "Back to Loader" msgstr "HBC/Loader" +msgid "Back to Wii Menu" +msgstr "Wii meny" + msgid "Backgroundmusic" msgstr "Bakgrunnsmusikk" +msgid "Backgroundmusic Path changed." +msgstr "Bakgrunnsmusikk sti endret" + msgid "Big thanks to:" msgstr "Stor takk til:" @@ -215,9 +221,6 @@ msgstr "Kan ikke slette:" msgid "Cancel" msgstr "Avbryt" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanaler" @@ -285,6 +288,9 @@ msgstr "Kan ikke opprette GCT fil" msgid "Could not find a WBFS partition." msgstr "Kan ikke finne en WBFS partisjon." +msgid "Could not initialize DIP module!" +msgstr "Kan ikke initialisere DIP modul!" + msgid "Could not initialize network!" msgstr "Kan ikke initialisere nettverk!" @@ -414,6 +420,9 @@ msgstr "Vil du laste ned dette temaet?" msgid "Do you want to format:" msgstr "Vil du formatere:" +msgid "Do you want to retry for 30 secs?" +msgstr "Vil du fortsette å prøve i 30 sekunder?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Vil du bruke alt DOL filen som er kjent for å være riktig?" @@ -525,6 +534,9 @@ msgstr "" msgid "Force" msgstr "Tving" +msgid "Format" +msgstr "Formatér" + msgid "Formatting, please wait..." msgstr "Formaterer, vennligst vent..." @@ -762,9 +774,6 @@ msgstr "Sannsynligvis har bildet dimensjoner som ikke kan deles med 4." msgid "Mount DVD drive" msgstr "Last DVD stasjon" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Musikk volum" @@ -798,6 +807,15 @@ msgstr "Ingen favoritter" msgid "No SD-Card inserted!" msgstr "Intet SD-kort satt i!" +msgid "No USB Device" +msgstr "Ingen USB enhet" + +msgid "No USB Device found." +msgstr "Ingen USB enhet funnet." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Ingen juksefiler valgt" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Partisjon" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Passord" @@ -900,15 +915,6 @@ msgstr "Velg fra liste" msgid "Play Count" msgstr "Ganger spilt" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Vennligst vent..." @@ -942,15 +948,9 @@ msgstr "Les SD på nytt" msgid "Rename Game on WBFS" msgstr "Gi nytt navn til spill på WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Nullstill teller" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Starter på nytt..." @@ -987,6 +987,9 @@ msgstr "Lagret" msgid "Screensaver" msgstr "Skjermbeskytter" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "Velg en DOL fil" @@ -999,6 +1002,9 @@ msgstr "Sep" msgid "Set Search-Filter" msgstr "Angi søkefilter" +msgid "Set as backgroundmusic?" +msgstr "Bruk som bakgrunnsmusikk?" + msgid "Settings" msgstr "Innstillinger" @@ -1114,6 +1120,9 @@ msgstr "Verktøystips" msgid "Transfer failed." msgstr "Overføring feilet." +msgid "USB Device not found" +msgstr "USB enhet ikke funnet" + msgid "USB Loader GX is protected" msgstr "USB Loader GX er beskyttet" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Lås opp konsollen for å bruke denne innstillingen." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Opplåst" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Venter på USB enhet" + msgid "Waiting..." msgstr "Venter..." @@ -1254,15 +1263,15 @@ msgstr "Du prøver å vise favoritter når du ikke har noen valgt." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Du har forsøkt å vise et korrupt bilde" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Din URL ble lagret i %sWiiTDB_URL.txt." @@ -1333,53 +1342,23 @@ msgstr "av" msgid "seconds left" msgstr "sekunder gjenstår" -msgid "Backgroundmusic Path changed." -msgstr "Bakgrunnsmusikk sti endret" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Avslutt USB Loader GX?" -msgid "Set as backgroundmusic?" -msgstr "Bruk som bakgrunnsmusikk?" +#~ msgid "No WBFS partition found" +#~ msgstr "Ingen WBFS partisjon funnet" -msgid "Back to Wii Menu" -msgstr "Wii meny" +#~ msgid "You need to format a partition" +#~ msgstr "Du må formatere en partisjon" -msgid "Could not initialize DIP module!" -msgstr "Kan ikke initialisere DIP modul!" +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "FEIL: USB enhet kan ikke lastes!" -msgid "Do you want to retry for 30 secs?" -msgstr "Vil du fortsette å prøve i 30 sekunder?" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "FEIL: cIOS kan ikke lastes!" -msgid "Format" -msgstr "Formatér" +#~ msgid "Loading..." +#~ msgstr "Laster..." -msgid "No USB Device" -msgstr "Ingen USB enhet" - -msgid "No USB Device found." -msgstr "Ingen USB enhet funnet." - -msgid "USB Device not found" -msgstr "USB enhet ikke funnet" - -msgid "Waiting for USB Device" -msgstr "Venter på USB enhet" - -msgid "Exit USB Loader GX?" -msgstr "Avslutt USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "Ingen WBFS partisjon funnet" - -msgid "You need to format a partition" -msgstr "Du må formatere en partisjon" - -msgid "ERROR: USB device could not be loaded!" -msgstr "FEIL: USB enhet kan ikke lastes!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "FEIL: cIOS kan ikke lastes!" - -msgid "Loading..." -msgstr "Laster..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Venter på USB enhet: %i sek..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Venter på USB enhet: %i sek..." diff --git a/Languages/polish.lang b/Languages/polish.lang index 1c70e023..2f347f0f 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -182,9 +182,15 @@ msgstr "Powrot do HBC/Wii Menu" msgid "Back to Loader" msgstr "Powrot do HBC" +msgid "Back to Wii Menu" +msgstr "Powrit do Wii Menu" + msgid "Backgroundmusic" msgstr "Muzyka w tle" +msgid "Backgroundmusic Path changed." +msgstr "Sciezka do muzyki w tle zmieniona" + msgid "Big thanks to:" msgstr "Podziekowania dla" @@ -215,9 +221,6 @@ msgstr "Nie mozna usunac" msgid "Cancel" msgstr "Anuluj" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "" @@ -285,6 +288,9 @@ msgstr "Nie udalo sie stworzyc pliku GCT" msgid "Could not find a WBFS partition." msgstr "Nie znaleziono partycji WBFS" +msgid "Could not initialize DIP module!" +msgstr "Nie zainicjalizowano modulu DIP!" + msgid "Could not initialize network!" msgstr "Nie zainicjalizowano sieci!" @@ -414,6 +420,9 @@ msgstr "" msgid "Do you want to format:" msgstr "Sformatowac:" +msgid "Do you want to retry for 30 secs?" +msgstr "Powtorzyc za 30 sec?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Uzyc alternatywnego pliku DOL?" @@ -525,6 +534,9 @@ msgstr "Obrot na osi X" msgid "Force" msgstr "Wymuc" +msgid "Format" +msgstr "Sformatuj" + msgid "Formatting, please wait..." msgstr "Formatowanie, prosze czekac..." @@ -762,9 +774,6 @@ msgstr "Prawdopodobnie rozdzielczosc nie jest podzielna przez 4" msgid "Mount DVD drive" msgstr "" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Poziom glosnosci" @@ -798,6 +807,15 @@ msgstr "Brak ulubionych" msgid "No SD-Card inserted!" msgstr "Nie wlozono karty SD!" +msgid "No USB Device" +msgstr "Nie wykryto urzadzenia USB" + +msgid "No USB Device found." +msgstr "Nie wykryto urzadzenia USB" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Partycja" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Haslo" @@ -900,15 +915,6 @@ msgstr "Wybierz z listy" msgid "Play Count" msgstr "Licznik" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "" @@ -942,15 +948,9 @@ msgstr "Przeladuj SD" msgid "Rename Game on WBFS" msgstr "Zmien tytul gry na WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Zrestartuj licznik" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Restartowanie..." @@ -987,6 +987,9 @@ msgstr "" msgid "Screensaver" msgstr "Wygaszacz ekranu" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "" @@ -999,6 +1002,9 @@ msgstr "Wrzesien" msgid "Set Search-Filter" msgstr "" +msgid "Set as backgroundmusic?" +msgstr "Ustawic jako muzyke w tle?" + msgid "Settings" msgstr "Ustawienia" @@ -1114,6 +1120,9 @@ msgstr "Chmurki z podpowiedziami" msgid "Transfer failed." msgstr "" +msgid "USB Device not found" +msgstr "Nie znaleziono urzadzenia USB" + msgid "USB Loader GX is protected" msgstr "USB Loader GX zabezpieczony" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Odblokuj konsole, aby uzyc tej opcji" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Odblokowano" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Oczekiwanie na urzadzenie USB" + msgid "Waiting..." msgstr "Oczekiwanie..." @@ -1254,15 +1263,15 @@ msgstr "WybraleS wySwietlenie usubionych, ale zadnych nie wybraleS" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Probujesz zaladowac zly obraz" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Adres zostal zapisany w pliku %sWiiTDB_URL.txt." @@ -1333,41 +1342,11 @@ msgstr "z" msgid "seconds left" msgstr "sekund pozostalo" -msgid "Backgroundmusic Path changed." -msgstr "Sciezka do muzyki w tle zmieniona" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Zakonczyc prace programu?" -msgid "Set as backgroundmusic?" -msgstr "Ustawic jako muzyke w tle?" +#~ msgid "No WBFS partition found" +#~ msgstr "Nie znaleziono partycji WBFS" -msgid "Back to Wii Menu" -msgstr "Powrit do Wii Menu" - -msgid "Could not initialize DIP module!" -msgstr "Nie zainicjalizowano modulu DIP!" - -msgid "Do you want to retry for 30 secs?" -msgstr "Powtorzyc za 30 sec?" - -msgid "Format" -msgstr "Sformatuj" - -msgid "No USB Device" -msgstr "Nie wykryto urzadzenia USB" - -msgid "No USB Device found." -msgstr "Nie wykryto urzadzenia USB" - -msgid "USB Device not found" -msgstr "Nie znaleziono urzadzenia USB" - -msgid "Waiting for USB Device" -msgstr "Oczekiwanie na urzadzenie USB" - -msgid "Exit USB Loader GX?" -msgstr "Zakonczyc prace programu?" - -msgid "No WBFS partition found" -msgstr "Nie znaleziono partycji WBFS" - -msgid "You need to format a partition" -msgstr "Musisz sformatowac partycje" +#~ msgid "You need to format a partition" +#~ msgstr "Musisz sformatowac partycje" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index 204ab0d7..057931af 100644 --- a/Languages/portuguese_br.lang +++ b/Languages/portuguese_br.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: boto12\n" "Language-Team: boto12\n" @@ -182,9 +182,15 @@ msgstr "Voltar ao Loader/Menu do Wii" msgid "Back to Loader" msgstr "Loader" +msgid "Back to Wii Menu" +msgstr "Menu do Wii" + msgid "Backgroundmusic" msgstr "Música de fundo" +msgid "Backgroundmusic Path changed." +msgstr "Pasta Música Fundo modificada" + msgid "Big thanks to:" msgstr "Agradecimentos:" @@ -215,9 +221,6 @@ msgstr "Não foi possível apagar:" msgid "Cancel" msgstr "Cancelar" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Canais" @@ -285,6 +288,9 @@ msgstr "Não foi possível criar o arquivo GCT" msgid "Could not find a WBFS partition." msgstr "Não foi encontrada nenhuma partição WBFS." +msgid "Could not initialize DIP module!" +msgstr "Não foi possível inicializar o módulo DIP!" + msgid "Could not initialize network!" msgstr "Não foi possível incializar a Ligação de Rede!" @@ -414,6 +420,9 @@ msgstr "Deseja baixar este tema?" msgid "Do you want to format:" msgstr "Deseja FORMATAR:" +msgid "Do you want to retry for 30 secs?" +msgstr "Deseja tentar novamente dentro de 30 segs?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Deseja usar o DOL alternativo que pensa ser o correcto?" @@ -525,6 +534,9 @@ msgstr "Paginação Horizontal" msgid "Force" msgstr "Forçar" +msgid "Format" +msgstr "Formatar" + msgid "Formatting, please wait..." msgstr "Formatando, por favor aguarde..." @@ -762,9 +774,6 @@ msgstr "Provável que o tamanho não seja divisível por 4." msgid "Mount DVD drive" msgstr "Carregar leitor DVD" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Volume da Música" @@ -798,6 +807,15 @@ msgstr "Lista de favoritos vazia" msgid "No SD-Card inserted!" msgstr "Cartão SD não inserido!" +msgid "No USB Device" +msgstr "Nenhum dispositivo USB" + +msgid "No USB Device found." +msgstr "Nenhum dispositivo USB encontrado." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Nenhuma partição WBFS o FAT/NTFS encontrada" + msgid "No cheats were selected" msgstr "Nenhuma seleção de truques" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Partição" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Senha" @@ -900,15 +915,6 @@ msgstr "Escolher da lista" msgid "Play Count" msgstr "Vezes jogadas" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Por favor aguarde..." @@ -942,15 +948,9 @@ msgstr "Atualizar do cartão SD" msgid "Rename Game on WBFS" msgstr "Alterar nome do jogo na partição WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Limpar Contagem" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "O Wii irá reiniciar" @@ -987,6 +987,9 @@ msgstr "Gravado" msgid "Screensaver" msgstr "Proteção de tela" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "Selecionar um DOL" @@ -999,6 +1002,9 @@ msgstr "Set" msgid "Set Search-Filter" msgstr "Usar filtro de busca" +msgid "Set as backgroundmusic?" +msgstr "Definir como música de fundo?" + msgid "Settings" msgstr "Configurações" @@ -1114,6 +1120,9 @@ msgstr "Dicas" msgid "Transfer failed." msgstr "Falhou a transferencia" +msgid "USB Device not found" +msgstr "Dispositivo USB não encontrado" + msgid "USB Loader GX is protected" msgstr "O USB Loader GX está bloqueado" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Desbloquear configuração antes de usar esta opção." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Desbloqueado" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Aguardando pelo Dispositivo USB" + msgid "Waiting..." msgstr "Aguardando..." @@ -1254,15 +1263,15 @@ msgstr "Está tentando visualizar os favoritos, mas não existe nenhum seleciona msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Você tentou carregar uma imagem corrompida" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Sua URL foi salva em %sWiiTDB_URL.txt." @@ -1333,59 +1342,26 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" -msgid "Backgroundmusic Path changed." -msgstr "Pasta Música Fundo modificada" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Não foi possivel descomprimir LZ77" -msgid "Set as backgroundmusic?" -msgstr "Definir como música de fundo?" +#~ msgid "Can't find disc" +#~ msgstr "Disco não encontrado" -msgid "Back to Wii Menu" -msgstr "Menu do Wii" +#~ msgid "IMD5 Header not right." +#~ msgstr "Cabeçalho IMD5 não esta correto" -msgid "Could not initialize DIP module!" -msgstr "Não foi possível inicializar o módulo DIP!" +#~ msgid "IMET Header wrong." +#~ msgstr "Cabeçalho IMET errado" -msgid "Do you want to retry for 30 secs?" -msgstr "Deseja tentar novamente dentro de 30 segs?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Deseja sair do USB Loader GX?" -msgid "Format" -msgstr "Formatar" +#~ msgid "You need to format a partition" +#~ msgstr "É necessário FORMATAR a partição" -msgid "No USB Device" -msgstr "Nenhum dispositivo USB" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Falha ao extrair opening.bnr" -msgid "No USB Device found." -msgstr "Nenhum dispositivo USB encontrado." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Nenhuma partição WBFS o FAT/NTFS encontrada" - -msgid "USB Device not found" -msgstr "Dispositivo USB não encontrado" - -msgid "Waiting for USB Device" -msgstr "Aguardando pelo Dispositivo USB" - -msgid "Can't decompress LZ77" -msgstr "Não foi possivel descomprimir LZ77" - -msgid "Can't find disc" -msgstr "Disco não encontrado" - -msgid "IMD5 Header not right." -msgstr "Cabeçalho IMD5 não esta correto" - -msgid "IMET Header wrong." -msgstr "Cabeçalho IMET errado" - -msgid "Exit USB Loader GX?" -msgstr "Deseja sair do USB Loader GX?" - -msgid "You need to format a partition" -msgstr "É necessário FORMATAR a partição" - -msgid "Failed to extract opening.bnr" -msgstr "Falha ao extrair opening.bnr" - -msgid "Homebrew Channel" -msgstr "Canal Homebrew" +#~ msgid "Homebrew Channel" +#~ msgstr "Canal Homebrew" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index 19f37fcf..66c03967 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -1,12 +1,12 @@ # USB Loader GX language source file. -# portuguese_pt.lang - r878 +# portuguese_pt.lang - r867 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" -"PO-Revision-Date: 2009-12-30 12:06-0000\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" +"PO-Revision-Date: 2009-12-21 14:45-0000\n" "Last-Translator: Sky8000\n" "Language-Team: Sky8000 \n" "MIME-Version: 1.0\n" @@ -182,9 +182,15 @@ msgstr "Voltar ao Loader/Menu da Wii" msgid "Back to Loader" msgstr "Loader" +msgid "Back to Wii Menu" +msgstr "Menu da Wii" + msgid "Backgroundmusic" msgstr "Música de fundo" +msgid "Backgroundmusic Path changed." +msgstr "Pasta Música Fundo alterada" + msgid "Big thanks to:" msgstr "Agradecimentos:" @@ -215,9 +221,6 @@ msgstr "Não foi possível apagar:" msgid "Cancel" msgstr "Cancelar" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Canais" @@ -285,6 +288,9 @@ msgstr "Não foi possível criar o ficheiro GCT" msgid "Could not find a WBFS partition." msgstr "Não foi encontrada nenhuma partição WBFS." +msgid "Could not initialize DIP module!" +msgstr "Não foi possível inicializar o módulo DIP!" + msgid "Could not initialize network!" msgstr "Não foi possível incializar a Ligação de Rede!" @@ -403,7 +409,7 @@ msgid "Do you really want to delete:" msgstr "Tem a certeza que quer eliminar o jogo:" msgid "Do you want to apply it now?" -msgstr "Deseja aplicar agora?" +msgstr "" msgid "Do you want to change language?" msgstr "Deseja alterar o idioma?" @@ -414,6 +420,9 @@ msgstr "Deseja descarregar este tema?" msgid "Do you want to format:" msgstr "Deseja FORMATAR:" +msgid "Do you want to retry for 30 secs?" +msgstr "Deseja tentar novamente dentro de 30 segs?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Pretende usar o DOL alternativo que se pensa ser o correcto?" @@ -466,7 +475,7 @@ msgid "ERROR:" msgstr "ERRO:" msgid "ERROR: Can't set up theme." -msgstr "ERRO: Impossível configurar tema." +msgstr "" msgid "Enable Parental Control" msgstr "Activar Controlo Parental" @@ -525,6 +534,9 @@ msgstr "Paginação Horizontal" msgid "Force" msgstr "Forçar" +msgid "Format" +msgstr "Formatar" + msgid "Formatting, please wait..." msgstr "Formatando, por favor aguarde..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "Definições do Interface" msgid "GXtheme.cfg not found in any subfolder." -msgstr "GXtheme.cfg não encontrado em nenhuma sub-pasta." +msgstr "" msgid "Game ID" msgstr "ID do Jogo" @@ -762,9 +774,6 @@ msgstr "O mais provável é que o tamanho não seja divisível por 4." msgid "Mount DVD drive" msgstr "Montar Unidade de DVD" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Volume Música" @@ -798,6 +807,15 @@ msgstr "Lista de favoritos vazia" msgid "No SD-Card inserted!" msgstr "Cartão SD não inserido!" +msgid "No USB Device" +msgstr "Nenhum dispositivo USB encontrado" + +msgid "No USB Device found." +msgstr "Nenhum dispositivo USB encontrado." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "Nenhuma partição WBFS ou FAT/NTFS encontrada" + msgid "No cheats were selected" msgstr "Não foram seleccionados truques" @@ -876,9 +894,6 @@ msgstr "Controlo Parental inactivo" msgid "Partition" msgstr "Partição" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "" @@ -900,15 +915,6 @@ msgstr "Escolher da lista" msgid "Play Count" msgstr "Vezes jogadas" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Por favor aguarde..." @@ -942,15 +948,9 @@ msgstr "Actualizar do cartão SD" msgid "Rename Game on WBFS" msgstr "Alterar nome do jogo (WBFS)" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Limpar Contagem" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "A Wii irá reiniciar" @@ -987,6 +987,9 @@ msgstr "Gravado" msgid "Screensaver" msgstr "Protecção de ecrã" +msgid "Select" +msgstr "Seleccionar" + msgid "Select a DOL" msgstr "Seleccionar o DOL" @@ -999,6 +1002,9 @@ msgstr "Set" msgid "Set Search-Filter" msgstr "Filtro de pesquisa" +msgid "Set as backgroundmusic?" +msgstr "Definir como música de fundo?" + msgid "Settings" msgstr "Configurações" @@ -1114,6 +1120,9 @@ msgstr "Dicas" msgid "Transfer failed." msgstr "A transferência falhou." +msgid "USB Device not found" +msgstr "Dispositivo USB não encontrado" + msgid "USB Loader GX is protected" msgstr "O USB Loader GX está bloqueado" @@ -1142,9 +1151,6 @@ msgstr "Desbloquear Controlo Parental" msgid "Unlock console to use this option." msgstr "Desbloquear configuração antes de usar esta opção." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Desbloqueado" @@ -1209,6 +1215,9 @@ msgstr "Pasta Patches WIP" msgid "WIP Patches Path changed" msgstr "Pasta dos Patches WIP alterada" +msgid "Waiting for USB Device" +msgstr "Aguardando pelo Dispositivo USB" + msgid "Waiting..." msgstr "Aguardando..." @@ -1254,15 +1263,15 @@ msgstr "Está a tentar visualizar os favoritos mas não existe nenhum selecciona msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "Está a utilizar um sistema de ficheiros NTFS. Devido à possibilidade de ocorrerem erros na gravação não será possível instalar jogos." -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "O Controlo Parental não está activo. Se deseja utilizar o Controlo Parental active-o na configuração da Wii (Wii Settings)." msgid "You have attempted to load a bad image" msgstr "Tentou carregar uma imagem corrompida" +msgid "You need to select or format a partition" +msgstr "Necessita seleccionar ou formatar uma partição" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "O URL foi guardado em %sWiiTDB_URL.txt." @@ -1333,59 +1342,20 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" -msgid "Backgroundmusic Path changed." -msgstr "Pasta Música Fundo alterada" +#~ msgid "Can't decompress LZ77" +#~ msgstr "Não é possível descomprimir LZ77" -msgid "Set as backgroundmusic?" -msgstr "Definir como música de fundo?" +#~ msgid "Can't find disc" +#~ msgstr "Disco não encontrado" -msgid "Back to Wii Menu" -msgstr "Menu da Wii" +#~ msgid "IMD5 Header not right." +#~ msgstr "O cabeçalho IMD5 não está correcto." -msgid "Could not initialize DIP module!" -msgstr "Não foi possível inicializar o módulo DIP!" +#~ msgid "IMET Header wrong." +#~ msgstr "Cabeçalho IMET errado." -msgid "Do you want to retry for 30 secs?" -msgstr "Deseja tentar novamente dentro de 30 segs?" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Falha ao extrair o opening.bnr" -msgid "Format" -msgstr "Formatar" - -msgid "No USB Device" -msgstr "Nenhum dispositivo USB encontrado" - -msgid "No USB Device found." -msgstr "Nenhum dispositivo USB encontrado." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "Nenhuma partição WBFS ou FAT/NTFS encontrada" - -msgid "Select" -msgstr "Seleccionar" - -msgid "USB Device not found" -msgstr "Dispositivo USB não encontrado" - -msgid "Waiting for USB Device" -msgstr "Aguardando pelo Dispositivo USB" - -msgid "You need to select or format a partition" -msgstr "Necessita seleccionar ou formatar uma partição" - -msgid "Can't decompress LZ77" -msgstr "Não é possível descomprimir LZ77" - -msgid "Can't find disc" -msgstr "Disco não encontrado" - -msgid "IMD5 Header not right." -msgstr "O cabeçalho IMD5 não está correcto." - -msgid "IMET Header wrong." -msgstr "Cabeçalho IMET errado." - -msgid "Failed to extract opening.bnr" -msgstr "Falha ao extrair o opening.bnr" - -msgid "Homebrew Channel" -msgstr "Canal Homebrew" +#~ msgid "Homebrew Channel" +#~ msgstr "Canal Homebrew" diff --git a/Languages/russian.lang b/Languages/russian.lang index 6055117d..8e973f91 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -1,14 +1,14 @@ # USB Loader GX language source file. -# russian.lang - r885 +# russian.lang - V2.1 r713 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-10 20:08+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" -"Last-Translator: nikolai_ca\n" -"Language-Team: Kir, alendit, nikolai_ca\n" +"Last-Translator: Kir\n" +"Language-Team: Kir\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,20 +17,20 @@ msgid " " msgstr "" msgid " Wad Saved as:" -msgstr " Wad сохранен как:" +msgstr "" msgid " could not be downloaded." -msgstr " не мог быть загружен" +msgstr "" msgid " has been Saved. The text has not been verified. Some of the code may not work right with each other. If you experience trouble, open the text in a real text editor for more information." -msgstr " был сохранен. Текст не был проверен. Некоторые части кода могут не работать успешно друг с другом. При обнаружении проблемы, загрузить текст в текстовый редактор чтобы получить дополнительную информацию." +msgstr "" msgid " is not on the server." -msgstr " не найден на сервере" +msgstr "" #, c-format msgid "%s : %s May not boot correctly if your System Menu is not up to date." -msgstr "%s : %s может не загрузиться правильно если ваше Системное Меню не последней версии" +msgstr "" msgid "0 (Everyone)" msgstr "0 (Для всех)" @@ -39,16 +39,16 @@ msgid "1 (Child 7+)" msgstr "1 (Дети 7+)" msgid "1 hour" -msgstr "1 час" +msgstr "" msgid "10 min" -msgstr "10 мин." +msgstr "" msgid "2 (Teen 12+)" msgstr "2 (Подростки 12+)" msgid "20 min" -msgstr "20 мин." +msgstr "" msgid "2D Cover Path" msgstr "Путь к 2D обложкам" @@ -57,10 +57,10 @@ msgid "3 (Mature 16+)" msgstr "3 (Подростки 16+)" msgid "3 min" -msgstr "3 мин." +msgstr "" msgid "30 min" -msgstr "30 мин." +msgstr "" msgid "3D Cover Path" msgstr "Путь к 3D обложкам" @@ -72,34 +72,34 @@ msgid "4 (Adults Only 18+)" msgstr "4 (Взрослые 18+)" msgid "5 min" -msgstr "5 мин." +msgstr "" msgid ">> Deleting tickets..." -msgstr ">> Удаление тикетов...." +msgstr "" msgid ">> Deleting tickets...ERROR! " -msgstr ">> Удаление тикетов...ОШИБКА! " +msgstr "" msgid ">> Deleting tickets...Ok! " -msgstr ">> Удаление тикетов...Успешно! " +msgstr "" msgid ">> Deleting title ...ERROR! " -msgstr ">> Удаление тайтла ...ОШИБКА! " +msgstr "" msgid ">> Deleting title ...Ok!" -msgstr ">> Удаление тайтла ...Успешно!" +msgstr "" msgid ">> Deleting title contents..." -msgstr ">> Удаление содержимого тайтла..." +msgstr "" msgid ">> Deleting title contents...ERROR! " -msgstr ">> Удаление содержимого тайтла...ОШИБКА!" +msgstr "" msgid ">> Deleting title contents...Ok!" -msgstr ">> Удаление содержимого тайтла...Успешно!" +msgstr "" msgid ">> Deleting title..." -msgstr ">> Удаление тайтла..." +msgstr "" msgid ">> Finishing installation..." msgstr ">> Заканчиваю установку..." @@ -114,19 +114,19 @@ msgid ">> Installing title..." msgstr ">>Установка тайтла" msgid ">> Reading WAD data..." -msgstr ">> Чтение данных WAD..." +msgstr ">>Чтение данных WAD..." msgid ">> Reading WAD data...ERROR! " -msgstr ">> Чтение данных WAD...ОШИБКА!" +msgstr "" msgid ">> Reading WAD data...Ok!" -msgstr ">> Чтение данных WAD...Успешно!" +msgstr "" msgid "AUTO" msgstr "АВТО" msgid "All partitions" -msgstr "Все разделы" +msgstr "" msgid "All the features of USB Loader GX are unlocked." msgstr "Все функции USB Loader GX разблокированы." @@ -135,7 +135,7 @@ msgid "Alternate DOL" msgstr "Альтернативный DOL" msgid "An Error occured" -msgstr "Произошла ошибка" +msgstr "" msgid "Anti" msgstr "Анти" @@ -147,7 +147,7 @@ msgid "Apr" msgstr "Апр" msgid "Are you sure you want to enable Parent Control?" -msgstr "Вы действительно хотите включить Родительский Контроль?" +msgstr "" msgid "Are you sure?" msgstr "Вы уверены ?" @@ -156,22 +156,22 @@ msgid "Aug" msgstr "Авг" msgid "Author:" -msgstr "Автор:" +msgstr "" msgid "AutoInit Network" -msgstr "АвтоИнициализация Сети" +msgstr "" msgid "AutoPatch" msgstr "Авто Патч" msgid "BCA Codes Path" -msgstr "Путь к кодам BCA" +msgstr "" msgid "BCA Codes Path changed" -msgstr "Путь к кодам BCA изменен" +msgstr "" msgid "BETA revisions" -msgstr "BETA-версии" +msgstr "" msgid "Back" msgstr "Назад" @@ -182,9 +182,15 @@ msgstr "Вернуться в HBC или меню Wii" msgid "Back to Loader" msgstr "Вернуться в загрузчик" +msgid "Back to Wii Menu" +msgstr "Вернуться в меню Wii" + msgid "Backgroundmusic" msgstr "Фоновая музыка" +msgid "Backgroundmusic Path changed." +msgstr "Путь к фоновой музыке изменен." + msgid "Big thanks to:" msgstr "Большое спасибо:" @@ -195,7 +201,7 @@ msgid "Boot/Standard" msgstr "Загрузка/Стандарт" msgid "Boot?" -msgstr "Загрузить?" +msgstr "" msgid "Both" msgstr "Оба" @@ -207,7 +213,7 @@ msgid "Can't create directory" msgstr "Не могу создать папку" msgid "Can't create file" -msgstr "Не могу создать файл" +msgstr "" msgid "Can't delete:" msgstr "Невозможно удалить:" @@ -215,17 +221,14 @@ msgstr "Невозможно удалить:" msgid "Cancel" msgstr "Отмена" -msgid "Change Play Path" -msgstr "" - msgid "Channels" -msgstr "Каналы" +msgstr "" msgid "Cheatfile is blank" msgstr "Файл с читами пустой" msgid "Checking existing artwork" -msgstr "Проверка существующей графики" +msgstr "" msgid "Checking for Updates" msgstr "Проверяю обновления" @@ -234,7 +237,7 @@ msgid "Click to Download Covers" msgstr "Нажми, чтобы скачать обложки" msgid "Click to change game ID" -msgstr "Нажмите чтобы изменить ID игры" +msgstr "" msgid "Clock" msgstr "Часы" @@ -247,16 +250,16 @@ msgstr "Скачивание кода" #, c-format msgid "Coded by: %s" -msgstr "Создано: %s" +msgstr "" msgid "Coding:" -msgstr "Создание:" +msgstr "" msgid "Confirm" msgstr "Подтвердить" msgid "Connection lost..." -msgstr "Связь потеряна..." +msgstr "" msgid "Console" msgstr "Консоль" @@ -283,7 +286,10 @@ msgid "Could not create GCT file" msgstr "Не могу создать GCT файл" msgid "Could not find a WBFS partition." -msgstr "Не удалось найти раздел WBFS" +msgstr "" + +msgid "Could not initialize DIP module!" +msgstr "Не могу запустить модуль DIP!" msgid "Could not initialize network!" msgstr "Не могу инициализировать сеть!" @@ -298,7 +304,7 @@ msgid "Could not read the disc." msgstr "Не могу прочесть диск" msgid "Could not save." -msgstr "Не могу сохранить." +msgstr "" msgid "Could not set USB." msgstr "Не могу настроить USB" @@ -319,7 +325,7 @@ msgid "Custom Paths" msgstr "Изменение путей" msgid "Customs/Original" -msgstr "Измененный/Оригинальные" +msgstr "" msgid "DOL Path" msgstr "Путь к DOL" @@ -343,31 +349,31 @@ msgid "Delete" msgstr "Удалить" msgid "Delete ?" -msgstr "Удалить ?" +msgstr "" msgid "Delete Cheat GCT" -msgstr "Удалить чит-код GCT" +msgstr "" msgid "Delete Cheat TXT" -msgstr "Удалить чит-код TXT" +msgstr "" msgid "Delete Cover Artwork" -msgstr "Удалить обложку" +msgstr "" msgid "Delete Disc Artwork" -msgstr "Удалить картинку диска" +msgstr "" msgid "Design:" -msgstr "Дизайн:" +msgstr "" msgid "Developed by" msgstr "Создано " msgid "Directory does not exist!" -msgstr "Каталог не существует!" +msgstr "" msgid "Disc Artwork Download" -msgstr "Загрузка изображений диска" +msgstr "" msgid "Disc Artwork Path" msgstr "Путь к изображениям дисков" @@ -388,43 +394,46 @@ msgid "Display" msgstr "Отображать" msgid "Display as a carousel" -msgstr "Покаказть в виде карусели" +msgstr "" msgid "Display as a grid" -msgstr "Показать в виде сетки" +msgstr "" msgid "Display as a list" -msgstr "Показать в виде списка" +msgstr "" msgid "Display favorites" -msgstr "Показать закладки" +msgstr "" msgid "Do you really want to delete:" msgstr "Вы хотите удалить:" msgid "Do you want to apply it now?" -msgstr "Вы действительно хотите использовать это?" +msgstr "" msgid "Do you want to change language?" msgstr "Вы хотите сменить язык ?" msgid "Do you want to download this theme?" -msgstr "Вы действительно хотите загрузить эту тему?" +msgstr "" msgid "Do you want to format:" msgstr "Вы хотите отформатировать:" +msgid "Do you want to retry for 30 secs?" +msgstr "Хотите попробовать еще раз на 30 секунд?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Вы хотите использовать DOL, который считается правильным?" msgid "Do you wish to update/download all language files?" -msgstr "Вы действительно хотите обновить/загрузить все языковые файлы?" +msgstr "" msgid "Done!" -msgstr "Готово!" +msgstr "" msgid "Download" -msgstr "Загрузка" +msgstr "" msgid "Download Boxart image?" msgstr "Скачать обложку диска?" @@ -436,25 +445,25 @@ msgid "Download Now" msgstr "Скачать сейчас" msgid "Download failed." -msgstr "Загрузка завершилась с ошибкой." +msgstr "" msgid "Download finished" msgstr "Скачивание завершено" msgid "Download request failed." -msgstr "Запрос на загрузку завершился с ошибкоа." +msgstr "" msgid "Downloading" msgstr "Скачиваю" msgid "Downloading Page List:" -msgstr "Загружается список страниц:" +msgstr "" msgid "Downloading file" msgstr "Скачиваю файл:" msgid "Downloading image:" -msgstr "Загружается картинка:" +msgstr "" msgid "Dutch" msgstr "Голландский" @@ -466,10 +475,10 @@ msgid "ERROR:" msgstr "ОШИБКА:" msgid "ERROR: Can't set up theme." -msgstr "ОШИБКА: Не удалось установить тему." +msgstr "" msgid "Enable Parental Control" -msgstr "Включить Родительский Контроль" +msgstr "" msgid "English" msgstr "Английский" @@ -487,28 +496,28 @@ msgid "Error reading Disc" msgstr "Ошибка чтения диска" msgid "Error while transfering data." -msgstr "Ошибка при передаче данных." +msgstr "" msgid "Error..." msgstr "Ошибка..." msgid "Error:" -msgstr "Ошибка:" +msgstr "" msgid "Extracting files..." -msgstr "Распаковка файлов..." +msgstr "" msgid "FAT: Use directories" -msgstr "FAT: Использовать каталоги" +msgstr "" msgid "Failed formating" msgstr "Форматирование не удалось" msgid "Failed to extract." -msgstr "Не удалось распаковать." +msgstr "" msgid "Failed to open partition" -msgstr "Не удалось открыть раздел" +msgstr "" msgid "Feb" msgstr "Фев" @@ -520,11 +529,14 @@ msgid "Finishing installation... Ok!" msgstr "Завершение установки... ОК!" msgid "Flip-X" -msgstr "Flip-X" +msgstr "" msgid "Force" msgstr "Принудительно" +msgid "Format" +msgstr "Форматировать" + msgid "Formatting, please wait..." msgstr "Форматирую, пожалуйста подождите..." @@ -550,7 +562,7 @@ msgid "GUI Settings" msgstr "Настройки интерфейса" msgid "GXtheme.cfg not found in any subfolder." -msgstr "GXtheme.cfg не найден ни в одном каталоге." +msgstr "" msgid "Game ID" msgstr "ID игры" @@ -568,16 +580,16 @@ msgid "Game Size" msgstr "Размер игры" msgid "Game Sound Mode" -msgstr "Режим звука в игре" +msgstr "" msgid "Game Sound Volume" -msgstr "Громкость звука в игре" +msgstr "" msgid "Game is already installed:" msgstr "Игра уже установлена:" msgid "Game partition" -msgstr "Раздел игры" +msgstr "" msgid "Games" msgstr "Игры" @@ -589,7 +601,7 @@ msgid "HOME Menu" msgstr "Домашнее Меню" msgid "Hermes CIOS" -msgstr "Hermes CIOS" +msgstr "" msgid "Homebrew Apps Path" msgstr "Путь к хоумбрю-программам" @@ -610,15 +622,15 @@ msgid "How to Shutdown?" msgstr "Способ отключения?" msgid "If you don't have WiFi, press 1 to get an URL to get your WiiTDB.zip" -msgstr "Если у вас нет сети WiFi, нажмите 1 чтобы получить URL для доступа к вашему WiiTDB.ZIP" +msgstr "" #, c-format msgid "Incoming file %0.2fKB" -msgstr "Входящий файл размером в %0.2fKB" +msgstr "" #, c-format msgid "Incoming file %0.2fMB" -msgstr "Входящий файл размером в %0.2fMB" +msgstr "" msgid "Initializing Network" msgstr "Инициализирую сеть" @@ -627,7 +639,7 @@ msgid "Insert Disk" msgstr "Вставьте диск" msgid "Insert a Wii Disc!" -msgstr "Вставьте диск Wii!" +msgstr "" msgid "Insert an SD-Card to download images." msgstr "Для скачивания изображений вставьте SD карту." @@ -639,10 +651,10 @@ msgid "Insert an SD-Card to use this option." msgstr "Для использования этой функции нужна SD карта" msgid "Install" -msgstr "Установка" +msgstr "" msgid "Install 1:1 Copy" -msgstr "Установка копии 1:1" +msgstr "" msgid "Install Error!" msgstr "Ошибка установки!" @@ -651,10 +663,10 @@ msgid "Install a game" msgstr "Установить игру" msgid "Install not possible" -msgstr "Установка невозможна" +msgstr "" msgid "Install partitions" -msgstr "Установить разделы" +msgstr "" msgid "Installing content... Ok!" msgstr "Установка контента... ОК!" @@ -672,10 +684,10 @@ msgid "Installing wad" msgstr "Установка WAD" msgid "Invalid PIN code" -msgstr "Неправильный PIN-код" +msgstr "" msgid "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." -msgstr "Возможно что у Вас есть информация полезная нам. Пожалуйста передайте эту информацию команде разработчиков." +msgstr "" msgid "Italian" msgstr "Итальянский" @@ -693,7 +705,7 @@ msgid "June" msgstr "Июн" msgid "Keep" -msgstr "Сохранить" +msgstr "" msgid "Keyboard" msgstr "Клавиатура" @@ -702,7 +714,7 @@ msgid "Korean" msgstr "Корейский" msgid "Language File" -msgstr "Языковой файл" +msgstr "" msgid "Language change:" msgstr "Смена языка:" @@ -720,11 +732,11 @@ msgid "Load" msgstr "Загрузить" msgid "Load From SD/USB" -msgstr "Загрузка с SD/USB" +msgstr "" #, c-format msgid "Load file from: %s ?" -msgstr "Загрузить файл из %s ?" +msgstr "" msgid "Load this DOL as alternate DOL?" msgstr "Загрузить этот DOL в качестве альтернативного ?" @@ -742,13 +754,13 @@ msgid "Locked" msgstr "Заблокировано" msgid "Loop Sound" -msgstr "Зациклить звут" +msgstr "" msgid "Mar" msgstr "Мар" msgid "Mark new games" -msgstr "Отметить новые игры" +msgstr "" msgid "May" msgstr "Май" @@ -760,9 +772,6 @@ msgid "Most likely it has dimensions that are not evenly divisible by 4." msgstr "Размеры картинки не делятся на 4. Поздравляю, блин." msgid "Mount DVD drive" -msgstr "Монтировать DVD" - -msgid "Music Loop Mode" msgstr "" msgid "Music Volume" @@ -775,7 +784,7 @@ msgid "Network init error" msgstr "Ошибка инициализации сети" msgid "New Disc Detected" -msgstr "Обнаружен новый диск" +msgstr "" msgid "Next" msgstr "Следующий" @@ -798,11 +807,20 @@ msgstr "Нет избранных" msgid "No SD-Card inserted!" msgstr "SD карта не вставлена!" +msgid "No USB Device" +msgstr "Нет USB устройств" + +msgid "No USB Device found." +msgstr "USB устройств не обнаружено" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" -msgstr "Не было выбрано ни одного чит-кода" +msgstr "" msgid "No data could be read." -msgstr "Невозможно считать данные." +msgstr "" msgid "No file missing!" msgstr "Файл не найден!" @@ -811,7 +829,7 @@ msgid "No new updates." msgstr "Нет обновлений" msgid "No themes found on the site." -msgstr "На сайте не найдено ни одной темы" +msgstr "" msgid "Normal" msgstr "Обычный" @@ -820,10 +838,10 @@ msgid "Normal Covers" msgstr "Обычные обложки" msgid "Not Found" -msgstr "Не найден" +msgstr "" msgid "Not a DOL/ELF file." -msgstr "Не является файлом DOL/ELF" +msgstr "" msgid "Not a Wii Disc" msgstr "Это не диск Wii" @@ -844,7 +862,7 @@ msgid "OFF" msgstr "ВЫКЛ" msgid "OK" -msgstr "OK" +msgstr "" msgid "ON" msgstr "ВКЛ" @@ -856,29 +874,26 @@ msgid "Official Site:" msgstr "Оф. сайт:" msgid "Only Customs" -msgstr "Только измененные" +msgstr "" msgid "Only Original" -msgstr "Только оригинальные" +msgstr "" msgid "Only for Install" msgstr "Только при установке" msgid "Original/Customs" -msgstr "Измененные/Модифицированные" +msgstr "" msgid "Parental Control" msgstr "Родительский Контроль" msgid "Parental Control disabled" -msgstr "Родительский Контроль выключен" +msgstr "" msgid "Partition" msgstr "Раздел" -msgid "Partition Format Menu" -msgstr "Меню форматирования раздела" - msgid "Password" msgstr "Пароль" @@ -889,7 +904,7 @@ msgid "Password has been changed" msgstr "Пароль был изменен" msgid "Paste it into your browser to get your WiiTDB.zip." -msgstr "Скопируйте это в Ваш браузер чтобы получить Ваш WiiTDB.zip" +msgstr "" msgid "Patch Country Strings" msgstr "Патчить строки страны" @@ -900,17 +915,8 @@ msgstr "Выберите из списка" msgid "Play Count" msgstr "Запущено раз" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." -msgstr "Пожалуйста подождите..." +msgstr "" msgid "Power off the Wii" msgstr "Выключить Wii" @@ -931,7 +937,7 @@ msgid "Reading WAD data... Ok!" msgstr "Чтение данных WAD... ОК!" msgid "Receiving file from:" -msgstr "Получение файлы из:" +msgstr "" msgid "Released" msgstr "Выпущено:" @@ -942,15 +948,9 @@ msgstr "Перечитать SD карту" msgid "Rename Game on WBFS" msgstr "Переименовать игры в WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Сбросить счетчик запусков" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Перезапускаю..." @@ -979,25 +979,31 @@ msgid "Save Failed" msgstr "Сохранение не удалось" msgid "Save Game List to" -msgstr "Сохранить список игр в" +msgstr "" msgid "Saved" -msgstr "Сохранено" +msgstr "" msgid "Screensaver" msgstr "Скринсейвер" +msgid "Select" +msgstr "" + msgid "Select a DOL" -msgstr "Выберите DOL" +msgstr "" msgid "Selected DOL" -msgstr "Выбранный DOL" +msgstr "" msgid "Sept" msgstr "Сен" msgid "Set Search-Filter" -msgstr "Установить фильтр для поиска" +msgstr "" + +msgid "Set as backgroundmusic?" +msgstr "установить как фоновую музыку" msgid "Settings" msgstr "Установки" @@ -1009,22 +1015,22 @@ msgid "Shutdown to Idle" msgstr "Перевести в режим сна" msgid "Sort alphabetically" -msgstr "Сортировать по алфавиту" +msgstr "" msgid "Sort by rank" -msgstr "Сортировать по популярности" +msgstr "" msgid "Sort order by most played" -msgstr "Сортировать по частоте проигрывания" +msgstr "" msgid "Sound" msgstr "Звук" msgid "Sound+BGM" -msgstr "Звук и фоновая музыка" +msgstr "" msgid "Sound+Quiet" -msgstr "Звук и тишина" +msgstr "" msgid "Spanish" msgstr "Испанский" @@ -1051,7 +1057,7 @@ msgid "Successfully deleted:" msgstr "Успешно удалено:" msgid "Successfully extracted theme." -msgstr "Успешно извлечена тема." +msgstr "" msgid "Successfully installed:" msgstr "Успешно установлено:" @@ -1069,26 +1075,26 @@ msgid "TXT Cheatcodes Path changed" msgstr "Путь к TXT читкодам изменен" msgid "The entered directory does not exist. Would you like to create it?" -msgstr "Заданный каталог не существует. Хотите создать его?" +msgstr "" msgid "The file is not a .wad" -msgstr "Это не файл .wad" +msgstr "" msgid "The wad file was installed. But It could not be deleted from the SD card." -msgstr "WAD файл установлен, но он не может быть удален с карты SD." +msgstr "" #, c-format msgid "The wad installation failed with error %ld" msgstr "Установка WAD не удалась, код ошибки %ld" msgid "Theme Download Path" -msgstr "Путь для загрузки темы" +msgstr "" msgid "Theme Download Path changed" -msgstr "Путь для загрузки темы изменен" +msgstr "" msgid "Theme Downloader" -msgstr "Загрузчик тем" +msgstr "" msgid "Theme Path" msgstr "Путь к темам" @@ -1097,13 +1103,13 @@ msgid "Theme Path Changed" msgstr "путь к темам изменён" msgid "Theme Title:" -msgstr "Заголовок темы:" +msgstr "" msgid "Time left:" msgstr "Осталось времени:" msgid "Title Launcher" -msgstr "Загрузчик тайтла" +msgstr "" msgid "Titles from WiiTDB" msgstr "Названия из WiiTDB" @@ -1112,13 +1118,16 @@ msgid "Tooltips" msgstr "Подсказки" msgid "Transfer failed." -msgstr "Передача не удалась." +msgstr "" + +msgid "USB Device not found" +msgstr "USB устройство не найдено" msgid "USB Loader GX is protected" msgstr "USB Loader GX заблокирован" msgid "USB Loader GX will only run with Hermes CIOS rev 4! Please make sure you have revision 4 installed!" -msgstr "USB Loader GX будет работать только с Hermes CIOS rev 4! Пожалуйста убедитесь что у вас установлена версия 4!" +msgstr "" #, c-format msgid "Unable to open the wad that was just downloaded (%s)." @@ -1128,28 +1137,25 @@ msgid "Uninstall" msgstr "Деинсталлировать" msgid "Uninstall Game" -msgstr "Деинсталлировать игру" +msgstr "" msgid "Uninstall Menu" -msgstr "Деинсталлировать меню" +msgstr "" msgid "Uninstalling wad" -msgstr "Деинсталлируется wad" +msgstr "" msgid "Unlock Parental Control" -msgstr "Разблокировать Родительский Контроль" +msgstr "" msgid "Unlock console to use this option." msgstr "Для изменения параметра разблокируйте консоль." -msgid "Unlock the app first." -msgstr "Разблокируйте приложение сначала." - msgid "Unlocked" msgstr "Разблокировано" msgid "Unsupported format, try to extract manually." -msgstr "Формат не поддерживается, попробуйте распаковать самостоятельно." +msgstr "" msgid "Update" msgstr "Обновление" @@ -1161,7 +1167,7 @@ msgid "Update DOL" msgstr "Обновить DOL" msgid "Update Files" -msgstr "Обновить файлы" +msgstr "" msgid "Update Path" msgstr "Путь к обновлениям" @@ -1170,7 +1176,7 @@ msgid "Update Path changed." msgstr "Путь к обновлениям изменен" msgid "Update all Language Files" -msgstr "Обновить все языковые файлы" +msgstr "" msgid "Update failed" msgstr "Обновление не удалось" @@ -1182,38 +1188,41 @@ msgid "Updating" msgstr "обновляю" msgid "Updating Language Files..." -msgstr "Обновление языковых файлов..." +msgstr "" msgid "Updating Language Files:" -msgstr "Обновление языковых файлов:" +msgstr "" msgid "Updating WiiTDB.zip" -msgstr "Обновление WiiTDB.zip" +msgstr "" msgid "Uploaded ZIP file installed to homebrew directory." -msgstr "Загруженный ZIP-файл установлен в каталог homebrew" +msgstr "" msgid "VIDTV Patch" msgstr "Патч VIDTV" #, c-format msgid "Version: %s" -msgstr "Версия: %s" +msgstr "" msgid "Video Mode" msgstr "Видео режим" msgid "WIP Patches Path" -msgstr "Путь к патчам QIP" +msgstr "" msgid "WIP Patches Path changed" -msgstr "Путь к патчам QIP изменен" +msgstr "" + +msgid "Waiting for USB Device" +msgstr "Ожидание USB устройства" msgid "Waiting..." msgstr "Ожидание..." msgid "What do you want to update?" -msgstr "Что Вы хотите обновить?" +msgstr "" msgid "WiFi Features" msgstr "свойства WiFi" @@ -1225,16 +1234,16 @@ msgid "Wii Menu" msgstr "Меню Wii" msgid "Wii Settings" -msgstr "Установки Wii" +msgstr "" msgid "WiiTDB Files" -msgstr "Файлы WiiTDB" +msgstr "" msgid "WiiTDB Path" -msgstr "Путь к WiiTDB" +msgstr "" msgid "WiiTDB Path changed." -msgstr "Путь к WiiTDB изменен" +msgstr "" msgid "Wiilight" msgstr "Подсветка Wii" @@ -1252,23 +1261,23 @@ msgid "You are choosing to display favorites and you do not have any selected." msgstr "Нельзя отобразить избранные, если вы их до этого не выбрали." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." -msgstr "Вы используете файловую систему NTFS. Из-за возможных ошибок записи на раздел NTFS установка игры невозможна." - -msgid "You can't access this menu!" -msgstr "Вы не можете использовать это меню!" +msgstr "" msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." -msgstr "У Вас не включен Родительский Контроль. Если вы хотите использовать Родительский Контроль, включите его в установках Wii." +msgstr "" msgid "You have attempted to load a bad image" msgstr "Вы попытались загрузить плохой образ" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." -msgstr "Ваш URL был сохранен в %sWiiTDB_URL.txt." +msgstr "" msgid "and translaters for language files updates" -msgstr "и переводчики для обновлений языковых файлов" +msgstr "" msgid "available" msgstr "доступно" @@ -1295,7 +1304,7 @@ msgid "files not found on the server!" msgstr "файлы не найдены на сервере!" msgid "for FAT/NTFS support" -msgstr "для поддержки FAT/NTFS" +msgstr "" msgid "for Ocarina" msgstr "за Ocarina" @@ -1310,7 +1319,7 @@ msgid "for his awesome tool LibWiiGui" msgstr "за отличную утилиту LibWiiGui" msgid "for hosting the themes" -msgstr "за хостинг тем" +msgstr "" msgid "for hosting the update files" msgstr "за хостинг обновлений" @@ -1333,41 +1342,11 @@ msgstr "из" msgid "seconds left" msgstr "секунд осталось" -msgid "Backgroundmusic Path changed." -msgstr "Путь к фоновой музыке изменен." +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Выйти из USB Loader GX?" -msgid "Set as backgroundmusic?" -msgstr "установить как фоновую музыку" +#~ msgid "No WBFS partition found" +#~ msgstr "Не найден раздел WBFS" -msgid "Back to Wii Menu" -msgstr "Вернуться в меню Wii" - -msgid "Could not initialize DIP module!" -msgstr "Не могу запустить модуль DIP!" - -msgid "Do you want to retry for 30 secs?" -msgstr "Хотите попробовать еще раз на 30 секунд?" - -msgid "Format" -msgstr "Форматировать" - -msgid "No USB Device" -msgstr "Нет USB устройств" - -msgid "No USB Device found." -msgstr "USB устройств не обнаружено" - -msgid "USB Device not found" -msgstr "USB устройство не найдено" - -msgid "Waiting for USB Device" -msgstr "Ожидание USB устройства" - -msgid "Exit USB Loader GX?" -msgstr "Выйти из USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "Не найден раздел WBFS" - -msgid "You need to format a partition" -msgstr "Требуется форматирование раздела" +#~ msgid "You need to format a partition" +#~ msgstr "Требуется форматирование раздела" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index ba80861e..a51f83da 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid\n" "Language-Team: kavid\n" @@ -182,9 +182,15 @@ msgstr "返回 HBC 或 Wii 系统菜单" msgid "Back to Loader" msgstr "返回 Loader" +msgid "Back to Wii Menu" +msgstr "返回 Wii 系统菜单" + msgid "Backgroundmusic" msgstr "背景音乐" +msgid "Backgroundmusic Path changed." +msgstr "背景音乐路径已变更" + msgid "Big thanks to:" msgstr "非常感谢:" @@ -215,9 +221,6 @@ msgstr "无法删除:" msgid "Cancel" msgstr "取消" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "频道" @@ -285,6 +288,9 @@ msgstr "无法建立 GCT 文件" msgid "Could not find a WBFS partition." msgstr "找不到 WBFS 分区." +msgid "Could not initialize DIP module!" +msgstr "无法启动 DIP 模块!" + msgid "Could not initialize network!" msgstr "无法启动网络!" @@ -414,6 +420,9 @@ msgstr "" msgid "Do you want to format:" msgstr "是否格式化:" +msgid "Do you want to retry for 30 secs?" +msgstr "是否等待 30 秒后重试?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "使用这个已知是正确的 Alt DOL 文件?" @@ -525,6 +534,9 @@ msgstr "按键规则" msgid "Force" msgstr "强制" +msgid "Format" +msgstr "格式化" + msgid "Formatting, please wait..." msgstr "格式化中, 请稍候..." @@ -762,9 +774,6 @@ msgstr "图片格式错误,可能它的尺寸不是 4 的倍数." msgid "Mount DVD drive" msgstr "挂载DVD光驱" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "音量" @@ -798,6 +807,15 @@ msgstr "没有收藏记录" msgid "No SD-Card inserted!" msgstr "未插入 SD 卡!" +msgid "No USB Device" +msgstr "没有 USB 设备" + +msgid "No USB Device found." +msgstr "找不到 USB 设备." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "没有选择作弊码" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "分区" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "密码" @@ -900,15 +915,6 @@ msgstr "从列表中选取" msgid "Play Count" msgstr "游戏计数" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "请等待..." @@ -942,15 +948,9 @@ msgstr "重新载入 SD 卡" msgid "Rename Game on WBFS" msgstr "改变 WBFS (硬盘)上的游戏名称" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "重置游戏计数" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "重启中..." @@ -987,6 +987,9 @@ msgstr "已保存" msgid "Screensaver" msgstr "屏幕保护" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "选择一个 DOL" @@ -999,6 +1002,9 @@ msgstr "九月" msgid "Set Search-Filter" msgstr "设置搜索过滤器" +msgid "Set as backgroundmusic?" +msgstr "设置成背景音乐?" + msgid "Settings" msgstr "设置" @@ -1114,6 +1120,9 @@ msgstr "提示信息" msgid "Transfer failed." msgstr "" +msgid "USB Device not found" +msgstr "找不到 USB 设备" + msgid "USB Loader GX is protected" msgstr "USB Loader GX 被锁定" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "请解锁后使用此功能" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "已解锁" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "等待 USB 设备" + msgid "Waiting..." msgstr "等待中..." @@ -1254,15 +1263,15 @@ msgstr "你选择显示收藏夹但里面还没有任何收藏" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "你在加载损坏的镜像" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "链接已写入 %sWiiTDB_URL.txt 文件." @@ -1333,44 +1342,14 @@ msgstr "的" msgid "seconds left" msgstr "剩余秒数" -msgid "Backgroundmusic Path changed." -msgstr "背景音乐路径已变更" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "退出 USB Loader GX?" -msgid "Set as backgroundmusic?" -msgstr "设置成背景音乐?" +#~ msgid "No WBFS partition found" +#~ msgstr "找不到 WBFS 分区" -msgid "Back to Wii Menu" -msgstr "返回 Wii 系统菜单" +#~ msgid "You need to format a partition" +#~ msgstr "必须格式化一个分区" -msgid "Could not initialize DIP module!" -msgstr "无法启动 DIP 模块!" - -msgid "Do you want to retry for 30 secs?" -msgstr "是否等待 30 秒后重试?" - -msgid "Format" -msgstr "格式化" - -msgid "No USB Device" -msgstr "没有 USB 设备" - -msgid "No USB Device found." -msgstr "找不到 USB 设备." - -msgid "USB Device not found" -msgstr "找不到 USB 设备" - -msgid "Waiting for USB Device" -msgstr "等待 USB 设备" - -msgid "Exit USB Loader GX?" -msgstr "退出 USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "找不到 WBFS 分区" - -msgid "You need to format a partition" -msgstr "必须格式化一个分区" - -msgid "Homebrew Channel" -msgstr "Homebrew 频道" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew 频道" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 0387c06c..4d61ffd9 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Penn\n" "Language-Team: Penn\n" @@ -182,9 +182,15 @@ msgstr "Volver a HBC o Menú Wii" msgid "Back to Loader" msgstr "Volver al HBC" +msgid "Back to Wii Menu" +msgstr "Volver a Menú Wii" + msgid "Backgroundmusic" msgstr "Música de fondo" +msgid "Backgroundmusic Path changed." +msgstr "Ruta a Música cambiada" + msgid "Big thanks to:" msgstr "Muchas gracias a:" @@ -215,9 +221,6 @@ msgstr "No se eliminó:" msgid "Cancel" msgstr "Cancelar" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Canales" @@ -285,6 +288,9 @@ msgstr "No se pudo crear archivo GCT" msgid "Could not find a WBFS partition." msgstr "No se encontró una partición WBFS." +msgid "Could not initialize DIP module!" +msgstr "¡No se pudo iniciar módulo DIP!" + msgid "Could not initialize network!" msgstr "¡No se pudo iniciar la Conexión!" @@ -414,6 +420,9 @@ msgstr "¿Quieres descargar este tema?" msgid "Do you want to format:" msgstr "Quieres formatear:" +msgid "Do you want to retry for 30 secs?" +msgstr "¿Quieres reintentar por 30 segs.?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "¿Quieres usar el DOL alternativo que se sabe es correcto?" @@ -525,6 +534,9 @@ msgstr "Desplazamiento X" msgid "Force" msgstr "Forzar" +msgid "Format" +msgstr "Formateo" + msgid "Formatting, please wait..." msgstr "Formateando, por favor espera..." @@ -762,9 +774,6 @@ msgstr "Probablemente tiene un tamaño no divisible por 4. Que estupidez." msgid "Mount DVD drive" msgstr "Montar lector DVD" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Volumen Música" @@ -798,6 +807,15 @@ msgstr "No hay favoritos" msgid "No SD-Card inserted!" msgstr "¡SD no insertada!" +msgid "No USB Device" +msgstr "USB no encontrado" + +msgid "No USB Device found." +msgstr "USB no encontrado." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Trampas no seleccionadas" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Partición" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Contraseña" @@ -900,15 +915,6 @@ msgstr "Elegir de una lista" msgid "Play Count" msgstr "Jugado" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Por favor espera..." @@ -942,15 +948,9 @@ msgstr "Recargar SD" msgid "Rename Game on WBFS" msgstr "Renombrar juego en WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Reiniciar conteo jugados" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Reiniciando..." @@ -987,6 +987,9 @@ msgstr "Guardado" msgid "Screensaver" msgstr "Protector de Pantalla" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "Selecciona un DOL" @@ -999,6 +1002,9 @@ msgstr "" msgid "Set Search-Filter" msgstr "Poner filtro-busqueda" +msgid "Set as backgroundmusic?" +msgstr "¿Poner como música de fondo?" + msgid "Settings" msgstr "Configuración" @@ -1114,6 +1120,9 @@ msgstr "InfoBurbujas" msgid "Transfer failed." msgstr "Transferencia fallida." +msgid "USB Device not found" +msgstr "USB no encontrado" + msgid "USB Loader GX is protected" msgstr "USB Loader GX está protegido" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Desbloquea la consola para usar esta opción." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Desbloqueada" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Esperando al Dispositivo USB" + msgid "Waiting..." msgstr "Esperando..." @@ -1254,15 +1263,15 @@ msgstr "Estás intentando mostrar los favoritos pero no tienes ninguno seleccion msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Has intentado cargar una imagen corrupta" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Tu URL ha sido guardada en %sWiiTDB_URL.txt." @@ -1333,71 +1342,41 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" -msgid "Backgroundmusic Path changed." -msgstr "Ruta a Música cambiada" +#~ msgid "Can't decompress LZ77" +#~ msgstr "No se pudo descomprimir LZ77" -msgid "Set as backgroundmusic?" -msgstr "¿Poner como música de fondo?" +#~ msgid "Can't find disc" +#~ msgstr "No se encontró disco" -msgid "Back to Wii Menu" -msgstr "Volver a Menú Wii" +#~ msgid "IMD5 Header not right." +#~ msgstr "Mal encabezado IMD5." -msgid "Could not initialize DIP module!" -msgstr "¡No se pudo iniciar módulo DIP!" +#~ msgid "IMET Header wrong." +#~ msgstr "Mal encabezado IMET." -msgid "Do you want to retry for 30 secs?" -msgstr "¿Quieres reintentar por 30 segs.?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "¿Salir de USB Loader GX?" -msgid "Format" -msgstr "Formateo" +#~ msgid "No WBFS partition found" +#~ msgstr "Partición WBFS no encontrada" -msgid "No USB Device" -msgstr "USB no encontrado" +#~ msgid "You need to format a partition" +#~ msgstr "Necesitas formatear una partición" -msgid "No USB Device found." -msgstr "USB no encontrado." +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "Fallo al extraer opening.bnr" -msgid "USB Device not found" -msgstr "USB no encontrado" +#~ msgid "Homebrew Channel" +#~ msgstr "Canal Homebrew" -msgid "Waiting for USB Device" -msgstr "Esperando al Dispositivo USB" +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "ERROR: ¡No se pudo cargar dispositivo USB!" -msgid "Can't decompress LZ77" -msgstr "No se pudo descomprimir LZ77" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "ERROR: ¡No se pudo cargar cIOS!" -msgid "Can't find disc" -msgstr "No se encontró disco" +#~ msgid "Loading..." +#~ msgstr "Cargando..." -msgid "IMD5 Header not right." -msgstr "Mal encabezado IMD5." - -msgid "IMET Header wrong." -msgstr "Mal encabezado IMET." - -msgid "Exit USB Loader GX?" -msgstr "¿Salir de USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "Partición WBFS no encontrada" - -msgid "You need to format a partition" -msgstr "Necesitas formatear una partición" - -msgid "Failed to extract opening.bnr" -msgstr "Fallo al extraer opening.bnr" - -msgid "Homebrew Channel" -msgstr "Canal Homebrew" - -msgid "ERROR: USB device could not be loaded!" -msgstr "ERROR: ¡No se pudo cargar dispositivo USB!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "ERROR: ¡No se pudo cargar cIOS!" - -msgid "Loading..." -msgstr "Cargando..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Esperando por tu lento disp. USB: %i segs..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Esperando por tu lento disp. USB: %i segs..." diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 31e65dc8..4df180c9 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-11-24 22:11+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -182,9 +182,15 @@ msgstr "Tillbaka till HBC eller Wii-Menyn" msgid "Back to Loader" msgstr "Tillbaka till loader" +msgid "Back to Wii Menu" +msgstr "Tillbaka till Wii-menyn" + msgid "Backgroundmusic" msgstr "Bakgrundsmusik" +msgid "Backgroundmusic Path changed." +msgstr "Sökväg till bakgrundsmusik ändrad." + msgid "Big thanks to:" msgstr "Stort tack till:" @@ -215,9 +221,6 @@ msgstr "Kunde inte radera:" msgid "Cancel" msgstr "Avbryt" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "" @@ -285,6 +288,9 @@ msgstr "Kunde inte skapa GCT fil" msgid "Could not find a WBFS partition." msgstr "Kunde inte hitta WBFS partition." +msgid "Could not initialize DIP module!" +msgstr "Kunde inte starta DIP-modul!" + msgid "Could not initialize network!" msgstr "Kunde inte starta nätverket!" @@ -414,6 +420,9 @@ msgstr "Vill du ladda ner detta tema?" msgid "Do you want to format:" msgstr "Vill du formatera:" +msgid "Do you want to retry for 30 secs?" +msgstr "Vill du försöka igen i 30 sekunder?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Vill du använda en alternativ DOL som är känd att fungera?" @@ -525,6 +534,9 @@ msgstr "Vänd-X" msgid "Force" msgstr "Tvinga" +msgid "Format" +msgstr "Formatera" + msgid "Formatting, please wait..." msgstr "Formaterar, Vänta..." @@ -762,9 +774,6 @@ msgstr "Troligtvis har den mått som inte är jämnt dividerade med 4." msgid "Mount DVD drive" msgstr "Montera DVD läsare" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Volym" @@ -798,6 +807,15 @@ msgstr "Inga favoriter" msgid "No SD-Card inserted!" msgstr "Inget SD-kort isatt!" +msgid "No USB Device" +msgstr "Ingen USB-enhet" + +msgid "No USB Device found." +msgstr "Ingen USB-enhet hittad." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Inga fusk har valda" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Lösenord" @@ -900,15 +915,6 @@ msgstr "Välj från en lista" msgid "Play Count" msgstr "Spelat" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Vänligen vänta..." @@ -942,15 +948,9 @@ msgstr "Ladda om SD" msgid "Rename Game on WBFS" msgstr "Döp om spel på WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Återställ spelat-räknaren" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Startar om..." @@ -987,6 +987,9 @@ msgstr "Sparat" msgid "Screensaver" msgstr "Skärmsläckare" +msgid "Select" +msgstr "Välj" + msgid "Select a DOL" msgstr "Välj en DOL" @@ -999,6 +1002,9 @@ msgstr "" msgid "Set Search-Filter" msgstr "Ställ in sök-filter" +msgid "Set as backgroundmusic?" +msgstr "Ställ in som bakgrundsmusik?" + msgid "Settings" msgstr "Inställningar" @@ -1114,6 +1120,9 @@ msgstr "Verktygstips" msgid "Transfer failed." msgstr "Flytt misslyckades." +msgid "USB Device not found" +msgstr "USB-enhet ej hittad" + msgid "USB Loader GX is protected" msgstr "USB Loader GX är skyddad" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Lås upp konsolen för denna inställning." -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Upplåst" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "Väntar på USB-enhet" + msgid "Waiting..." msgstr "Väntar..." @@ -1254,15 +1263,15 @@ msgstr "Du har valt att visa favoriter men du har inga favoriter valda." msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Du har försökt ladda en dålig bild" +msgid "You need to select or format a partition" +msgstr "Du måste välja eller formatera en partition" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "Din URL har sparats som %sWiiTDB_URL.txt." @@ -1333,71 +1342,35 @@ msgstr "av" msgid "seconds left" msgstr "sekunder kvar" -msgid "Backgroundmusic Path changed." -msgstr "Sökväg till bakgrundsmusik ändrad." +#~ msgid "Can't decompress LZ77" +#~ msgstr "Kunde inte dekomprimera LZ77" -msgid "Set as backgroundmusic?" -msgstr "Ställ in som bakgrundsmusik?" +#~ msgid "Can't find disc" +#~ msgstr "Kunde inte hitta skiva" -msgid "Back to Wii Menu" -msgstr "Tillbaka till Wii-menyn" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 Rubrik stämmer inte." -msgid "Could not initialize DIP module!" -msgstr "Kunde inte starta DIP-modul!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMET Rubriken är fel." -msgid "Do you want to retry for 30 secs?" -msgstr "Vill du försöka igen i 30 sekunder?" +#~ msgid "No WBFS or FAT game partition found" +#~ msgstr "Ingen WBFS eller FAT spel partition hittad" -msgid "Format" -msgstr "Formatera" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "Avsluta USB Loader GX?" -msgid "No USB Device" -msgstr "Ingen USB-enhet" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew Kanalen" -msgid "No USB Device found." -msgstr "Ingen USB-enhet hittad." +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "FEL: USB-enhet kunde inte laddas!" -msgid "Select" -msgstr "Välj" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "FEL: cIOS kunde inte laddas!" -msgid "USB Device not found" -msgstr "USB-enhet ej hittad" +#~ msgid "Loading..." +#~ msgstr "Laddar..." -msgid "Waiting for USB Device" -msgstr "Väntar på USB-enhet" - -msgid "You need to select or format a partition" -msgstr "Du måste välja eller formatera en partition" - -msgid "Can't decompress LZ77" -msgstr "Kunde inte dekomprimera LZ77" - -msgid "Can't find disc" -msgstr "Kunde inte hitta skiva" - -msgid "IMD5 Header not right." -msgstr "IMD5 Rubrik stämmer inte." - -msgid "IMET Header wrong." -msgstr "IMET Rubriken är fel." - -msgid "No WBFS or FAT game partition found" -msgstr "Ingen WBFS eller FAT spel partition hittad" - -msgid "Exit USB Loader GX?" -msgstr "Avsluta USB Loader GX?" - -msgid "Homebrew Channel" -msgstr "Homebrew Kanalen" - -msgid "ERROR: USB device could not be loaded!" -msgstr "FEL: USB-enhet kunde inte laddas!" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "FEL: cIOS kunde inte laddas!" - -msgid "Loading..." -msgstr "Laddar..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "Väntar på din slöa USB-enhet: %i sek..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "Väntar på din slöa USB-enhet: %i sek..." diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index f4eb3dfe..d769d996 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Miller Liang\n" "Language-Team: kyogc, Miller\n" @@ -182,9 +182,15 @@ msgstr "返回 HBC 或 Wii 系統目錄" msgid "Back to Loader" msgstr "返回 Loader" +msgid "Back to Wii Menu" +msgstr "返回 Wii 系統目錄" + msgid "Backgroundmusic" msgstr "背景音樂" +msgid "Backgroundmusic Path changed." +msgstr "背景音樂路徑" + msgid "Big thanks to:" msgstr "非常感謝:" @@ -215,9 +221,6 @@ msgstr "無法刪除:" msgid "Cancel" msgstr "取消" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "頻道" @@ -285,6 +288,9 @@ msgstr "無法建立 GCT 文件" msgid "Could not find a WBFS partition." msgstr "找不到 WBFS 磁區." +msgid "Could not initialize DIP module!" +msgstr "無法啟動 DIP 模塊!" + msgid "Could not initialize network!" msgstr "無法啟動網絡!" @@ -414,6 +420,9 @@ msgstr "是否要下載這個佈景主題？" msgid "Do you want to format:" msgstr "是否格式化:" +msgid "Do you want to retry for 30 secs?" +msgstr "是否等待 30 秒後重試?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "使用這個已知是正確的 Alt DOL 文件?" @@ -525,6 +534,9 @@ msgstr "按鍵規則" msgid "Force" msgstr "強制" +msgid "Format" +msgstr "格式化" + msgid "Formatting, please wait..." msgstr "格式化中, 請稍候..." @@ -762,9 +774,6 @@ msgstr "圖片格式錯誤，可能它的尺寸不是 4 的倍數." msgid "Mount DVD drive" msgstr "掛載DVD光碟" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "音量" @@ -798,6 +807,15 @@ msgstr "沒有收藏記錄" msgid "No SD-Card inserted!" msgstr "未插入 SD 卡!" +msgid "No USB Device" +msgstr "沒有 USB 設備" + +msgid "No USB Device found." +msgstr "找不到 USB 設備." + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "找不到 WBFS 和 FAT/NTFS 磁區中的遊戲" + msgid "No cheats were selected" msgstr "沒有選擇金手指" @@ -876,9 +894,6 @@ msgstr "關閉親子控制" msgid "Partition" msgstr "磁區" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "密碼" @@ -900,15 +915,6 @@ msgstr "從列表中選取" msgid "Play Count" msgstr "執行次數" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "請稍候..." @@ -942,15 +948,9 @@ msgstr "重新載入 SD 卡" msgid "Rename Game on WBFS" msgstr "變更WBFS上的遊戲名稱" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "重置執行次數" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "正在重新啟動" @@ -987,6 +987,9 @@ msgstr "已儲存" msgid "Screensaver" msgstr "螢幕保護" +msgid "Select" +msgstr "選取" + msgid "Select a DOL" msgstr "選擇一個 DOL" @@ -999,6 +1002,9 @@ msgstr "九月" msgid "Set Search-Filter" msgstr "關鍵字篩選" +msgid "Set as backgroundmusic?" +msgstr "設定背景音樂" + msgid "Settings" msgstr "設定" @@ -1114,6 +1120,9 @@ msgstr "提示信息" msgid "Transfer failed." msgstr "傳輸失敗" +msgid "USB Device not found" +msgstr "找不到 USB 設備" + msgid "USB Loader GX is protected" msgstr "USB Loader GX 被鎖定" @@ -1142,9 +1151,6 @@ msgstr "解鎖家長控制" msgid "Unlock console to use this option." msgstr "解鎖以進行設定" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "已解鎖" @@ -1209,6 +1215,9 @@ msgstr "WIP 補丁路徑" msgid "WIP Patches Path changed" msgstr "WIP 補丁路徑已更新" +msgid "Waiting for USB Device" +msgstr "等待 USB 設備" + msgid "Waiting..." msgstr "等待中..." @@ -1254,15 +1263,15 @@ msgstr "你選擇顯示收藏夾但裡面還沒有任何收藏" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "您正在使用 NTFS 文件系統。由於可能一個錯誤寫入到一個 NTFS 分區，這時候是無法安裝遊戲的。" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "家長控制已鎖定。如果要解除 Wii 被鎖住的功能，您必須要先至控制台解除家長控制。" msgid "You have attempted to load a bad image" msgstr "載入的影像有問題" +msgid "You need to select or format a partition" +msgstr "選擇你要格式化的磁區" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "鏈接已寫入 %sWiiTDB_URL.txt 文件." @@ -1333,59 +1342,20 @@ msgstr "的" msgid "seconds left" msgstr "剩餘秒數" -msgid "Backgroundmusic Path changed." -msgstr "背景音樂路徑" +#~ msgid "Can't decompress LZ77" +#~ msgstr "無法解壓縮的LZ77" -msgid "Set as backgroundmusic?" -msgstr "設定背景音樂" +#~ msgid "Can't find disc" +#~ msgstr "找不到磁碟" -msgid "Back to Wii Menu" -msgstr "返回 Wii 系統目錄" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 標題不正確" -msgid "Could not initialize DIP module!" -msgstr "無法啟動 DIP 模塊!" +#~ msgid "IMET Header wrong." +#~ msgstr "沒有開頭音樂" -msgid "Do you want to retry for 30 secs?" -msgstr "是否等待 30 秒後重試?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "離開 USB Loader GX?" -msgid "Format" -msgstr "格式化" - -msgid "No USB Device" -msgstr "沒有 USB 設備" - -msgid "No USB Device found." -msgstr "找不到 USB 設備." - -msgid "No WBFS or FAT/NTFS partition found" -msgstr "找不到 WBFS 和 FAT/NTFS 磁區中的遊戲" - -msgid "Select" -msgstr "選取" - -msgid "USB Device not found" -msgstr "找不到 USB 設備" - -msgid "Waiting for USB Device" -msgstr "等待 USB 設備" - -msgid "You need to select or format a partition" -msgstr "選擇你要格式化的磁區" - -msgid "Can't decompress LZ77" -msgstr "無法解壓縮的LZ77" - -msgid "Can't find disc" -msgstr "找不到磁碟" - -msgid "IMD5 Header not right." -msgstr "IMD5 標題不正確" - -msgid "IMET Header wrong." -msgstr "沒有開頭音樂" - -msgid "Exit USB Loader GX?" -msgstr "離開 USB Loader GX?" - -msgid "Homebrew Channel" -msgstr "Homebrew 頻道" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew 頻道" diff --git a/Languages/thai.lang b/Languages/thai.lang index 76f9edf2..f6d4e9ec 100644 --- a/Languages/thai.lang +++ b/Languages/thai.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -182,9 +182,15 @@ msgstr "กลับไป HBC หรือ เมนู Wii" msgid "Back to Loader" msgstr "กลับไปที่ Loader" +msgid "Back to Wii Menu" +msgstr "กลับไป เมนู Wii" + msgid "Backgroundmusic" msgstr "ดนตรีเบื้องหลัง" +msgid "Backgroundmusic Path changed." +msgstr "เปลี่ยนที่เก็บ ดนตรีเบื้องหลัง" + msgid "Big thanks to:" msgstr "ขอขอบคุณ:" @@ -215,9 +221,6 @@ msgstr "ไม่สามารถลบได้:" msgid "Cancel" msgstr "ยกเลิก" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "แชนแนล" @@ -285,6 +288,9 @@ msgstr "ไม่สามารถสร้างไฟล์ GCT" msgid "Could not find a WBFS partition." msgstr "ไม่พบ WBFS พาร์ติชั่น" +msgid "Could not initialize DIP module!" +msgstr "ไม่สามารถเปิดใช้โมดูล DIP ได้ !" + msgid "Could not initialize network!" msgstr "ไม่สามารถเชื่อมต่อกับเครือข่ายได้ !" @@ -414,6 +420,9 @@ msgstr "ต้องการดาวน์โหลดธีมนี้ ?" msgid "Do you want to format:" msgstr "ต้องการฟอร์แมต:" +msgid "Do you want to retry for 30 secs?" +msgstr "ต้องการลองใหม่ทุก 30 วินาที?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "ต้องการจะใช้ alt DOL เฉพาะที่รู้ว่าถูกต้อง?" @@ -525,6 +534,9 @@ msgstr "กลับ-X" msgid "Force" msgstr "บังคับ" +msgid "Format" +msgstr "ฟอร์แมต" + msgid "Formatting, please wait..." msgstr "กำลังฟอร์แมต,รอสักครู่..." @@ -762,9 +774,6 @@ msgstr "ดูเหมือนว่าขนาดจะหารด้วย msgid "Mount DVD drive" msgstr "เชื่อม DVD ไดร์ฟ" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "ความดังเสียงเพลง" @@ -798,6 +807,15 @@ msgstr "ไม่พบเกมส์ที่ชื่นชอบ" msgid "No SD-Card inserted!" msgstr "ไม่ได้เสียบ SD card!" +msgid "No USB Device" +msgstr "ไม่ได้เสียบอุปกรณ์ USB" + +msgid "No USB Device found." +msgstr "ไม่พบอุปกรณ์ USB" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "ไม่ได้เลือกการโกงเกมส์ไว้" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "พาร์ติชั่น" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "รหัสผ่าน" @@ -900,15 +915,6 @@ msgstr "เลือกจากรายการ" msgid "Play Count" msgstr "จำนวนที่เล่น" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "รอสักครู่" @@ -942,15 +948,9 @@ msgstr "โหลด SD ใหม่" msgid "Rename Game on WBFS" msgstr "เปลี่ยนชื่อเกมส์บน WBFS" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "เคลียร์การนับจำนวนที่เล่น" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "รีสตารท์..." @@ -987,6 +987,9 @@ msgstr "บันทึกแล้ว" msgid "Screensaver" msgstr "รักษาหน้าจอ" +msgid "Select" +msgstr "" + msgid "Select a DOL" msgstr "เลือก DOL" @@ -999,6 +1002,9 @@ msgstr "กย." msgid "Set Search-Filter" msgstr "กำหนดเงื่อนไขการค้นหา" +msgid "Set as backgroundmusic?" +msgstr "เลือกเป็น Background music?" + msgid "Settings" msgstr "กำหนดค่า" @@ -1114,6 +1120,9 @@ msgstr "คำแนะนำ" msgid "Transfer failed." msgstr "ถ่ายโอนไม่ได้" +msgid "USB Device not found" +msgstr "ไม่พบอุปกรณ์ USB" + msgid "USB Loader GX is protected" msgstr "USB Loader GX 5 ถูกป้องกัน" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "ปลดล๊อค Console ก่อน เพื่อใช้ตัวเลือกนี้" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "ปลดล๊อค" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "กำลังรออุปกรณ์ USB" + msgid "Waiting..." msgstr "กำลังรอ..." @@ -1254,15 +1263,15 @@ msgstr "คุณเลือกจะแสดงเกมส์ที่ชอ msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "คุณพยายามที่จะโหลดรูปภาพที่เสียหาย" +msgid "You need to select or format a partition" +msgstr "" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "URL ของคุณถูกบันทึกใน %sWiiTDB_URL.txt." @@ -1333,71 +1342,41 @@ msgstr "จาก" msgid "seconds left" msgstr "วินาทีที่เหลือ" -msgid "Backgroundmusic Path changed." -msgstr "เปลี่ยนที่เก็บ ดนตรีเบื้องหลัง" +#~ msgid "Can't decompress LZ77" +#~ msgstr "คลายไฟล์ LZ777 ไม่ได้" -msgid "Set as backgroundmusic?" -msgstr "เลือกเป็น Background music?" +#~ msgid "Can't find disc" +#~ msgstr "หาแผ่นไม่เจอ" -msgid "Back to Wii Menu" -msgstr "กลับไป เมนู Wii" +#~ msgid "IMD5 Header not right." +#~ msgstr "ส่วนขยายไฟล์ผิดพลาด" -msgid "Could not initialize DIP module!" -msgstr "ไม่สามารถเปิดใช้โมดูล DIP ได้ !" +#~ msgid "IMET Header wrong." +#~ msgstr "ส่วนขยายไฟล์ผิดพลาด" -msgid "Do you want to retry for 30 secs?" -msgstr "ต้องการลองใหม่ทุก 30 วินาที?" +#~ msgid "Exit USB Loader GX?" +#~ msgstr "ปิด USB Loader GX?" -msgid "Format" -msgstr "ฟอร์แมต" +#~ msgid "No WBFS partition found" +#~ msgstr "ไม่พบพาร์ติชั่นแบบ WBFS " -msgid "No USB Device" -msgstr "ไม่ได้เสียบอุปกรณ์ USB" +#~ msgid "You need to format a partition" +#~ msgstr "ต้องทำการฟอร์แมทพาร์ติชั่น" -msgid "No USB Device found." -msgstr "ไม่พบอุปกรณ์ USB" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "แตกไฟล์ opening.bnr ไม่ได้" -msgid "USB Device not found" -msgstr "ไม่พบอุปกรณ์ USB" +#~ msgid "You need to start this game one time to create a save file, then exit and start it again." +#~ msgstr "คุณต้องเริ่มโหลดเกมส์นี้ใหม่ เพื่อสร้างไฟล์เซฟ ดังนั้นออกจากเกมส์แล้วเริ่มโหลดอีกครั้ง" -msgid "Waiting for USB Device" -msgstr "กำลังรออุปกรณ์ USB" +#~ msgid "ERROR: USB device could not be loaded!" +#~ msgstr "ผิดพลาด! ไม่สามารถโหลดอุปกรณ์ USB ได้" -msgid "Can't decompress LZ77" -msgstr "คลายไฟล์ LZ777 ไม่ได้" +#~ msgid "ERROR: cIOS could not be loaded!" +#~ msgstr "ผิดพลาด! ไม่สามารถโหลด cIOS ได้" -msgid "Can't find disc" -msgstr "หาแผ่นไม่เจอ" +#~ msgid "Loading..." +#~ msgstr "กำลังโหลด..." -msgid "IMD5 Header not right." -msgstr "ส่วนขยายไฟล์ผิดพลาด" - -msgid "IMET Header wrong." -msgstr "ส่วนขยายไฟล์ผิดพลาด" - -msgid "Exit USB Loader GX?" -msgstr "ปิด USB Loader GX?" - -msgid "No WBFS partition found" -msgstr "ไม่พบพาร์ติชั่นแบบ WBFS " - -msgid "You need to format a partition" -msgstr "ต้องทำการฟอร์แมทพาร์ติชั่น" - -msgid "Failed to extract opening.bnr" -msgstr "แตกไฟล์ opening.bnr ไม่ได้" - -msgid "You need to start this game one time to create a save file, then exit and start it again." -msgstr "คุณต้องเริ่มโหลดเกมส์นี้ใหม่ เพื่อสร้างไฟล์เซฟ ดังนั้นออกจากเกมส์แล้วเริ่มโหลดอีกครั้ง" - -msgid "ERROR: USB device could not be loaded!" -msgstr "ผิดพลาด! ไม่สามารถโหลดอุปกรณ์ USB ได้" - -msgid "ERROR: cIOS could not be loaded!" -msgstr "ผิดพลาด! ไม่สามารถโหลด cIOS ได้" - -msgid "Loading..." -msgstr "กำลังโหลด..." - -msgid "Waiting for your slow USB Device: %i secs..." -msgstr "กำลังรออุปกรณ์ USB อันเชื่องช้าของคุณ: %i วินาที..." +#~ msgid "Waiting for your slow USB Device: %i secs..." +#~ msgstr "กำลังรออุปกรณ์ USB อันเชื่องช้าของคุณ: %i วินาที..." diff --git a/Languages/turkish.lang b/Languages/turkish.lang index c8b518e2..f0d087f8 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-08 10:44+0100\n" +"POT-Creation-Date: 2009-12-29 03:43+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -182,9 +182,15 @@ msgstr "HBC veya Wii Menüye dönüş" msgid "Back to Loader" msgstr "Yükleyiciye dönüş" +msgid "Back to Wii Menu" +msgstr "Wii Menüye dönüş" + msgid "Backgroundmusic" msgstr "Arkaplan müziği" +msgid "Backgroundmusic Path changed." +msgstr "Arkaplan müzik Yolu değişti." + msgid "Big thanks to:" msgstr "Teşekkürler:" @@ -215,9 +221,6 @@ msgstr "Silinemiyor" msgid "Cancel" msgstr "Iptal" -msgid "Change Play Path" -msgstr "" - msgid "Channels" msgstr "Kanallar" @@ -285,6 +288,9 @@ msgstr "GCT dosyası oluşturulamadı" msgid "Could not find a WBFS partition." msgstr "WBFS bölümü bulunamadı" +msgid "Could not initialize DIP module!" +msgstr "DIP modülü başlatılamadı!" + msgid "Could not initialize network!" msgstr "Ağa bağlanılamadı!" @@ -414,6 +420,9 @@ msgstr "Bu temayı indirmek istiyor musunuz?" msgid "Do you want to format:" msgstr "Formatlamak istiyor musunuz:" +msgid "Do you want to retry for 30 secs?" +msgstr "30 saniye sonra denemek ister misiniz?" + msgid "Do you want to use the alternate DOL that is known to be correct?" msgstr "Doğru olduğu bilinen alternatif DOL ü kullanmak ister misiniz?" @@ -525,6 +534,9 @@ msgstr "Çevir-X" msgid "Force" msgstr "Zorla" +msgid "Format" +msgstr "Biçimlendir" + msgid "Formatting, please wait..." msgstr "Biçimlendiriliyor, bekleyiniz..." @@ -762,9 +774,6 @@ msgstr "Muhtemelen 4 ile tam bölünemeyen boyutları var." msgid "Mount DVD drive" msgstr "DVD sürücüsü bağla" -msgid "Music Loop Mode" -msgstr "" - msgid "Music Volume" msgstr "Ses Seviyesi" @@ -798,6 +807,15 @@ msgstr "Hiç Favori yok" msgid "No SD-Card inserted!" msgstr "SD-Card takılı değil!" +msgid "No USB Device" +msgstr "USB Aygıtı yok" + +msgid "No USB Device found." +msgstr "USB Aygıtı bulunamadı" + +msgid "No WBFS or FAT/NTFS partition found" +msgstr "" + msgid "No cheats were selected" msgstr "Hile seçilmedi" @@ -876,9 +894,6 @@ msgstr "" msgid "Partition" msgstr "Bölüm" -msgid "Partition Format Menu" -msgstr "" - msgid "Password" msgstr "Parola" @@ -900,15 +915,6 @@ msgstr "Listeden seç" msgid "Play Count" msgstr "Oynama Sayısı" -msgid "Play Next" -msgstr "" - -msgid "Play Previous" -msgstr "" - -msgid "Playing Music:" -msgstr "" - msgid "Please wait..." msgstr "Lütfen bekleyin.." @@ -942,15 +948,9 @@ msgstr "SD'yi yeniden yükle" msgid "Rename Game on WBFS" msgstr "WBFS'deki oyunu yeniden isimlendir" -msgid "Reset BG Music" -msgstr "" - msgid "Reset Playcounter" msgstr "Sayacı sıfırla" -msgid "Reset to standard BGM?" -msgstr "" - msgid "Restarting..." msgstr "Yeniden başlatılıyor" @@ -987,6 +987,9 @@ msgstr "Kaydedildi" msgid "Screensaver" msgstr "Ekran Koruyucu" +msgid "Select" +msgstr "Seç" + msgid "Select a DOL" msgstr "Bir DOL seç" @@ -999,6 +1002,9 @@ msgstr "Eyl" msgid "Set Search-Filter" msgstr "Arama Filtresi Ayarla" +msgid "Set as backgroundmusic?" +msgstr "Arkaplan müziği olarak ayarla?" + msgid "Settings" msgstr "Ayarlar" @@ -1114,6 +1120,9 @@ msgstr "Yardımlar" msgid "Transfer failed." msgstr "Transfer başarısız" +msgid "USB Device not found" +msgstr "USB Aygıtı bulunamadı" + msgid "USB Loader GX is protected" msgstr "USB Loader GX koruma altında" @@ -1142,9 +1151,6 @@ msgstr "" msgid "Unlock console to use this option." msgstr "Bu seçeneği kullanmak için konsol kilidini açın" -msgid "Unlock the app first." -msgstr "" - msgid "Unlocked" msgstr "Kilit açıldı" @@ -1209,6 +1215,9 @@ msgstr "" msgid "WIP Patches Path changed" msgstr "" +msgid "Waiting for USB Device" +msgstr "USB Aygıtı için Bekleniyor" + msgid "Waiting..." msgstr "Beklemede..." @@ -1254,15 +1263,15 @@ msgstr "Favorileri göstermeyi seçtiniz ama hiç seçili yok" msgid "You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible." msgstr "" -msgid "You can't access this menu!" -msgstr "" - msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." msgstr "" msgid "You have attempted to load a bad image" msgstr "Bozuk bir resim yüklemeye çalıştın" +msgid "You need to select or format a partition" +msgstr "Bir bölüm seçmeniz ya da formatlamanız gerekiyor" + #, c-format msgid "Your URL has been saved in %sWiiTDB_URL.txt." msgstr "URL %sWiiTDB_URL.txt dosyasına kaydedildi" @@ -1333,62 +1342,26 @@ msgstr "./" msgid "seconds left" msgstr "saniye kaldı" -msgid "Backgroundmusic Path changed." -msgstr "Arkaplan müzik Yolu değişti." +#~ msgid "Can't decompress LZ77" +#~ msgstr "LZ77 açılamıyor" -msgid "Set as backgroundmusic?" -msgstr "Arkaplan müziği olarak ayarla?" +#~ msgid "Can't find disc" +#~ msgstr "Disk bulunamıyor" -msgid "Back to Wii Menu" -msgstr "Wii Menüye dönüş" +#~ msgid "IMD5 Header not right." +#~ msgstr "IMD5 Başlığı doğru değil" -msgid "Could not initialize DIP module!" -msgstr "DIP modülü başlatılamadı!" +#~ msgid "IMET Header wrong." +#~ msgstr "IMET Başlığı yanlış" -msgid "Do you want to retry for 30 secs?" -msgstr "30 saniye sonra denemek ister misiniz?" +#~ msgid "No WBFS or FAT game partition found" +#~ msgstr "WBFS veya FAT oyun bölümü bulunamadı" -msgid "Format" -msgstr "Biçimlendir" +#~ msgid "for FAT support" +#~ msgstr "FAT desteği için" -msgid "No USB Device" -msgstr "USB Aygıtı yok" +#~ msgid "Failed to extract opening.bnr" +#~ msgstr "opening.bnr çıkartılamadı" -msgid "No USB Device found." -msgstr "USB Aygıtı bulunamadı" - -msgid "Select" -msgstr "Seç" - -msgid "USB Device not found" -msgstr "USB Aygıtı bulunamadı" - -msgid "Waiting for USB Device" -msgstr "USB Aygıtı için Bekleniyor" - -msgid "You need to select or format a partition" -msgstr "Bir bölüm seçmeniz ya da formatlamanız gerekiyor" - -msgid "Can't decompress LZ77" -msgstr "LZ77 açılamıyor" - -msgid "Can't find disc" -msgstr "Disk bulunamıyor" - -msgid "IMD5 Header not right." -msgstr "IMD5 Başlığı doğru değil" - -msgid "IMET Header wrong." -msgstr "IMET Başlığı yanlış" - -msgid "No WBFS or FAT game partition found" -msgstr "WBFS veya FAT oyun bölümü bulunamadı" - -msgid "for FAT support" -msgstr "FAT desteği için" - -msgid "Failed to extract opening.bnr" -msgstr "opening.bnr çıkartılamadı" - -msgid "Homebrew Channel" -msgstr "Homebrew Kanalı" +#~ msgid "Homebrew Channel" +#~ msgstr "Homebrew Kanalı" diff --git a/gui.pnproj b/gui.pnproj index f00af59b..d03f4b5b 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/banner/gui_banner.cpp b/source/banner/gui_banner.cpp index 53cd34f5..267d2685 100644 --- a/source/banner/gui_banner.cpp +++ b/source/banner/gui_banner.cpp @@ -5,127 +5,98 @@ * Shows TPL Banner images ***************************************************************************/ #include "gui_banner.h" - -typedef struct -{ - u32 texture_header_offset; - u32 palette_header_offset; -} TPLTexture; - -typedef struct -{ - u16 heigth; - u16 width; - //... - //there is more but we only need these -} TPLTextureHeader; - -//only one field tpls -typedef struct -{ - u32 magic; - u32 ntextures; - u32 texture_size; - TPLTexture textures; -} TPLHeader; - - -GuiBanner::GuiBanner(const char *tplfilepath) -{ - memory = NULL; - tplfilesize = 0; - width = 0; - height = 0; - - FILE *tplfp = fopen(tplfilepath,"rb"); - - if(tplfp !=NULL) { - - fseek (tplfp , 0 , SEEK_END); - tplfilesize = ftell (tplfp); - rewind (tplfp); - memory = memalign(32, tplfilesize); - if(!memory) { - fclose(tplfp); - return; - } - fread(memory, 1, tplfilesize, tplfp); - fclose(tplfp); - - const u8 * buffer = (const u8*) memory; - const TPLHeader *hdr = (TPLHeader *) buffer; - const TPLTextureHeader *texhdr = (TPLTextureHeader *) &buffer[hdr->textures.texture_header_offset]; - - height = texhdr[0].heigth; - width = texhdr[0].width; - - TPLFile tplfile; - int ret; - - ret = TPL_OpenTPLFromMemory(&tplfile, memory, tplfilesize); - if(ret < 0) { - free(memory); - memory = NULL; - return; - } - ret = TPL_GetTexture(&tplfile,0,&texObj); - if(ret < 0) { - free(memory); - memory = NULL; - return; - } - TPL_CloseTPLFile(&tplfile); - - widescreen = 0; - filecheck = true; - - } else { - filecheck = false; - fclose(tplfp); - } -} - -GuiBanner::GuiBanner(void *mem, u32 len) -{ - if(!mem || !len) - return; - - memory = mem; - tplfilesize = len; - - const u8 * buffer = (const u8*) memory; - const TPLHeader *hdr = (TPLHeader *) buffer; - const TPLTextureHeader *texhdr = (TPLTextureHeader *) &buffer[hdr->textures.texture_header_offset]; - - height = texhdr[0].heigth; - width = texhdr[0].width; - - TPLFile tplfile; - - int ret; - - ret = TPL_OpenTPLFromMemory(&tplfile, memory, tplfilesize); - if(ret < 0) { - free(memory); - memory = NULL; - return; - } - ret = TPL_GetTexture(&tplfile,0,&texObj); - if(ret < 0) { - free(memory); - memory = NULL; - return; - } - TPL_CloseTPLFile(&tplfile); - - filecheck = true; -} + +GuiBanner::GuiBanner(const char *tplfilepath) +{ + memory = NULL; + tplfilesize = 0; + width = 0; + height = 0; + + FILE *tplfp = fopen(tplfilepath,"rb"); + + if(tplfp !=NULL) { + + unsigned short heighttemp = 0; + unsigned short widthtemp = 0; + + fseek(tplfp , 0x14, SEEK_SET); + fread((void*)&heighttemp,1,2,tplfp); + fread((void*)&widthtemp,1,2,tplfp); + fseek (tplfp , 0 , SEEK_END); + tplfilesize = ftell (tplfp); + rewind (tplfp); + memory = memalign(32, tplfilesize); + if(!memory) { + fclose(tplfp); + return; + } + fread(memory, 1, tplfilesize, tplfp); + fclose(tplfp); + + TPLFile tplfile; + int ret; + + ret = TPL_OpenTPLFromMemory(&tplfile, memory, tplfilesize); + if(ret < 0) { + free(memory); + memory = NULL; + return; + } + ret = TPL_GetTexture(&tplfile,0,&texObj); + if(ret < 0) { + free(memory); + memory = NULL; + return; + } + TPL_CloseTPLFile(&tplfile); + + width = widthtemp; + height = heighttemp; + widescreen = 0; + filecheck = true; + + } else { + filecheck = false; + fclose(tplfp); + } +} + +GuiBanner::GuiBanner(void *mem, u32 len, int w, int h) +{ + if(!mem || !len) + return; + memory = mem; + tplfilesize = len; + width = w; + height = h; + + TPLFile tplfile; + + int ret; + + ret = TPL_OpenTPLFromMemory(&tplfile, memory, tplfilesize); + if(ret < 0) { + free(memory); + memory = NULL; + return; + } + ret = TPL_GetTexture(&tplfile,0,&texObj); + if(ret < 0) { + free(memory); + memory = NULL; + return; + } + TPL_CloseTPLFile(&tplfile); + + filecheck = true; +} GuiBanner::~GuiBanner() -{ +{ if(memory != NULL) { - free(memory); - memory = NULL; + free(memory); + memory = NULL; } } @@ -133,11 +104,11 @@ void GuiBanner::Draw() { LOCK(this); if(!filecheck ||!this->IsVisible()) - return; + return; - float currScale = this->GetScale(); - - Menu_DrawTPLImg(this->GetLeft(), this->GetTop(), 0, width, height, &texObj, imageangle, widescreen ? currScale*0.80 : currScale, currScale, this->GetAlpha(), xx1,yy1,xx2,yy2,xx3,yy3,xx4,yy4); + float currScale = this->GetScale(); + + Menu_DrawTPLImg(this->GetLeft(), this->GetTop(), 0, width, height, &texObj, imageangle, widescreen ? currScale*0.80 : currScale, currScale, this->GetAlpha(), xx1,yy1,xx2,yy2,xx3,yy3,xx4,yy4); this->UpdateEffects(); } diff --git a/source/banner/gui_banner.h b/source/banner/gui_banner.h index d0f1d61a..d372baaf 100644 --- a/source/banner/gui_banner.h +++ b/source/banner/gui_banner.h @@ -19,7 +19,9 @@ public: //!Constructor //!\param mem Memory of the loaded tpl //!\param len Filesize of the tpl - GuiBanner(void *mem, u32 len); + //!\param w Width of the tpl + //!\param h Height of the tpl + GuiBanner(void *mem, u32 len, int w, int h); //!Destructor ~GuiBanner(); void Draw(); diff --git a/source/banner/openingbnr.h b/source/banner/openingbnr.h index 0895cc74..3142fba0 100644 --- a/source/banner/openingbnr.h +++ b/source/banner/openingbnr.h @@ -13,8 +13,6 @@ extern "C" { #endif -#include - /*********************************************************** * Error description: * 0 Successfully extracted diff --git a/source/bannersound.h b/source/bannersound.h index b6da62d1..6cf7b526 100644 --- a/source/bannersound.h +++ b/source/bannersound.h @@ -1,6 +1,6 @@ -#ifndef BANNERSOUND_H -#define BANNERSOUND_H - -const u8 *LoadBannerSound(const u8 *discid, u32 *size); - -#endif /* BANNERSOUND_H */ +#ifndef BANNERSOUND_H +#define BANNERSOUND_H + +const u8 *LoadBannerSound(const u8 *discid, u32 *size); + +#endif /* BANNERSOUND_H */ diff --git a/source/cheats/cheatmenu.cpp b/source/cheats/cheatmenu.cpp index 96527d0e..3e751079 100644 --- a/source/cheats/cheatmenu.cpp +++ b/source/cheats/cheatmenu.cpp @@ -12,7 +12,11 @@ #include "filelist.h" #include "sys.h" #include "gct.h" -#include "../menu/menus.h" + +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /*** Extern variables ***/ extern GuiWindow * mainWindow; diff --git a/source/homebrewboot/HomebrewBrowse.cpp b/source/homebrewboot/HomebrewBrowse.cpp index 05d9db14..ea3bb3b4 100644 --- a/source/homebrewboot/HomebrewBrowse.cpp +++ b/source/homebrewboot/HomebrewBrowse.cpp @@ -19,7 +19,6 @@ #include "homebrewboot/BootHomebrew.h" #include "network/networkops.h" #include "menu.h" -#include "menu/menus.h" #include "filelist.h" #include "sys.h" #include "network/http.h" @@ -29,13 +28,19 @@ #include "unzip/miniunz.h" #include "usbloader/utils.h" -#include "../menu/menus.h" +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); /*** Extern variables ***/ +extern GuiWindow * mainWindow; +extern GuiSound * bgMusic; extern GuiImage * bgImg; extern u32 infilesize; extern u32 uncfilesize; extern char wiiloadVersion[2]; +extern u8 shutdown; +extern u8 reset; extern struct SSettings Settings; extern void *innetbuffer; @@ -726,6 +731,11 @@ int MenuHomebrewBrowse() { MainButton4.ResetState(); } + else if (shutdown == 1) + Sys_Shutdown(); + else if (reset == 1) + Sys_Reboot(); + else if (backBtn.GetState() == STATE_CLICKED) { menu = MENU_DISCLIST; changed = true; @@ -824,29 +834,29 @@ int MenuHomebrewBrowse() { read += result; } - + char filename[101]; if (!error) { - + network_read((u8*) &filename, 100); - + // Do we need to unzip this thing? if (wiiloadVersion[0] > 0 || wiiloadVersion[1] > 4) { // We need to unzip... if (temp[0] == 'P' && temp[1] == 'K' && temp[2] == 0x03 && temp[3] == 0x04) { // It's a zip file, unzip to the apps directory - + // Zip archive, ask for permission to install the zip char zippath[255]; sprintf((char *) &zippath, "%s%s", Settings.homebrewapps_path, filename); - + FILE *fp = fopen(zippath, "wb"); if (fp != NULL) { fwrite(temp, 1, infilesize, fp); fclose(fp); - + // Now unzip the zip file... unzFile uf = unzOpen(zippath); if (uf==NULL) { @@ -854,9 +864,9 @@ int MenuHomebrewBrowse() { } else { extractZip(uf,0,1,0, Settings.homebrewapps_path); unzCloseCurrentFile(uf); - + remove(zippath); - + // Reload this menu here... menu = MENU_HOMEBREWBROWSE; break; @@ -870,17 +880,17 @@ int MenuHomebrewBrowse() { uLongf f = uncfilesize; error = uncompress(unc, &f, temp, infilesize) != Z_OK; uncfilesize = f; - + free(temp); temp = unc; } } - + if (!error && strstr(filename,".zip") == NULL) { innetbuffer = temp; } } - + ProgressStop(); if (error || read != infilesize) { diff --git a/source/input.cpp b/source/input.cpp index 9cb65714..b8ea2289 100644 --- a/source/input.cpp +++ b/source/input.cpp @@ -23,43 +23,6 @@ int rumbleRequest[4] = {0,0,0,0}; GuiTrigger userInput[4]; static int rumbleCount[4] = {0,0,0,0}; -u32 frameCount = 0; -extern bool ScreenshotTriggered; - -/**************************************************************************** - * UpdatePadsCB - * - * called by postRetraceCallback in InitGCVideo - scans gcpad and wpad - ***************************************************************************/ -void UpdatePadsCB () -{ - frameCount++; - WPAD_ScanPads(); - PAD_ScanPads(); - - for (int i=3; i >= 0; i--) - { - memcpy(&userInput[i].wpad, WPAD_Data(i), sizeof(WPADData)); - - userInput[i].chan = i; - userInput[i].pad.btns_d = PAD_ButtonsDown(i); - userInput[i].pad.btns_u = PAD_ButtonsUp(i); - userInput[i].pad.btns_h = PAD_ButtonsHeld(i); - userInput[i].pad.stickX = PAD_StickX(i); - userInput[i].pad.stickY = PAD_StickY(i); - userInput[i].pad.substickX = PAD_SubStickX(i); - userInput[i].pad.substickY = PAD_SubStickY(i); - userInput[i].pad.triggerL = PAD_TriggerL(i); - userInput[i].pad.triggerR = PAD_TriggerR(i); - - if((userInput[i].wpad.btns_d & WPAD_NUNCHUK_BUTTON_Z) - || (userInput[i].wpad.btns_d & WPAD_CLASSIC_BUTTON_ZL) - || (userInput[i].pad.btns_d & PAD_TRIGGER_Z)) - { - ScreenshotTriggered = true; - } - } -} /**************************************************************************** * ShutoffRumble diff --git a/source/input.h b/source/input.h index 80b7fe0e..b82c6263 100644 --- a/source/input.h +++ b/source/input.h @@ -17,7 +17,6 @@ extern int rumbleRequest[4]; -void UpdatePadsCB (); void ShutoffRumble(); void DoRumble(int i); diff --git a/source/libwiigui/GuiBGM.cpp b/source/libwiigui/GuiBGM.cpp deleted file mode 100644 index d9d59a3a..00000000 --- a/source/libwiigui/GuiBGM.cpp +++ /dev/null @@ -1,250 +0,0 @@ -/**************************************************************************** - * SettingsPrompts - * USB Loader GX 2009 - * - * Backgroundmusic - ***************************************************************************/ -#include -#include "GuiBGM.h" -#include "menu.h" - -GuiBGM::GuiBGM(const u8 *s, int l, int v) - :GuiSound(s, l, v) -{ - loop = 0; - loopMode = ONCE; - currentPath = NULL; - currentPlaying = 0; - - //shouldn't be needed but - //fixes some kind of weird bug in ogg system - GuiSound::Load(s, l, v); -} - -GuiBGM::~GuiBGM() -{ - if(currentPath) - delete [] currentPath; - - ClearList(); -}; - -void GuiBGM::SetLoop(bool l) -{ -} - -void GuiBGM::SetLoop(int l) -{ - loop = false; - loopMode = ONCE; - - if(l == LOOP) - { - loop = true; - } - else - loopMode = l; -} - -bool GuiBGM::Load(const char *path) -{ - if(!path) - { - LoadStandard(); - return false; - } - if(strcmp(path, "") == 0) - { - LoadStandard(); - return false; - } - - if(!GuiSound::Load(path)) - { - LoadStandard(); - return false; - } - - return ParsePath(path); -} - -bool GuiBGM::LoadStandard() -{ - ClearList(); - if(currentPath) - { - delete [] currentPath; - currentPath = NULL; - } - - strcpy(Settings.ogg_path, ""); - - bool ret = GuiSound::Load(bg_music_ogg, bg_music_ogg_size, true); - - if(ret) - Play(); - - return ret; -} - -bool GuiBGM::ParsePath(const char * folderpath) -{ - ClearList(); - - if(currentPath) - delete [] currentPath; - - currentPath = new char[strlen(folderpath)+1]; - sprintf(currentPath, "%s", folderpath); - - char * isdirpath = strrchr(folderpath, '.'); - if(isdirpath) - { - char * pathptr = strrchr(currentPath, '/'); - if(pathptr) - { - pathptr++; - pathptr[0] = 0; - } - } - - char * LoadedFilename = strrchr(folderpath, '/')+1; - - char filename[1024]; - struct stat st; - - DIR_ITER * dir = diropen(currentPath); - if (dir == NULL) - { - LoadStandard(); - return false; - } - u32 counter = 0; - - while (dirnext(dir,filename,&st) == 0) - { - char * fileext = strrchr(filename, '.'); - if(fileext) - { - if(strcasecmp(fileext, ".mp3") == 0 || strcasecmp(fileext, ".ogg") == 0 - || strcasecmp(fileext, ".wav") == 0) - { - AddEntrie(filename); - - if(strcmp(LoadedFilename, filename) == 0) - currentPlaying = counter; - - counter++; - } - } - } - - dirclose(dir); - - snprintf(Settings.ogg_path, sizeof(Settings.ogg_path), "%s", folderpath); - - return true; -} - -void GuiBGM::AddEntrie(const char * filename) -{ - if(!filename) - return; - - char * NewEntrie = new char[strlen(filename)+1]; - sprintf(NewEntrie, "%s", filename); - - PlayList.push_back(NewEntrie); -} - -void GuiBGM::ClearList() -{ - for(u32 i = 0; i < PlayList.size(); i++) - { - if(PlayList.at(i) != NULL) - { - delete [] PlayList.at(i); - PlayList.at(i) = NULL; - } - } - - PlayList.clear(); -} - -bool GuiBGM::PlayNext() -{ - if(!currentPath) - return false; - - currentPlaying++; - if(currentPlaying >= (int) PlayList.size()) - currentPlaying = 0; - - snprintf(Settings.ogg_path, sizeof(Settings.ogg_path), "%s%s", currentPath, PlayList.at(currentPlaying)); - - if(!GuiSound::Load(Settings.ogg_path)) - return false; - - Play(); - - return true; -} - -bool GuiBGM::PlayPrevious() -{ - if(!currentPath) - return false; - - currentPlaying--; - if(currentPlaying < 0) - currentPlaying = PlayList.size()-1; - - snprintf(Settings.ogg_path, sizeof(Settings.ogg_path), "%s%s", currentPath, PlayList.at(currentPlaying)); - - if(!GuiSound::Load(Settings.ogg_path)) - return false; - - Play(); - - return true; -} - -bool GuiBGM::PlayRandom() -{ - if(!currentPath) - return false; - - srand (time(NULL)); - - currentPlaying = rand() % PlayList.size(); - - //just in case - if(currentPlaying < 0) - currentPlaying = PlayList.size()-1; - else if(currentPlaying >= (int) PlayList.size()) - currentPlaying = 0; - - snprintf(Settings.ogg_path, sizeof(Settings.ogg_path), "%s%s", currentPath, PlayList.at(currentPlaying)); - - if(!GuiSound::Load(Settings.ogg_path)) - return false; - - Play(); - - return true; -} - -void GuiBGM::UpdateState() -{ - if(!IsPlaying()) - { - if(loopMode == DIR_LOOP) - { - PlayNext(); - } - else if(loopMode == RANDOM_BGM) - { - PlayRandom(); - } - } -} diff --git a/source/libwiigui/GuiBGM.h b/source/libwiigui/GuiBGM.h deleted file mode 100644 index 7d3f2117..00000000 --- a/source/libwiigui/GuiBGM.h +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - * SettingsPrompts - * USB Loader GX 2009 - * - * Backgroundmusic - ***************************************************************************/ - -#ifndef _BGM_H_ -#define _BGM_H_ - -#include "libwiigui/gui.h" - -enum -{ - ONCE = 0, - LOOP, - RANDOM_BGM, - DIR_LOOP -}; - -class GuiBGM : public GuiSound -{ - public: - GuiBGM(const u8 *s, int l, int v); - ~GuiBGM(); - bool Load(const char *path); - bool LoadStandard(); - bool ParsePath(const char * folderpath); - bool PlayNext(); - bool PlayPrevious(); - bool PlayRandom(); - void SetLoop(bool l); - void SetLoop(int l); - void UpdateState(); - protected: - void AddEntrie(const char * filename); - void ClearList(); - - int currentPlaying; - int loopMode; - char * currentPath; - std::vector PlayList; -}; - -#endif diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h index 5efd3d1a..83b62db9 100644 --- a/source/libwiigui/gui.h +++ b/source/libwiigui/gui.h @@ -144,7 +144,7 @@ class GuiSound bool Load(const char *p); //!Destructor ~GuiSound(); - + //!Start sound playback void Play(); //!Stop sound playback @@ -430,7 +430,7 @@ class GuiElement void Lock(); void Unlock(); // static mutex_t mutex; - static mutex_t _lock_mutex; + static mutex_t _lock_mutex; lwp_t _lock_thread; u16 _lock_count; lwpq_t _lock_queue; diff --git a/source/libwiigui/gui_gamebrowser.cpp b/source/libwiigui/gui_gamebrowser.cpp index ef5a39f7..c99c04bb 100644 --- a/source/libwiigui/gui_gamebrowser.cpp +++ b/source/libwiigui/gui_gamebrowser.cpp @@ -1,642 +1,639 @@ -/**************************************************************************** - * libwiigui - * - * gui_gamebrowser.cpp - * - * GUI class definitions - ***************************************************************************/ - -#include "gui.h" -#include "../wpad.h" - -#include -#include "gui_gamebrowser.h" -#include "../settings/cfg.h" -#include "../main.h" -#include "settings/newtitles.h" - -#include -#include - -#define GAMESELECTSIZE 30 -int txtscroll = 0; -/** - * Constructor for the GuiGameBrowser class. - */ -GuiGameBrowser::GuiGameBrowser(int w, int h, struct discHdr * l, int gameCnt, const char *themePath, const u8 *imagebg, int selected, int offset) -{ - width = w; - height = h; - this->gameCnt = gameCnt; - gameList = l; - pagesize = THEME.pagesize; - scrollbaron = (gameCnt > pagesize) ? 1 : 0; - selectable = true; - listOffset = MAX(0,MIN(offset,(gameCnt-pagesize))); - selectedItem = selected - offset; - focus = 1; // allow focus - char imgPath[100]; - - trigA = new GuiTrigger; - trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - trigHeldA = new GuiTrigger; - trigHeldA->SetHeldTrigger(-1, WPAD_BUTTON_A, PAD_BUTTON_A); - btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, Settings.sfxvolume); - - snprintf(imgPath, sizeof(imgPath), "%sbg_options.png", themePath); - bgGames = new GuiImageData(imgPath, imagebg); - - snprintf(imgPath, sizeof(imgPath), "%snew.png", themePath); - newGames = new GuiImageData(imgPath, new_png); - - bgGameImg = new GuiImage(bgGames); - bgGameImg->SetParent(this); - bgGameImg->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - - maxTextWidth = bgGameImg->GetWidth() - 24 - 4; - - snprintf(imgPath, sizeof(imgPath), "%sbg_options_entry.png", themePath); - bgGamesEntry = new GuiImageData(imgPath, bg_options_entry_png); - - snprintf(imgPath, sizeof(imgPath), "%sscrollbar.png", themePath); - scrollbar = new GuiImageData(imgPath, scrollbar_png); - scrollbarImg = new GuiImage(scrollbar); - scrollbarImg->SetParent(this); - scrollbarImg->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); - scrollbarImg->SetPosition(0, 4); - - maxTextWidth -= scrollbarImg->GetWidth() + 4; - - snprintf(imgPath, sizeof(imgPath), "%sscrollbar_arrowdown.png", themePath); - arrowDown = new GuiImageData(imgPath, scrollbar_arrowdown_png); - arrowDownImg = new GuiImage(arrowDown); - arrowDownOver = new GuiImageData(imgPath, scrollbar_arrowdown_png); - arrowDownOverImg = new GuiImage(arrowDownOver); - snprintf(imgPath, sizeof(imgPath), "%sscrollbar_arrowup.png", themePath); - arrowUp = new GuiImageData(imgPath, scrollbar_arrowup_png); - arrowUpImg = new GuiImage(arrowUp); - arrowUpOver = new GuiImageData(imgPath, scrollbar_arrowup_png); - arrowUpOverImg = new GuiImage(arrowUpOver); - snprintf(imgPath, sizeof(imgPath), "%sscrollbar_box.png", themePath); - scrollbarBox = new GuiImageData(imgPath, scrollbar_box_png); - scrollbarBoxImg = new GuiImage(scrollbarBox); - scrollbarBoxOver = new GuiImageData(imgPath, scrollbar_box_png); - scrollbarBoxOverImg = new GuiImage(scrollbarBoxOver); - - arrowUpBtn = new GuiButton(arrowUpImg->GetWidth(), arrowUpImg->GetHeight()); - arrowUpBtn->SetParent(this); - arrowUpBtn->SetImage(arrowUpImg); - arrowUpBtn->SetImageOver(arrowUpOverImg); - arrowUpBtn->SetImageHold(arrowUpOverImg); - arrowUpBtn->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - arrowUpBtn->SetPosition(width/2-18+7,-18); - arrowUpBtn->SetSelectable(false); - arrowUpBtn->SetTrigger(trigA); - arrowUpBtn->SetEffectOnOver(EFFECT_SCALE, 50, 130); - arrowUpBtn->SetSoundClick(btnSoundClick); - - arrowDownBtn = new GuiButton(arrowDownImg->GetWidth(), arrowDownImg->GetHeight()); - arrowDownBtn->SetParent(this); - arrowDownBtn->SetImage(arrowDownImg); - arrowDownBtn->SetImageOver(arrowDownOverImg); - arrowDownBtn->SetImageHold(arrowDownOverImg); - arrowDownBtn->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); - arrowDownBtn->SetPosition(width/2-18+7,18); - arrowDownBtn->SetSelectable(false); - arrowDownBtn->SetTrigger(trigA); - arrowDownBtn->SetEffectOnOver(EFFECT_SCALE, 50, 130); - arrowDownBtn->SetSoundClick(btnSoundClick); - - scrollbarBoxBtn = new GuiButton(scrollbarBoxImg->GetWidth(), scrollbarBoxImg->GetHeight()); - scrollbarBoxBtn->SetParent(this); - scrollbarBoxBtn->SetImage(scrollbarBoxImg); - scrollbarBoxBtn->SetImageOver(scrollbarBoxOverImg); - scrollbarBoxBtn->SetImageHold(scrollbarBoxOverImg); - scrollbarBoxBtn->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - scrollbarBoxBtn->SetSelectable(false); - scrollbarBoxBtn->SetEffectOnOver(EFFECT_SCALE, 50, 120); - scrollbarBoxBtn->SetMinY(0); - scrollbarBoxBtn->SetMaxY(height-30); - scrollbarBoxBtn->SetHoldable(true); - scrollbarBoxBtn->SetTrigger(trigHeldA); - - gameIndex = new int[pagesize]; - game = new GuiButton * [pagesize]; - gameTxt = new GuiText * [pagesize]; - gameTxtOver = new GuiText * [pagesize]; - gameBg = new GuiImage * [pagesize]; - newImg = new GuiImage * [pagesize]; - - for(int i=0; i < pagesize; i++) - { - gameTxt[i] = new GuiText(NULL, 20, THEME.gametext); - gameTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - gameTxt[i]->SetPosition(24,0); - gameTxt[i]->SetMaxWidth(maxTextWidth, GuiText::DOTTED); - - - gameTxtOver[i] = new GuiText(NULL, 20, THEME.gametext); - gameTxtOver[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - gameTxtOver[i]->SetPosition(24,0); - gameTxtOver[i]->SetMaxWidth(maxTextWidth, GuiText::SCROLL); - - gameBg[i] = new GuiImage(bgGamesEntry); - - newImg[i] = new GuiImage(newGames); - newImg[i]->SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE); - newImg[i]->SetVisible(false); - - game[i] = new GuiButton(width-28,GAMESELECTSIZE); - game[i]->SetParent(this); - game[i]->SetLabel(gameTxt[i]); - game[i]->SetLabelOver(gameTxtOver[i]); - game[i]->SetIcon(newImg[i]); - game[i]->SetImageOver(gameBg[i]); - game[i]->SetPosition(5,GAMESELECTSIZE*i+4); - game[i]->SetRumble(false); - game[i]->SetTrigger(trigA); - game[i]->SetSoundClick(btnSoundClick); - - gameIndex[i] = i; - } - UpdateListEntries(); -} - -/** - * Destructor for the GuiGameBrowser class. - */ -GuiGameBrowser::~GuiGameBrowser() -{ - delete arrowUpBtn; - delete arrowDownBtn; - delete scrollbarBoxBtn; - delete scrollbarImg; - delete arrowDownImg; - delete arrowDownOverImg; - delete arrowUpImg; - delete arrowUpOverImg; - delete scrollbarBoxImg; - delete scrollbarBoxOverImg; - delete scrollbar; - delete arrowDown; - delete arrowDownOver; - delete arrowUp; - delete arrowUpOver; - delete scrollbarBox; - delete scrollbarBoxOver; - delete bgGameImg; - delete bgGames; - delete bgGamesEntry; - delete newGames; - - delete trigA; - delete trigHeldA; - delete btnSoundClick; - - for(int i=0; iResetState(); - - if(f == 1) - game[selectedItem]->SetState(STATE_SELECTED); -} - -void GuiGameBrowser::ResetState() -{ - LOCK(this); - if(state != STATE_DISABLED) - { - state = STATE_DEFAULT; - stateChan = -1; - } - - for(int i=0; iResetState(); - } -} - -int GuiGameBrowser::GetOffset() -{ - return listOffset; -} -int GuiGameBrowser::GetClickedOption() -{ - int found = -1; - for(int i=0; iGetState() == STATE_CLICKED) - { - game[i]->SetState(STATE_SELECTED); - found = gameIndex[i]; - break; - } - } - return found; -} - -int GuiGameBrowser::GetSelectedOption() -{ - int found = -1; - for(int i=0; iGetState() == STATE_SELECTED) - { - game[i]->SetState(STATE_SELECTED); - found = gameIndex[i]; - break; - } - } - return found; -} - -/**************************************************************************** - * FindMenuItem - * - * Help function to find the next visible menu item on the list - ***************************************************************************/ - -int GuiGameBrowser::FindMenuItem(int currentItem, int direction) -{ - int nextItem = currentItem + direction; - - if(nextItem < 0 || nextItem >= gameCnt) - return -1; - - if(strlen(get_title(&gameList[nextItem])) > 0) - return nextItem; - else - return FindMenuItem(nextItem, direction); -} - -/** - * Draw the button on screen - */ -void GuiGameBrowser::Draw() -{ - LOCK(this); - if(!this->IsVisible() || !gameCnt) - return; - - bgGameImg->Draw(); - - int next = listOffset; - - for(int i=0; i= 0) - { - game[i]->Draw(); - next = this->FindMenuItem(next, 1); - } - else - break; - } - - if(scrollbaron == 1) { - scrollbarImg->Draw(); - arrowUpBtn->Draw(); - arrowDownBtn->Draw(); - scrollbarBoxBtn->Draw(); - } - this->UpdateEffects(); -} - -void GuiGameBrowser::UpdateListEntries() -{ - if(!gameList) - return; - - int next = listOffset; - for(int i=0; i= 0) - { - if(game[i]->GetState() == STATE_DISABLED) - { - game[i]->SetVisible(true); - game[i]->SetState(STATE_DEFAULT); - } - gameTxt[i]->SetText(get_title(&gameList[next])); - gameTxt[i]->SetPosition(24, 0); - gameTxtOver[i]->SetText(get_title(&gameList[next])); - gameTxtOver[i]->SetPosition(24, 0); - - if (Settings.marknewtitles) { - bool isNew = NewTitles::Instance()->IsNew(gameList[next].id); - if (isNew) { - gameTxt[i]->SetMaxWidth(maxTextWidth - (newGames->GetWidth() + 1), GuiText::DOTTED); - gameTxtOver[i]->SetMaxWidth(maxTextWidth - (newGames->GetWidth() + 1), GuiText::SCROLL); - } else { - gameTxt[i]->SetMaxWidth(maxTextWidth, GuiText::DOTTED); - gameTxtOver[i]->SetMaxWidth(maxTextWidth, GuiText::SCROLL); - } - newImg[i]->SetVisible(isNew); - } - - gameIndex[i] = next; - next = this->FindMenuItem(next, 1); - } - else - { - game[i]->SetVisible(false); - game[i]->SetState(STATE_DISABLED); - } - } -} - -void GuiGameBrowser::Update(GuiTrigger * t) -{ - LOCK(this); - if(state == STATE_DISABLED || !t || !gameCnt) - return; - - int next, prev; - int old_listOffset = listOffset; - static int position2; - // scrolldelay affects how fast the list scrolls - // when the arrows are clicked - float scrolldelay = 3.5; - - if (scrollbaron == 1) { - // update the location of the scroll box based on the position in the option list - arrowUpBtn->Update(t); - arrowDownBtn->Update(t); - scrollbarBoxBtn->Update(t); - } - - next = listOffset; - - u32 buttonshold = ButtonsHold(); - - if(buttonshold != WPAD_BUTTON_UP && buttonshold != WPAD_BUTTON_DOWN) { - - for(int i=0; i= 0) - next = this->FindMenuItem(next, 1); - - if(focus) - { - if(i != selectedItem && game[i]->GetState() == STATE_SELECTED) - game[i]->ResetState(); - else if(i == selectedItem && game[i]->GetState() == STATE_DEFAULT) - game[selectedItem]->SetState(STATE_SELECTED, t->chan); - } - - game[i]->Update(t); - - if(game[i]->GetState() == STATE_SELECTED) - { - selectedItem = i; - } - } - } - - // pad and joystick navigation - if(!focus || !gameCnt) - return; // skip navigation - - if (scrollbaron == 1) - { - - if (t->Down() || arrowDownBtn->GetState() == STATE_CLICKED || arrowDownBtn->GetState() == STATE_HELD) //down - { - - next = this->FindMenuItem(gameIndex[selectedItem], 1); - - if(next >= 0) - { - if(selectedItem == pagesize-1) - { - // move list down by 1 - listOffset = this->FindMenuItem(listOffset, 1); - } - else if(game[selectedItem+1]->IsVisible()) - { - game[selectedItem]->ResetState(); - game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); - selectedItem++; - } -// scrollbarBoxBtn->Draw(); - usleep(10000 * scrolldelay); - } - if (!(ButtonsHold() & WPAD_BUTTON_A)) - arrowDownBtn->ResetState(); - } - else if(t->Up() || arrowUpBtn->GetState() == STATE_CLICKED || arrowUpBtn->GetState() == STATE_HELD) //up - { - prev = this->FindMenuItem(gameIndex[selectedItem], -1); - - if(prev >= 0) - { - if(selectedItem == 0) - { - // move list up by 1 - listOffset = prev; - } - else - { - game[selectedItem]->ResetState(); - game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); - selectedItem--; - } -// scrollbarBoxBtn->Draw(); - usleep(10000 * scrolldelay); - } - if (!(ButtonsHold() & WPAD_BUTTON_A)) - arrowUpBtn->ResetState(); - } - int position1 = t->wpad.ir.y; - - if (position2 == 0 && position1 > 0) - { - position2 = position1; - } - - if ((buttonshold & WPAD_BUTTON_B) && position1 > 0) - { - scrollbarBoxBtn->ScrollIsOn(1); - if (position2 > position1) - { - - prev = this->FindMenuItem(gameIndex[selectedItem], -1); - - if(prev >= 0) - { - if(selectedItem == 0) - { - // move list up by 1 - listOffset = prev; - } - else - { - game[selectedItem]->ResetState(); - game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); - selectedItem--; - } -// scrollbarBoxBtn->Draw(); - usleep(10000 * scrolldelay); - } - } - else if (position2 < position1) - { - next = this->FindMenuItem(gameIndex[selectedItem], 1); - - if(next >= 0) - { - if(selectedItem == pagesize-1) - { - // move list down by 1 - listOffset = this->FindMenuItem(listOffset, 1); - } - else if(game[selectedItem+1]->IsVisible()) - { - game[selectedItem]->ResetState(); - game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); - selectedItem++; - } -// scrollbarBoxBtn->Draw(); - usleep(10000 * scrolldelay); - } - } - - } - else if(!(buttonshold & WPAD_BUTTON_B)) - { - scrollbarBoxBtn->ScrollIsOn(0); - position2 = 0; - } - - if(scrollbarBoxBtn->GetState() == STATE_HELD && scrollbarBoxBtn->GetStateChan() == t->chan && t->wpad.ir.valid && gameCnt > pagesize) - { - // allow dragging of scrollbar box - scrollbarBoxBtn->SetPosition(width/2-18+7,0); - int position = t->wpad.ir.y - 32 - scrollbarBoxBtn->GetTop(); - - listOffset = (position * gameCnt)/(25.2 * pagesize) - selectedItem; - - if(listOffset <= 0) - { - listOffset = 0; - selectedItem = 0; - } - else if(listOffset+pagesize >= gameCnt) - { - listOffset = gameCnt - pagesize; - selectedItem = pagesize-1; - } - - } - int positionbar = (25.2 * pagesize)*(listOffset + selectedItem) / gameCnt; - - if(positionbar > (24 * pagesize)) - positionbar = (24 * pagesize); - scrollbarBoxBtn->SetPosition(width/2-18+7, positionbar+8); - - - if(t->Right()) //skip pagesize # of games if right is pressed - { - if(listOffset < gameCnt && gameCnt > pagesize) - { - listOffset =listOffset+ pagesize; - if(listOffset+pagesize >= gameCnt) - listOffset = gameCnt-pagesize; - } - } - else if(t->Left()) - { - if(listOffset > 0) - { - listOffset =listOffset- pagesize; - if(listOffset < 0) - listOffset = 0; - } - } - - } - else - { - if(t->Down()) //if there isn't a scrollbar and down is pressed - { - next = this->FindMenuItem(gameIndex[selectedItem], 1); - - if(next >= 0) - { - if(selectedItem == pagesize-1) - { - // move list down by 1 - listOffset = this->FindMenuItem(listOffset, 1); - } - else if(game[selectedItem+1]->IsVisible()) - { - game[selectedItem]->ResetState(); - game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); - selectedItem++; - } - } - } - else if(t->Up()) //up - { - prev = this->FindMenuItem(gameIndex[selectedItem], -1); - - if(prev >= 0) - { - if(selectedItem == 0) - { - // move list up by 1 - listOffset = prev; - } - else - { - game[selectedItem]->ResetState(); - game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); - selectedItem--; - } - } - } - } - - if(old_listOffset != listOffset) - UpdateListEntries(); - - if(updateCB) - updateCB(this); -} - -void GuiGameBrowser::Reload(struct discHdr * l, int count) -{ - LOCK(this); - gameList = l; - gameCnt = count; - scrollbaron = (gameCnt > pagesize) ? 1 : 0; - selectedItem = 0; - listOffset = 0; - focus = 1; - UpdateListEntries(); - - for(int i=0; iResetState(); -} +/**************************************************************************** + * libwiigui + * + * gui_gamebrowser.cpp + * + * GUI class definitions + ***************************************************************************/ + +#include "gui.h" +#include "../wpad.h" + +#include +#include "gui_gamebrowser.h" +#include "../settings/cfg.h" +#include "../main.h" +#include "settings/newtitles.h" + +#include +#include + +#define GAMESELECTSIZE 30 +int txtscroll = 0; +/** + * Constructor for the GuiGameBrowser class. + */ +GuiGameBrowser::GuiGameBrowser(int w, int h, struct discHdr * l, int gameCnt, const char *themePath, const u8 *imagebg, int selected, int offset) +{ + width = w; + height = h; + this->gameCnt = gameCnt; + gameList = l; + pagesize = THEME.pagesize; + scrollbaron = (gameCnt > pagesize) ? 1 : 0; + selectable = true; + listOffset = MAX(0,MIN(offset,(gameCnt-pagesize))); + selectedItem = selected - offset; + focus = 1; // allow focus + char imgPath[100]; + + trigA = new GuiTrigger; + trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + trigHeldA = new GuiTrigger; + trigHeldA->SetHeldTrigger(-1, WPAD_BUTTON_A, PAD_BUTTON_A); + btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, Settings.sfxvolume); + + snprintf(imgPath, sizeof(imgPath), "%sbg_options.png", themePath); + bgGames = new GuiImageData(imgPath, imagebg); + + snprintf(imgPath, sizeof(imgPath), "%snew.png", themePath); + newGames = new GuiImageData(imgPath, new_png); + + bgGameImg = new GuiImage(bgGames); + bgGameImg->SetParent(this); + bgGameImg->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); + + maxTextWidth = bgGameImg->GetWidth() - 24 - 4; + + snprintf(imgPath, sizeof(imgPath), "%sbg_options_entry.png", themePath); + bgGamesEntry = new GuiImageData(imgPath, bg_options_entry_png); + + snprintf(imgPath, sizeof(imgPath), "%sscrollbar.png", themePath); + scrollbar = new GuiImageData(imgPath, scrollbar_png); + scrollbarImg = new GuiImage(scrollbar); + scrollbarImg->SetParent(this); + scrollbarImg->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); + scrollbarImg->SetPosition(0, 4); + + maxTextWidth -= scrollbarImg->GetWidth() + 4; + + snprintf(imgPath, sizeof(imgPath), "%sscrollbar_arrowdown.png", themePath); + arrowDown = new GuiImageData(imgPath, scrollbar_arrowdown_png); + arrowDownImg = new GuiImage(arrowDown); + arrowDownOver = new GuiImageData(imgPath, scrollbar_arrowdown_png); + arrowDownOverImg = new GuiImage(arrowDownOver); + snprintf(imgPath, sizeof(imgPath), "%sscrollbar_arrowup.png", themePath); + arrowUp = new GuiImageData(imgPath, scrollbar_arrowup_png); + arrowUpImg = new GuiImage(arrowUp); + arrowUpOver = new GuiImageData(imgPath, scrollbar_arrowup_png); + arrowUpOverImg = new GuiImage(arrowUpOver); + snprintf(imgPath, sizeof(imgPath), "%sscrollbar_box.png", themePath); + scrollbarBox = new GuiImageData(imgPath, scrollbar_box_png); + scrollbarBoxImg = new GuiImage(scrollbarBox); + scrollbarBoxOver = new GuiImageData(imgPath, scrollbar_box_png); + scrollbarBoxOverImg = new GuiImage(scrollbarBoxOver); + + arrowUpBtn = new GuiButton(arrowUpImg->GetWidth(), arrowUpImg->GetHeight()); + arrowUpBtn->SetParent(this); + arrowUpBtn->SetImage(arrowUpImg); + arrowUpBtn->SetImageOver(arrowUpOverImg); + arrowUpBtn->SetImageHold(arrowUpOverImg); + arrowUpBtn->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + arrowUpBtn->SetPosition(width/2-18+7,-18); + arrowUpBtn->SetSelectable(false); + arrowUpBtn->SetTrigger(trigA); + arrowUpBtn->SetEffectOnOver(EFFECT_SCALE, 50, 130); + arrowUpBtn->SetSoundClick(btnSoundClick); + + arrowDownBtn = new GuiButton(arrowDownImg->GetWidth(), arrowDownImg->GetHeight()); + arrowDownBtn->SetParent(this); + arrowDownBtn->SetImage(arrowDownImg); + arrowDownBtn->SetImageOver(arrowDownOverImg); + arrowDownBtn->SetImageHold(arrowDownOverImg); + arrowDownBtn->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); + arrowDownBtn->SetPosition(width/2-18+7,18); + arrowDownBtn->SetSelectable(false); + arrowDownBtn->SetTrigger(trigA); + arrowDownBtn->SetEffectOnOver(EFFECT_SCALE, 50, 130); + arrowDownBtn->SetSoundClick(btnSoundClick); + + scrollbarBoxBtn = new GuiButton(scrollbarBoxImg->GetWidth(), scrollbarBoxImg->GetHeight()); + scrollbarBoxBtn->SetParent(this); + scrollbarBoxBtn->SetImage(scrollbarBoxImg); + scrollbarBoxBtn->SetImageOver(scrollbarBoxOverImg); + scrollbarBoxBtn->SetImageHold(scrollbarBoxOverImg); + scrollbarBoxBtn->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + scrollbarBoxBtn->SetSelectable(false); + scrollbarBoxBtn->SetEffectOnOver(EFFECT_SCALE, 50, 120); + scrollbarBoxBtn->SetMinY(0); + scrollbarBoxBtn->SetMaxY(height-30); + scrollbarBoxBtn->SetHoldable(true); + scrollbarBoxBtn->SetTrigger(trigHeldA); + + gameIndex = new int[pagesize]; + game = new GuiButton * [pagesize]; + gameTxt = new GuiText * [pagesize]; + gameTxtOver = new GuiText * [pagesize]; + gameBg = new GuiImage * [pagesize]; + newImg = new GuiImage * [pagesize]; + + for(int i=0; i < pagesize; i++) + { + gameTxt[i] = new GuiText(get_title(&gameList[i]), 20, THEME.gametext); + gameTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); + gameTxt[i]->SetPosition(24,0); + gameTxt[i]->SetMaxWidth(maxTextWidth, GuiText::DOTTED); + + + gameTxtOver[i] = new GuiText(get_title(&gameList[i]), 20, THEME.gametext); + gameTxtOver[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); + gameTxtOver[i]->SetPosition(24,0); + gameTxtOver[i]->SetMaxWidth(maxTextWidth, GuiText::SCROLL); + + gameBg[i] = new GuiImage(bgGamesEntry); + + newImg[i] = new GuiImage(newGames); + newImg[i]->SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE); + newImg[i]->SetVisible(false); + + game[i] = new GuiButton(width-28,GAMESELECTSIZE); + game[i]->SetParent(this); + game[i]->SetLabel(gameTxt[i]); + game[i]->SetLabelOver(gameTxtOver[i]); + game[i]->SetIcon(newImg[i]); + game[i]->SetImageOver(gameBg[i]); + game[i]->SetPosition(5,GAMESELECTSIZE*i+4); + game[i]->SetRumble(false); + game[i]->SetTrigger(trigA); + game[i]->SetSoundClick(btnSoundClick); + + gameIndex[i] = i; + } + UpdateListEntries(); +} + +/** + * Destructor for the GuiGameBrowser class. + */ +GuiGameBrowser::~GuiGameBrowser() +{ + delete arrowUpBtn; + delete arrowDownBtn; + delete scrollbarBoxBtn; + delete scrollbarImg; + delete arrowDownImg; + delete arrowDownOverImg; + delete arrowUpImg; + delete arrowUpOverImg; + delete scrollbarBoxImg; + delete scrollbarBoxOverImg; + delete scrollbar; + delete arrowDown; + delete arrowDownOver; + delete arrowUp; + delete arrowUpOver; + delete scrollbarBox; + delete scrollbarBoxOver; + delete bgGameImg; + delete bgGames; + delete bgGamesEntry; + delete newGames; + + delete trigA; + delete trigHeldA; + delete btnSoundClick; + + for(int i=0; iResetState(); + + if(f == 1) + game[selectedItem]->SetState(STATE_SELECTED); +} + +void GuiGameBrowser::ResetState() +{ + LOCK(this); + if(state != STATE_DISABLED) + { + state = STATE_DEFAULT; + stateChan = -1; + } + + for(int i=0; iResetState(); + } +} + +int GuiGameBrowser::GetOffset() +{ + return listOffset; +} +int GuiGameBrowser::GetClickedOption() +{ + int found = -1; + for(int i=0; iGetState() == STATE_CLICKED) + { + game[i]->SetState(STATE_SELECTED); + found = gameIndex[i]; + break; + } + } + return found; +} + +int GuiGameBrowser::GetSelectedOption() +{ + int found = -1; + for(int i=0; iGetState() == STATE_SELECTED) + { + game[i]->SetState(STATE_SELECTED); + found = gameIndex[i]; + break; + } + } + return found; +} + +/**************************************************************************** + * FindMenuItem + * + * Help function to find the next visible menu item on the list + ***************************************************************************/ + +int GuiGameBrowser::FindMenuItem(int currentItem, int direction) +{ + int nextItem = currentItem + direction; + + if(nextItem < 0 || nextItem >= gameCnt) + return -1; + + if(strlen(get_title(&gameList[nextItem])) > 0) + return nextItem; + else + return FindMenuItem(nextItem, direction); +} + +/** + * Draw the button on screen + */ +void GuiGameBrowser::Draw() +{ + LOCK(this); + if(!this->IsVisible() || !gameCnt) + return; + + bgGameImg->Draw(); + + int next = listOffset; + + for(int i=0; i= 0) + { + game[i]->Draw(); + next = this->FindMenuItem(next, 1); + } + else + break; + } + + if(scrollbaron == 1) { + scrollbarImg->Draw(); + arrowUpBtn->Draw(); + arrowDownBtn->Draw(); + scrollbarBoxBtn->Draw(); + } + this->UpdateEffects(); +} + +void GuiGameBrowser::UpdateListEntries() +{ + int next = listOffset; + for(int i=0; i= 0) + { + if(game[i]->GetState() == STATE_DISABLED) + { + game[i]->SetVisible(true); + game[i]->SetState(STATE_DEFAULT); + } + gameTxt[i]->SetText(get_title(&gameList[next])); + gameTxt[i]->SetPosition(24, 0); + gameTxtOver[i]->SetText(get_title(&gameList[next])); + gameTxtOver[i]->SetPosition(24, 0); + + if (Settings.marknewtitles) { + bool isNew = NewTitles::Instance()->IsNew(gameList[next].id); + if (isNew) { + gameTxt[i]->SetMaxWidth(maxTextWidth - (newGames->GetWidth() + 1), GuiText::DOTTED); + gameTxtOver[i]->SetMaxWidth(maxTextWidth - (newGames->GetWidth() + 1), GuiText::SCROLL); + } else { + gameTxt[i]->SetMaxWidth(maxTextWidth, GuiText::DOTTED); + gameTxtOver[i]->SetMaxWidth(maxTextWidth, GuiText::SCROLL); + } + newImg[i]->SetVisible(isNew); + } + + gameIndex[i] = next; + next = this->FindMenuItem(next, 1); + } + else + { + game[i]->SetVisible(false); + game[i]->SetState(STATE_DISABLED); + } + } +} + +void GuiGameBrowser::Update(GuiTrigger * t) +{ + LOCK(this); + if(state == STATE_DISABLED || !t || !gameCnt) + return; + + int next, prev; + int old_listOffset = listOffset; + static int position2; + // scrolldelay affects how fast the list scrolls + // when the arrows are clicked + float scrolldelay = 3.5; + + if (scrollbaron == 1) { + // update the location of the scroll box based on the position in the option list + arrowUpBtn->Update(t); + arrowDownBtn->Update(t); + scrollbarBoxBtn->Update(t); + } + + next = listOffset; + + u32 buttonshold = ButtonsHold(); + + if(buttonshold != WPAD_BUTTON_UP && buttonshold != WPAD_BUTTON_DOWN) { + + for(int i=0; i= 0) + next = this->FindMenuItem(next, 1); + + if(focus) + { + if(i != selectedItem && game[i]->GetState() == STATE_SELECTED) + game[i]->ResetState(); + else if(i == selectedItem && game[i]->GetState() == STATE_DEFAULT) + game[selectedItem]->SetState(STATE_SELECTED, t->chan); + } + + game[i]->Update(t); + + if(game[i]->GetState() == STATE_SELECTED) + { + selectedItem = i; + } + } + } + + // pad and joystick navigation + if(!focus || !gameCnt) + return; // skip navigation + + if (scrollbaron == 1) + { + + if (t->Down() || arrowDownBtn->GetState() == STATE_CLICKED || arrowDownBtn->GetState() == STATE_HELD) //down + { + + next = this->FindMenuItem(gameIndex[selectedItem], 1); + + if(next >= 0) + { + if(selectedItem == pagesize-1) + { + // move list down by 1 + listOffset = this->FindMenuItem(listOffset, 1); + } + else if(game[selectedItem+1]->IsVisible()) + { + game[selectedItem]->ResetState(); + game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); + selectedItem++; + } +// scrollbarBoxBtn->Draw(); + usleep(10000 * scrolldelay); + } + if (!(ButtonsHold() & WPAD_BUTTON_A)) + arrowDownBtn->ResetState(); + } + else if(t->Up() || arrowUpBtn->GetState() == STATE_CLICKED || arrowUpBtn->GetState() == STATE_HELD) //up + { + prev = this->FindMenuItem(gameIndex[selectedItem], -1); + + if(prev >= 0) + { + if(selectedItem == 0) + { + // move list up by 1 + listOffset = prev; + } + else + { + game[selectedItem]->ResetState(); + game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); + selectedItem--; + } +// scrollbarBoxBtn->Draw(); + usleep(10000 * scrolldelay); + } + if (!(ButtonsHold() & WPAD_BUTTON_A)) + arrowUpBtn->ResetState(); + } + int position1 = t->wpad.ir.y; + + if (position2 == 0 && position1 > 0) + { + position2 = position1; + } + + if ((buttonshold & WPAD_BUTTON_B) && position1 > 0) + { + scrollbarBoxBtn->ScrollIsOn(1); + if (position2 > position1) + { + + prev = this->FindMenuItem(gameIndex[selectedItem], -1); + + if(prev >= 0) + { + if(selectedItem == 0) + { + // move list up by 1 + listOffset = prev; + } + else + { + game[selectedItem]->ResetState(); + game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); + selectedItem--; + } +// scrollbarBoxBtn->Draw(); + usleep(10000 * scrolldelay); + } + } + else if (position2 < position1) + { + next = this->FindMenuItem(gameIndex[selectedItem], 1); + + if(next >= 0) + { + if(selectedItem == pagesize-1) + { + // move list down by 1 + listOffset = this->FindMenuItem(listOffset, 1); + } + else if(game[selectedItem+1]->IsVisible()) + { + game[selectedItem]->ResetState(); + game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); + selectedItem++; + } +// scrollbarBoxBtn->Draw(); + usleep(10000 * scrolldelay); + } + } + + } + else if(!(buttonshold & WPAD_BUTTON_B)) + { + scrollbarBoxBtn->ScrollIsOn(0); + position2 = 0; + } + + if(scrollbarBoxBtn->GetState() == STATE_HELD && scrollbarBoxBtn->GetStateChan() == t->chan && t->wpad.ir.valid && gameCnt > pagesize) + { + // allow dragging of scrollbar box + scrollbarBoxBtn->SetPosition(width/2-18+7,0); + int position = t->wpad.ir.y - 32 - scrollbarBoxBtn->GetTop(); + + listOffset = (position * gameCnt)/(25.2 * pagesize) - selectedItem; + + if(listOffset <= 0) + { + listOffset = 0; + selectedItem = 0; + } + else if(listOffset+pagesize >= gameCnt) + { + listOffset = gameCnt - pagesize; + selectedItem = pagesize-1; + } + + } + int positionbar = (25.2 * pagesize)*(listOffset + selectedItem) / gameCnt; + + if(positionbar > (24 * pagesize)) + positionbar = (24 * pagesize); + scrollbarBoxBtn->SetPosition(width/2-18+7, positionbar+8); + + + if(t->Right()) //skip pagesize # of games if right is pressed + { + if(listOffset < gameCnt && gameCnt > pagesize) + { + listOffset =listOffset+ pagesize; + if(listOffset+pagesize >= gameCnt) + listOffset = gameCnt-pagesize; + } + } + else if(t->Left()) + { + if(listOffset > 0) + { + listOffset =listOffset- pagesize; + if(listOffset < 0) + listOffset = 0; + } + } + + } + else + { + if(t->Down()) //if there isn't a scrollbar and down is pressed + { + next = this->FindMenuItem(gameIndex[selectedItem], 1); + + if(next >= 0) + { + if(selectedItem == pagesize-1) + { + // move list down by 1 + listOffset = this->FindMenuItem(listOffset, 1); + } + else if(game[selectedItem+1]->IsVisible()) + { + game[selectedItem]->ResetState(); + game[selectedItem+1]->SetState(STATE_SELECTED, t->chan); + selectedItem++; + } + } + } + else if(t->Up()) //up + { + prev = this->FindMenuItem(gameIndex[selectedItem], -1); + + if(prev >= 0) + { + if(selectedItem == 0) + { + // move list up by 1 + listOffset = prev; + } + else + { + game[selectedItem]->ResetState(); + game[selectedItem-1]->SetState(STATE_SELECTED, t->chan); + selectedItem--; + } + } + } + } + + if(old_listOffset != listOffset) + UpdateListEntries(); + + if(updateCB) + updateCB(this); +} + +void GuiGameBrowser::Reload(struct discHdr * l, int count) +{ + LOCK(this); + gameList = l; + gameCnt = count; + scrollbaron = (gameCnt > pagesize) ? 1 : 0; + selectedItem = 0; + listOffset = 0; + focus = 1; + UpdateListEntries(); + + for(int i=0; iResetState(); +} diff --git a/source/main.cpp b/source/main.cpp index 81ce2627..64919f01 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -15,13 +15,14 @@ #include #include #include -#include #include //#include -extern "C" { -extern void __exception_setreload(int t); +extern "C" +{ + extern void __exception_setreload(int t); } + #include #include @@ -49,147 +50,436 @@ extern void __exception_setreload(int t); #include "usbloader/usbstorage.h" #include "memory/mem2.h" #include "lstub.h" -#include "xml/xml.h" -#include "settings/newtitles.h" -#include "menu/menus.h" extern bool geckoinit; extern bool textVideoInit; extern char headlessID[8]; -PartList partitions; /* Constants */ -#define CONSOLE_XCOORD 260 -#define CONSOLE_YCOORD 115 -#define CONSOLE_WIDTH 340 -#define CONSOLE_HEIGHT 218 +#define CONSOLE_XCOORD 260 +#define CONSOLE_YCOORD 115 +#define CONSOLE_WIDTH 340 +#define CONSOLE_HEIGHT 218 FreeTypeGX *fontSystem=0; FreeTypeGX *fontClock=0; +PartList partitions; -void LoadHeadlessID(const char * ID) +u8 dbvideo =0; + +static void BootUpProblems() { - InitTextVideo(); - strncpy(headlessID, ID, sizeof(headlessID)); - InitCheckThread(); - time_t endtime = time(0) + 30; + s32 ret2; + + // load main font from file, or default to built-in font + fontSystem = new FreeTypeGX(); + fontSystem->loadFont(NULL, font_ttf, font_ttf_size, 0); + fontSystem->setCompatibilityMode(FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE); + + GuiImageData bootimageData(gxlogo_png); + GuiImage bootimage(&bootimageData); + GuiText boottext(NULL, 20, (GXColor) {255, 255, 255, 255} + ); + boottext.SetPosition(200, 240-1.2*bootimage.GetHeight()/2+250); + bootimage.SetPosition(320-1.2*bootimage.GetWidth()/2, 240-1.2*bootimage.GetHeight()/2); + bootimage.SetScale(1.2); + + GuiImageData usbimageData(usbport_png); + GuiImage usbimage(&usbimageData); + usbimage.SetPosition(400,300); + usbimage.SetScale(.7); + usbimage.SetAlpha(200); + time_t curtime; - printf("\tWaiting for USB-Device:\n"); - while(checkthreadState != 1) + time_t endtime = time(0) + 30; + do { - usleep(100); - curtime = time(0); - printf("\t\t%d\n", int(endtime-curtime)); - if(endtime == curtime) - { - printf("\n\tDevice could not be loaded.\n\tExiting...\n"); - sleep(5); - SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); + /*ret2 = IOS_ReloadIOSsafe(249); + if (ret2 < 0) { + ret2 = IOS_ReloadIOSsafe(222); + SDCard_Init(); + load_ehc_module(); + SDCard_deInit(); + if(ret2 <0) { + boottext.SetText("ERROR: cIOS could not be loaded!"); + bootimage.Draw(); + boottext.Draw(); + Menu_Render(); + sleep(5); + SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); } + }*/ + USBDevice_deInit(); + USBDevice_Init(); + ret2 = WBFS_Init(WBFS_DEVICE_USB); + if (ret2 >= 0) + { + boottext.SetText("Loading..."); + bootimage.Draw(); + boottext.Draw(); + Menu_Render(); + break; + } + curtime = time(0); + boottext.SetTextf("Waiting for your slow USB Device: %i secs...", int(endtime-curtime)); + while(curtime == time(0)) + { + boottext.Draw(); + bootimage.Draw(); + if (endtime-curtime<15)usbimage.Draw(); + Menu_Render(); + } + } while((endtime-time(0)) > 0); + + /*if(ret2 < 0) { + boottext.SetText("ERROR: USB device could not be loaded!"); + usbimage.Draw(); + bootimage.Draw(); + boottext.Draw(); + Menu_Render(); + SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); + }*/ + + ///delete font to load up custom if set + if(fontSystem) + { + delete fontSystem; + fontSystem = NULL; } - mountMethod = 0; - checkthreadState = 0; - ExitCheckThread(); - CloseXMLDatabase(); - NewTitles::DestroyInstance(); - ShutdownAudio(); - StopGX(); - gettextCleanUp(); - menuBootgame(headlessID); } -int main(int argc, char *argv[]) + +unsigned int *xfb = NULL; + +void InitTextVideo () { - setlocale(LC_ALL, "en.UTF-8"); - geckoinit = InitGecko(); + gprintf("\nInitTextVideo ()"); + if (textVideoInit) + { + gprintf("...0"); + return; + } + dbvideo=1; + VIDEO_Init(); + // get default video mode + GXRModeObj *vmode = VIDEO_GetPreferredMode(NULL); - if (hbcStubAvailable() || geckoinit) - InitTextVideo(); + // widescreen fix + VIDEO_Configure (vmode); - __exception_setreload(5);//auto reset code dump nobody gives us codedump info anyways. + // Allocate the video buffers + xfb = (u32 *) MEM_K0_TO_K1 (SYS_AllocateFramebuffer (vmode)); - gprintf("\n\n------------------"); - gprintf("\nUSB Loader GX rev%s linked with %s",GetRev(), _V_STRING); - gprintf("\nmain(%d", argc); - for (int i=0;i"); + // A console is always useful while debugging + console_init (xfb, 20, 64, vmode->fbWidth, vmode->xfbHeight, vmode->fbWidth * 2); + + // Clear framebuffers etc. + VIDEO_ClearFrameBuffer (vmode, xfb, COLOR_BLACK); + VIDEO_SetNextFramebuffer (xfb); + + VIDEO_SetBlack (FALSE); + VIDEO_Flush (); + VIDEO_WaitVSync (); + if (vmode->viTVMode & VI_NON_INTERLACE) + VIDEO_WaitVSync (); + + //send console output to the gecko + if (geckoinit)CON_EnableGecko(1, true); + textVideoInit = true; + gprintf("...1"); + +} + + +int +main(int argc, char *argv[]) +{ + setlocale(LC_ALL, "en.UTF-8"); + geckoinit = InitGecko(); + + if (hbcStubAvailable() || geckoinit) + { + InitTextVideo(); + } + + // DEBUG_Init(GDBSTUB_DEVICE_USB, 1); + //_break(); + + __exception_setreload(5); //auto reset code dump nobody gives us codedump info anyways. + + gprintf("\n\n------------------"); + gprintf("\nUSB Loader GX rev%s",GetRev()); + gprintf("\nmain(%d", argc); + for (int i=0;i"); gprintf(")"); // This part is added, because we need a identify patched ios - //printf("\n\tReloading into ios 236"); - if (IOS_ReloadIOSsafe(236) < 0) - IOS_ReloadIOSsafe(36); +// printf("\n\tReloading into ios 236"); + if (IOS_ReloadIOSsafe(236) < 0) + { +// printf("\n\tIOS 236 not found, reloading into 36"); + IOS_ReloadIOSsafe(36); + } - printf("\n\tStarting up"); + printf("\n\tStarting up"); - MEM2_init(36); // Initialize 36 MB - MEM2_takeBigOnes(true); + MEM2_init(36); // Initialize 36 MB + MEM2_takeBigOnes(true); - printf("\n\tInitialize USB (wake up)"); - USBDevice_Init();// seems enough to wake up some HDDs if they are in sleep mode when the loader starts (tested with WD MyPassport Essential 2.5") - printf("\n\tInitialize sd card"); - SDCard_Init(); // mount SD for loading cfg's + s32 ret; + bool startupproblem = false; bool bootDevice_found=false; - if (argc >= 1) { - if (!strncasecmp(argv[0], "usb:/", 5)) { + if (argc >= 1) + { + if (!strncasecmp(argv[0], "usb:/", 5)) + { strcpy(bootDevice, "USB:"); bootDevice_found = true; } else if (!strncasecmp(argv[0], "sd:/", 4)) - bootDevice_found = true; + bootDevice_found = true; } - CheckForCIOS(); + printf("\n\tInitializing controllers"); + + /** PAD_Init has to be before InitVideo don't move that **/ + PAD_Init(); // initialize PAD/WPAD + + printf("\n\tInitialize USB (wake up)"); + + USBDevice_Init(); // seems enough to wake up some HDDs if they are in sleep mode when the loader starts (tested with WD MyPassport Essential 2.5") + + gprintf("\n\tChecking for stub IOS"); + ios222rev = getIOSrev(0x00000001000000dell); + ios249rev = getIOSrev(0x00000001000000f9ll); + + //if we don't like either of the cIOS then scram + if (!(ios222rev==4 || (ios249rev>=9 && ios249rev<65280))) + { + InitTextVideo(); + printf("\x1b[2J"); + if ((ios222rev < 0 && ios222rev != WII_EINSTALL) && (ios249rev < 0 && ios249rev != WII_EINSTALL)) + { + printf("\n\n\n\tWARNING!"); + printf("\n\tUSB Loader GX needs unstubbed cIOS 222 v4 or 249 v9+"); + printf("\n\n\tWe cannot determine the versions on your system,\n\tsince you have no patched ios 36 or 236 installed."); + printf("\n\tTherefor, if loading of USB Loader GX fails, you\n\tprobably have installed the 4.2 update,"); + printf("\n\tand you should go figure out how to get some cios action going on\n\tin your Wii."); + printf("\n\n\tThis message will show every time."); + sleep(5); + } + else + { + printf("\n\n\n\tERROR!"); + printf("\n\tUSB Loader GX needs unstubbed cIOS 222 v4 or 249 v9+"); + printf("\n\n\tI found \n\t\t222 = %d%s",ios222rev,ios222rev==65280?" (Stubbed by 4.2 update)":""); + printf("\n\t\t249 = %d%s",ios249rev,ios249rev==65280?" (Stubbed by 4.2 update)":""); + printf("\n\n\tGo figure out how to get some cIOS action going on\n\tin your Wii and come back and see me."); + + sleep(15); + printf("\n\n\tBye"); + + USBDevice_deInit(); + exit(0); + } + } + + printf("\n\tReloading ios 249..."); + ret = IOS_ReloadIOSsafe(249); + + printf("%d", ret); + + if (ret < 0) + { + printf("\n\tIOS 249 failed, reloading ios 222..."); + ret = IOS_ReloadIOSsafe(222); + printf("%d", ret); + + if (ret < 0) + { + printf("\n\tIOS 222 failed, reloading ios 250..."); + ret = IOS_ReloadIOSsafe(250); + printf("%d", ret); + + if(ret < 0) + { + printf("\n\tIOS 250 failed, reloading ios 223..."); + ret = IOS_ReloadIOSsafe(223); + printf("%d", ret); + + if (ret < 0) + { + printf("\n\tERROR: cIOS could not be loaded!\n"); + sleep(5); + SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); + } + } + } + printf("\n\tInitialize sd card"); + SDCard_Init(); + printf("\n\tLoad ehc module"); + load_ehc_module(); + printf("\n\tdeinit sd card"); + SDCard_deInit(); + } + + printf("\n\tInit wbfs..."); + ret = WBFS_Init(WBFS_DEVICE_USB); + printf("%d", ret); + + if (ret < 0) + { + printf("\n\tYou have issues with a slow disc, or a difficult disc\n\tReloading 222..."); + ret = IOS_ReloadIOSsafe(222); + printf("%d", ret); + /*if(ret < 0) { + // printf("\n\tSleeping for 4 seconds"); + // sleep(4); + + InitVideo(); // Initialise video + Menu_Render(); + BootUpProblems(); + startupproblem = true; + ret = 1; + }*/ + printf("\n\tInitialize sd card"); + SDCard_Init(); + printf("\n\tLoad ehc module"); + load_ehc_module(); + printf("\n\tdeinit sd card"); + SDCard_deInit(); + + printf("\n\tInitialize wbfs..."); + USBDevice_deInit(); + USBDevice_Init(); + ret = WBFS_Init(WBFS_DEVICE_USB); + printf("%d", ret); + + if(ret < 0) + { + // printf("\n\tSleeping for 4 seconds"); + // sleep(4); + InitVideo(); // Initialise video + Menu_Render(); + BootUpProblems(); + startupproblem = true; + ret = 1; + } + } + + printf("\n\tInitialize sd card"); + SDCard_Init(); // mount SD for loading cfg's + + //this should have already been done by now in order to WBFS_Init(). + printf("\n\tInitialize usb device"); + USBDevice_Init(); // and mount USB:/ if (!bootDevice_found) { - printf("\n\tSearch for configuration file"); + printf("\n\tSearch for configuration file"); + //try USB //left in all the dol and elf files in this check in case this is the first time running the app and they dont have the config if (checkfile((char*) "USB:/config/GXglobal.cfg") || (checkfile((char*) "USB:/apps/usbloader_gx/boot.elf")) - || checkfile((char*) "USB:/apps/usbloadergx/boot.dol") || (checkfile((char*) "USB:/apps/usbloadergx/boot.elf")) - || checkfile((char*) "USB:/apps/usbloader_gx/boot.dol")) + || checkfile((char*) "USB:/apps/usbloadergx/boot.dol") || (checkfile((char*) "USB:/apps/usbloadergx/boot.elf")) + || checkfile((char*) "USB:/apps/usbloader_gx/boot.dol")) strcpy(bootDevice, "USB:"); - printf("\n\tConfiguration file is on %s", bootDevice); + printf("\n\tConfiguration file is on %s", bootDevice); + } + + // Try opening and closing the configuration file here + // to prevent a crash dump later on - giantpune + char GXGlobal_cfg[26]; + sprintf(GXGlobal_cfg, "%s/config/GXGlobal.cfg", bootDevice); + FILE *fp = fopen(GXGlobal_cfg, "r"); + if (fp) + { + fclose(fp); } gettextCleanUp(); printf("\n\tLoading configuration..."); CFG_Load(); printf("done"); + // gprintf("\n\tbootDevice = %s",bootDevice); - printf("\n\tLoading Background Music..."); - bgMusic = new GuiBGM(bg_music_ogg, bg_music_ogg_size, Settings.volume); - if(strstr(Settings.ogg_path, "USB:") == 0) - bgMusic->Load(Settings.ogg_path); - bgMusic->SetLoop(Settings.musicloopmode); //loop music + /* Load Custom IOS */ + if ((Settings.cios == ios222 && IOS_GetVersion() != 222) || + (Settings.cios == ios223 && IOS_GetVersion() != 223)) + { + printf("\n\tReloading IOS to config setting (%d)...", ios222 ? 222 : 223); + SDCard_deInit(); // unmount SD for reloading IOS + USBDevice_deInit(); // unmount USB for reloading IOS + USBStorage_Deinit(); + ret = IOS_ReloadIOSsafe(ios222 ? 222 : 223); + printf("%d", ret); + SDCard_Init(); + load_ehc_module(); + if (ret < 0) + { + SDCard_deInit(); + Settings.cios = ios249; + ret = IOS_ReloadIOSsafe(249); + // now mount SD:/ //no need to keep mindlessly mounting and unmounting SD card + SDCard_Init(); + } - printf("\n\tOpening XML Database..."); - // open database if available, load titles if needed - if(!OpenXMLDatabase(Settings.titlestxt_path,Settings.db_language, Settings.db_JPtoEN, true, Settings.titlesOverride == 1 ? true: false, true)) - printf("failed"); + USBDevice_Init(); // and mount USB:/ + WBFS_Init(WBFS_DEVICE_USB); + } else if ((Settings.cios == ios249 && IOS_GetVersion() != 249) || + (Settings.cios == ios250 && IOS_GetVersion() != 250)) + { - LoadAppCIOS(); + printf("\n\tReloading IOS to config setting (%d)...", ios249 ? 249 : 250); + SDCard_deInit(); // unmount SD for reloading IOS + USBDevice_deInit(); // unmount USB for reloading IOS + USBStorage_Deinit(); + ret = IOS_ReloadIOSsafe(ios249 ? 249 : 250); + printf("%d", ret); + if (ret < 0) + { + Settings.cios = ios222; + ret = IOS_ReloadIOSsafe(222); + SDCard_Init(); + load_ehc_module(); + } + + else SDCard_Init(); // now mount SD:/ //no need to keep mindlessly mounting and unmounting SD card + USBDevice_Init(); // and mount USB:/ + WBFS_Init(WBFS_DEVICE_USB); + } + + // Partition_GetList(&partitions); + + if (ret < 0) + { + printf("\nERROR: cIOS could not be loaded!"); + sleep(5); + exit(0); + //SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); + } + //gprintf("\n\tcIOS = %u (Rev %u)",IOS_GetVersion(), IOS_GetRevision());//don't need gprintf if sending console shit to gecko, too printf("\n\tcIOS = %u (Rev %u)",IOS_GetVersion(), IOS_GetRevision()); - //if a ID was passed via args copy it and try to boot it after the partition is mounted - //its not really a headless mode. more like hairless. - if (argc > 1 && argv[1]) - { - if (strlen(argv[1]) == 6) - LoadHeadlessID(argv[1]); - } + // printf("Sleeping for 5 seconds\n"); + // sleep(5); + //if a ID was passed via args copy it and try to boot it after the partition is mounted + //its not really a headless mode. more like hairless. + if (argc > 1 && argv[1]) + { + if (strlen(argv[1])==6) + strncpy(headlessID, argv[1], sizeof(headlessID)); + } - printf("\n\tInitializing controllers"); - /** PAD_Init has to be before InitVideo don't move that **/ - PAD_Init(); // initialize PAD/WPAD //! Init the rest of the System Sys_Init(); Wpad_Init(); - InitVideo(); - InitAudio(); // Initialize audio + if(!startupproblem) + InitVideo(); + InitAudio(); // Initialize audio WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR); WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight); @@ -206,9 +496,8 @@ int main(int argc, char *argv[]) fontClock->loadFont(NULL, clock_ttf, clock_ttf_size, 0); fontClock->setCompatibilityMode(FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE); - gprintf("\n\tEnd of Main()"); + gprintf("\n\tEnd of Main()"); InitGUIThreads(); - MainMenu(MENU_DISCLIST); - + MainMenu(MENU_CHECK); return 0; } diff --git a/source/menu.cpp b/source/menu.cpp index 38f709f6..a9945a98 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -21,9 +21,7 @@ #include "settings/cfg.h" #include "themes/Theme_Downloader.h" #include "usbloader/disc.h" -#include "usbloader/wdvd.h" #include "usbloader/getentries.h" -#include "usbloader/usbstorage.h" #include "wad/title.h" #include "xml/xml.h" #include "audio.h" @@ -41,12 +39,12 @@ GuiWindow * mainWindow = NULL; GuiImageData * pointer[4]; GuiImage * bgImg = NULL; GuiImageData * background = NULL; -GuiBGM * bgMusic = NULL; +GuiSound * bgMusic = NULL; GuiSound *btnClick2 = NULL; struct discHdr *dvdheader = NULL; int currentMenu; -u8 mountMethod=3; +u8 mountMethod=0; char game_partition[6]; int load_from_fs; @@ -67,6 +65,8 @@ static int ExitRequested = 0; /*** Extern variables ***/ extern struct discHdr * gameList; extern FreeTypeGX *fontClock; +extern u8 shutdown; +extern u8 reset; extern s32 gameSelected, gameStart; extern u8 boothomebrew; extern u8 dbvideo; @@ -79,8 +79,7 @@ extern u8 dbvideo; * after finishing the removal/insertion of new elements, and after initial * GUI setup. ***************************************************************************/ -void ResumeGui() -{ +void ResumeGui() { guiHalt = false; LWP_ResumeThread (guithread); } @@ -93,11 +92,8 @@ void ResumeGui() * This eliminates the possibility that the GUI is in the middle of accessing * an element that is being changed. ***************************************************************************/ -void HaltGui() -{ - if (guiHalt) - return; - +void HaltGui() { + if (guiHalt)return; guiHalt = true; // wait for thread to finish @@ -121,13 +117,13 @@ static void * UpdateGUI (void *arg) { if (Settings.tooltips == TooltipsOn && THEME.show_tooltip != 0 && mainWindow->GetState() != STATE_DISABLED) mainWindow->DrawTooltip(); - for (int i=3; i >= 0; i--) - { // so that player 1's cursor appears on top! + for (int i=3; i >= 0; i--) { // so that player 1's cursor appears on top! if (userInput[i].wpad.ir.valid) Menu_DrawImg(userInput[i].wpad.ir.x-48, userInput[i].wpad.ir.y-48, 200.0, 96, 96, pointer[i]->GetImage(), userInput[i].wpad.ir.angle, CFG.widescreen? 0.8 : 1, 1, 255,0,0,0,0,0,0,0,0); - if (Settings.rumble == RumbleOn) + if (Settings.rumble == RumbleOn) { DoRumble(i); + } } Menu_Render(); @@ -135,8 +131,6 @@ static void * UpdateGUI (void *arg) { for (int i=0; i < 4; i++) mainWindow->Update(&userInput[i]); - if(bgMusic) - bgMusic->UpdateState(); } else { for (int a = 5; a < 255; a += 10) { @@ -172,6 +166,9 @@ static void * UpdateGUI (void *arg) { break; } + + + } return NULL; } @@ -185,17 +182,13 @@ void InitGUIThreads() { LWP_CreateThread(&guithread, UpdateGUI, NULL, NULL, 0, LWP_PRIO_HIGHEST); InitProgressThread(); InitNetworkThread(); - InitCheckThread(); - ResumeCheck(); if (Settings.autonetwork) ResumeNetworkThread(); } -void ExitGUIThreads() -{ +void ExitGUIThreads() { ExitRequested = 1; - ExitCheckThread(); LWP_JoinThread(guithread, NULL); guithread = LWP_THREAD_NULL; } @@ -260,6 +253,9 @@ int MainMenu(int menu) { currentMenu = menu; char imgPath[100]; + //if (strcmp(headlessID,"")!=0)HaltGui(); + //WindowPrompt("Can you see me now",0,"ok"); + snprintf(imgPath, sizeof(imgPath), "%splayer1_point.png", CFG.theme_path); pointer[0] = new GuiImageData(imgPath, player1_point_png); snprintf(imgPath, sizeof(imgPath), "%splayer2_point.png", CFG.theme_path); @@ -281,48 +277,57 @@ int MainMenu(int menu) { bgImg = new GuiImage(background); mainWindow->Append(bgImg); - bgMusic->Play(); - - ResumeGui(); + if (strcmp(headlessID,"")==0) + ResumeGui(); + bgMusic = new GuiSound(bg_music_ogg, bg_music_ogg_size, Settings.volume); + bgMusic->SetLoop(1); //loop music + // startup music + if (strcmp("", Settings.oggload_path) && strcmp("notset", Settings.ogg_path)) { + bgMusic->Load(Settings.ogg_path); + } + bgMusic->Play(); while (currentMenu != MENU_EXIT) { + bgMusic->SetVolume(Settings.volume); - switch (currentMenu) - { - case MENU_FORMAT: - currentMenu = MenuFormat(); - break; - case MENU_INSTALL: - currentMenu = MenuInstall(); - break; - case MENU_SETTINGS: - currentMenu = MenuSettings(); - break; - case MENU_THEMEDOWNLOADER: - currentMenu = Theme_Downloader(); - break; - case MENU_HOMEBREWBROWSE: - currentMenu = MenuHomebrewBrowse(); - break; - case MENU_DISCLIST: - currentMenu = MenuDiscList(); - break; - default: // unrecognized menu - currentMenu = MenuDiscList(); - break; + switch (currentMenu) { + case MENU_CHECK: + + currentMenu = MenuCheck(); + break; + case MENU_FORMAT: + currentMenu = MenuFormat(); + break; + case MENU_INSTALL: + currentMenu = MenuInstall(); + break; + case MENU_SETTINGS: + currentMenu = MenuSettings(); + break; + case MENU_THEMEDOWNLOADER: + currentMenu = Theme_Downloader(); + break; + case MENU_HOMEBREWBROWSE: + currentMenu = MenuHomebrewBrowse(); + break; + case MENU_DISCLIST: + currentMenu = MenuDiscList(); + break; + default: // unrecognized menu + currentMenu = MenuCheck(); + break; } } + // MemInfoPrompt(); gprintf("\nExiting main GUI. mountMethod = %d",mountMethod); CloseXMLDatabase(); NewTitles::DestroyInstance(); - CFG_Cleanup(); - if (strcmp(headlessID,"")!=0)//the GUIthread was never started, so it cant be ended and joined properly if headless mode was used. so we resume it and close it. - ResumeGui(); + ResumeGui(); ExitGUIThreads(); bgMusic->Stop(); @@ -342,72 +347,70 @@ int MainMenu(int menu) { StopGX(); gettextCleanUp(); - menuBootgame(""); - - return 0; -} - -void menuBootgame(const char *headless) -{ - if (mountMethod==3) - { - struct discHdr *header = &gameList[gameSelected]; - char tmp[20]; - u32 tid; - sprintf(tmp,"%c%c%c%c",header->id[0],header->id[1],header->id[2],header->id[3]); - memcpy(&tid, tmp, 4); - gprintf("\nBooting title %016llx",TITLE_ID((header->id[5]=='1'?0x00010001:0x00010002),tid)); - WII_Initialize(); - WII_LaunchTitle(TITLE_ID((header->id[5]=='1'?0x00010001:0x00010002),tid)); - } - if (mountMethod==2) - { - gprintf("\nLoading BC for GameCube"); - WII_Initialize(); - WII_LaunchTitle(0x0000000100000100ULL); - } + if(dbvideo) + { + InitVideodebug (); + printf("\n\n\n\n\n"); + } + if (mountMethod==3) + { + struct discHdr *header = &gameList[gameSelected]; + char tmp[20]; + u32 tid; + sprintf(tmp,"%c%c%c%c",header->id[0],header->id[1],header->id[2],header->id[3]); + memcpy(&tid, tmp, 4); + gprintf("\nBooting title %016llx",TITLE_ID((header->id[5]=='1'?0x00010001:0x00010002),tid)); + WII_Initialize(); + WII_LaunchTitle(TITLE_ID((header->id[5]=='1'?0x00010001:0x00010002),tid)); + } + if (mountMethod==2) + { + gprintf("\nLoading BC for GameCube"); + WII_Initialize(); + WII_LaunchTitle(0x0000000100000100ULL); + } else if (boothomebrew == 1) { - gprintf("\nBootHomebrew"); + gprintf("\nBootHomebrew"); BootHomebrew(Settings.selected_homebrew); } - else if (boothomebrew == 2) { - gprintf("\nBootHomebrewFromMenu"); + else if (boothomebrew == 2) { + gprintf("\nBootHomebrewFromMenu"); BootHomebrewFromMem(); } - else { - gprintf("\n\tSettings.partition:%d",Settings.partition); - struct discHdr *header = NULL; - //if the GUI was "skipped" to boot a game from main(argv[1]) - if (strcmp(headless,"")!=0) - { - gprintf("\n\tHeadless mode (%s)",headless); - __Menu_GetEntries(1); - if (!gameCnt) - { - gprintf(" ERROR : !gameCnt"); - exit(0); - } - gprintf("\n\tgameCnt:%d",gameCnt); - for(u32 i=0;iid[0],header->id[1],header->id[2],header->id[3],header->id[4],header->id[5]); - if (strcmp(tmp,headless)==0) - { - gameSelected = i; - gprintf(" found (%d)",i); - break; - } - //if the game was not found - if (i==gameCnt-1) - { - gprintf(" not found (%d IDs checked)",i); - exit(0); - } - } - } + else { + gprintf("\n\tSettings.partition:%d",Settings.partition); + struct discHdr *header = NULL; + //if the GUI was "skipped" to boot a game from main(argv[1]) + if (strcmp(headlessID,"")!=0) + { + gprintf("\n\tHeadless mode (%s)",headlessID); + __Menu_GetEntries(1); + if (!gameCnt) + { + gprintf(" ERROR : !gameCnt"); + exit(0); + } + //gprintf("\n\tgameCnt:%d",gameCnt); + for(u32 i=0;iid[0],header->id[1],header->id[2],header->id[3],header->id[4],header->id[5]); + if (strcmp(tmp,headlessID)==0) + { + gameSelected = i; + gprintf(" found (%d)",i); + break; + } + //if the game was not found + if (i==gameCnt-1) + { + gprintf(" not found (%d IDs checked)",i); + exit(0); + } + } + } int ret = 0; @@ -423,10 +426,10 @@ void menuBootgame(const char *headless) fix002 = game_cfg->errorfix002; iosChoice = game_cfg->ios; countrystrings = game_cfg->patchcountrystrings; - if (!altdoldefault) { - alternatedol = game_cfg->loadalternatedol; - alternatedoloffset = game_cfg->alternatedolstart; - } + if (!altdoldefault) { + alternatedol = game_cfg->loadalternatedol; + alternatedoloffset = game_cfg->alternatedolstart; + } reloadblock = game_cfg->iosreloadblock; } else { videoChoice = Settings.video; @@ -440,86 +443,81 @@ void menuBootgame(const char *headless) } fix002 = Settings.error002; countrystrings = Settings.patchcountrystrings; - if (!altdoldefault) { - alternatedol = off; - alternatedoloffset = 0; - } + if (!altdoldefault) { + alternatedol = off; + alternatedoloffset = 0; + } reloadblock = off; } - int ios2; + int ios2; - switch (iosChoice) { - case i249: - ios2 = 249; - break; + switch (iosChoice) { + case i249: + ios2 = 249; + break; - case i222: - ios2 = 222; - break; + case i222: + ios2 = 222; + break; - case i223: - ios2 = 223; - break; + case i223: + ios2 = 223; + break; - default: - ios2 = 249; - break; - } + default: + ios2 = 249; + break; + } - // When the selected ios is 249, and you're loading from FAT, reset ios to 222 - if (load_from_fs != PART_FS_WBFS && ios2 == 249) - ios2 = 222; + // When the selected ios is 249, and you're loading from FAT, reset ios to 222 + if (load_from_fs != PART_FS_WBFS && ios2 == 249) { + ios2 = 222; + } + bool onlinefix = ShutdownWC24(); - ShutdownWC24(); - - // You cannot reload ios when loading from fat - if (IOS_GetVersion() != ios2) - { + // You cannot reload ios when loading from fat + if (IOS_GetVersion() != ios2 || onlinefix) { ret = Sys_ChangeIos(ios2); - if (ret < 0) + if (ret < 0) { Sys_ChangeIos(249); + } } + if (!mountMethod) + { + gprintf("\nLoading fragment list..."); + ret = get_frag_list(header->id); + gprintf("%d\n", ret); - if (!mountMethod) - { - gprintf("\nLoading fragment list..."); - ret = get_frag_list(header->id); - gprintf("%d\n", ret); + gprintf("\nSetting fragment list..."); + ret = set_frag_list(header->id); + gprintf("%d\n", ret); - gprintf("\nSetting fragment list..."); - ret = set_frag_list(header->id); - gprintf("%d\n", ret); - - ret = Disc_SetUSB(header->id); - if (ret < 0) Sys_BackToLoader(); - gprintf("\n\tUSB set to game"); - } - else { - gprintf("\n\tUSB not set, loading DVD"); - Disc_SetUSB(NULL); - ret = WDVD_Close(); - ret = Disc_Init(); - } + ret = Disc_SetUSB(header->id); + if (ret < 0) Sys_BackToLoader(); + gprintf("\n\tUSB set to game"); + } + else { + gprintf("\n\tUSB not set, loading DVD"); + } ret = Disc_Open(); - gprintf("\n\tDisc_Open():%d",ret); - if (ret < 0 && !mountMethod) Sys_BackToLoader(); + if (ret < 0) Sys_BackToLoader(); - if (gameList) - free(gameList); + if (gameList){ + free(gameList); + } + if(dvdheader) + delete dvdheader; - if(dvdheader) - delete dvdheader; + gprintf("\nLoading BCA data..."); + ret = do_bca_code(header->id); + gprintf("%d\n", ret); - gprintf("\nLoading BCA data..."); - ret = do_bca_code(header->id); - gprintf("%d\n", ret); - - if (reloadblock == on && Sys_IsHermes()) - { + if (reloadblock == on && Sys_IsHermes()) { patch_cios_data(); - if (load_from_fs == PART_FS_WBFS) - mload_close(); + if (load_from_fs == PART_FS_WBFS) { + mload_close(); + } } u8 errorfixer002 = 0; @@ -646,13 +644,14 @@ void menuBootgame(const char *headless) vipatch = 0; break; } - gprintf("\n\tDisc_wiiBoot"); + gprintf("\n\tDisc_wiiBoot"); ret = Disc_WiiBoot(videoselected, cheat, vipatch, countrystrings, errorfixer002, alternatedol, alternatedoloffset); if (ret < 0) { Sys_LoadMenu(); } - printf("Returning entry point: 0x%0x\n", ret); + printf("Returning entry point: 0x%0x\n", ret); } + return 0; } diff --git a/source/menu.h b/source/menu.h index e2585671..0ffb3a75 100644 --- a/source/menu.h +++ b/source/menu.h @@ -15,11 +15,8 @@ void InitGUIThreads(void); void ExitGUIThreads(void); -void ResumeGui(); -void HaltGui(); -void menuBootgame(const char *headless); -int MainMenu (int menu); +int MainMenu (int menuitem); enum { MENU_EXIT = -1, diff --git a/source/menu/device_check.cpp b/source/menu/device_check.cpp deleted file mode 100644 index d3149996..00000000 --- a/source/menu/device_check.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#include -#include - -#include "gecko.h" -#include "menus.h" -#include "wpad.h" -#include "fatmounter.h" -#include "usbloader/getentries.h" -#include "usbloader/wbfs.h" - -extern int load_from_fs; -extern char game_partition[6]; - -static lwp_t checkthread = LWP_THREAD_NULL; -static bool checkHalt = false; -static bool ExitRequested = false; -static u8 sdState =0; -u8 hddState = 0; -u8 checkthreadState = 0; -bool ScreenshotTriggered = false; - -extern u8 shutdown; -extern u8 reset; - -void ResumeCheck() -{ - checkHalt = false; - LWP_ResumeThread(checkthread); -} - -void HaltCheck() -{ - if(checkHalt) - return; - - checkHalt = true; - - while (!LWP_ThreadIsSuspended(checkthread)) - usleep(50); -} - -int CheckPartition() -{ - s32 ret2 = -1; - memset(game_partition, 0, 6); - load_from_fs = -1; - - extern PartList partitions; - // Added for slow HDD - for (int runs = 0; runs < 10; runs++) - { - if (Partition_GetList(WBFS_DEVICE_USB, &partitions) != 0) - continue; - - if (Settings.partition != -1 && partitions.num > Settings.partition) - { - PartInfo pinfo = partitions.pinfo[Settings.partition]; - if (WBFS_OpenPart(pinfo.part_fs, pinfo.index, partitions.pentry[Settings.partition].sector, partitions.pentry[Settings.partition].size, (char *) &game_partition) == 0) - { - ret2 = 0; - load_from_fs = pinfo.part_fs; - break; - } - } - - if (partitions.wbfs_n != 0) - { - ret2 = WBFS_Open(); - for (int p = 0; p < partitions.num; p++) - { - if (partitions.pinfo[p].fs_type == FS_TYPE_WBFS) - { - Settings.partition = p; - load_from_fs = PART_FS_WBFS; - break; - } - } - } - - else if (Sys_IsHermes() && (partitions.fat_n != 0 || partitions.ntfs_n != 0)) - { - // Loop through FAT/NTFS partitions, and find the first partition with games on it (if there is one) - u32 count; - for (int i = 0; i < partitions.num; i++) - { - if (partitions.pinfo[i].fs_type == FS_TYPE_FAT32 || partitions.pinfo[i].fs_type == FS_TYPE_NTFS) - { - if (!WBFS_OpenPart(partitions.pinfo[i].part_fs, partitions.pinfo[i].index, partitions.pentry[i].sector, partitions.pentry[i].size, (char *) &game_partition)) - { - // Get the game count... - WBFS_GetCount(&count); - if (count > 0) - { - load_from_fs = partitions.pinfo[i].part_fs; - Settings.partition = i; - break; - } - else - { - WBFS_Close(); - } - } - } - } - } - - if ((ret2 >= 0 || load_from_fs != PART_FS_WBFS) && isInserted(bootDevice)) - { - cfg_save_global(); - break; - } - } - - if (ret2 < 0 && load_from_fs != PART_FS_WBFS) - return -1; - - ret2 = Disc_Init(); - if (ret2 < 0) - return ret2; - - hddState = 1; - - return hddState; -} - -int CheckHDD() -{ - USBDevice_deInit(); - USBDevice_Init(); - - int wbfsinit = WBFS_Init(WBFS_DEVICE_USB); - - if (wbfsinit >= 0) - wbfsinit = CheckPartition(); - - return wbfsinit; -} - -static void * CheckDevices (void *arg) -{ - sdState = isInserted(bootDevice); - while (!ExitRequested) - { - if (checkHalt && !ExitRequested) - { - LWP_SuspendThread(checkthread); - continue; - } - - if (shutdown == 1) - Sys_Shutdown(); - - else if (reset == 1) - Sys_Reboot(); - - if (!hddState) - { - if(CheckHDD() >= 0) - { - LWP_SetThreadPriority(LWP_GetSelf(), 0); - - if(strstr(Settings.ogg_path, "USB:/") != 0) - { - bgMusic->Load(Settings.ogg_path); - bgMusic->Play(); - } - - checkthreadState = 1; - } - } - - //this really doesnt work right. it seems that isInserted() isn't what it should be. - int sdNow = isInserted(bootDevice); - if (sdState != sdNow) - { - sdState = sdNow; - checkthreadState = 2; - } - - if(ScreenshotTriggered) - { - gprintf("\n\tscreenShotBtn clicked"); - ScreenShot(); - ScreenshotTriggered = false; - gprintf("...It's easy, mmmmmmKay"); - } - - usleep(20000); - } - - return NULL; -} - -void InitCheckThread() -{ - LWP_CreateThread(&checkthread, CheckDevices, NULL, NULL, 0, 30); -} - -void ExitCheckThread() -{ - ExitRequested = true; - LWP_ResumeThread(checkthread); - LWP_JoinThread(checkthread, NULL); - checkthread = LWP_THREAD_NULL; -} diff --git a/source/menu/menu_check.cpp b/source/menu/menu_check.cpp new file mode 100644 index 00000000..b1ee8f62 --- /dev/null +++ b/source/menu/menu_check.cpp @@ -0,0 +1,164 @@ +#include +#include + +#include "menus.h" +#include "wpad.h" +#include "fatmounter.h" +#include "usbloader/getentries.h" +#include "usbloader/wbfs.h" + +extern int load_from_fs; +extern char game_partition[6]; +extern char headlessID[8]; + +/**************************************************************************** + * MenuCheck + ***************************************************************************/ +int MenuCheck() { + gprintf("\nMenuCheck()"); + int menu = MENU_NONE; + int i = 0; + int choice; + s32 ret2, wbfsinit; + OptionList options; + options.length = i; + + VIDEO_WaitVSync (); + + wbfsinit = WBFS_Init(WBFS_DEVICE_USB); + if (wbfsinit < 0) { + ret2 = WindowPrompt(tr("No USB Device found."), tr("Do you want to retry for 30 secs?"), "cIOS249", "cIOS222", tr("Back to Wii Menu")); + SDCard_deInit(); + USBDevice_deInit(); + WPAD_Flush(0); + WPAD_Disconnect(0); + WPAD_Shutdown(); + if (ret2 == 1) { + Settings.cios = ios249; + } else if (ret2 == 2) { + Settings.cios = ios222; + } else { + Sys_LoadMenu(); + } + ret2 = DiscWait(tr("No USB Device"), tr("Waiting for USB Device"), 0, 0, 1); + //reinitialize SD and USB + Wpad_Init(); + WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR); + WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight); + if (ret2 < 0) { + WindowPrompt (tr("Error !"),tr("USB Device not found"), tr("OK")); + Sys_LoadMenu(); + } + } + + ret2 = -1; + memset(game_partition, 0, 6); + load_from_fs = -1; + + extern PartList partitions; + // Added for slow HDD + for (int runs = 0; runs < 10; runs++) { + if (Partition_GetList(WBFS_DEVICE_USB, &partitions) != 0) { + sleep(1); + continue; + } + + if (Settings.partition != -1 && partitions.num > Settings.partition) { + PartInfo pinfo = partitions.pinfo[Settings.partition]; + if (WBFS_OpenPart(pinfo.part_fs, pinfo.index, partitions.pentry[Settings.partition].sector, partitions.pentry[Settings.partition].size, (char *) &game_partition) == 0) + { + ret2 = 0; + load_from_fs = pinfo.part_fs; + break; + } + } + + if (partitions.wbfs_n != 0) { + ret2 = WBFS_Open(); + for (int p = 0; p < partitions.num; p++) { + if (partitions.pinfo[p].fs_type == FS_TYPE_WBFS) { + Settings.partition = p; + load_from_fs = PART_FS_WBFS; + break; + } + } + } else if (Sys_IsHermes() && (partitions.fat_n != 0 || partitions.ntfs_n != 0)) { + // Loop through FAT/NTFS partitions, and find the first partition with games on it (if there is one) + u32 count; + + for (int i = 0; i < partitions.num; i++) { + if (partitions.pinfo[i].fs_type == FS_TYPE_FAT32 || partitions.pinfo[i].fs_type == FS_TYPE_NTFS) { + + if (!WBFS_OpenPart(partitions.pinfo[i].part_fs, partitions.pinfo[i].index, partitions.pentry[i].sector, partitions.pentry[i].size, (char *) &game_partition)) { + // Get the game count... + WBFS_GetCount(&count); + + if (count > 0) { + load_from_fs = partitions.pinfo[i].part_fs; + Settings.partition = i; + break; + } else { + WBFS_Close(); + } + } + } + } + } + + if ((ret2 >= 0 || load_from_fs != PART_FS_WBFS) && isInserted(bootDevice)) { + cfg_save_global(); + break; + } + sleep(1); + } + + if (ret2 < 0 && load_from_fs != PART_FS_WBFS) { + choice = WindowPrompt(tr("No WBFS or FAT/NTFS partition found"),tr("You need to select or format a partition"), tr("Select"), tr("Format"), tr("Return")); + if (choice == 0) { + Sys_LoadMenu(); + } else { + load_from_fs = choice == 1 ? PART_FS_FAT : PART_FS_WBFS; + menu = MENU_FORMAT; + } + } + + ret2 = Disc_Init(); + if (ret2 < 0) { + WindowPrompt (tr("Error !"),tr("Could not initialize DIP module!"),tr("OK")); + Sys_LoadMenu(); + } + + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + if (wbfsinit < 0) { + sleep(1); + } + + // open database if needed, load titles if needed + if(isInserted(bootDevice))OpenXMLDatabase(Settings.titlestxt_path,Settings.db_language, Settings.db_JPtoEN, true, Settings.titlesOverride==1?true:false, true); + + // titles.txt loaded after database to override database titles with custom titles + //snprintf(pathname, sizeof(pathname), "%stitles.txt", Settings.titlestxt_path); + //cfg_parsefile(pathname, &title_set); + + //Spieleliste laden + __Menu_GetEntries(0); + + if (strcmp(headlessID,"")!=0) + menu = MENU_EXIT; + + if (menu == MENU_NONE) + menu = MENU_DISCLIST; + + //for HDDs with issues + if (wbfsinit < 0) { + sleep(1); + USBDevice_Init(); + SDCard_Init(); + } + + return menu; +} diff --git a/source/menu/menu_disclist.cpp b/source/menu/menu_disclist.cpp index f42bf681..dbd37bce 100644 --- a/source/menu/menu_disclist.cpp +++ b/source/menu/menu_disclist.cpp @@ -1,1649 +1,1629 @@ -#include "menus.h" -#include "fatmounter.h" -#include "usbloader/wdvd.h" -#include "usbloader/getentries.h" -#include "usbloader/wbfs.h" -#include "patches/fst.h" -#include "network/networkops.h" -#include "prompts/gameinfo.h" -#include "prompts/DiscBrowser.h" -#include "settings/Settings.h" -#include "wpad.h" -#include "sys.h" - -#include "libwiigui/gui_gamebrowser.h" -#include "libwiigui/gui_gamegrid.h" -#include "libwiigui/gui_gamecarousel.h" -#include "libwiigui/gui_searchbar.h" - -#define MAX_CHARACTERS 38 -extern u8 * gameScreenTex; -extern struct discHdr *dvdheader; -extern u8 mountMethod; -extern int load_from_fs; -extern s32 gameSelected; -extern GuiText * GameIDTxt; -extern GuiText * GameRegionTxt; -extern const u8 data1; -extern FreeTypeGX *fontClock; -extern bool updateavailable; -extern int cntMissFiles; -extern GuiImageData * cover; -extern GuiImage * coverImg; -extern GuiImageData * pointer[4]; -extern bool altdoldefault; -extern GuiImage * bgImg; - -GuiButton *Toolbar[9]; -int idiotFlag=-1; -char idiotChar[50]; - -void DiscListWinUpdateCallback(void * e); -void rockout(int f = 0); - -static u32 startat = 0; -//static u8 ignoreNewDisc =0;//ignore the new drive when it is detected - -/**************************************************************************** - * MenuDiscList - ***************************************************************************/ -int MenuDiscList() { - - gprintf("\nMenuDiscList()"); - if(checkthreadState == 1) - { - mountMethod = 0; - checkthreadState = 0; - } - __Menu_GetEntries(); - int offset = MIN(startat,gameCnt-1); - startat = offset; - //gprintf("\n\tstartat:%d offset:%d",startat,offset); - int datag = 0; - int datagB =0; - int dataed = -1; - int cosa=0,sina=0; - int selectImg1 = 0; - char ID[4]; - char IDfull[7]; - u32 covert = 0; - char imgPath[100]; - if (!dvdheader) - dvdheader = new struct discHdr; - u8 mountMethodOLD =0; - - WDVD_GetCoverStatus(&covert); - u32 covertOld=covert; - - f32 freespace, used, size = 0.0; - wchar_t searchChar; - //SCREENSAVER - int check = 0; //to skip the first cycle when wiimote isn't completely connected - - datagB=0; - int menu = MENU_NONE, dataef=0; - - - u32 nolist; - char text[MAX_CHARACTERS + 4]; - int choice = 0, selectedold = 100; - s32 ret; - - //CLOCK - struct tm * timeinfo; - char theTime[80]=""; - time_t lastrawtime=0; - - if (mountMethod != 3 && load_from_fs == PART_FS_WBFS) { - WBFS_DiskSpace(&used, &freespace); - } - - if (!gameCnt) { //if there is no list of games to display - nolist = 1; - } - - GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); - // because destroy GuiSound must wait while sound playing is finished, we use a global sound - if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); - // GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); - - snprintf(imgPath, sizeof(imgPath), "%sbutton_install.png", CFG.theme_path); - GuiImageData btnInstall(imgPath, button_install_png); - snprintf(imgPath, sizeof(imgPath), "%sbutton_install_over.png", CFG.theme_path); - GuiImageData btnInstallOver(imgPath, button_install_over_png); - - snprintf(imgPath, sizeof(imgPath), "%ssettings_button.png", CFG.theme_path); - GuiImageData btnSettings(imgPath, settings_button_png); - snprintf(imgPath, sizeof(imgPath), "%ssettings_button_over.png", CFG.theme_path); - GuiImageData btnSettingsOver(imgPath, settings_button_over_png); - GuiImageData dataID(&data1); - - snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff.png", CFG.theme_path); - GuiImageData btnpwroff(imgPath, wiimote_poweroff_png); - snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff_over.png", CFG.theme_path); - GuiImageData btnpwroffOver(imgPath, wiimote_poweroff_over_png); - snprintf(imgPath, sizeof(imgPath), "%smenu_button.png", CFG.theme_path); - GuiImageData btnhome(imgPath, menu_button_png); - snprintf(imgPath, sizeof(imgPath), "%smenu_button_over.png", CFG.theme_path); - GuiImageData btnhomeOver(imgPath, menu_button_over_png); - snprintf(imgPath, sizeof(imgPath), "%sSDcard_over.png", CFG.theme_path); - GuiImageData btnsdcardOver(imgPath, sdcard_over_png); - snprintf(imgPath, sizeof(imgPath), "%sSDcard.png", CFG.theme_path); - GuiImageData btnsdcard(imgPath, sdcard_png); - - - snprintf(imgPath, sizeof(imgPath), "%sfavIcon.png", CFG.theme_path); - GuiImageData imgfavIcon(imgPath, favIcon_png); - snprintf(imgPath, sizeof(imgPath), "%sfavIcon_gray.png", CFG.theme_path); - GuiImageData imgfavIcon_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%ssearchIcon.png", CFG.theme_path); - GuiImageData imgsearchIcon(imgPath, searchIcon_png); - snprintf(imgPath, sizeof(imgPath), "%ssearchIcon_gray.png", CFG.theme_path); - GuiImageData imgsearchIcon_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%sabcIcon.png", CFG.theme_path); - GuiImageData imgabcIcon(imgPath, abcIcon_png); - snprintf(imgPath, sizeof(imgPath), "%sabcIcon_gray.png", CFG.theme_path); - GuiImageData imgabcIcon_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%srankIcon.png", CFG.theme_path); - GuiImageData imgrankIcon(imgPath, rankIcon_png); - snprintf(imgPath, sizeof(imgPath), "%srankIcon_gray.png", CFG.theme_path); - GuiImageData imgrankIcon_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%splayCountIcon.png", CFG.theme_path); - GuiImageData imgplayCountIcon(imgPath, playCountIcon_png); - snprintf(imgPath, sizeof(imgPath), "%splayCountIcon_gray.png", CFG.theme_path); - GuiImageData imgplayCountIcon_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid.png", CFG.theme_path); - GuiImageData imgarrangeGrid(imgPath, arrangeGrid_png); - snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid_gray.png", CFG.theme_path); - GuiImageData imgarrangeGrid_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%sarrangeList.png", CFG.theme_path); - GuiImageData imgarrangeList(imgPath, arrangeList_png); - snprintf(imgPath, sizeof(imgPath), "%sarrangeList_gray.png", CFG.theme_path); - GuiImageData imgarrangeList_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%sarrangeCarousel.png", CFG.theme_path); - GuiImageData imgarrangeCarousel(imgPath, arrangeCarousel_png); - snprintf(imgPath, sizeof(imgPath), "%sarrangeCarousel_gray.png", CFG.theme_path); - GuiImageData imgarrangeCarousel_gray(imgPath, NULL); - - snprintf(imgPath, sizeof(imgPath), "%slock.png", CFG.theme_path); - GuiImageData imgLock(imgPath, lock_png); - snprintf(imgPath, sizeof(imgPath), "%slock_gray.png", CFG.theme_path); - GuiImageData imgLock_gray(imgPath, NULL); - snprintf(imgPath, sizeof(imgPath), "%sunlock.png", CFG.theme_path); - GuiImageData imgUnlock(imgPath, unlock_png); - snprintf(imgPath, sizeof(imgPath), "%sunlock_gray.png", CFG.theme_path); - GuiImageData imgUnlock_gray(imgPath, NULL); - - snprintf(imgPath, sizeof(imgPath), "%sdvd.png", CFG.theme_path); - GuiImageData imgdvd(imgPath, dvd_png); - snprintf(imgPath, sizeof(imgPath), "%sdvd_gray.png", CFG.theme_path); - GuiImageData imgdvd_gray(imgPath, NULL); - - snprintf(imgPath, sizeof(imgPath), "%sbrowser.png", CFG.theme_path); - GuiImageData homebrewImgData(imgPath, browser_png); - snprintf(imgPath, sizeof(imgPath), "%sbrowser_over.png", CFG.theme_path); - GuiImageData homebrewImgDataOver(imgPath, browser_over_png); - - - GuiTrigger trigA; - trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiTrigger trigHome; - trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, PAD_BUTTON_START); - GuiTrigger trig2; - trig2.SetButtonOnlyTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_X, 0); - GuiTrigger trig1; - trig1.SetButtonOnlyTrigger(-1, WPAD_BUTTON_1 | WPAD_CLASSIC_BUTTON_Y, 0); - GuiTrigger trigN; - trigN.SetButtonOnlyTrigger(0, 0, 0); - - char spaceinfo[30]; - if (load_from_fs != PART_FS_WBFS) { - memset(spaceinfo, 0, 30); - } else { - if (!strcmp(Settings.db_language,"JA")) { - // needs to be "total...used" for Japanese - sprintf(spaceinfo,(mountMethod!=3?"%.2fGB %s %.2fGB %s":" "),(freespace+used),tr("of"),freespace,tr("free")); - } else { - sprintf(spaceinfo,(mountMethod!=3?"%.2fGB %s %.2fGB %s":" "),freespace,tr("of"),(freespace+used),tr("free")); - } - } - GuiText usedSpaceTxt(spaceinfo, 18, THEME.info); - usedSpaceTxt.SetAlignment(THEME.hddinfo_align, ALIGN_TOP); - usedSpaceTxt.SetPosition(THEME.hddinfo_x, THEME.hddinfo_y); - - char GamesCnt[15]; - sprintf(GamesCnt,"%s: %i",(mountMethod!=3?tr("Games"):tr("Channels")), gameCnt); - GuiText gamecntTxt(GamesCnt, 18, THEME.info); - - GuiButton gamecntBtn(100,18); - gamecntBtn.SetAlignment(THEME.gamecount_align, ALIGN_TOP); - gamecntBtn.SetPosition(THEME.gamecount_x,THEME.gamecount_y); - gamecntBtn.SetLabel(&gamecntTxt); - gamecntBtn.SetEffectGrow(); - if (mountMethod!=3)gamecntBtn.SetTrigger(&trigA); - - GuiTooltip installBtnTT(tr("Install a game")); - if (Settings.wsprompt == yes) - installBtnTT.SetWidescreen(CFG.widescreen); - installBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage installBtnImg(&btnInstall); - GuiImage installBtnImgOver(&btnInstallOver); - installBtnImg.SetWidescreen(CFG.widescreen); - installBtnImgOver.SetWidescreen(CFG.widescreen); - - GuiButton installBtn(&installBtnImg, &installBtnImgOver, ALIGN_LEFT, ALIGN_TOP, THEME.install_x, THEME.install_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2, 1, &installBtnTT,24,-30, 0,5); - - - GuiTooltip settingsBtnTT(tr("Settings")); - if (Settings.wsprompt == yes) - settingsBtnTT.SetWidescreen(CFG.widescreen); - settingsBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage settingsBtnImg(&btnSettings); - settingsBtnImg.SetWidescreen(CFG.widescreen); - GuiImage settingsBtnImgOver(&btnSettingsOver); - settingsBtnImgOver.SetWidescreen(CFG.widescreen); - GuiButton settingsBtn(&settingsBtnImg,&settingsBtnImgOver, 0, 3, THEME.setting_x, THEME.setting_y, &trigA, &btnSoundOver, btnClick2,1,&settingsBtnTT,65,-30,0,5); - - GuiTooltip homeBtnTT(tr("Back to HBC or Wii Menu")); - if (Settings.wsprompt == yes) - homeBtnTT.SetWidescreen(CFG.widescreen); - settingsBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage homeBtnImg(&btnhome); - homeBtnImg.SetWidescreen(CFG.widescreen); - GuiImage homeBtnImgOver(&btnhomeOver); - homeBtnImgOver.SetWidescreen(CFG.widescreen); - GuiButton homeBtn(&homeBtnImg,&homeBtnImgOver, 0, 3, THEME.home_x, THEME.home_y, &trigA, &btnSoundOver, btnClick2,1,&homeBtnTT,15,-30,1,5); - homeBtn.RemoveSoundClick(); - homeBtn.SetTrigger(&trigHome); - - GuiTooltip poweroffBtnTT(tr("Power off the Wii")); - if (Settings.wsprompt == yes) - poweroffBtnTT.SetWidescreen(CFG.widescreen); - poweroffBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage poweroffBtnImg(&btnpwroff); - GuiImage poweroffBtnImgOver(&btnpwroffOver); - poweroffBtnImg.SetWidescreen(CFG.widescreen); - poweroffBtnImgOver.SetWidescreen(CFG.widescreen); - GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, btnClick2,1,&poweroffBtnTT,-10,-30,1,5); - - GuiTooltip sdcardBtnTT(tr("Reload SD")); - if (Settings.wsprompt == yes) - sdcardBtnTT.SetWidescreen(CFG.widescreen); - sdcardBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage sdcardImg(&btnsdcard); - GuiImage sdcardImgOver(&btnsdcardOver); - sdcardImg.SetWidescreen(CFG.widescreen); - sdcardImgOver.SetWidescreen(CFG.widescreen); - GuiButton sdcardBtn(&sdcardImg,&sdcardImgOver, 0, 3, THEME.sdcard_x, THEME.sdcard_y, &trigA, &btnSoundOver, btnClick2,1,&sdcardBtnTT,15,-30,0,5); - - GuiButton gameInfo(0,0); - gameInfo.SetTrigger(&trig2); - gameInfo.SetSoundClick(btnClick2); - - - GuiImage wiiBtnImg(&dataID); - wiiBtnImg.SetWidescreen(CFG.widescreen); - GuiButton wiiBtn(&wiiBtnImg,&wiiBtnImg, 0, 4, 0, -10, &trigA, &btnSoundOver, btnClick2,0); - - GuiTooltip favoriteBtnTT(tr("Display favorites")); - if (Settings.wsprompt == yes) - favoriteBtnTT.SetWidescreen(CFG.widescreen); - favoriteBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage favoriteBtnImg(&imgfavIcon); - favoriteBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage favoriteBtnImg_g(favoriteBtnImg);favoriteBtnImg_g.SetGrayscale(); - GuiImage favoriteBtnImg_g(&imgfavIcon_gray); - if(favoriteBtnImg_g.GetImage() == NULL) { favoriteBtnImg_g = favoriteBtnImg; favoriteBtnImg_g.SetGrayscale();} - favoriteBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton favoriteBtn(&favoriteBtnImg_g,&favoriteBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_favorite_x, THEME.gamelist_favorite_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2,1, &favoriteBtnTT, -15, 52, 0, 3); - favoriteBtn.SetAlpha(180); - - GuiTooltip searchBtnTT(tr("Set Search-Filter")); - if (Settings.wsprompt == yes) - searchBtnTT.SetWidescreen(CFG.widescreen); - searchBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage searchBtnImg(&imgsearchIcon); - searchBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage searchBtnImg_g(searchBtnImg); searchBtnImg_g.SetGrayscale(); - GuiImage searchBtnImg_g(&imgsearchIcon_gray); - if(searchBtnImg_g.GetImage() == NULL) { searchBtnImg_g = searchBtnImg; searchBtnImg_g.SetGrayscale();} - searchBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton searchBtn(&searchBtnImg_g,&searchBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_search_x, THEME.gamelist_search_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2,1, &searchBtnTT, -15, 52, 0, 3); - searchBtn.SetAlpha(180); - - GuiTooltip abcBtnTT(Settings.fave ? tr("Sort by rank") : tr("Sort alphabetically")); - if (Settings.wsprompt == yes) - abcBtnTT.SetWidescreen(CFG.widescreen); - abcBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage abcBtnImg(Settings.fave ? &imgrankIcon : &imgabcIcon); - abcBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage abcBtnImg_g(abcBtnImg); abcBtnImg_g.SetGrayscale(); - GuiImage abcBtnImg_g(Settings.fave ? &imgrankIcon_gray : &imgabcIcon_gray); - if(abcBtnImg_g.GetImage() == NULL) { abcBtnImg_g = abcBtnImg; abcBtnImg_g.SetGrayscale();} - abcBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton abcBtn(&abcBtnImg_g,&abcBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_abc_x, THEME.gamelist_abc_y, &trigA, &btnSoundOver, btnClick2,1,&abcBtnTT, -15, 52, 0, 3); - abcBtn.SetAlpha(180); - - GuiTooltip countBtnTT(tr("Sort order by most played")); - if (Settings.wsprompt == yes) - countBtnTT.SetWidescreen(CFG.widescreen); - countBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage countBtnImg(&imgplayCountIcon); - countBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage countBtnImg_g(countBtnImg); countBtnImg_g.SetGrayscale(); - GuiImage countBtnImg_g(&imgplayCountIcon_gray); - if(countBtnImg_g.GetImage() == NULL) { countBtnImg_g = countBtnImg; countBtnImg_g.SetGrayscale();} - countBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton countBtn(&countBtnImg_g,&countBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_count_x, THEME.gamelist_count_y, &trigA, &btnSoundOver, btnClick2,1, &countBtnTT, -15, 52, 0, 3); - countBtn.SetAlpha(180); - - GuiTooltip listBtnTT(tr("Display as a list")); - if (Settings.wsprompt == yes) - listBtnTT.SetWidescreen(CFG.widescreen); - listBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage listBtnImg(&imgarrangeList); - listBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage listBtnImg_g(listBtnImg); listBtnImg_g.SetGrayscale(); - GuiImage listBtnImg_g(&imgarrangeList_gray); - if(listBtnImg_g.GetImage() == NULL) { listBtnImg_g = listBtnImg; listBtnImg_g.SetGrayscale();} - listBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton listBtn(&listBtnImg_g,&listBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_list_x, THEME.gamelist_list_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2,1, &listBtnTT, 15, 52, 1, 3); - listBtn.SetAlpha(180); - - GuiTooltip gridBtnTT(tr("Display as a grid")); - if (Settings.wsprompt == yes) - gridBtnTT.SetWidescreen(CFG.widescreen); - gridBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage gridBtnImg(&imgarrangeGrid); - gridBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage gridBtnImg_g(gridBtnImg); gridBtnImg_g.SetGrayscale(); - GuiImage gridBtnImg_g(&imgarrangeGrid_gray); - if(gridBtnImg_g.GetImage() == NULL) { gridBtnImg_g = gridBtnImg; gridBtnImg_g.SetGrayscale();} - gridBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton gridBtn(&gridBtnImg_g,&gridBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_grid_x, THEME.gamelist_grid_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2,1, &gridBtnTT, 15, 52, 1, 3); - gridBtn.SetAlpha(180); - - GuiTooltip carouselBtnTT(tr("Display as a carousel")); - if (Settings.wsprompt == yes) - carouselBtnTT.SetWidescreen(CFG.widescreen); - carouselBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage carouselBtnImg(&imgarrangeCarousel); - carouselBtnImg.SetWidescreen(CFG.widescreen); -// GuiImage carouselBtnImg_g(carouselBtnImg); carouselBtnImg_g.SetGrayscale(); - GuiImage carouselBtnImg_g(&imgarrangeCarousel_gray); - if(carouselBtnImg_g.GetImage() == NULL) { carouselBtnImg_g = carouselBtnImg; carouselBtnImg_g.SetGrayscale();} - carouselBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton carouselBtn(&carouselBtnImg_g,&carouselBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_carousel_x, THEME.gamelist_carousel_y, mountMethod!=3?&trigA:&trigN, &btnSoundOver, btnClick2,1, &carouselBtnTT, 15, 52, 1, 3); - carouselBtn.SetAlpha(180); - - bool canUnlock = (Settings.parentalcontrol == 0 && Settings.parental.enabled == 1); - - GuiTooltip lockBtnTT(canUnlock ? tr("Unlock Parental Control") : tr("Parental Control disabled")); - if (Settings.wsprompt == yes) - lockBtnTT.SetWidescreen(CFG.widescreen); - lockBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage lockBtnImg(&imgLock); - lockBtnImg.SetWidescreen(CFG.widescreen); - GuiImage lockBtnImg_g(&imgLock_gray); - if(lockBtnImg_g.GetImage() == NULL) { lockBtnImg_g = lockBtnImg; lockBtnImg_g.SetGrayscale(); } - lockBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton lockBtn(&lockBtnImg_g, &lockBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_lock_x, THEME.gamelist_lock_y, &trigA, &btnSoundOver, btnClick2,1, &lockBtnTT, 15, 52, 1, 3); - lockBtn.SetAlpha(180); - - GuiTooltip unlockBtnTT(tr("Enable Parental Control")); - if (Settings.wsprompt == yes) - unlockBtnTT.SetWidescreen(CFG.widescreen); - unlockBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage unlockBtnImg(&imgUnlock); - unlockBtnImg.SetWidescreen(CFG.widescreen); - GuiImage unlockBtnImg_g(&imgUnlock_gray); - if(unlockBtnImg_g.GetImage() == NULL) { unlockBtnImg_g = unlockBtnImg; unlockBtnImg_g.SetGrayscale(); } - unlockBtnImg_g.SetWidescreen(CFG.widescreen); - - if (canUnlock && Settings.godmode) - { - lockBtn.SetImage(&unlockBtnImg_g); - lockBtn.SetImageOver(&unlockBtnImg_g); - lockBtn.SetToolTip(&unlockBtnTT, 15, 52, 1, 3); - } - -/* - GuiButton unlockBtn(&unlockBtnImg_g, &unlockBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_lock_x, THEME.gamelist_lock_y, &trigA, &btnSoundOver, btnClick2,1, &lockBtnTT, 15, 52, 1, 3); - unlockBtn.SetAlpha(180); -*/ - - GuiTooltip dvdBtnTT(tr("Mount DVD drive")); - if (Settings.wsprompt == yes) - dvdBtnTT.SetWidescreen(CFG.widescreen); - dvdBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage dvdBtnImg(&imgdvd); - dvdBtnImg.SetWidescreen(CFG.widescreen); - GuiImage dvdBtnImg_g(dvdBtnImg); //dvdBtnImg_g.SetGrayscale(); -// GuiImage carouselBtnImg_g(&imgarrangeCarousel_gray); - dvdBtnImg_g.SetWidescreen(CFG.widescreen); - GuiButton dvdBtn(&dvdBtnImg_g,&dvdBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_dvd_x, THEME.gamelist_dvd_y, &trigA, &btnSoundOver, btnClick2,1, &dvdBtnTT, 15, 52, 1, 3); - dvdBtn.SetAlpha(180); - - GuiTooltip homebrewBtnTT(tr("Homebrew Launcher")); - if (Settings.wsprompt == yes) - homebrewBtnTT.SetWidescreen(CFG.widescreen); - homebrewBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiImage homebrewImg(&homebrewImgData); - GuiImage homebrewImgOver(&homebrewImgDataOver); - homebrewImg.SetWidescreen(CFG.widescreen); - homebrewImgOver.SetWidescreen(CFG.widescreen); - GuiButton homebrewBtn(&homebrewImg,&homebrewImgOver, ALIGN_LEFT, ALIGN_TOP, THEME.homebrew_x, THEME.homebrew_y, &trigA, &btnSoundOver, btnClick2,1,&homebrewBtnTT,15,-30,1,5); - - if (Settings.fave) { - favoriteBtn.SetImage(&favoriteBtnImg); - favoriteBtn.SetImageOver(&favoriteBtnImg); - favoriteBtn.SetAlpha(255); - } - static bool show_searchwindow = false; - if(gameFilter && *gameFilter) - { - if(show_searchwindow && gameCnt==1) - show_searchwindow = false; - if(!show_searchwindow) - searchBtn.SetEffect(EFFECT_PULSE, 10, 105); - searchBtn.SetImage(&searchBtnImg); - searchBtn.SetImageOver(&searchBtnImg); - searchBtn.SetAlpha(255); - } - if (Settings.sort==all) { - abcBtn.SetImage(&abcBtnImg); - abcBtn.SetImageOver(&abcBtnImg); - abcBtn.SetAlpha(255); - } else if (Settings.sort==pcount) { - countBtn.SetImage(&countBtnImg); - countBtn.SetImageOver(&countBtnImg); - countBtn.SetAlpha(255); - } - if (Settings.gameDisplay==list || mountMethod == 3) { - listBtn.SetImage(&listBtnImg); - listBtn.SetImageOver(&listBtnImg); - listBtn.SetAlpha(255); - } else if (Settings.gameDisplay==grid) { - gridBtn.SetImage(&gridBtnImg); - gridBtn.SetImageOver(&gridBtnImg); - gridBtn.SetAlpha(255); - } else if (Settings.gameDisplay==carousel) { - carouselBtn.SetImage(&carouselBtnImg); - carouselBtn.SetImageOver(&carouselBtnImg); - carouselBtn.SetAlpha(255); - } - - if (Settings.gameDisplay==list|| mountMethod == 3) { - favoriteBtn.SetPosition(THEME.gamelist_favorite_x, THEME.gamelist_favorite_y); - searchBtn.SetPosition(THEME.gamelist_search_x, THEME.gamelist_search_y); - abcBtn.SetPosition(THEME.gamelist_abc_x, THEME.gamelist_abc_y); - countBtn.SetPosition(THEME.gamelist_count_x, THEME.gamelist_count_y); - listBtn.SetPosition(THEME.gamelist_list_x, THEME.gamelist_list_y); - gridBtn.SetPosition(THEME.gamelist_grid_x, THEME.gamelist_grid_y); - carouselBtn.SetPosition(THEME.gamelist_carousel_x, THEME.gamelist_carousel_y); - lockBtn.SetPosition(THEME.gamelist_lock_x, THEME.gamelist_lock_y); - dvdBtn.SetPosition(THEME.gamelist_dvd_x, THEME.gamelist_dvd_y); - } else if(Settings.gameDisplay==grid) { - favoriteBtn.SetPosition(THEME.gamegrid_favorite_x, THEME.gamegrid_favorite_y); - searchBtn.SetPosition(THEME.gamegrid_search_x, THEME.gamegrid_search_y); - abcBtn.SetPosition(THEME.gamegrid_abc_x, THEME.gamegrid_abc_y); - countBtn.SetPosition(THEME.gamegrid_count_x, THEME.gamegrid_count_y); - listBtn.SetPosition(THEME.gamegrid_list_x, THEME.gamegrid_list_y); - gridBtn.SetPosition(THEME.gamegrid_grid_x, THEME.gamegrid_grid_y); - carouselBtn.SetPosition(THEME.gamegrid_carousel_x, THEME.gamegrid_carousel_y); - lockBtn.SetPosition(THEME.gamegrid_lock_x, THEME.gamegrid_lock_y); - dvdBtn.SetPosition(THEME.gamegrid_dvd_x, THEME.gamegrid_dvd_y); - } else if(Settings.gameDisplay==carousel) { - favoriteBtn.SetPosition(THEME.gamecarousel_favorite_x, THEME.gamecarousel_favorite_y); - searchBtn.SetPosition(THEME.gamecarousel_search_x, THEME.gamecarousel_favorite_y); - abcBtn.SetPosition(THEME.gamecarousel_abc_x, THEME.gamecarousel_abc_y); - countBtn.SetPosition(THEME.gamecarousel_count_x, THEME.gamecarousel_count_y); - listBtn.SetPosition(THEME.gamecarousel_list_x, THEME.gamecarousel_list_y); - gridBtn.SetPosition(THEME.gamecarousel_grid_x, THEME.gamecarousel_grid_y); - carouselBtn.SetPosition(THEME.gamecarousel_carousel_x, THEME.gamecarousel_carousel_y); - lockBtn.SetPosition(THEME.gamecarousel_lock_x, THEME.gamecarousel_lock_y); - dvdBtn.SetPosition(THEME.gamecarousel_dvd_x, THEME.gamecarousel_dvd_y); - } - - - //Downloading Covers - GuiTooltip DownloadBtnTT(tr("Click to Download Covers")); - if (Settings.wsprompt == yes) - DownloadBtnTT.SetWidescreen(CFG.widescreen); - DownloadBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiButton DownloadBtn(0,0); - DownloadBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP); - DownloadBtn.SetPosition(THEME.covers_x,THEME.covers_y); - - GuiTooltip IDBtnTT(tr("Click to change game ID")); - if (Settings.wsprompt == yes) - IDBtnTT.SetWidescreen(CFG.widescreen); - IDBtnTT.SetAlpha(THEME.tooltipAlpha); - GuiButton idBtn(0,0); - idBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP); - idBtn.SetPosition(THEME.id_x,THEME.id_y); - - if (Settings.godmode == 1 && mountMethod!=3) {//only make the button have trigger & tooltip if in godmode - DownloadBtn.SetSoundOver(&btnSoundOver); - DownloadBtn.SetTrigger(&trigA); - DownloadBtn.SetTrigger(&trig1); - DownloadBtn.SetToolTip(&DownloadBtnTT,205,-30); - - idBtn.SetSoundOver(&btnSoundOver); - idBtn.SetTrigger(&trigA); - idBtn.SetToolTip(&IDBtnTT,205,-30); - - } else - { - DownloadBtn.SetRumble(false); - idBtn.SetRumble(false); - } - - GuiGameBrowser * gameBrowser = NULL; - GuiGameGrid * gameGrid = NULL; - GuiGameCarousel * gameCarousel = NULL; - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser = new GuiGameBrowser(THEME.gamelist_w, THEME.gamelist_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); - gameBrowser->SetPosition(THEME.gamelist_x, THEME.gamelist_y); - gameBrowser->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); - } else if (Settings.gameDisplay==grid) { - gameGrid = new GuiGameGrid(THEME.gamegrid_w,THEME.gamegrid_h, gameList, gameCnt, CFG.theme_path, bg_options_png, 0, 0); - gameGrid->SetPosition(THEME.gamegrid_x,THEME.gamegrid_y); - gameGrid->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); - } else if (Settings.gameDisplay==carousel) { - //GuiGameCarousel gameCarousel(THEME.gamecarousel_w, THEME.gamecarousel_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); - gameCarousel = new GuiGameCarousel(640, 400, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); - gameCarousel->SetPosition(THEME.gamecarousel_x,THEME.gamecarousel_y); - gameCarousel->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); - } - - GuiText clockTimeBack("88:88", 40, (GXColor) {THEME.clock.r, THEME.clock.g, THEME.clock.b, THEME.clock.a/6}); - clockTimeBack.SetAlignment(THEME.clock_align, ALIGN_TOP); - clockTimeBack.SetPosition(THEME.clock_x, THEME.clock_y); - clockTimeBack.SetFont(fontClock); - GuiText clockTime(theTime, 40, THEME.clock); - clockTime.SetAlignment(THEME.clock_align, ALIGN_TOP); - clockTime.SetPosition(THEME.clock_x, THEME.clock_y); - clockTime.SetFont(fontClock); - - HaltGui(); - GuiWindow w(screenwidth, screenheight); - - if (THEME.show_hddinfo == -1 || THEME.show_hddinfo == 1) { //force show hdd info - w.Append(&usedSpaceTxt); - } - if (THEME.show_gamecount == -1 || THEME.show_gamecount == 1) { //force show game cnt info - w.Append(&gamecntBtn); - } - w.Append(&sdcardBtn); - w.Append(&poweroffBtn); - w.Append(&gameInfo); - if (Settings.godmode && load_from_fs != PART_FS_NTFS) - w.Append(&installBtn); - w.Append(&homeBtn); - w.Append(&settingsBtn); - w.Append(&DownloadBtn); - w.Append(&idBtn); - - - // Begin Toolbar - w.Append(&favoriteBtn); - Toolbar[0] = &favoriteBtn; - w.Append(&searchBtn); - Toolbar[1] = &searchBtn; - w.Append(&abcBtn); - Toolbar[2] = &abcBtn; - w.Append(&countBtn); - Toolbar[3] = &countBtn; - w.Append(&listBtn); - Toolbar[4] = &listBtn; - w.Append(&gridBtn); - Toolbar[5] = &gridBtn; - w.Append(&carouselBtn); - Toolbar[6] = &carouselBtn; - w.Append(&lockBtn); - Toolbar[7] = &lockBtn; - w.Append(&dvdBtn); - Toolbar[8] = &dvdBtn; - w.SetUpdateCallback(DiscListWinUpdateCallback); - // End Toolbar - - - - if (Settings.godmode == 1) - w.Append(&homebrewBtn); - - if ((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) { - w.Append(&clockTimeBack); - w.Append(&clockTime); - } - - if (Settings.gameDisplay==list|| mountMethod == 3) { - mainWindow->Append(gameBrowser); - } - else if (Settings.gameDisplay==grid) { - mainWindow->Append(gameGrid); - } - else if (Settings.gameDisplay==carousel) { - mainWindow->Append(gameCarousel); - } - mainWindow->Append(&w); - - GuiSearchBar *searchBar=NULL; - if(show_searchwindow) { - searchBar = new GuiSearchBar(gameFilterNextList); - if(searchBar) - mainWindow->Append(searchBar); - } - - ResumeGui(); - -// ShowMemInfo(); - - while (menu == MENU_NONE) { - - if (idiotFlag==1) { - gprintf("\n\tIdiot flag"); - char idiotBuffer[200]; - snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), - idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4.")); - - int deleteImg = WindowPrompt(0,idiotBuffer,tr("OK"),tr("Delete")); - if (deleteImg==0) { - snprintf(idiotBuffer, sizeof(idiotBuffer), "%s %s.",tr("You are about to delete "), idiotChar); - deleteImg = WindowPrompt(tr("Confirm"),idiotBuffer,tr("Delete"),tr("Cancel")); - if (deleteImg==1) { - remove(idiotChar); - } - } - idiotFlag=-1; - } - - WDVD_GetCoverStatus(&covert);//for detecting if i disc has been inserted - - // if the idiot is showing favorites and don't have any - if (Settings.fave && !gameCnt) { - WindowPrompt(tr("No Favorites"),tr("You are choosing to display favorites and you do not have any selected."),tr("Back")); - Settings.fave=!Settings.fave; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - __Menu_GetEntries(); - menu = MENU_DISCLIST; - break; - } - - //CLOCK - time_t rawtime = time(0); //this fixes code dump caused by the clock - if (((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) && rawtime != lastrawtime) { - lastrawtime = rawtime; - timeinfo = localtime (&rawtime); - if (dataed < 1) { - if (Settings.hddinfo == hr12) { - if (rawtime & 1) - strftime(theTime, sizeof(theTime), "%I:%M", timeinfo); - else - strftime(theTime, sizeof(theTime), "%I %M", timeinfo); - } - if (Settings.hddinfo == hr24) { - if (rawtime & 1) - strftime(theTime, sizeof(theTime), "%H:%M", timeinfo); - else - strftime(theTime, sizeof(theTime), "%H %M", timeinfo); - } - clockTime.SetText(theTime); - - } else if (dataed > 0) { - - clockTime.SetTextf("%i", (dataed-1)); - } - - } - - if ((datagB<1)&&(Settings.cios==1)&&(Settings.video == ntsc)&&(Settings.hddinfo == hr12)&&(Settings.qboot==1)&&(Settings.wsprompt==0)&&(Settings.language==ger)&&(Settings.tooltips==0)){dataed=1;dataef=1;}if (dataef==1){if (cosa>7){cosa=1;}datag++;if (sina==3){wiiBtn.SetAlignment(ALIGN_LEFT,ALIGN_BOTTOM);wiiBtnImg.SetAngle(0);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),((datag*2)-130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==2){wiiBtn.SetAlignment(ALIGN_RIGHT,ALIGN_TOP);wiiBtnImg.SetAngle(270);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((-2*(datag)+130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((2*(datag)-120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==1){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(180);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(2*(datag)-120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==0){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(90);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((2*(datag)-130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((-2*(datag)+120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}} - // respond to button presses - /* if (shutdown == 1) { - gprintf("\n\tshutdown"); - Sys_Shutdown(); - } - if (reset == 1) - Sys_Reboot();*/ - - if (updateavailable == true) { - gprintf("\n\tUpdate Available"); - HaltGui(); - GuiWindow ww(640,480); - w.SetState(STATE_DISABLED); - mainWindow->Append(&ww); - ResumeGui(); - ProgressUpdateWindow(); - updateavailable = false; - mainWindow->Remove(&ww); - w.SetState(STATE_DEFAULT); - menu = MENU_DISCLIST; - } - - if (poweroffBtn.GetState() == STATE_CLICKED) { - - - gprintf("\n\tpoweroffBtn clicked"); - choice = WindowPrompt(tr("How to Shutdown?"),0,tr("Full Shutdown"), tr("Shutdown to Idle"), tr("Cancel")); - if (choice == 2) { - Sys_ShutdownToIdel(); - } else if (choice == 1) { - Sys_ShutdownToStandby(); - } else { - poweroffBtn.ResetState(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } - - } else if (gamecntBtn.GetState() == STATE_CLICKED && mountMethod!=3) { - gprintf("\n\tgameCntBtn clicked"); - gamecntBtn.ResetState(); - char linebuf[150]; - snprintf(linebuf, sizeof(linebuf), "%s %sGameList ?",tr("Save Game List to"), Settings.update_path); - choice = WindowPrompt(0,linebuf,"TXT","CSV",tr("Back")); - if (choice) { - if (save_gamelist(choice-1)) - WindowPrompt(0,tr("Saved"),tr("OK")); - else - WindowPrompt(tr("Error"),tr("Could not save."),tr("OK")); - } - menu = MENU_DISCLIST; - break; - - } else if (homeBtn.GetState() == STATE_CLICKED) { - gprintf("\n\thomeBtn clicked"); - bgMusic->Pause(); - choice = WindowExitPrompt(); - bgMusic->Resume(); - - if (choice == 3) { - Sys_LoadMenu(); // Back to System Menu - } else if (choice == 2) { - Sys_BackToLoader(); - } else { - homeBtn.ResetState(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } - - } else if (wiiBtn.GetState() == STATE_CLICKED) { - gprintf("\n\twiiBtn clicked"); - - dataed++; - wiiBtn.ResetState(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } else if (installBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tinstallBtn clicked"); - choice = WindowPrompt(tr("Install a game"),0,tr("Yes"),tr("No")); - if (choice == 1) { - menu = MENU_INSTALL; - break; - } else { - installBtn.ResetState(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } - } - else if (dvdBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tdvdBtn Clicked"); - - mountMethodOLD = (mountMethod==3?mountMethod:0); - - int ass =DiscMount(dvdheader); - if (ass>0)mountMethod=ass; - gprintf("\n\tmountMethod:%d",mountMethod); - //dvdBtn.ResetState(); - - covertOld =2; - rockout(); - //break; - } - else if ((covert & 0x2)&&(covert!=covertOld)&& mountMethod!=1 && mountMethod!=2) { - - //gprintf("\n\tNew Disc Detected mountMethod:%d covert:%d old:%d",mountMethod,covert,covertOld); - if(!mountMethod) - choice = WindowPrompt(tr("New Disc Detected"),0,tr("Install"),tr("Mount DVD drive"),tr("Cancel")); - if (choice == 1) { - if (load_from_fs == PART_FS_NTFS) { - WindowPrompt(tr("Install not possible"), tr("You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible."), tr("OK")); - } else { - menu = MENU_INSTALL; - break; - } - } - else if (choice ==2 || mountMethod==3) - { - dvdBtn.SetState(STATE_CLICKED); - }else { - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } - - } - - else if (sdcardBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tsdCardBtn Clicked"); - SDCard_deInit(); - SDCard_Init(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - startat = gameBrowser->GetSelectedOption(); - offset = gameBrowser->GetOffset(); - } else if (Settings.gameDisplay==grid) { - startat = gameGrid->GetSelectedOption(); - offset = gameGrid->GetOffset(); - } else if (Settings.gameDisplay==carousel) { - startat = gameCarousel->GetSelectedOption(); - offset = gameCarousel->GetOffset(); - } - if (isInserted(bootDevice)) { - HaltGui(); // to fix endless rumble when clicking on the SD icon when rumble is disabled because rumble is set to on in Global_Default() - CFG_Load(); - ResumeGui(); - } - sdcardBtn.ResetState(); - menu = MENU_DISCLIST; - break; - } - - else if (DownloadBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tDownloadBtn Clicked"); - if (isInserted(bootDevice)) { - choice = WindowPrompt(tr("Cover Download"), 0, tr("Normal Covers"), tr("3D Covers"), tr("Disc Images"), tr("Back")); // ask for download choice - if (choice != 0) { - int choice2 = choice; - bool missing; - missing = SearchMissingImages(choice2); - if (IsNetworkInit() == false && missing == true) { - WindowPrompt(tr("Network init error"), 0, tr("OK")); - } else { - if (GetMissingFiles() != NULL && cntMissFiles > 0) { - char tempCnt[40]; - sprintf(tempCnt,"%i %s",cntMissFiles,tr("Missing files")); - if (choice!=3)choice = WindowPrompt(tr("Download Boxart image?"),tempCnt,tr("Yes"),tr("No")); - else if (choice==3)choice = WindowPrompt(tr("Download Discart image?"),tempCnt,tr("Yes"),tr("No")); - if (choice == 1) { - ret = ProgressDownloadWindow(choice2); - if (ret == 0) { - WindowPrompt(tr("Download finished"),0,tr("OK")); - } else { - sprintf(tempCnt,"%i %s",ret,tr("files not found on the server!")); - WindowPrompt(tr("Download finished"),tempCnt,tr("OK")); - } - } - } - } - } - } else { - WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to download images."), tr("OK")); - } - if (choice)menu = MENU_DISCLIST; - DownloadBtn.ResetState(); - if (Settings.gameDisplay==list|| mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - }//end download - - else if (settingsBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tsettingsBtn Clicked"); - if (Settings.gameDisplay==list|| mountMethod == 3) { - startat = gameBrowser->GetSelectedOption(); - offset = gameBrowser->GetOffset(); - } else if (Settings.gameDisplay==grid) { - startat = gameGrid->GetSelectedOption(); - offset = gameGrid->GetOffset(); - } else if (Settings.gameDisplay==carousel) { - startat = gameCarousel->GetSelectedOption(); - offset = gameCarousel->GetOffset(); - } - menu = MENU_SETTINGS; - break; - - } - - else if (favoriteBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tfavoriteBtn Clicked"); - Settings.fave=!Settings.fave; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - __Menu_GetEntries(); - menu = MENU_DISCLIST; - break; - - } - - else if (searchBtn.GetState() == STATE_CLICKED) { - - gprintf("\n\tsearchBtn Clicked"); - show_searchwindow=!show_searchwindow; - HaltGui(); - if(searchBar) - { - mainWindow->Remove(searchBar); - delete searchBar; - searchBar = NULL; - } - if(show_searchwindow) - { - if(gameFilter && *gameFilter) - { - searchBtn.StopEffect(); - searchBtn.SetEffectGrow(); - } - searchBar = new GuiSearchBar(gameFilterNextList); - if(searchBar) - mainWindow->Append(searchBar); - } - else - { - if(gameFilter && *gameFilter) - searchBtn.SetEffect(EFFECT_PULSE, 10, 105); - } - searchBtn.ResetState(); - ResumeGui(); - } - - else if (searchBar && (searchChar=searchBar->GetClicked())) { - if(searchChar > 27) - { - int len = gameFilter ? wcslen(gameFilter) : 0; - wchar_t newFilter[len+2]; - if(gameFilter) - wcscpy(newFilter, gameFilter); - newFilter[len] = searchChar; - newFilter[len+1] = 0; - - - __Menu_GetEntries(0, newFilter); - menu = MENU_DISCLIST; - break; - } - else if(searchChar == 7) // Close - { - show_searchwindow=false; - HaltGui(); - if(searchBar) - { - mainWindow->Remove(searchBar); - delete searchBar; - searchBar = NULL; - } - if(gameFilter && *gameFilter) - { - searchBtn.SetEffect(EFFECT_PULSE, 10, 105); - searchBtn.SetImage(&searchBtnImg); - searchBtn.SetImageOver(&searchBtnImg); - searchBtn.SetAlpha(255); - } - else - { - searchBtn.StopEffect(); - searchBtn.SetEffectGrow(); - searchBtn.SetImage(&searchBtnImg_g); - searchBtn.SetImageOver(&searchBtnImg_g); - searchBtn.SetAlpha(180); - } - - ResumeGui(); - } - else if(searchChar == 8) // Backspace - { - __Menu_GetEntries(0, gameFilterPrev); - menu = MENU_DISCLIST; - break; - } - - } - - else if (abcBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tabcBtn clicked"); - if (Settings.sort != all) { - Settings.sort=all; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - __Menu_GetEntries(); - - menu = MENU_DISCLIST; - break; - } - abcBtn.ResetState(); - } - - else if (countBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tcountBtn Clicked"); - if (Settings.sort != pcount) { - Settings.sort=pcount; - //if(isSdInserted()) { - if (isInserted(bootDevice)) { - cfg_save_global(); - } - __Menu_GetEntries(); - - menu = MENU_DISCLIST; - break; - } - countBtn.ResetState(); - - } - - else if (listBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tlistBtn Clicked"); - if (Settings.gameDisplay!=list) { - Settings.gameDisplay=list; - menu = MENU_DISCLIST; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - listBtn.ResetState(); - break; - } else { - listBtn.ResetState(); - } - } - - - else if (gridBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tgridBtn Clicked"); - if (Settings.gameDisplay!=grid) { - - Settings.gameDisplay=grid; - menu = MENU_DISCLIST; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - gridBtn.ResetState(); - break; - } else { - gridBtn.ResetState(); - } - } - - else if (carouselBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tcarouselBtn Clicked"); - if (Settings.gameDisplay!=carousel) { - Settings.gameDisplay=carousel; - menu = MENU_DISCLIST; - if (isInserted(bootDevice)) { - cfg_save_global(); - } - carouselBtn.ResetState(); - break; - } else { - carouselBtn.ResetState(); - } - } - else if (homebrewBtn.GetState() == STATE_CLICKED) { - gprintf("\n\thomebrewBtn Clicked"); - menu = MENU_HOMEBREWBROWSE; - break; - } - else if (gameInfo.GetState() == STATE_CLICKED && mountMethod!=3) { - gprintf("\n\tgameinfo Clicked"); - gameInfo.ResetState(); - if(selectImg1>=0 && selectImg1<(s32)gameCnt) { - gameSelected = selectImg1; - rockout(); - struct discHdr *header = &gameList[selectImg1]; - snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); - choice = showGameInfo(IDfull); - rockout(2); - if (choice==2) - homeBtn.SetState(STATE_CLICKED); - if (choice==3) { - menu = MENU_DISCLIST; - break; - } - } - } - else if (lockBtn.GetState() == STATE_CLICKED) { - gprintf("\n\tlockBtn clicked"); - lockBtn.ResetState(); - if (!canUnlock) { - WindowPrompt(tr("Parental Control"), tr("You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings."), tr("OK")); - } else { - if (Settings.godmode) { - if (WindowPrompt(tr("Parental Control"), tr("Are you sure you want to enable Parent Control?"), tr("Yes"), tr("No")) == 1) { - Settings.godmode = 0; - lockBtn.SetImage(&lockBtnImg_g); - lockBtn.SetImageOver(&lockBtnImg_g); - lockBtn.SetToolTip(&lockBtnTT, 15, 52, 1, 3); - - // Retrieve the gamelist again - menu = MENU_DISCLIST; - break; - } - } else { - // Require the user to enter the PIN code - char pin[5]; - memset(&pin, 0, 5); - int ret = OnScreenNumpad((char *) &pin, 5); - - if (ret == 1) { - if (memcmp(pin, Settings.parental.pin, 4) == 0) { - Settings.godmode = 1; - lockBtn.SetImage(&unlockBtnImg_g); - lockBtn.SetImageOver(&unlockBtnImg_g); - lockBtn.SetToolTip(&unlockBtnTT, 15, 52, 1, 3); - - // Retrieve the gamelist again - menu = MENU_DISCLIST; - break; - } else { - WindowPrompt(tr("Parental Control"), tr("Invalid PIN code"), tr("OK")); - } - } - } - } - } - - if (Settings.gameDisplay==grid && mountMethod != 3) { - int selectimg; - DownloadBtn.SetSize(0,0); - selectimg = gameGrid->GetSelectedOption(); - gameSelected = gameGrid->GetClickedOption(); - selectImg1=selectimg; - } - - else if (Settings.gameDisplay==carousel && mountMethod != 3) { - int selectimg; - DownloadBtn.SetSize(0,0); - selectimg = gameCarousel->GetSelectedOption(); - gameSelected = gameCarousel->GetClickedOption(); - selectImg1=selectimg; - } - else if (Settings.gameDisplay==list || mountMethod == 3) { - //Get selected game under cursor - int selectimg; - DownloadBtn.SetSize(160,224); - idBtn.SetSize(100,40); - - selectimg = gameBrowser->GetSelectedOption(); - gameSelected = gameBrowser->GetClickedOption(); - selectImg1=selectimg; - - if (gameSelected > 0) //if click occured - selectimg = gameSelected; - - char gameregion[7]; - if ((selectimg >= 0) && (selectimg < (s32) gameCnt)) { - if (selectimg != selectedold) { - selectedold = selectimg;//update displayed cover, game ID, and region if the selected game changes - struct discHdr *header = &gameList[selectimg]; - snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]); - snprintf (IDfull,sizeof(IDfull),"%s%c%c%c", ID, header->id[3], header->id[4], header->id[5]); - w.Remove(&DownloadBtn); - - if (GameIDTxt) { - w.Remove(&idBtn); - delete GameIDTxt; - GameIDTxt = NULL; - } - if (GameRegionTxt) { - w.Remove(GameRegionTxt); - delete GameRegionTxt; - GameRegionTxt = NULL; - } - - switch (header->id[3]) { - case 'E': - sprintf(gameregion,"NTSC U"); - break; - case 'J': - sprintf(gameregion,"NTSC J"); - break; - case 'W': - sprintf(gameregion,"NTSC T"); - break; - default: - case 'K': - sprintf(gameregion,"NTSC K"); - break; - case 'P': - case 'D': - case 'F': - case 'I': - case 'S': - case 'H': - case 'U': - case 'X': - case 'Y': - case 'Z': - sprintf(gameregion," PAL "); - break; - } - - //load game cover - if (cover) { - delete cover; - cover = NULL; - } - - cover = LoadCoverImage(header); - - if (coverImg) { - delete coverImg; - coverImg = NULL; - } - coverImg = new GuiImage(cover); - coverImg->SetWidescreen(CFG.widescreen); - - DownloadBtn.SetImage(coverImg);// put the new image on the download button - w.Append(&DownloadBtn); - - if ((Settings.sinfo == GameID) || (Settings.sinfo == Both)) { - GameIDTxt = new GuiText(IDfull, 22, THEME.info); - GameIDTxt->SetAlignment(ALIGN_LEFT, ALIGN_TOP); - //GameIDTxt->SetPosition(THEME.id_x,THEME.id_y); - idBtn.SetEffect(EFFECT_FADE, 20); - idBtn.SetLabel(GameIDTxt); - w.Append(&idBtn); - } - //don't try to show region for channels because all the custom channels wont follow the rules - if (((Settings.sinfo == GameRegion) || (Settings.sinfo == Both))&&mountMethod!=3) { - GameRegionTxt = new GuiText(gameregion, 22, THEME.info); - GameRegionTxt->SetAlignment(ALIGN_LEFT, ALIGN_TOP); - GameRegionTxt->SetPosition(THEME.region_x, THEME.region_y); - GameRegionTxt->SetEffect(EFFECT_FADE, 20); - w.Append(GameRegionTxt); - } - } - } - - if (idBtn.GetState() == STATE_CLICKED && mountMethod!=3) { - gprintf("\n\tidBtn Clicked"); - struct discHdr * header = &gameList[gameBrowser->GetSelectedOption()]; - //enter new game ID - char entered[10]; - snprintf(entered, sizeof(entered), "%s", IDfull); - //entered[9] = '\0'; - int result = OnScreenKeyboard(entered, 7,0); - if (result == 1) { - WBFS_ReIDGame(header->id, entered); - //__Menu_GetEntries(); - menu = MENU_DISCLIST; - } - - idBtn.ResetState(); - } - startat=gameBrowser->GetOffset(), offset=startat; - } - - if (((gameSelected >= 0) && (gameSelected < (s32)gameCnt)) - || mountMethod==1 - || mountMethod==2) { - if(searchBar) - { - HaltGui(); - mainWindow->Remove(searchBar); - ResumeGui(); - } - rockout(); - struct discHdr *header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); - // struct discHdr *header = dvdheader:&gameList[gameSelected]); - if (!mountMethod)//only get this stuff it we are booting a game from USB - { - WBFS_GameSize(header->id, &size); - if (strlen(get_title(header)) < (MAX_CHARACTERS + 3)) { - sprintf(text, "%s", get_title(header)); - } else { - strncpy(text, get_title(header), MAX_CHARACTERS); - text[MAX_CHARACTERS] = '\0'; - strncat(text, "...", 3); - } - } - - //check if alt Dol and gct file is present - FILE *exeFile = NULL; - char nipple[100]; - header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); //reset header - snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); - struct Game_CFG* game_cfg = CFG_get_game_opt(header->id); - - if (game_cfg) { - alternatedol = game_cfg->loadalternatedol; - ocarinaChoice = game_cfg->ocarina; - } else { - alternatedol = off; - ocarinaChoice = Settings.ocarina; - } - - - if (Settings.qboot == yes) { //quickboot game - if (alternatedol == on) { - /* Open dol File and check exist */ - sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull); - exeFile = fopen (nipple ,"rb"); - if (exeFile==NULL) { - sprintf(nipple, "%s %s",nipple,tr("does not exist!")); - WindowPrompt(tr("Error"),nipple,tr("OK")); - menu = MENU_CHECK; - wiilight(0); - break; - } else { - fclose(exeFile); - } - } - if (ocarinaChoice != off) { - /* Open gct File and check exist */ - sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull); - exeFile = fopen (nipple ,"rb"); - if (exeFile==NULL) { - gprintf("\n\ttried to load missing gct."); - sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats.")); - WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); - } else { - fseek (exeFile, 0, SEEK_END); - long size=ftell (exeFile); - rewind (exeFile); - fclose(exeFile); - if (size>MAX_GCT_SIZE) { - gprintf("\n\tgct is too big"); - sprintf(nipple, "%s %s",nipple,tr("contains over 255 lines of code. It will produce unexpected results.")); - WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); - } - } - - } - - wiilight(0); - if (isInserted(bootDevice)) { - //////////save game play count//////////////// - struct Game_NUM* game_num = CFG_get_game_num(header->id); - - if (game_num) { - favoritevar = game_num->favorite; - playcount = game_num->count; - } else { - favoritevar = 0; - playcount = 0; - } - playcount += 1; - - CFG_save_game_num(header->id); - gprintf("\n\tplaycount for %c%c%c%c%c%c raised to %i",header->id[0],header->id[1],header->id[2],header->id[3],header->id[4],header->id[5],playcount); - - } - menu = MENU_EXIT; - break; - - } - bool returnHere = true;// prompt to start game - while (returnHere) { - returnHere = false; - if (Settings.wiilight != wiilight_forInstall) wiilight(1); - choice = GameWindowPrompt(); - // header = &gameList[gameSelected]; //reset header - - if (choice == 1) { - if (alternatedol == on) { - /* Open dol File and check exist */ - sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull); - exeFile = fopen (nipple ,"rb"); - if (exeFile==NULL) { - gprintf("\n\tTried to load alt dol that isn't there"); - sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot.")); - WindowPrompt(tr("Error"),nipple,tr("OK")); - menu = MENU_CHECK; - wiilight(0); - break; - } else { - fclose(exeFile); - } - } - if (ocarinaChoice != off) { - /* Open gct File and check exist */ - sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull); - exeFile = fopen (nipple ,"rb"); - if (exeFile==NULL) { - gprintf("\n\ttried to load gct file that isn't there"); - sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats.")); - WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); - } else { - fseek (exeFile, 0, SEEK_END); - long size=ftell (exeFile); - rewind (exeFile); - fclose(exeFile); - if (size>MAX_GCT_SIZE) { - gprintf("\n\tgct file is too big"); - sprintf(nipple, "%s %s",nipple,tr("contains over 255 lines of code. It will produce unexpected results.")); - WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); - } - } - - } - wiilight(0); - returnHere = false; - menu = MENU_EXIT; - - } else if (choice == 2) { - wiilight(0); - HaltGui(); - if (Settings.gameDisplay==list || mountMethod == 3) mainWindow->Remove(gameBrowser); - else if (Settings.gameDisplay==grid) mainWindow->Remove(gameGrid); - else if (Settings.gameDisplay==carousel) mainWindow->Remove(gameCarousel); - mainWindow->Remove(&w); - ResumeGui(); - - //re-evaluate header now in case they changed games while on the game prompt - header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); - int settret = GameSettings(header); - /* unneeded for now, kept in case database gets a separate language setting - //menu = MENU_DISCLIST; // refresh titles (needed if the language setting has changed) - */ - HaltGui(); - if (Settings.gameDisplay==list || mountMethod == 3) mainWindow->Append(gameBrowser); - else if (Settings.gameDisplay==grid) mainWindow->Append(gameGrid); - else if (Settings.gameDisplay==carousel) mainWindow->Append(gameCarousel); - mainWindow->Append(&w); - ResumeGui(); - if (settret == 1) { //if deleted - menu = MENU_DISCLIST; - break; - } - returnHere = true; - rockout(2); - } - - else if (choice == 3 && !mountMethod) { //WBFS renaming - wiilight(0); - //re-evaluate header now in case they changed games while on the game prompt - header = &gameList[gameSelected]; - - //enter new game title - char entered[60]; - snprintf(entered, sizeof(entered), "%s", get_title(header)); - entered[59] = '\0'; - int result = OnScreenKeyboard(entered, 60,0); - if (result == 1) { - WBFS_RenameGame(header->id, entered); - __Menu_GetEntries(); - menu = MENU_DISCLIST; - } - } else if (choice == 0) { - rockout(2); - if (mountMethod==1||mountMethod==2)mountMethod = mountMethodOLD; - if (Settings.gameDisplay==list || mountMethod == 3) { - gameBrowser->SetFocus(1); - } else if (Settings.gameDisplay==grid) { - gameGrid->SetFocus(1); - } else if (Settings.gameDisplay==carousel) { - gameCarousel->SetFocus(1); - } - } - - - } - if(searchBar) - { - HaltGui(); - mainWindow->Append(searchBar); - ResumeGui(); - } - } - // to skip the first call of windowScreensaver at startup when wiimote is not connected - if (IsWpadConnected()) { - check = 1; - } - - // screensaver is called when wiimote shuts down, depending on the wiimotet idletime - if (!IsWpadConnected() && check !=0 && Settings.screensaver!=0) { - check++; - int screensaverIsOn=0; - if (check==11500) { //to allow time for the wii to turn off and not show the screensaver - screensaverIsOn=WindowScreensaver(); - } - if (screensaverIsOn==1)check=0; - } - if (dvdBtn.GetState() != STATE_CLICKED) - covertOld=covert; - else - dvdBtn.ResetState(); - //respond to the checkthread and unpause it - switch(checkthreadState) - { - case 1: - mountMethod = 0; - menu = MENU_DISCLIST; - checkthreadState = 0; - gprintf("\ncase 1"); - break; - - case 2: - sdcardBtn.SetState(STATE_CLICKED); - checkthreadState = 0; - gprintf("\ncase 2"); - break; - } - } - - // set alt dol default - if (menu == MENU_EXIT && altdoldefault && mountMethod!=3) { - struct discHdr *header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); - struct Game_CFG* game_cfg = CFG_get_game_opt(header->id); - // use default only if no alt dol was selected manually - if (game_cfg) { - if (game_cfg->alternatedolstart != 0) - altdoldefault = false; - } - if (altdoldefault) { - int autodol = autoSelectDol((char*)header->id, true); - if (autodol>0) { - alternatedol = 2; - alternatedoloffset = autodol; - char temp[20]; - sprintf(temp,"%d",autodol); - } else { - // alt dol menu for games that require more than a single alt dol - int autodol = autoSelectDolMenu((char*)header->id, true); - if (autodol>0) { - alternatedol = 2; - alternatedoloffset = autodol; - } - } - } - } -//no need to close sd here. we still need to get settings and codes and shit - /*if (menu == MENU_EXIT) { - SDCard_deInit(); - }*/ - //if (Settings.gameDisplay==list) {startat=gameBrowser->GetOffset(), offset=startat;}//save the variables in case we are refreshing the list - //gprintf("\n\tstartat:%d offset:%d",startat,offset); - HaltGui(); - mainWindow->RemoveAll(); - mainWindow->Append(bgImg); - delete searchBar; - searchBar = NULL; - delete gameBrowser; - gameBrowser = NULL; - delete gameGrid; - gameGrid = NULL; - delete gameCarousel; - gameCarousel = NULL; - ResumeGui(); - return menu; -} - -void DiscListWinUpdateCallback(void * e) -{ - GuiWindow *w = (GuiWindow *)e; - for(int i=0; i<8; ++i) - { - if(Toolbar[i]->GetState() == STATE_SELECTED) - { - w->Remove(Toolbar[i]); - w->Append(Toolbar[i]); // draw the selected Icon allways on top - break; - } - } -} - -void rockout(int f) { - - - HaltGui(); - int num=(f==2?-1:gameSelected); - - char imgPath[100]; - if ((!(strcasestr(get_title(&gameList[num]),"guitar")|| - strcasestr(get_title(&gameList[num]),"band")|| - strcasestr(get_title(&gameList[num]),"rock")|| - f==1))||mountMethod) { - for (int i = 0; i < 4; i++) - delete pointer[i]; - snprintf(imgPath, sizeof(imgPath), "%splayer1_point.png", CFG.theme_path); - pointer[0] = new GuiImageData(imgPath, player1_point_png); - snprintf(imgPath, sizeof(imgPath), "%splayer2_point.png", CFG.theme_path); - pointer[1] = new GuiImageData(imgPath, player2_point_png); - snprintf(imgPath, sizeof(imgPath), "%splayer3_point.png", CFG.theme_path); - pointer[2] = new GuiImageData(imgPath, player3_point_png); - snprintf(imgPath, sizeof(imgPath), "%splayer4_point.png", CFG.theme_path); - pointer[3] = new GuiImageData(imgPath, player4_point_png); - } else { - - for (int i = 0; i < 4; i++) - delete pointer[i]; - snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path); - pointer[0] = new GuiImageData(imgPath, rplayer1_point_png); - snprintf(imgPath, sizeof(imgPath), "%srplayer2_point.png", CFG.theme_path); - pointer[1] = new GuiImageData(imgPath, rplayer2_point_png); - snprintf(imgPath, sizeof(imgPath), "%srplayer3_point.png", CFG.theme_path); - pointer[2] = new GuiImageData(imgPath, rplayer3_point_png); - snprintf(imgPath, sizeof(imgPath), "%srplayer4_point.png", CFG.theme_path); - pointer[3] = new GuiImageData(imgPath, rplayer4_point_png); - } - ResumeGui(); -} +#include "menus.h" +#include "fatmounter.h" +#include "usbloader/wdvd.h" +#include "usbloader/getentries.h" +#include "usbloader/wbfs.h" +#include "patches/fst.h" +#include "network/networkops.h" +#include "prompts/gameinfo.h" +#include "prompts/DiscBrowser.h" +#include "settings/Settings.h" +#include "wpad.h" +#include "sys.h" + +#include "libwiigui/gui_gamebrowser.h" +#include "libwiigui/gui_gamegrid.h" +#include "libwiigui/gui_gamecarousel.h" +#include "libwiigui/gui_searchbar.h" + +#define MAX_CHARACTERS 38 +extern u8 * gameScreenTex; +extern struct discHdr *dvdheader; +extern u8 mountMethod; +extern int load_from_fs; +extern s32 gameSelected; +extern GuiText * GameIDTxt; +extern GuiText * GameRegionTxt; +extern const u8 data1; +extern FreeTypeGX *fontClock; +extern bool updateavailable; +extern int cntMissFiles; +extern GuiImageData * cover; +extern GuiImage * coverImg; +extern GuiImageData * pointer[4]; +extern bool altdoldefault; +extern GuiImage * bgImg; + +GuiButton *Toolbar[9]; +int idiotFlag=-1; +char idiotChar[50]; + +void DiscListWinUpdateCallback(void * e); +void rockout(int f = 0); + +static u32 startat = 0; + +/**************************************************************************** + * MenuDiscList + ***************************************************************************/ +int MenuDiscList() { + + gprintf("\nMenuDiscList()"); + //TakeScreenshot("SD:/screenshot1.png"); + __Menu_GetEntries(); + int offset = MIN(startat,gameCnt-1); + startat = offset; + //gprintf("\n\tstartat:%d offset:%d",startat,offset); + int datag = 0; + int datagB =0; + int dataed = -1; + int cosa=0,sina=0; + int selectImg1 = 0; + char ID[4]; + char IDfull[7]; + u32 covert = 0; + char imgPath[100]; + if (!dvdheader) + dvdheader = new struct discHdr; + u8 mountMethodOLD =0; + + WDVD_GetCoverStatus(&covert); + u32 covertOld=covert; + + f32 freespace, used, size = 0.0; + wchar_t searchChar; + //SCREENSAVER + int check = 0; //to skip the first cycle when wiimote isn't completely connected + + datagB=0; + int menu = MENU_NONE, dataef=0; + + + u32 nolist; + char text[MAX_CHARACTERS + 4]; + int choice = 0, selectedold = 100; + s32 ret; + + //CLOCK + struct tm * timeinfo; + char theTime[80]=""; + time_t lastrawtime=0; + + if (mountMethod != 3 && load_from_fs == PART_FS_WBFS) { + WBFS_DiskSpace(&used, &freespace); + } + + if (!gameCnt) { //if there is no list of games to display + nolist = 1; + } + + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); + // because destroy GuiSound must wait while sound playing is finished, we use a global sound + if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + // GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + + snprintf(imgPath, sizeof(imgPath), "%sbutton_install.png", CFG.theme_path); + GuiImageData btnInstall(imgPath, button_install_png); + snprintf(imgPath, sizeof(imgPath), "%sbutton_install_over.png", CFG.theme_path); + GuiImageData btnInstallOver(imgPath, button_install_over_png); + + snprintf(imgPath, sizeof(imgPath), "%ssettings_button.png", CFG.theme_path); + GuiImageData btnSettings(imgPath, settings_button_png); + snprintf(imgPath, sizeof(imgPath), "%ssettings_button_over.png", CFG.theme_path); + GuiImageData btnSettingsOver(imgPath, settings_button_over_png); + GuiImageData dataID(&data1); + + snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff.png", CFG.theme_path); + GuiImageData btnpwroff(imgPath, wiimote_poweroff_png); + snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff_over.png", CFG.theme_path); + GuiImageData btnpwroffOver(imgPath, wiimote_poweroff_over_png); + snprintf(imgPath, sizeof(imgPath), "%smenu_button.png", CFG.theme_path); + GuiImageData btnhome(imgPath, menu_button_png); + snprintf(imgPath, sizeof(imgPath), "%smenu_button_over.png", CFG.theme_path); + GuiImageData btnhomeOver(imgPath, menu_button_over_png); + snprintf(imgPath, sizeof(imgPath), "%sSDcard_over.png", CFG.theme_path); + GuiImageData btnsdcardOver(imgPath, sdcard_over_png); + snprintf(imgPath, sizeof(imgPath), "%sSDcard.png", CFG.theme_path); + GuiImageData btnsdcard(imgPath, sdcard_png); + + + snprintf(imgPath, sizeof(imgPath), "%sfavIcon.png", CFG.theme_path); + GuiImageData imgfavIcon(imgPath, favIcon_png); + snprintf(imgPath, sizeof(imgPath), "%sfavIcon_gray.png", CFG.theme_path); + GuiImageData imgfavIcon_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%ssearchIcon.png", CFG.theme_path); + GuiImageData imgsearchIcon(imgPath, searchIcon_png); + snprintf(imgPath, sizeof(imgPath), "%ssearchIcon_gray.png", CFG.theme_path); + GuiImageData imgsearchIcon_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%sabcIcon.png", CFG.theme_path); + GuiImageData imgabcIcon(imgPath, abcIcon_png); + snprintf(imgPath, sizeof(imgPath), "%sabcIcon_gray.png", CFG.theme_path); + GuiImageData imgabcIcon_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%srankIcon.png", CFG.theme_path); + GuiImageData imgrankIcon(imgPath, rankIcon_png); + snprintf(imgPath, sizeof(imgPath), "%srankIcon_gray.png", CFG.theme_path); + GuiImageData imgrankIcon_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%splayCountIcon.png", CFG.theme_path); + GuiImageData imgplayCountIcon(imgPath, playCountIcon_png); + snprintf(imgPath, sizeof(imgPath), "%splayCountIcon_gray.png", CFG.theme_path); + GuiImageData imgplayCountIcon_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid.png", CFG.theme_path); + GuiImageData imgarrangeGrid(imgPath, arrangeGrid_png); + snprintf(imgPath, sizeof(imgPath), "%sarrangeGrid_gray.png", CFG.theme_path); + GuiImageData imgarrangeGrid_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%sarrangeList.png", CFG.theme_path); + GuiImageData imgarrangeList(imgPath, arrangeList_png); + snprintf(imgPath, sizeof(imgPath), "%sarrangeList_gray.png", CFG.theme_path); + GuiImageData imgarrangeList_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%sarrangeCarousel.png", CFG.theme_path); + GuiImageData imgarrangeCarousel(imgPath, arrangeCarousel_png); + snprintf(imgPath, sizeof(imgPath), "%sarrangeCarousel_gray.png", CFG.theme_path); + GuiImageData imgarrangeCarousel_gray(imgPath, NULL); + + snprintf(imgPath, sizeof(imgPath), "%slock.png", CFG.theme_path); + GuiImageData imgLock(imgPath, lock_png); + snprintf(imgPath, sizeof(imgPath), "%slock_gray.png", CFG.theme_path); + GuiImageData imgLock_gray(imgPath, NULL); + snprintf(imgPath, sizeof(imgPath), "%sunlock.png", CFG.theme_path); + GuiImageData imgUnlock(imgPath, unlock_png); + snprintf(imgPath, sizeof(imgPath), "%sunlock_gray.png", CFG.theme_path); + GuiImageData imgUnlock_gray(imgPath, NULL); + + snprintf(imgPath, sizeof(imgPath), "%sdvd.png", CFG.theme_path); + GuiImageData imgdvd(imgPath, dvd_png); + snprintf(imgPath, sizeof(imgPath), "%sdvd_gray.png", CFG.theme_path); + GuiImageData imgdvd_gray(imgPath, NULL); + + snprintf(imgPath, sizeof(imgPath), "%sbrowser.png", CFG.theme_path); + GuiImageData homebrewImgData(imgPath, browser_png); + snprintf(imgPath, sizeof(imgPath), "%sbrowser_over.png", CFG.theme_path); + GuiImageData homebrewImgDataOver(imgPath, browser_over_png); + + + GuiTrigger trigA; + trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + GuiTrigger trigHome; + trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, PAD_BUTTON_START); + GuiTrigger trig2; + trig2.SetButtonOnlyTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_X, 0); + GuiTrigger trig1; + trig1.SetButtonOnlyTrigger(-1, WPAD_BUTTON_1 | WPAD_CLASSIC_BUTTON_Y, 0); + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); + + char spaceinfo[30]; + if (load_from_fs != PART_FS_WBFS) { + memset(spaceinfo, 0, 30); + } else { + if (!strcmp(Settings.db_language,"JA")) { + // needs to be "total...used" for Japanese + sprintf(spaceinfo,(mountMethod!=3?"%.2fGB %s %.2fGB %s":" "),(freespace+used),tr("of"),freespace,tr("free")); + } else { + sprintf(spaceinfo,(mountMethod!=3?"%.2fGB %s %.2fGB %s":" "),freespace,tr("of"),(freespace+used),tr("free")); + } + } + GuiText usedSpaceTxt(spaceinfo, 18, THEME.info); + usedSpaceTxt.SetAlignment(THEME.hddinfo_align, ALIGN_TOP); + usedSpaceTxt.SetPosition(THEME.hddinfo_x, THEME.hddinfo_y); + + char GamesCnt[15]; + sprintf(GamesCnt,"%s: %i",(mountMethod!=3?tr("Games"):tr("Channels")), gameCnt); + GuiText gamecntTxt(GamesCnt, 18, THEME.info); + + GuiButton gamecntBtn(100,18); + gamecntBtn.SetAlignment(THEME.gamecount_align, ALIGN_TOP); + gamecntBtn.SetPosition(THEME.gamecount_x,THEME.gamecount_y); + gamecntBtn.SetLabel(&gamecntTxt); + gamecntBtn.SetEffectGrow(); + gamecntBtn.SetTrigger(&trigA); + + GuiTooltip installBtnTT(tr("Install a game")); + if (Settings.wsprompt == yes) + installBtnTT.SetWidescreen(CFG.widescreen); + installBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage installBtnImg(&btnInstall); + GuiImage installBtnImgOver(&btnInstallOver); + installBtnImg.SetWidescreen(CFG.widescreen); + installBtnImgOver.SetWidescreen(CFG.widescreen); + + GuiButton installBtn(&installBtnImg, &installBtnImgOver, ALIGN_LEFT, ALIGN_TOP, THEME.install_x, THEME.install_y, &trigA, &btnSoundOver, btnClick2, 1, &installBtnTT,24,-30, 0,5); + + + GuiTooltip settingsBtnTT(tr("Settings")); + if (Settings.wsprompt == yes) + settingsBtnTT.SetWidescreen(CFG.widescreen); + settingsBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage settingsBtnImg(&btnSettings); + settingsBtnImg.SetWidescreen(CFG.widescreen); + GuiImage settingsBtnImgOver(&btnSettingsOver); + settingsBtnImgOver.SetWidescreen(CFG.widescreen); + GuiButton settingsBtn(&settingsBtnImg,&settingsBtnImgOver, 0, 3, THEME.setting_x, THEME.setting_y, &trigA, &btnSoundOver, btnClick2,1,&settingsBtnTT,65,-30,0,5); + + GuiTooltip homeBtnTT(tr("Back to HBC or Wii Menu")); + if (Settings.wsprompt == yes) + homeBtnTT.SetWidescreen(CFG.widescreen); + settingsBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage homeBtnImg(&btnhome); + homeBtnImg.SetWidescreen(CFG.widescreen); + GuiImage homeBtnImgOver(&btnhomeOver); + homeBtnImgOver.SetWidescreen(CFG.widescreen); + GuiButton homeBtn(&homeBtnImg,&homeBtnImgOver, 0, 3, THEME.home_x, THEME.home_y, &trigA, &btnSoundOver, btnClick2,1,&homeBtnTT,15,-30,1,5); + homeBtn.RemoveSoundClick(); + homeBtn.SetTrigger(&trigHome); + + GuiTooltip poweroffBtnTT(tr("Power off the Wii")); + if (Settings.wsprompt == yes) + poweroffBtnTT.SetWidescreen(CFG.widescreen); + poweroffBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage poweroffBtnImg(&btnpwroff); + GuiImage poweroffBtnImgOver(&btnpwroffOver); + poweroffBtnImg.SetWidescreen(CFG.widescreen); + poweroffBtnImgOver.SetWidescreen(CFG.widescreen); + GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, btnClick2,1,&poweroffBtnTT,-10,-30,1,5); + + GuiTooltip sdcardBtnTT(tr("Reload SD")); + if (Settings.wsprompt == yes) + sdcardBtnTT.SetWidescreen(CFG.widescreen); + sdcardBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage sdcardImg(&btnsdcard); + GuiImage sdcardImgOver(&btnsdcardOver); + sdcardImg.SetWidescreen(CFG.widescreen); + sdcardImgOver.SetWidescreen(CFG.widescreen); + GuiButton sdcardBtn(&sdcardImg,&sdcardImgOver, 0, 3, THEME.sdcard_x, THEME.sdcard_y, &trigA, &btnSoundOver, btnClick2,1,&sdcardBtnTT,15,-30,0,5); + + GuiButton gameInfo(0,0); + gameInfo.SetTrigger(&trig2); + gameInfo.SetSoundClick(btnClick2); + + + GuiImage wiiBtnImg(&dataID); + wiiBtnImg.SetWidescreen(CFG.widescreen); + GuiButton wiiBtn(&wiiBtnImg,&wiiBtnImg, 0, 4, 0, -10, &trigA, &btnSoundOver, btnClick2,0); + + GuiTooltip favoriteBtnTT(tr("Display favorites")); + if (Settings.wsprompt == yes) + favoriteBtnTT.SetWidescreen(CFG.widescreen); + favoriteBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage favoriteBtnImg(&imgfavIcon); + favoriteBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage favoriteBtnImg_g(favoriteBtnImg);favoriteBtnImg_g.SetGrayscale(); + GuiImage favoriteBtnImg_g(&imgfavIcon_gray); + if(favoriteBtnImg_g.GetImage() == NULL) { favoriteBtnImg_g = favoriteBtnImg; favoriteBtnImg_g.SetGrayscale();} + favoriteBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton favoriteBtn(&favoriteBtnImg_g,&favoriteBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_favorite_x, THEME.gamelist_favorite_y, &trigA, &btnSoundOver, btnClick2,1, &favoriteBtnTT, -15, 52, 0, 3); + favoriteBtn.SetAlpha(180); + + GuiTooltip searchBtnTT(tr("Set Search-Filter")); + if (Settings.wsprompt == yes) + searchBtnTT.SetWidescreen(CFG.widescreen); + searchBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage searchBtnImg(&imgsearchIcon); + searchBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage searchBtnImg_g(searchBtnImg); searchBtnImg_g.SetGrayscale(); + GuiImage searchBtnImg_g(&imgsearchIcon_gray); + if(searchBtnImg_g.GetImage() == NULL) { searchBtnImg_g = searchBtnImg; searchBtnImg_g.SetGrayscale();} + searchBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton searchBtn(&searchBtnImg_g,&searchBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_search_x, THEME.gamelist_search_y, &trigA, &btnSoundOver, btnClick2,1, &searchBtnTT, -15, 52, 0, 3); + searchBtn.SetAlpha(180); + + GuiTooltip abcBtnTT(Settings.fave ? tr("Sort by rank") : tr("Sort alphabetically")); + if (Settings.wsprompt == yes) + abcBtnTT.SetWidescreen(CFG.widescreen); + abcBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage abcBtnImg(Settings.fave ? &imgrankIcon : &imgabcIcon); + abcBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage abcBtnImg_g(abcBtnImg); abcBtnImg_g.SetGrayscale(); + GuiImage abcBtnImg_g(Settings.fave ? &imgrankIcon_gray : &imgabcIcon_gray); + if(abcBtnImg_g.GetImage() == NULL) { abcBtnImg_g = abcBtnImg; abcBtnImg_g.SetGrayscale();} + abcBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton abcBtn(&abcBtnImg_g,&abcBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_abc_x, THEME.gamelist_abc_y, &trigA, &btnSoundOver, btnClick2,1,&abcBtnTT, -15, 52, 0, 3); + abcBtn.SetAlpha(180); + + GuiTooltip countBtnTT(tr("Sort order by most played")); + if (Settings.wsprompt == yes) + countBtnTT.SetWidescreen(CFG.widescreen); + countBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage countBtnImg(&imgplayCountIcon); + countBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage countBtnImg_g(countBtnImg); countBtnImg_g.SetGrayscale(); + GuiImage countBtnImg_g(&imgplayCountIcon_gray); + if(countBtnImg_g.GetImage() == NULL) { countBtnImg_g = countBtnImg; countBtnImg_g.SetGrayscale();} + countBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton countBtn(&countBtnImg_g,&countBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_count_x, THEME.gamelist_count_y, &trigA, &btnSoundOver, btnClick2,1, &countBtnTT, -15, 52, 0, 3); + countBtn.SetAlpha(180); + + GuiTooltip listBtnTT(tr("Display as a list")); + if (Settings.wsprompt == yes) + listBtnTT.SetWidescreen(CFG.widescreen); + listBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage listBtnImg(&imgarrangeList); + listBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage listBtnImg_g(listBtnImg); listBtnImg_g.SetGrayscale(); + GuiImage listBtnImg_g(&imgarrangeList_gray); + if(listBtnImg_g.GetImage() == NULL) { listBtnImg_g = listBtnImg; listBtnImg_g.SetGrayscale();} + listBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton listBtn(&listBtnImg_g,&listBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_list_x, THEME.gamelist_list_y, &trigA, &btnSoundOver, btnClick2,1, &listBtnTT, 15, 52, 1, 3); + listBtn.SetAlpha(180); + + GuiTooltip gridBtnTT(tr("Display as a grid")); + if (Settings.wsprompt == yes) + gridBtnTT.SetWidescreen(CFG.widescreen); + gridBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage gridBtnImg(&imgarrangeGrid); + gridBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage gridBtnImg_g(gridBtnImg); gridBtnImg_g.SetGrayscale(); + GuiImage gridBtnImg_g(&imgarrangeGrid_gray); + if(gridBtnImg_g.GetImage() == NULL) { gridBtnImg_g = gridBtnImg; gridBtnImg_g.SetGrayscale();} + gridBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton gridBtn(&gridBtnImg_g,&gridBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_grid_x, THEME.gamelist_grid_y, &trigA, &btnSoundOver, btnClick2,1, &gridBtnTT, 15, 52, 1, 3); + gridBtn.SetAlpha(180); + + GuiTooltip carouselBtnTT(tr("Display as a carousel")); + if (Settings.wsprompt == yes) + carouselBtnTT.SetWidescreen(CFG.widescreen); + carouselBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage carouselBtnImg(&imgarrangeCarousel); + carouselBtnImg.SetWidescreen(CFG.widescreen); +// GuiImage carouselBtnImg_g(carouselBtnImg); carouselBtnImg_g.SetGrayscale(); + GuiImage carouselBtnImg_g(&imgarrangeCarousel_gray); + if(carouselBtnImg_g.GetImage() == NULL) { carouselBtnImg_g = carouselBtnImg; carouselBtnImg_g.SetGrayscale();} + carouselBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton carouselBtn(&carouselBtnImg_g,&carouselBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_carousel_x, THEME.gamelist_carousel_y, &trigA, &btnSoundOver, btnClick2,1, &carouselBtnTT, 15, 52, 1, 3); + carouselBtn.SetAlpha(180); + + bool canUnlock = (Settings.parentalcontrol == 0 && Settings.parental.enabled == 1); + + GuiTooltip lockBtnTT(canUnlock ? tr("Unlock Parental Control") : tr("Parental Control disabled")); + if (Settings.wsprompt == yes) + lockBtnTT.SetWidescreen(CFG.widescreen); + lockBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage lockBtnImg(&imgLock); + lockBtnImg.SetWidescreen(CFG.widescreen); + GuiImage lockBtnImg_g(&imgLock_gray); + if(lockBtnImg_g.GetImage() == NULL) { lockBtnImg_g = lockBtnImg; lockBtnImg_g.SetGrayscale(); } + lockBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton lockBtn(&lockBtnImg_g, &lockBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_lock_x, THEME.gamelist_lock_y, &trigA, &btnSoundOver, btnClick2,1, &lockBtnTT, 15, 52, 1, 3); + lockBtn.SetAlpha(180); + + GuiTooltip unlockBtnTT(tr("Enable Parental Control")); + if (Settings.wsprompt == yes) + unlockBtnTT.SetWidescreen(CFG.widescreen); + unlockBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage unlockBtnImg(&imgUnlock); + unlockBtnImg.SetWidescreen(CFG.widescreen); + GuiImage unlockBtnImg_g(&imgUnlock_gray); + if(unlockBtnImg_g.GetImage() == NULL) { unlockBtnImg_g = unlockBtnImg; unlockBtnImg_g.SetGrayscale(); } + unlockBtnImg_g.SetWidescreen(CFG.widescreen); + + if (canUnlock && Settings.godmode) + { + lockBtn.SetImage(&unlockBtnImg_g); + lockBtn.SetImageOver(&unlockBtnImg_g); + lockBtn.SetToolTip(&unlockBtnTT, 15, 52, 1, 3); + } + +/* + GuiButton unlockBtn(&unlockBtnImg_g, &unlockBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_lock_x, THEME.gamelist_lock_y, &trigA, &btnSoundOver, btnClick2,1, &lockBtnTT, 15, 52, 1, 3); + unlockBtn.SetAlpha(180); +*/ + + GuiTooltip dvdBtnTT(tr("Mount DVD drive")); + if (Settings.wsprompt == yes) + dvdBtnTT.SetWidescreen(CFG.widescreen); + dvdBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage dvdBtnImg(&imgdvd); + dvdBtnImg.SetWidescreen(CFG.widescreen); + GuiImage dvdBtnImg_g(dvdBtnImg); //dvdBtnImg_g.SetGrayscale(); +// GuiImage carouselBtnImg_g(&imgarrangeCarousel_gray); + dvdBtnImg_g.SetWidescreen(CFG.widescreen); + GuiButton dvdBtn(&dvdBtnImg_g,&dvdBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_dvd_x, THEME.gamelist_dvd_y, &trigA, &btnSoundOver, btnClick2,1, &dvdBtnTT, 15, 52, 1, 3); + dvdBtn.SetAlpha(180); + + GuiTooltip homebrewBtnTT(tr("Homebrew Launcher")); + if (Settings.wsprompt == yes) + homebrewBtnTT.SetWidescreen(CFG.widescreen); + homebrewBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiImage homebrewImg(&homebrewImgData); + GuiImage homebrewImgOver(&homebrewImgDataOver); + homebrewImg.SetWidescreen(CFG.widescreen); + homebrewImgOver.SetWidescreen(CFG.widescreen); + GuiButton homebrewBtn(&homebrewImg,&homebrewImgOver, ALIGN_LEFT, ALIGN_TOP, THEME.homebrew_x, THEME.homebrew_y, &trigA, &btnSoundOver, btnClick2,1,&homebrewBtnTT,15,-30,1,5); + + if (Settings.fave) { + favoriteBtn.SetImage(&favoriteBtnImg); + favoriteBtn.SetImageOver(&favoriteBtnImg); + favoriteBtn.SetAlpha(255); + } + static bool show_searchwindow = false; + if(gameFilter && *gameFilter) + { + if(show_searchwindow && gameCnt==1) + show_searchwindow = false; + if(!show_searchwindow) + searchBtn.SetEffect(EFFECT_PULSE, 10, 105); + searchBtn.SetImage(&searchBtnImg); + searchBtn.SetImageOver(&searchBtnImg); + searchBtn.SetAlpha(255); + } + if (Settings.sort==all) { + abcBtn.SetImage(&abcBtnImg); + abcBtn.SetImageOver(&abcBtnImg); + abcBtn.SetAlpha(255); + } else if (Settings.sort==pcount) { + countBtn.SetImage(&countBtnImg); + countBtn.SetImageOver(&countBtnImg); + countBtn.SetAlpha(255); + } + if (Settings.gameDisplay==list) { + listBtn.SetImage(&listBtnImg); + listBtn.SetImageOver(&listBtnImg); + listBtn.SetAlpha(255); + } else if (Settings.gameDisplay==grid) { + gridBtn.SetImage(&gridBtnImg); + gridBtn.SetImageOver(&gridBtnImg); + gridBtn.SetAlpha(255); + } else if (Settings.gameDisplay==carousel) { + carouselBtn.SetImage(&carouselBtnImg); + carouselBtn.SetImageOver(&carouselBtnImg); + carouselBtn.SetAlpha(255); + } + + if (Settings.gameDisplay==list) { + favoriteBtn.SetPosition(THEME.gamelist_favorite_x, THEME.gamelist_favorite_y); + searchBtn.SetPosition(THEME.gamelist_search_x, THEME.gamelist_search_y); + abcBtn.SetPosition(THEME.gamelist_abc_x, THEME.gamelist_abc_y); + countBtn.SetPosition(THEME.gamelist_count_x, THEME.gamelist_count_y); + listBtn.SetPosition(THEME.gamelist_list_x, THEME.gamelist_list_y); + gridBtn.SetPosition(THEME.gamelist_grid_x, THEME.gamelist_grid_y); + carouselBtn.SetPosition(THEME.gamelist_carousel_x, THEME.gamelist_carousel_y); + lockBtn.SetPosition(THEME.gamelist_lock_x, THEME.gamelist_lock_y); + dvdBtn.SetPosition(THEME.gamelist_dvd_x, THEME.gamelist_dvd_y); + } else if(Settings.gameDisplay==grid) { + favoriteBtn.SetPosition(THEME.gamegrid_favorite_x, THEME.gamegrid_favorite_y); + searchBtn.SetPosition(THEME.gamegrid_search_x, THEME.gamegrid_search_y); + abcBtn.SetPosition(THEME.gamegrid_abc_x, THEME.gamegrid_abc_y); + countBtn.SetPosition(THEME.gamegrid_count_x, THEME.gamegrid_count_y); + listBtn.SetPosition(THEME.gamegrid_list_x, THEME.gamegrid_list_y); + gridBtn.SetPosition(THEME.gamegrid_grid_x, THEME.gamegrid_grid_y); + carouselBtn.SetPosition(THEME.gamegrid_carousel_x, THEME.gamegrid_carousel_y); + lockBtn.SetPosition(THEME.gamegrid_lock_x, THEME.gamegrid_lock_y); + dvdBtn.SetPosition(THEME.gamegrid_dvd_x, THEME.gamegrid_dvd_y); + } else if(Settings.gameDisplay==carousel) { + favoriteBtn.SetPosition(THEME.gamecarousel_favorite_x, THEME.gamecarousel_favorite_y); + searchBtn.SetPosition(THEME.gamecarousel_search_x, THEME.gamecarousel_favorite_y); + abcBtn.SetPosition(THEME.gamecarousel_abc_x, THEME.gamecarousel_abc_y); + countBtn.SetPosition(THEME.gamecarousel_count_x, THEME.gamecarousel_count_y); + listBtn.SetPosition(THEME.gamecarousel_list_x, THEME.gamecarousel_list_y); + gridBtn.SetPosition(THEME.gamecarousel_grid_x, THEME.gamecarousel_grid_y); + carouselBtn.SetPosition(THEME.gamecarousel_carousel_x, THEME.gamecarousel_carousel_y); + lockBtn.SetPosition(THEME.gamecarousel_lock_x, THEME.gamecarousel_lock_y); + dvdBtn.SetPosition(THEME.gamecarousel_dvd_x, THEME.gamecarousel_dvd_y); + } + + + //Downloading Covers + GuiTooltip DownloadBtnTT(tr("Click to Download Covers")); + if (Settings.wsprompt == yes) + DownloadBtnTT.SetWidescreen(CFG.widescreen); + DownloadBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiButton DownloadBtn(0,0); + DownloadBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + DownloadBtn.SetPosition(THEME.covers_x,THEME.covers_y); + + GuiTooltip IDBtnTT(tr("Click to change game ID")); + if (Settings.wsprompt == yes) + IDBtnTT.SetWidescreen(CFG.widescreen); + IDBtnTT.SetAlpha(THEME.tooltipAlpha); + GuiButton idBtn(0,0); + idBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + idBtn.SetPosition(THEME.id_x,THEME.id_y); + + if (Settings.godmode == 1 && mountMethod!=3) {//only make the button have trigger & tooltip if in godmode + DownloadBtn.SetSoundOver(&btnSoundOver); + DownloadBtn.SetTrigger(&trigA); + DownloadBtn.SetTrigger(&trig1); + DownloadBtn.SetToolTip(&DownloadBtnTT,205,-30); + + idBtn.SetSoundOver(&btnSoundOver); + idBtn.SetTrigger(&trigA); + idBtn.SetToolTip(&IDBtnTT,205,-30); + + } else + { + DownloadBtn.SetRumble(false); + idBtn.SetRumble(false); + } + + GuiGameBrowser * gameBrowser = NULL; + GuiGameGrid * gameGrid = NULL; + GuiGameCarousel * gameCarousel = NULL; + if (Settings.gameDisplay==list) { + gameBrowser = new GuiGameBrowser(THEME.gamelist_w, THEME.gamelist_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); + gameBrowser->SetPosition(THEME.gamelist_x, THEME.gamelist_y); + gameBrowser->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); + } else if (Settings.gameDisplay==grid) { + gameGrid = new GuiGameGrid(THEME.gamegrid_w,THEME.gamegrid_h, gameList, gameCnt, CFG.theme_path, bg_options_png, 0, 0); + gameGrid->SetPosition(THEME.gamegrid_x,THEME.gamegrid_y); + gameGrid->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); + } else if (Settings.gameDisplay==carousel) { + //GuiGameCarousel gameCarousel(THEME.gamecarousel_w, THEME.gamecarousel_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); + gameCarousel = new GuiGameCarousel(640, 400, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); + gameCarousel->SetPosition(THEME.gamecarousel_x,THEME.gamecarousel_y); + gameCarousel->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); + } + + GuiText clockTimeBack("88:88", 40, (GXColor) {THEME.clock.r, THEME.clock.g, THEME.clock.b, THEME.clock.a/6}); + clockTimeBack.SetAlignment(THEME.clock_align, ALIGN_TOP); + clockTimeBack.SetPosition(THEME.clock_x, THEME.clock_y); + clockTimeBack.SetFont(fontClock); + GuiText clockTime(theTime, 40, THEME.clock); + clockTime.SetAlignment(THEME.clock_align, ALIGN_TOP); + clockTime.SetPosition(THEME.clock_x, THEME.clock_y); + clockTime.SetFont(fontClock); + + HaltGui(); + GuiWindow w(screenwidth, screenheight); + + if (THEME.show_hddinfo == -1 || THEME.show_hddinfo == 1) { //force show hdd info + w.Append(&usedSpaceTxt); + } + if (THEME.show_gamecount == -1 || THEME.show_gamecount == 1) { //force show game cnt info + w.Append(&gamecntBtn); + } + w.Append(&sdcardBtn); + w.Append(&poweroffBtn); + w.Append(&gameInfo); + if (Settings.godmode && load_from_fs != PART_FS_NTFS) + w.Append(&installBtn); + w.Append(&homeBtn); + w.Append(&settingsBtn); + w.Append(&DownloadBtn); + w.Append(&idBtn); + w.Append(&screenShotBtn); + + + // Begin Toolbar + w.Append(&favoriteBtn); + Toolbar[0] = &favoriteBtn; + w.Append(&searchBtn); + Toolbar[1] = &searchBtn; + w.Append(&abcBtn); + Toolbar[2] = &abcBtn; + w.Append(&countBtn); + Toolbar[3] = &countBtn; + w.Append(&listBtn); + Toolbar[4] = &listBtn; + w.Append(&gridBtn); + Toolbar[5] = &gridBtn; + w.Append(&carouselBtn); + Toolbar[6] = &carouselBtn; + w.Append(&lockBtn); + Toolbar[7] = &lockBtn; + w.Append(&dvdBtn); + Toolbar[8] = &dvdBtn; + w.SetUpdateCallback(DiscListWinUpdateCallback); + // End Toolbar + + + + if (Settings.godmode == 1) + w.Append(&homebrewBtn); + + if ((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) { + w.Append(&clockTimeBack); + w.Append(&clockTime); + } + + if (Settings.gameDisplay==list) { + mainWindow->Append(gameBrowser); + } + if (Settings.gameDisplay==grid) { + mainWindow->Append(gameGrid); + } + if (Settings.gameDisplay==carousel) { + mainWindow->Append(gameCarousel); + } + mainWindow->Append(&w); + + GuiSearchBar *searchBar=NULL; + if(show_searchwindow) { + searchBar = new GuiSearchBar(gameFilterNextList); + if(searchBar) + mainWindow->Append(searchBar); + } + + ResumeGui(); + +// ShowMemInfo(); + + while (menu == MENU_NONE) { + + if (idiotFlag==1) { + gprintf("\n\tIdiot flag"); + char idiotBuffer[200]; + snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), + idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4.")); + + int deleteImg = WindowPrompt(0,idiotBuffer,tr("OK"),tr("Delete")); + if (deleteImg==0) { + snprintf(idiotBuffer, sizeof(idiotBuffer), "%s %s.",tr("You are about to delete "), idiotChar); + deleteImg = WindowPrompt(tr("Confirm"),idiotBuffer,tr("Delete"),tr("Cancel")); + if (deleteImg==1) { + remove(idiotChar); + } + } + idiotFlag=-1; + } + + WDVD_GetCoverStatus(&covert);//for detecting if i disc has been inserted + + // if the idiot is showing favorites and don't have any + if (Settings.fave && !gameCnt) { + WindowPrompt(tr("No Favorites"),tr("You are choosing to display favorites and you do not have any selected."),tr("Back")); + Settings.fave=!Settings.fave; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + __Menu_GetEntries(); + menu = MENU_DISCLIST; + break; + } + + //CLOCK + time_t rawtime = time(0); //this fixes code dump caused by the clock + if (((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) && rawtime != lastrawtime) { + lastrawtime = rawtime; + timeinfo = localtime (&rawtime); + if (dataed < 1) { + if (Settings.hddinfo == hr12) { + if (rawtime & 1) + strftime(theTime, sizeof(theTime), "%I:%M", timeinfo); + else + strftime(theTime, sizeof(theTime), "%I %M", timeinfo); + } + if (Settings.hddinfo == hr24) { + if (rawtime & 1) + strftime(theTime, sizeof(theTime), "%H:%M", timeinfo); + else + strftime(theTime, sizeof(theTime), "%H %M", timeinfo); + } + clockTime.SetText(theTime); + + } else if (dataed > 0) { + + clockTime.SetTextf("%i", (dataed-1)); + } + + } + + if ((datagB<1)&&(Settings.cios==1)&&(Settings.video == ntsc)&&(Settings.hddinfo == hr12)&&(Settings.qboot==1)&&(Settings.wsprompt==0)&&(Settings.language==ger)&&(Settings.tooltips==0)){dataed=1;dataef=1;}if (dataef==1){if (cosa>7){cosa=1;}datag++;if (sina==3){wiiBtn.SetAlignment(ALIGN_LEFT,ALIGN_BOTTOM);wiiBtnImg.SetAngle(0);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),((datag*2)-130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==2){wiiBtn.SetAlignment(ALIGN_RIGHT,ALIGN_TOP);wiiBtnImg.SetAngle(270);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((-2*(datag)+130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((2*(datag)-120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==1){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(180);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(2*(datag)-120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==0){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(90);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((2*(datag)-130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((-2*(datag)+120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}} + // respond to button presses + if (shutdown == 1) { + gprintf("\n\tshutdown"); + Sys_Shutdown(); + } + if (reset == 1) + Sys_Reboot(); + + if (updateavailable == true) { + gprintf("\n\tUpdate Available"); + HaltGui(); + GuiWindow ww(640,480); + w.SetState(STATE_DISABLED); + mainWindow->Append(&ww); + ResumeGui(); + ProgressUpdateWindow(); + updateavailable = false; + mainWindow->Remove(&ww); + w.SetState(STATE_DEFAULT); + menu = MENU_DISCLIST; + } + + if (poweroffBtn.GetState() == STATE_CLICKED) { + + + gprintf("\n\tpoweroffBtn clicked"); + choice = WindowPrompt(tr("How to Shutdown?"),0,tr("Full Shutdown"), tr("Shutdown to Idle"), tr("Cancel")); + if (choice == 2) { + Sys_ShutdownToIdel(); + } else if (choice == 1) { + Sys_ShutdownToStandby(); + } else { + poweroffBtn.ResetState(); + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } + + } else if (gamecntBtn.GetState() == STATE_CLICKED && mountMethod!=3) { + gprintf("\n\tgameCntBtn clicked"); + gamecntBtn.ResetState(); + char linebuf[150]; + snprintf(linebuf, sizeof(linebuf), "%s %sGameList ?",tr("Save Game List to"), Settings.update_path); + choice = WindowPrompt(0,linebuf,"TXT","CSV",tr("Back")); + if (choice) { + if (save_gamelist(choice-1)) + WindowPrompt(0,tr("Saved"),tr("OK")); + else + WindowPrompt(tr("Error"),tr("Could not save."),tr("OK")); + } + menu = MENU_DISCLIST; + break; + + } + else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + + + }else if (homeBtn.GetState() == STATE_CLICKED) { + gprintf("\n\thomeBtn clicked"); + bgMusic->Pause(); + choice = WindowExitPrompt(); + bgMusic->Resume(); + + if (choice == 3) { + Sys_LoadMenu(); // Back to System Menu + } else if (choice == 2) { + Sys_BackToLoader(); + } else { + homeBtn.ResetState(); + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } + + } else if (wiiBtn.GetState() == STATE_CLICKED) { + gprintf("\n\twiiBtn clicked"); + + dataed++; + wiiBtn.ResetState(); + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } else if (installBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tinstallBtn clicked"); + choice = WindowPrompt(tr("Install a game"),0,tr("Yes"),tr("No")); + if (choice == 1) { + menu = MENU_INSTALL; + break; + } else { + installBtn.ResetState(); + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } + }else if ((covert & 0x2)&&(covert!=covertOld)) { + gprintf("\n\tNew Disc Detected"); + choice = WindowPrompt(tr("New Disc Detected"),0,tr("Install"),tr("Mount DVD drive"),tr("Cancel")); + if (choice == 1) { + if (load_from_fs == PART_FS_NTFS) { + WindowPrompt(tr("Install not possible"), tr("You are using NTFS filesystem. Due to possible write errors to a NTFS partition, installing a game is not possible."), tr("OK")); + } else { + menu = MENU_INSTALL; + break; + } + } + else if (choice ==2) + { + dvdBtn.SetState(STATE_CLICKED); + }else { + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } + } + + else if (sdcardBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tsdCardBtn Clicked"); + SDCard_deInit(); + SDCard_Init(); + if (Settings.gameDisplay==list) { + startat = gameBrowser->GetSelectedOption(); + offset = gameBrowser->GetOffset(); + } else if (Settings.gameDisplay==grid) { + startat = gameGrid->GetSelectedOption(); + offset = gameGrid->GetOffset(); + } else if (Settings.gameDisplay==carousel) { + startat = gameCarousel->GetSelectedOption(); + offset = gameCarousel->GetOffset(); + } + if (isInserted(bootDevice)) { + HaltGui(); // to fix endless rumble when clicking on the SD icon when rumble is disabled because rumble is set to on in Global_Default() + CFG_Load(); + ResumeGui(); + } + sdcardBtn.ResetState(); + menu = MENU_DISCLIST; + break; + } + + else if (DownloadBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tDownloadBtn Clicked"); + if (isInserted(bootDevice)) { + choice = WindowPrompt(tr("Cover Download"), 0, tr("Normal Covers"), tr("3D Covers"), tr("Disc Images"), tr("Back")); // ask for download choice + if (choice != 0) { + int choice2 = choice; + bool missing; + missing = SearchMissingImages(choice2); + if (IsNetworkInit() == false && missing == true) { + WindowPrompt(tr("Network init error"), 0, tr("OK")); + } else { + if (GetMissingFiles() != NULL && cntMissFiles > 0) { + char tempCnt[40]; + sprintf(tempCnt,"%i %s",cntMissFiles,tr("Missing files")); + if (choice!=3)choice = WindowPrompt(tr("Download Boxart image?"),tempCnt,tr("Yes"),tr("No")); + else if (choice==3)choice = WindowPrompt(tr("Download Discart image?"),tempCnt,tr("Yes"),tr("No")); + if (choice == 1) { + ret = ProgressDownloadWindow(choice2); + if (ret == 0) { + WindowPrompt(tr("Download finished"),0,tr("OK")); + } else { + sprintf(tempCnt,"%i %s",ret,tr("files not found on the server!")); + WindowPrompt(tr("Download finished"),tempCnt,tr("OK")); + } + } + } + } + } + } else { + WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to download images."), tr("OK")); + } + menu = MENU_DISCLIST; + DownloadBtn.ResetState(); + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + }//end download + + else if (settingsBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tsettingsBtn Clicked"); + if (Settings.gameDisplay==list) { + startat = gameBrowser->GetSelectedOption(); + offset = gameBrowser->GetOffset(); + } else if (Settings.gameDisplay==grid) { + startat = gameGrid->GetSelectedOption(); + offset = gameGrid->GetOffset(); + } else if (Settings.gameDisplay==carousel) { + startat = gameCarousel->GetSelectedOption(); + offset = gameCarousel->GetOffset(); + } + menu = MENU_SETTINGS; + break; + + } + + else if (favoriteBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tfavoriteBtn Clicked"); + Settings.fave=!Settings.fave; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + __Menu_GetEntries(); + menu = MENU_DISCLIST; + break; + + } + + else if (searchBtn.GetState() == STATE_CLICKED && mountMethod!=3) { + + gprintf("\n\tsearchBtn Clicked"); + show_searchwindow=!show_searchwindow; + HaltGui(); + if(searchBar) + { + mainWindow->Remove(searchBar); + delete searchBar; + searchBar = NULL; + } + if(show_searchwindow) + { + if(gameFilter && *gameFilter) + { + searchBtn.StopEffect(); + searchBtn.SetEffectGrow(); + } + searchBar = new GuiSearchBar(gameFilterNextList); + if(searchBar) + mainWindow->Append(searchBar); + } + else + { + if(gameFilter && *gameFilter) + searchBtn.SetEffect(EFFECT_PULSE, 10, 105); + } + searchBtn.ResetState(); + ResumeGui(); + } + + else if (searchBar && (searchChar=searchBar->GetClicked())) { + if(searchChar > 27) + { + int len = gameFilter ? wcslen(gameFilter) : 0; + wchar_t newFilter[len+2]; + if(gameFilter) + wcscpy(newFilter, gameFilter); + newFilter[len] = searchChar; + newFilter[len+1] = 0; + + + __Menu_GetEntries(0, newFilter); + menu = MENU_DISCLIST; + break; + } + else if(searchChar == 7) // Close + { + show_searchwindow=false; + HaltGui(); + if(searchBar) + { + mainWindow->Remove(searchBar); + delete searchBar; + searchBar = NULL; + } + if(gameFilter && *gameFilter) + { + searchBtn.SetEffect(EFFECT_PULSE, 10, 105); + searchBtn.SetImage(&searchBtnImg); + searchBtn.SetImageOver(&searchBtnImg); + searchBtn.SetAlpha(255); + } + else + { + searchBtn.StopEffect(); + searchBtn.SetEffectGrow(); + searchBtn.SetImage(&searchBtnImg_g); + searchBtn.SetImageOver(&searchBtnImg_g); + searchBtn.SetAlpha(180); + } + + ResumeGui(); + } + else if(searchChar == 8) // Backspace + { + __Menu_GetEntries(0, gameFilterPrev); + menu = MENU_DISCLIST; + break; + } + + } + + else if (abcBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tabcBtn clicked"); + if (Settings.sort != all) { + Settings.sort=all; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + __Menu_GetEntries(); + + menu = MENU_DISCLIST; + break; + } + abcBtn.ResetState(); + } + + else if (countBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tcountBtn Clicked"); + if (Settings.sort != pcount) { + Settings.sort=pcount; + //if(isSdInserted()) { + if (isInserted(bootDevice)) { + cfg_save_global(); + } + __Menu_GetEntries(); + + menu = MENU_DISCLIST; + break; + } + countBtn.ResetState(); + + } + + else if (listBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tlistBtn Clicked"); + if (Settings.gameDisplay!=list) { + Settings.gameDisplay=list; + menu = MENU_DISCLIST; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + listBtn.ResetState(); + break; + } else { + listBtn.ResetState(); + } + } + + + else if (gridBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tgridBtn Clicked"); + if (Settings.gameDisplay!=grid) { + + Settings.gameDisplay=grid; + menu = MENU_DISCLIST; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + gridBtn.ResetState(); + break; + } else { + gridBtn.ResetState(); + } + } + + else if (carouselBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tcarouselBtn Clicked"); + if (Settings.gameDisplay!=carousel) { + Settings.gameDisplay=carousel; + menu = MENU_DISCLIST; + if (isInserted(bootDevice)) { + cfg_save_global(); + } + carouselBtn.ResetState(); + break; + } else { + carouselBtn.ResetState(); + } + } + else if (homebrewBtn.GetState() == STATE_CLICKED) { + gprintf("\n\thomebrewBtn Clicked"); + menu = MENU_HOMEBREWBROWSE; + break; + } + else if (gameInfo.GetState() == STATE_CLICKED && mountMethod!=3) { + gprintf("\n\tgameinfo Clicked"); + gameInfo.ResetState(); + if(selectImg1>=0 && selectImg1<(s32)gameCnt) { + gameSelected = selectImg1; + rockout(); + struct discHdr *header = &gameList[selectImg1]; + snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); + choice = showGameInfo(IDfull); + rockout(2); + if (choice==2) + homeBtn.SetState(STATE_CLICKED); + if (choice==3) { + menu = MENU_DISCLIST; + break; + } + } + } + else if (lockBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tlockBtn clicked"); + lockBtn.ResetState(); + if (!canUnlock) { + WindowPrompt(tr("Parental Control"), tr("You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings."), tr("OK")); + } else { + if (Settings.godmode) { + if (WindowPrompt(tr("Parental Control"), tr("Are you sure you want to enable Parent Control?"), tr("Yes"), tr("No")) == 1) { + Settings.godmode = 0; + lockBtn.SetImage(&lockBtnImg_g); + lockBtn.SetImageOver(&lockBtnImg_g); + lockBtn.SetToolTip(&lockBtnTT, 15, 52, 1, 3); + + // Retrieve the gamelist again + menu = MENU_DISCLIST; + break; + } + } else { + // Require the user to enter the PIN code + char pin[5]; + memset(&pin, 0, 5); + int ret = OnScreenNumpad((char *) &pin, 5); + + if (ret == 1) { + if (memcmp(pin, Settings.parental.pin, 4) == 0) { + Settings.godmode = 1; + lockBtn.SetImage(&unlockBtnImg_g); + lockBtn.SetImageOver(&unlockBtnImg_g); + lockBtn.SetToolTip(&unlockBtnTT, 15, 52, 1, 3); + + // Retrieve the gamelist again + menu = MENU_DISCLIST; + break; + } else { + WindowPrompt(tr("Parental Control"), tr("Invalid PIN code"), tr("OK")); + } + } + } + } + } + else if (dvdBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tdvdBtn Clicked"); + mountMethodOLD = (mountMethod==3?mountMethod:0); + + mountMethod=DiscMount(dvdheader); + dvdBtn.ResetState(); + + rockout(); + //break; + } + if (Settings.gameDisplay==grid) { + int selectimg; + DownloadBtn.SetSize(0,0); + selectimg = gameGrid->GetSelectedOption(); + gameSelected = gameGrid->GetClickedOption(); + selectImg1=selectimg; + } + + if (Settings.gameDisplay==carousel) { + int selectimg; + DownloadBtn.SetSize(0,0); + selectimg = gameCarousel->GetSelectedOption(); + gameSelected = gameCarousel->GetClickedOption(); + selectImg1=selectimg; + } + if (Settings.gameDisplay==list) { + //Get selected game under cursor + int selectimg; + DownloadBtn.SetSize(160,224); + idBtn.SetSize(100,40); + + selectimg = gameBrowser->GetSelectedOption(); + gameSelected = gameBrowser->GetClickedOption(); + selectImg1=selectimg; + + if (gameSelected > 0) //if click occured + selectimg = gameSelected; + + char gameregion[7]; + if ((selectimg >= 0) && (selectimg < (s32) gameCnt)) { + if (selectimg != selectedold) { + selectedold = selectimg;//update displayed cover, game ID, and region if the selected game changes + struct discHdr *header = &gameList[selectimg]; + snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]); + snprintf (IDfull,sizeof(IDfull),"%s%c%c%c", ID, header->id[3], header->id[4], header->id[5]); + w.Remove(&DownloadBtn); + + if (GameIDTxt) { + w.Remove(&idBtn); + delete GameIDTxt; + GameIDTxt = NULL; + } + if (GameRegionTxt) { + w.Remove(GameRegionTxt); + delete GameRegionTxt; + GameRegionTxt = NULL; + } + + switch (header->id[3]) { + case 'E': + sprintf(gameregion,"NTSC U"); + break; + case 'J': + sprintf(gameregion,"NTSC J"); + break; + case 'W': + sprintf(gameregion,"NTSC T"); + break; + default: + case 'K': + sprintf(gameregion,"NTSC K"); + break; + case 'P': + case 'D': + case 'F': + case 'I': + case 'S': + case 'H': + case 'U': + case 'X': + case 'Y': + case 'Z': + sprintf(gameregion," PAL "); + break; + } + + //load game cover + if (cover) { + delete cover; + cover = NULL; + } + + cover = LoadCoverImage(header); + + if (coverImg) { + delete coverImg; + coverImg = NULL; + } + coverImg = new GuiImage(cover); + coverImg->SetWidescreen(CFG.widescreen); + + DownloadBtn.SetImage(coverImg);// put the new image on the download button + w.Append(&DownloadBtn); + + if ((Settings.sinfo == GameID) || (Settings.sinfo == Both)) { + GameIDTxt = new GuiText(IDfull, 22, THEME.info); + GameIDTxt->SetAlignment(ALIGN_LEFT, ALIGN_TOP); + //GameIDTxt->SetPosition(THEME.id_x,THEME.id_y); + idBtn.SetEffect(EFFECT_FADE, 20); + idBtn.SetLabel(GameIDTxt); + w.Append(&idBtn); + } + //don't try to show region for channels because all the custom channels wont follow the rules + if (((Settings.sinfo == GameRegion) || (Settings.sinfo == Both))&&mountMethod!=3) { + GameRegionTxt = new GuiText(gameregion, 22, THEME.info); + GameRegionTxt->SetAlignment(ALIGN_LEFT, ALIGN_TOP); + GameRegionTxt->SetPosition(THEME.region_x, THEME.region_y); + GameRegionTxt->SetEffect(EFFECT_FADE, 20); + w.Append(GameRegionTxt); + } + } + } + + if (idBtn.GetState() == STATE_CLICKED && mountMethod!=3) { + gprintf("\n\tidBtn Clicked"); + struct discHdr * header = &gameList[gameBrowser->GetSelectedOption()]; + //enter new game ID + char entered[10]; + snprintf(entered, sizeof(entered), "%s", IDfull); + //entered[9] = '\0'; + int result = OnScreenKeyboard(entered, 7,0); + if (result == 1) { + WBFS_ReIDGame(header->id, entered); + //__Menu_GetEntries(); + menu = MENU_DISCLIST; + } + + idBtn.ResetState(); + } + startat=gameBrowser->GetOffset(), offset=startat; + } + + if (((gameSelected >= 0) && (gameSelected < (s32)gameCnt)) + || mountMethod==1 + || mountMethod==2) { + if(searchBar) + { + HaltGui(); + mainWindow->Remove(searchBar); + ResumeGui(); + } + rockout(); + struct discHdr *header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); + // struct discHdr *header = dvdheader:&gameList[gameSelected]); + if (!mountMethod)//only get this stuff it we are booting a game from USB + { + WBFS_GameSize(header->id, &size); + if (strlen(get_title(header)) < (MAX_CHARACTERS + 3)) { + sprintf(text, "%s", get_title(header)); + } else { + strncpy(text, get_title(header), MAX_CHARACTERS); + text[MAX_CHARACTERS] = '\0'; + strncat(text, "...", 3); + } + } + + //check if alt Dol and gct file is present + FILE *exeFile = NULL; + char nipple[100]; + header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); //reset header + snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]); + struct Game_CFG* game_cfg = CFG_get_game_opt(header->id); + + if (game_cfg) { + alternatedol = game_cfg->loadalternatedol; + ocarinaChoice = game_cfg->ocarina; + } else { + alternatedol = off; + ocarinaChoice = Settings.ocarina; + } + + + if (Settings.qboot == yes) { //quickboot game + if (alternatedol == on) { + /* Open dol File and check exist */ + sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull); + exeFile = fopen (nipple ,"rb"); + if (exeFile==NULL) { + sprintf(nipple, "%s %s",nipple,tr("does not exist!")); + WindowPrompt(tr("Error"),nipple,tr("OK")); + menu = MENU_CHECK; + wiilight(0); + break; + } else { + fclose(exeFile); + } + } + if (ocarinaChoice != off) { + /* Open gct File and check exist */ + sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull); + exeFile = fopen (nipple ,"rb"); + if (exeFile==NULL) { + gprintf("\n\ttried to load missing gct."); + sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats.")); + WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); + } else { + fseek (exeFile, 0, SEEK_END); + long size=ftell (exeFile); + rewind (exeFile); + fclose(exeFile); + if (size>MAX_GCT_SIZE) { + gprintf("\n\tgct is too big"); + sprintf(nipple, "%s %s",nipple,tr("contains over 255 lines of code. It will produce unexpected results.")); + WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); + } + } + + } + + wiilight(0); + if (isInserted(bootDevice)) { + //////////save game play count//////////////// + struct Game_NUM* game_num = CFG_get_game_num(header->id); + + if (game_num) { + favoritevar = game_num->favorite; + playcount = game_num->count; + } else { + favoritevar = 0; + playcount = 0; + } + playcount += 1; + + CFG_save_game_num(header->id); + gprintf("\n\tplaycount for %c%c%c%c%c%c raised to %i",header->id[0],header->id[1],header->id[2],header->id[3],header->id[4],header->id[5],playcount); + + } + menu = MENU_EXIT; + break; + + } + bool returnHere = true;// prompt to start game + while (returnHere) { + returnHere = false; + if (Settings.wiilight != wiilight_forInstall) wiilight(1); + choice = GameWindowPrompt(); + // header = &gameList[gameSelected]; //reset header + + if (choice == 1) { + if (alternatedol == on) { + /* Open dol File and check exist */ + sprintf(nipple, "%s%s.dol",Settings.dolpath,IDfull); + exeFile = fopen (nipple ,"rb"); + if (exeFile==NULL) { + gprintf("\n\tTried to load alt dol that isn't there"); + sprintf(nipple, "%s %s",nipple,tr("does not exist! You Messed something up, Idiot.")); + WindowPrompt(tr("Error"),nipple,tr("OK")); + menu = MENU_CHECK; + wiilight(0); + break; + } else { + fclose(exeFile); + } + } + if (ocarinaChoice != off) { + /* Open gct File and check exist */ + sprintf(nipple, "%s%s.gct",Settings.Cheatcodespath,IDfull); + exeFile = fopen (nipple ,"rb"); + if (exeFile==NULL) { + gprintf("\n\ttried to load gct file that isn't there"); + sprintf(nipple, "%s %s",nipple,tr("does not exist! Loading game without cheats.")); + WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); + } else { + fseek (exeFile, 0, SEEK_END); + long size=ftell (exeFile); + rewind (exeFile); + fclose(exeFile); + if (size>MAX_GCT_SIZE) { + gprintf("\n\tgct file is too big"); + sprintf(nipple, "%s %s",nipple,tr("contains over 255 lines of code. It will produce unexpected results.")); + WindowPrompt(tr("Error"),nipple,NULL,NULL,NULL,NULL,170); + } + } + + } + wiilight(0); + returnHere = false; + menu = MENU_EXIT; + + } else if (choice == 2) { + wiilight(0); + HaltGui(); + if (Settings.gameDisplay==list) mainWindow->Remove(gameBrowser); + else if (Settings.gameDisplay==grid) mainWindow->Remove(gameGrid); + else if (Settings.gameDisplay==carousel) mainWindow->Remove(gameCarousel); + mainWindow->Remove(&w); + ResumeGui(); + + //re-evaluate header now in case they changed games while on the game prompt + header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); + int settret = GameSettings(header); + /* unneeded for now, kept in case database gets a separate language setting + //menu = MENU_DISCLIST; // refresh titles (needed if the language setting has changed) + */ + HaltGui(); + if (Settings.gameDisplay==list) mainWindow->Append(gameBrowser); + else if (Settings.gameDisplay==grid) mainWindow->Append(gameGrid); + else if (Settings.gameDisplay==carousel) mainWindow->Append(gameCarousel); + mainWindow->Append(&w); + ResumeGui(); + if (settret == 1) { //if deleted + menu = MENU_DISCLIST; + break; + } + returnHere = true; + rockout(2); + } + + else if (choice == 3 && !mountMethod) { //WBFS renaming + wiilight(0); + //re-evaluate header now in case they changed games while on the game prompt + header = &gameList[gameSelected]; + + //enter new game title + char entered[60]; + snprintf(entered, sizeof(entered), "%s", get_title(header)); + entered[59] = '\0'; + int result = OnScreenKeyboard(entered, 60,0); + if (result == 1) { + WBFS_RenameGame(header->id, entered); + __Menu_GetEntries(); + menu = MENU_DISCLIST; + } + } else if (choice == 0) { + rockout(2); + if (mountMethod==1||mountMethod==2)mountMethod = mountMethodOLD; + if (Settings.gameDisplay==list) { + gameBrowser->SetFocus(1); + } else if (Settings.gameDisplay==grid) { + gameGrid->SetFocus(1); + } else if (Settings.gameDisplay==carousel) { + gameCarousel->SetFocus(1); + } + } + + + } + if(searchBar) + { + HaltGui(); + mainWindow->Append(searchBar); + ResumeGui(); + } + } + // to skip the first call of windowScreensaver at startup when wiimote is not connected + if (IsWpadConnected()) { + check = 1; + } + + // screensaver is called when wiimote shuts down, depending on the wiimotet idletime + if (!IsWpadConnected() && check !=0 && Settings.screensaver!=0) { + check++; + int screensaverIsOn=0; + if (check==11500) { //to allow time for the wii to turn off and not show the screensaver + screensaverIsOn=WindowScreensaver(); + } + if (screensaverIsOn==1)check=0; + } + covertOld=covert; + } + + // set alt dol default + if (menu == MENU_EXIT && altdoldefault) { + struct discHdr *header = (mountMethod==1||mountMethod==2?dvdheader:&gameList[gameSelected]); + struct Game_CFG* game_cfg = CFG_get_game_opt(header->id); + // use default only if no alt dol was selected manually + if (game_cfg) { + if (game_cfg->alternatedolstart != 0) + altdoldefault = false; + } + if (altdoldefault) { + int autodol = autoSelectDol((char*)header->id, true); + if (autodol>0) { + alternatedol = 2; + alternatedoloffset = autodol; + char temp[20]; + sprintf(temp,"%d",autodol); + } else { + // alt dol menu for games that require more than a single alt dol + int autodol = autoSelectDolMenu((char*)header->id, true); + if (autodol>0) { + alternatedol = 2; + alternatedoloffset = autodol; + } + } + } + } +//no need to close sd here. we still need to get settings and codes and shit + /*if (menu == MENU_EXIT) { + SDCard_deInit(); + }*/ + //if (Settings.gameDisplay==list) {startat=gameBrowser->GetOffset(), offset=startat;}//save the variables in case we are refreshing the list + //gprintf("\n\tstartat:%d offset:%d",startat,offset); + HaltGui(); + mainWindow->RemoveAll(); + mainWindow->Append(bgImg); + delete searchBar; + searchBar = NULL; + delete gameBrowser; + gameBrowser = NULL; + delete gameGrid; + gameGrid = NULL; + delete gameCarousel; + gameCarousel = NULL; + ResumeGui(); + return menu; +} + +void DiscListWinUpdateCallback(void * e) +{ + GuiWindow *w = (GuiWindow *)e; + for(int i=0; i<8; ++i) + { + if(Toolbar[i]->GetState() == STATE_SELECTED) + { + w->Remove(Toolbar[i]); + w->Append(Toolbar[i]); // draw the selected Icon allways on top + break; + } + } +} + +void rockout(int f) { + + + HaltGui(); + int num=(f==2?-1:gameSelected); + + char imgPath[100]; + if ((!(strcasestr(get_title(&gameList[num]),"guitar")|| + strcasestr(get_title(&gameList[num]),"band")|| + strcasestr(get_title(&gameList[num]),"rock")|| + f==1))||mountMethod) { + for (int i = 0; i < 4; i++) + delete pointer[i]; + snprintf(imgPath, sizeof(imgPath), "%splayer1_point.png", CFG.theme_path); + pointer[0] = new GuiImageData(imgPath, player1_point_png); + snprintf(imgPath, sizeof(imgPath), "%splayer2_point.png", CFG.theme_path); + pointer[1] = new GuiImageData(imgPath, player2_point_png); + snprintf(imgPath, sizeof(imgPath), "%splayer3_point.png", CFG.theme_path); + pointer[2] = new GuiImageData(imgPath, player3_point_png); + snprintf(imgPath, sizeof(imgPath), "%splayer4_point.png", CFG.theme_path); + pointer[3] = new GuiImageData(imgPath, player4_point_png); + } else { + + for (int i = 0; i < 4; i++) + delete pointer[i]; + snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path); + pointer[0] = new GuiImageData(imgPath, rplayer1_point_png); + snprintf(imgPath, sizeof(imgPath), "%srplayer2_point.png", CFG.theme_path); + pointer[1] = new GuiImageData(imgPath, rplayer2_point_png); + snprintf(imgPath, sizeof(imgPath), "%srplayer3_point.png", CFG.theme_path); + pointer[2] = new GuiImageData(imgPath, rplayer3_point_png); + snprintf(imgPath, sizeof(imgPath), "%srplayer4_point.png", CFG.theme_path); + pointer[3] = new GuiImageData(imgPath, rplayer4_point_png); + } + ResumeGui(); +} diff --git a/source/menu/menu_format.cpp b/source/menu/menu_format.cpp index 408ee9a3..ff97fd76 100644 --- a/source/menu/menu_format.cpp +++ b/source/menu/menu_format.cpp @@ -1,196 +1,185 @@ -#include - -#include "menus.h" -#include "menus.h" -#include "fatmounter.h" -#include "usbloader/usbstorage.h" -#include "usbloader/utils.h" -#include "usbloader/wbfs.h" -#include "libwiigui/gui_customoptionbrowser.h" - -extern int load_from_fs; -extern char game_partition[6]; - -/**************************************************************************** - * MenuFormat - ***************************************************************************/ -int MenuFormat() { - - USBDevice_deInit(); - sleep(1); - - USBStorage_Init(); - - int menu = MENU_NONE; - char imgPath[100]; - - customOptionList options(MAX_PARTITIONS_EX); - extern PartList partitions; - - u32 cnt, counter = 0; - int choice, ret; - char text[ISFS_MAXPATH]; - - //create the partitionlist - for (cnt = 0; cnt < (u32) partitions.num; cnt++) { - partitionEntry *entry = &partitions.pentry[cnt]; - - /* Calculate size in gigabytes */ - f32 size = entry->size * (partitions.sector_size / GB_SIZE); - - if (size) { - options.SetName(counter, "%s %d:",tr("Partition"), cnt+1); - options.SetValue(counter,"%.2fGB", size); - } else { - options.SetName(counter, "%s %d:",tr("Partition"), cnt+1); - options.SetValue(counter,tr("Can't be formatted")); - } - counter++; - } - - GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); - // because destroy GuiSound must wait while sound playing is finished, we use a global sound - if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); - // GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); - snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff.png", CFG.theme_path); - GuiImageData btnpwroff(imgPath, wiimote_poweroff_png); - snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff_over.png", CFG.theme_path); - GuiImageData btnpwroffOver(imgPath, wiimote_poweroff_over_png); - snprintf(imgPath, sizeof(imgPath), "%smenu_button.png", CFG.theme_path); - GuiImageData btnhome(imgPath, menu_button_png); - snprintf(imgPath, sizeof(imgPath), "%smenu_button_over.png", CFG.theme_path); - GuiImageData btnhomeOver(imgPath, menu_button_over_png); - GuiImageData battery(battery_png); - GuiImageData batteryBar(battery_bar_png); - GuiImageData batteryRed(battery_red_png); - GuiImageData batteryBarRed(battery_bar_red_png); - - - GuiTrigger trigA; - trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiTrigger trigHome; - trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiTrigger trigB; - trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B); - - GuiButton backBtn(0,0); - backBtn.SetTrigger(&trigB); - - GuiImage poweroffBtnImg(&btnpwroff); - GuiImage poweroffBtnImgOver(&btnpwroffOver); - poweroffBtnImg.SetWidescreen(CFG.widescreen); - poweroffBtnImgOver.SetWidescreen(CFG.widescreen); - GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, btnClick2,1); - GuiImage exitBtnImg(&btnhome); - GuiImage exitBtnImgOver(&btnhomeOver); - exitBtnImg.SetWidescreen(CFG.widescreen); - exitBtnImgOver.SetWidescreen(CFG.widescreen); - GuiButton exitBtn(&exitBtnImg,&exitBtnImgOver, 0, 3, THEME.home_x, THEME.home_y, &trigA, &btnSoundOver, btnClick2,1); - exitBtn.SetTrigger(&trigHome); - - GuiCustomOptionBrowser optionBrowser(396, 280, &options, CFG.theme_path, "bg_options_settings.png", bg_options_settings_png, 0, 10); - optionBrowser.SetPosition(0, 40); - optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - - HaltGui(); - GuiWindow w(screenwidth, screenheight); - w.Append(&poweroffBtn); - w.Append(&backBtn); - w.Append(&exitBtn); - - mainWindow->Append(&w); - mainWindow->Append(&optionBrowser); - - ResumeGui(); - - while (menu == MENU_NONE) { - - VIDEO_WaitVSync (); - - ret = optionBrowser.GetClickedOption(); - - if(ret >= 0) { - if(Settings.godmode == 1) { - partitionEntry *entry = &partitions.pentry[ret]; - if (entry->size) { - if (load_from_fs == PART_FS_FAT) { - WBFS_OpenPart(partitions.pinfo[ret].part_fs, partitions.pinfo[ret].index, entry->sector, - entry->size, (char *) &game_partition); - load_from_fs = partitions.pinfo[ret].part_fs; - menu = MENU_SETTINGS; - - Settings.partition = ret; - if(isInserted(bootDevice))cfg_save_global(); - } else { - sprintf(text, "%s %d : %.2fGB",tr("Partition"), ret+1, entry->size * (partitions.sector_size / GB_SIZE)); - choice = WindowPrompt( tr("Do you want to format:"), text,tr("Yes"),tr("No")); - if (choice == 1) { - ret = FormatingPartition(tr("Formatting, please wait..."), entry); - if (ret < 0) { - WindowPrompt(tr("Error !"),tr("Failed formating"),tr("Return")); - menu = MENU_SETTINGS; - } else { - sleep(1); - ret = WBFS_Open(); - sprintf(text, "%s %s", text,tr("formatted!")); - WindowPrompt(tr("Success:"),text,tr("OK")); - if(ret < 0) { - WindowPrompt(tr("ERROR"), tr("Failed to open partition"), tr("OK")); - Sys_LoadMenu(); - } - menu = MENU_SETTINGS; - } - } - } - } else if(Settings.godmode == 0) { - mainWindow->Remove(&optionBrowser); - char entered[20] = ""; - int result = OnScreenKeyboard(entered, 20,0); - mainWindow->Append(&optionBrowser); - if ( result == 1 ) { - if (!strcmp(entered, Settings.unlockCode)) { //if password correct - if (Settings.godmode == 0) { - WindowPrompt(tr("Correct Password"),tr("All the features of USB Loader GX are unlocked."),tr("OK")); - Settings.godmode = 1; - } - } else { - WindowPrompt(tr("Wrong Password"),tr("USB Loader GX is protected"),tr("OK")); - } - } - } - } - } - - /* if (shutdown == 1) - Sys_Shutdown(); - if (reset == 1) - Sys_Reboot();*/ - - if (poweroffBtn.GetState() == STATE_CLICKED) { - choice = WindowPrompt (tr("Shutdown System"),tr("Are you sure?"),tr("Yes"),tr("No")); - if (choice == 1) { - Sys_Shutdown(); - } - - } else if (exitBtn.GetState() == STATE_CLICKED) { - choice = WindowPrompt (tr("Return to Wii Menu"),tr("Are you sure?"),tr("Yes"),tr("No")); - if (choice == 1) { - Sys_LoadMenu(); - } - } - else if (backBtn.GetState() == STATE_CLICKED) { - menu = MENU_SETTINGS; - break; - } - } - - - HaltGui(); - - mainWindow->Remove(&optionBrowser); - mainWindow->Remove(&w); - ResumeGui(); - - return menu; -} - +#include + +#include "menus.h" +#include "fatmounter.h" +#include "usbloader/usbstorage.h" +#include "usbloader/utils.h" +#include "usbloader/wbfs.h" +#include "libwiigui/gui_customoptionbrowser.h" + +extern int load_from_fs; +extern char game_partition[6]; + +/**************************************************************************** + * MenuFormat + ***************************************************************************/ +int MenuFormat() { + + USBDevice_deInit(); + sleep(1); + + USBStorage_Init(); + + int menu = MENU_NONE; + char imgPath[100]; + + customOptionList options(MAX_PARTITIONS_EX); + extern PartList partitions; + + u32 cnt, counter = 0; + int choice, ret; + char text[ISFS_MAXPATH]; + + //create the partitionlist + for (cnt = 0; cnt < (u32) partitions.num; cnt++) { + partitionEntry *entry = &partitions.pentry[cnt]; + + /* Calculate size in gigabytes */ + f32 size = entry->size * (partitions.sector_size / GB_SIZE); + + if (size) { + options.SetName(counter, "%s %d:",tr("Partition"), cnt+1); + options.SetValue(counter,"%.2fGB", size); + } else { + options.SetName(counter, "%s %d:",tr("Partition"), cnt+1); + options.SetValue(counter,tr("Can't be formatted")); + } + counter++; + } + + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); + // because destroy GuiSound must wait while sound playing is finished, we use a global sound + if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + // GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff.png", CFG.theme_path); + GuiImageData btnpwroff(imgPath, wiimote_poweroff_png); + snprintf(imgPath, sizeof(imgPath), "%swiimote_poweroff_over.png", CFG.theme_path); + GuiImageData btnpwroffOver(imgPath, wiimote_poweroff_over_png); + snprintf(imgPath, sizeof(imgPath), "%smenu_button.png", CFG.theme_path); + GuiImageData btnhome(imgPath, menu_button_png); + snprintf(imgPath, sizeof(imgPath), "%smenu_button_over.png", CFG.theme_path); + GuiImageData btnhomeOver(imgPath, menu_button_over_png); + GuiImageData battery(battery_png); + GuiImageData batteryBar(battery_bar_png); + GuiImageData batteryRed(battery_red_png); + GuiImageData batteryBarRed(battery_bar_red_png); + + + GuiTrigger trigA; + trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + GuiTrigger trigHome; + trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); + + GuiImage poweroffBtnImg(&btnpwroff); + GuiImage poweroffBtnImgOver(&btnpwroffOver); + poweroffBtnImg.SetWidescreen(CFG.widescreen); + poweroffBtnImgOver.SetWidescreen(CFG.widescreen); + GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, btnClick2,1); + GuiImage exitBtnImg(&btnhome); + GuiImage exitBtnImgOver(&btnhomeOver); + exitBtnImg.SetWidescreen(CFG.widescreen); + exitBtnImgOver.SetWidescreen(CFG.widescreen); + GuiButton exitBtn(&exitBtnImg,&exitBtnImgOver, 0, 3, THEME.home_x, THEME.home_y, &trigA, &btnSoundOver, btnClick2,1); + exitBtn.SetTrigger(&trigHome); + + GuiCustomOptionBrowser optionBrowser(396, 280, &options, CFG.theme_path, "bg_options_settings.png", bg_options_settings_png, 0, 10); + optionBrowser.SetPosition(0, 40); + optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + + HaltGui(); + GuiWindow w(screenwidth, screenheight); + w.Append(&poweroffBtn); + w.Append(&exitBtn); + + mainWindow->Append(&w); + mainWindow->Append(&optionBrowser); + + ResumeGui(); + + while (menu == MENU_NONE) { + + VIDEO_WaitVSync (); + + ret = optionBrowser.GetClickedOption(); + + if(ret >= 0) { + if(Settings.godmode == 1) { + partitionEntry *entry = &partitions.pentry[ret]; + if (entry->size) { + if (load_from_fs == PART_FS_FAT) { + WBFS_OpenPart(partitions.pinfo[ret].part_fs, partitions.pinfo[ret].index, entry->sector, + entry->size, (char *) &game_partition); + load_from_fs = partitions.pinfo[ret].part_fs; + menu = MENU_DISCLIST; + + Settings.partition = ret; + if(isInserted(bootDevice))cfg_save_global(); + } else { + sprintf(text, "%s %d : %.2fGB",tr("Partition"), ret+1, entry->size * (partitions.sector_size / GB_SIZE)); + choice = WindowPrompt( tr("Do you want to format:"), text,tr("Yes"),tr("No")); + if (choice == 1) { + ret = FormatingPartition(tr("Formatting, please wait..."), entry); + if (ret < 0) { + WindowPrompt(tr("Error !"),tr("Failed formating"),tr("Return")); + menu = MENU_SETTINGS; + } else { + sleep(1); + ret = WBFS_Open(); + sprintf(text, "%s %s", text,tr("formatted!")); + WindowPrompt(tr("Success:"),text,tr("OK")); + if(ret < 0) { + WindowPrompt(tr("ERROR"), tr("Failed to open partition"), tr("OK")); + Sys_LoadMenu(); + } + menu = MENU_DISCLIST; + } + } + } + } else if(Settings.godmode == 0) { + mainWindow->Remove(&optionBrowser); + char entered[20] = ""; + int result = OnScreenKeyboard(entered, 20,0); + mainWindow->Append(&optionBrowser); + if ( result == 1 ) { + if (!strcmp(entered, Settings.unlockCode)) { //if password correct + if (Settings.godmode == 0) { + WindowPrompt(tr("Correct Password"),tr("All the features of USB Loader GX are unlocked."),tr("OK")); + Settings.godmode = 1; + } + } else { + WindowPrompt(tr("Wrong Password"),tr("USB Loader GX is protected"),tr("OK")); + } + } + } + } + } + + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + if (poweroffBtn.GetState() == STATE_CLICKED) { + choice = WindowPrompt (tr("Shutdown System"),tr("Are you sure?"),tr("Yes"),tr("No")); + if (choice == 1) { + Sys_Shutdown(); + } + + } else if (exitBtn.GetState() == STATE_CLICKED) { + choice = WindowPrompt (tr("Return to Wii Menu"),tr("Are you sure?"),tr("Yes"),tr("No")); + if (choice == 1) { + Sys_LoadMenu(); + } + } + } + + + HaltGui(); + + mainWindow->Remove(&optionBrowser); + mainWindow->Remove(&w); + ResumeGui(); + + return menu; +} + diff --git a/source/menu/menu_install.cpp b/source/menu/menu_install.cpp index 831e3fb0..a9b8fe21 100644 --- a/source/menu/menu_install.cpp +++ b/source/menu/menu_install.cpp @@ -134,6 +134,15 @@ int MenuInstall() { menu = MENU_DISCLIST; break; } + + if (shutdown == 1) { + wiilight(0); + Sys_Shutdown(); + } + if (reset == 1) { + wiilight(0); + Sys_Reboot(); + } } //Turn off the WiiLight diff --git a/source/menu/menus.h b/source/menu/menus.h index 32ddfde9..269d998e 100644 --- a/source/menu/menus.h +++ b/source/menu/menus.h @@ -1,32 +1,24 @@ -#ifndef _MENUS_H -#define _MENUS_H - -#include - -#include "libwiigui/gui.h" -#include "libwiigui/GuiBGM.h" -#include "language/gettext.h" -#include "prompts/PromptWindows.h" -#include "menu.h" -#include "gecko.h" -#include "filelist.h" -#include "sys.h" - -extern GuiWindow * mainWindow; -extern GuiBGM * bgMusic; -extern u8 checkthreadState; -extern u8 needToReloadGamelist; -extern u8 hddOK; -extern u8 mountMethod; - - -int MenuInstall(); -int MenuDiscList(); -int MenuFormat(); - -extern void ResumeCheck(); -extern void HaltCheck(); -extern void InitCheckThread(); -extern void ExitCheckThread(); - -#endif // _MENUS_H +#ifndef _MENUS_H +#define _MENUS_H + +#include "libwiigui/gui.h" +#include "language/gettext.h" +#include "prompts/PromptWindows.h" +#include "menu.h" +#include "gecko.h" +#include "filelist.h" +#include "sys.h" + +extern void ResumeGui(); +extern void HaltGui(); +extern GuiWindow * mainWindow; +extern GuiSound * bgMusic; +extern u8 shutdown; +extern u8 reset; + +int MenuInstall(); +int MenuDiscList(); +int MenuFormat(); +int MenuCheck(); + +#endif // _MENUS_H diff --git a/source/prompts/DiscBrowser.cpp b/source/prompts/DiscBrowser.cpp index be5bf0b9..d05efae6 100644 --- a/source/prompts/DiscBrowser.cpp +++ b/source/prompts/DiscBrowser.cpp @@ -10,7 +10,6 @@ #include "prompts/PromptWindows.h" #include "filelist.h" #include "menu.h" -#include "../menu/menus.h" #include "usbloader/disc.h" #include "usbloader/fstfile.h" #include "usbloader/wdvd.h" @@ -22,8 +21,14 @@ #include "../gecko.h" #include "../patches/dvd_broadway.h" +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /*** Extern variables ***/ extern GuiWindow * mainWindow; +extern u8 shutdown; +extern u8 reset; extern u8 mountMethod; /******************************************************************************** @@ -45,7 +50,7 @@ int DiscBrowse(struct discHdr * header) { return ret; } } - + ret = Disc_Open(); if (ret < 0) { ResumeGui(); @@ -66,7 +71,7 @@ int DiscBrowse(struct discHdr * header) { WindowPrompt(tr("ERROR:"), tr("Could not open WBFS partition"), tr("OK")); return ret; } - + int *buffer = (int*)allocate_memory(0x20); if (buffer == NULL) { @@ -81,7 +86,7 @@ int DiscBrowse(struct discHdr * header) { WindowPrompt(tr("ERROR:"), tr("Could not read the disc."), tr("OK")); return ret; } - + void *fstbuffer = allocate_memory(buffer[2]*4); FST_ENTRY *fst = (FST_ENTRY *)fstbuffer; @@ -199,6 +204,11 @@ int DiscBrowse(struct discHdr * header) { while (!exit) { VIDEO_WaitVSync(); + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + ret = optionBrowser3.GetClickedOption(); if (ret > 0) { @@ -234,29 +244,29 @@ int autoSelectDol(const char *id, bool force) { char id4[10]; sprintf(id4,"%c%c%c%c",id[0],id[1],id[2],id[3]); - + ////// games that can be forced (always need alt dol) - //Boogie + //Boogie if (strcmp(id,"RBOP69") == 0) return 675;//previous value was 657 if (strcmp(id,"RBOE69") == 0) return 675;//starstremr - + //Fifa 08 if (strcmp(id,"RF8E69") == 0) return 439;//from isostar if (strcmp(id,"RF8P69") == 0) return 463;//from isostar if (strcmp(id,"RF8X69") == 0) return 464;//from isostar - + //Madden NFL07 if (strcmp(id,"RMDP69") == 0) return 39;//from isostar - + //Madden NFL08 if (strcmp(id,"RNFP69") == 0) return 1079;//from isostar - + //Medal of Honor: Heroes 2 if (strcmp(id,"RM2X69") == 0)return 601;//dj_skual if (strcmp(id,"RM2P69") == 0)return 517;//MZottel - if (strcmp(id,"RM2E69") == 0) return 492;//Old8oy - + if (strcmp(id,"RM2E69") == 0) return 492;//Old8oy + //Mortal Kombat if (strcmp(id,"RKMP5D") == 0) return 290;//from isostar if (strcmp(id,"RKME5D") == 0) return 290;//starstremr @@ -266,7 +276,7 @@ int autoSelectDol(const char *id, bool force) { //Pangya! Golf with Style if (strcmp(id,"RPYP9B") == 0) return 12490;//from isostar - + //Redsteel if (strcmp(id,"REDP41") == 0) return 1957;//from isostar if (strcmp(id,"REDE41") == 0) return 1957;//starstremr @@ -274,37 +284,37 @@ int autoSelectDol(const char *id, bool force) { //SSX if (strcmp(id,"RSXP69") == 0) return 377;//previous value was 337 if (strcmp(id,"RSXE69") == 0) return 377;//previous value was 337 - + //Wii Sports Resort, needs alt dol one time only, to show the Motion Plus video //if (strcmp(id,"RZTP01") == 0 && CheckForSave(id4)==0) return 952;//from isostar //if (strcmp(id,"RZTE01") == 0 && CheckForSave(id4)==0) return 674;//from starstremr //as well as Grand Slam Tennis, Tiger Woods 10, Virtual Tennis 2009 - + ///// games that can't be forced (alt dol is not always needed) if (!force) { - + //Grand Slam Tennis if (strcmp(id,"R5TP69") == 0) return 1493;//from isostar if (strcmp(id,"R5TE69") == 0) return 1493;//starstremr - + //Medal of Honor Heroes if (strcmp(id,"RMZX69") == 0) return 492;//from isostar if (strcmp(id,"RMZP69") == 0) return 492;//from isostar - if (strcmp(id,"RMZE69") == 0) return 492;//starstremr - + if (strcmp(id,"RMZE69") == 0) return 492;//starstremr + //Tiger Woods 10 if (strcmp(id,"R9OP69") == 0) return 1991;//from isostar if (strcmp(id,"R9OE69") == 0) return 1973;//starstremr - + //Virtual Tennis 2009 if (strcmp(id,"RVUP8P") == 0) return 16426;//from isostar if (strcmp(id,"RVUE8P") == 0) return 16405;//from isostar - + //Wii Sports Resort if (strcmp(id,"RZTP01") == 0) return 952;//from isostar if (strcmp(id,"RZTE01") == 0) return 674;//from starstremr } - + return -1; } @@ -313,7 +323,7 @@ int autoSelectDolMenu(const char *id, bool force) { /* char id4[10]; sprintf(id4,"%c%c%c%c",id[0],id[1],id[2],id[3]); - + switch (CheckForSave(id4)) { case 0: WindowPrompt(tr("NO save"),0,tr("OK")); @@ -329,7 +339,7 @@ int autoSelectDolMenu(const char *id, bool force) { } return -1; */ - + //Indiana Jones and the Staff of Kings (Fate of Atlantis) if (strcmp(id,"RJ8E64") == 0) { int choice = WindowPrompt(tr("Select a DOL"), 0, "Fate of Atlantis", tr("Default")); @@ -355,7 +365,7 @@ int autoSelectDolMenu(const char *id, bool force) { } return choice; } - + //Metal Slug Anthology (Metal Slug 6) if (strcmp(id,"RMLEH4") == 0) { int choice = WindowPrompt(tr("Select a DOL"), 0, "Metal Slug 6", tr("Default")); @@ -381,7 +391,7 @@ int autoSelectDolMenu(const char *id, bool force) { } return choice; } - + //Metroid Prime Trilogy if (strcmp(id,"R3ME01") == 0) { //do not use any alt dol if there is no save game in the nand @@ -432,7 +442,7 @@ int autoSelectDolMenu(const char *id, bool force) { } return choice; } - + //Rampage: Total Destruction (M1.dol=Rampage, jarvos.dol=Rampage World Tour) if (strcmp(id,"RPGP5D") == 0) { int choice = WindowPrompt(tr("Select a DOL"), 0, "Rampage", "World Tour", tr("Default")); @@ -449,7 +459,7 @@ int autoSelectDolMenu(const char *id, bool force) { } return choice; } - + //The House Of The Dead 2 & 3 Return (only to play 2) if (strcmp(id,"RHDE8P") == 0) { int choice = WindowPrompt(tr("Select a DOL"), 0, "HotD 2", tr("Default")); @@ -491,11 +501,11 @@ void __dvd_readidcb(s32 result) dvddone = result; } -u8 DiscMount1(discHdr *header) { +u8 DiscMount(discHdr *header) { gprintf("\nDiscMount() "); int ret; HaltGui(); - + u8 *tmpBuff = (u8 *) malloc(0x60); memcpy(tmpBuff, g_diskID, 0x60); // Make a backup of the first 96 bytes at 0x80000000 @@ -503,7 +513,7 @@ u8 DiscMount1(discHdr *header) { dvddone = 0; ret = bwDVD_LowReset(__dvd_readidcb); while(ret>=0 && dvddone==0); - + dvddone = 0; ret = bwDVD_LowReadID(g_diskID, __dvd_readidcb); // Leave this one here, or you'll get an IOCTL error while(ret>=0 && dvddone==0); @@ -511,65 +521,15 @@ u8 DiscMount1(discHdr *header) { dvddone = 0; ret = bwDVD_LowUnencryptedRead(g_diskID, 0x60, 0x00, __dvd_readidcb); // Overwrite the g_diskID thing while(ret>=0 && dvddone==0); - + memcpy(header, g_diskID, 0x60); memcpy(g_diskID, tmpBuff, 0x60); // Put the backup back, or games won't load free(tmpBuff); - + ResumeGui(); if (dvddone != 1) { return 0; } return (header->magic == 0x5D1C9EA3) ? 1 : 2; // Don't check gamecube magic (0xC2339F3D) } - -u8 DiscMount(discHdr *header) { - gprintf("\nDiscMount() "); - - HaltGui(); - GuiWindow w(screenwidth, screenheight); - - mainWindow->Append(&w); - - ResumeGui(); - -//HaltCheck(); - int ret = Disc_SetUSB(NULL); - ret = WDVD_Close(); - ret = Disc_Init(); - - - - - ret = DiscWait(tr("Insert Disk"),tr("Waiting..."),tr("Cancel"),0,0); - if (ret < 0) { - WindowPrompt (tr("Error reading Disc"),0,tr("Back")); - goto OUT; - } - mainWindow->SetState(STATE_DISABLED); - //gprintf("..1"); - ret = Disc_Open(); - if (ret < 0) { - WindowPrompt (tr("Could not open Disc"),0,tr("Back")); - goto OUT; - } - //gprintf("..2"); - Disc_ReadHeader(header); - //gprintf("..3"); - ret = Disc_IsWii(); - //gprintf("..4"); - //ResumeCheck(); - if (ret < 0) { - ret = 2; - } - ret = 1; - - - OUT: - HaltGui(); - mainWindow->Remove(&w); - mainWindow->SetState(STATE_DEFAULT); - ResumeGui(); - return ret; -} diff --git a/source/prompts/ProgressWindow.cpp b/source/prompts/ProgressWindow.cpp index 25b5eea6..b1ae11f7 100644 --- a/source/prompts/ProgressWindow.cpp +++ b/source/prompts/ProgressWindow.cpp @@ -40,6 +40,10 @@ static time_t start; extern GuiWindow * mainWindow; extern float gamesize; +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /**************************************************************************** * GameInstallProgress diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 3327f8db..cc6d0b5e 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -23,6 +23,7 @@ #include "fatmounter.h" #include "listfiles.h" #include "menu.h" +#include "menu.h" #include "filelist.h" #include "sys.h" #include "wpad.h" @@ -52,10 +53,15 @@ extern u32 gameCnt; extern s32 gameSelected, gameStart; extern float gamesize; extern struct discHdr * gameList; +extern u8 shutdown; +extern u8 reset; extern u8 mountMethod; extern struct discHdr *dvdheader; extern char game_partition[6]; -extern u8 shutdown; + +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); /**************************************************************************** * OnScreenNumpad @@ -65,9 +71,9 @@ extern u8 shutdown; ***************************************************************************/ int OnScreenNumpad(char * var, u32 maxlen) { int save = -1; - + GuiNumpad numpad(var, maxlen); - + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); // because destroy GuiSound must wait while sound playing is finished, we use a global sound if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size,Settings.sfxvolume); @@ -98,7 +104,7 @@ int OnScreenNumpad(char * var, u32 maxlen) { GuiButton cancelBtn(&cancelBtnImg,&cancelBtnImg, 1, 4, -5, -15, &trigA, &btnSoundOver, btnClick2,1); cancelBtn.SetLabel(&cancelBtnTxt); cancelBtn.SetTrigger(&trigB); - + numpad.Append(&okBtn); numpad.Append(&cancelBtn); @@ -126,7 +132,7 @@ int OnScreenNumpad(char * var, u32 maxlen) { mainWindow->SetState(STATE_DEFAULT); ResumeGui(); gprintf("\t%s",(save == 1?"saved":"discarded")); - return save; + return save; } /**************************************************************************** @@ -690,9 +696,17 @@ int WindowPrompt(const char *title, const char *msg, const char *btn1Label, } + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); + promptWindow.Append(&dialogBoxImg); promptWindow.Append(&titleTxt); promptWindow.Append(&msgTxt); + promptWindow.Append(&screenShotBtn); if (btn1Label) promptWindow.Append(&btn1); @@ -712,7 +726,12 @@ int WindowPrompt(const char *title, const char *msg, const char *btn1Label, while (choice == -1) { VIDEO_WaitVSync(); - + if (shutdown == 1) { + wiilight(0); + Sys_Shutdown(); + } + if (reset == 1) + Sys_Reboot(); if (btn1.GetState() == STATE_CLICKED) { choice = 1; } else if (btn2.GetState() == STATE_CLICKED) { @@ -727,7 +746,12 @@ int WindowPrompt(const char *title, const char *msg, const char *btn1Label, choice = 3; } else if (btn4.GetState() == STATE_CLICKED) { choice = 0; - } + } else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + } if (count>0)count--; if (count==0) choice = 1; } @@ -954,9 +978,12 @@ int WindowExitPrompt() } - if (shutdown == 1) + if (shutdown == 1) { wiilight(0); - + Sys_Shutdown(); + } + if (reset == 1) + Sys_Reboot(); if (btn1.GetState() == STATE_CLICKED) { choice = 1; btn1.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50); @@ -1111,6 +1138,12 @@ int GameWindowPrompt() { trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0); GuiTrigger trigMinus; trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0); + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); if (CFG.widescreen) snprintf(imgPath, sizeof(imgPath), "%swdialogue_box_startgame.png", CFG.theme_path); @@ -1241,6 +1274,7 @@ int GameWindowPrompt() { promptWindow.Append(&dialogBoxImg); promptWindow.Append(&nameBtn); promptWindow.Append(&playcntTxt); + promptWindow.Append(&screenShotBtn); promptWindow.Append(&btn2); if (!mountMethod)//stuff we don't show if it is a DVD mounted { @@ -1261,7 +1295,7 @@ int GameWindowPrompt() { promptWindow.Append(&diskImg2); promptWindow.Append(&btn1); - + short changed = -1; GuiImageData * diskCover = NULL; GuiImageData * diskCover2 = NULL; @@ -1418,6 +1452,19 @@ int GameWindowPrompt() { diskImg.SetSpin(btn1.GetState() == STATE_SELECTED); diskImg2.SetSpin(btn1.GetState() == STATE_SELECTED); + if (shutdown == 1) { //for power button + promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50); + mainWindow->SetState(STATE_DEFAULT); + while (promptWindow.GetEffect() > 0) usleep(50); + HaltGui(); + mainWindow->Remove(&promptWindow); + ResumeGui(); + wiilight(0); + Sys_Shutdown(); + } + + if (reset == 1) //for reset button + Sys_Reboot(); if(gameSound) { @@ -1497,6 +1544,12 @@ int GameWindowPrompt() { } btnFavorite5.ResetState(); } + else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + } // this next part is long because nobody could agree on what the left/right buttons should do else if ((btnRight.GetState() == STATE_CLICKED) && (Settings.xflip == no)) {//next game promptWindow.SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_OUT, 50); @@ -2715,7 +2768,7 @@ int ProgressUpdateWindow() { } else { filesize = download_request("http://www.techjawa.com/usbloadergx/ULNR.file");//for some reason it didn't download completely when saved as a wad. } - + if (filesize > 0) { pfile = fopen(dolpath, "wb");//here we save the txt as a wad @@ -2834,7 +2887,7 @@ int ProgressUpdateWindow() { return 1; } -#else +#else int ProgressUpdateWindow() { gprintf("\nProgressUpdateWindow(not full channel)"); @@ -2998,7 +3051,7 @@ int ProgressUpdateWindow() { promptWindow.Append(&progressbarOutlineImg); promptWindow.Append(&prTxt); msgTxt.SetTextf("%s Rev%i", tr("Update to"), newrev); - + s32 filesize; if (Settings.beta_upgrades) { char url[255]; @@ -3516,6 +3569,14 @@ HBCWindowPrompt(const char *name, const char *coder, const char *version, btn2.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); btn2.SetPosition(-40, 2); + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); + promptWindow.Append(&screenShotBtn); + promptWindow.Append(&dialogBoxImg); if (strcmp(long_description,""))promptWindow.Append(&whiteBoxImg); if (strcmp(long_description,""))promptWindow.Append(&scrollbarImg); @@ -3542,15 +3603,23 @@ HBCWindowPrompt(const char *name, const char *coder, const char *version, while (choice == -1) { VIDEO_WaitVSync(); - - if (shutdown == 1) + if (shutdown == 1) { wiilight(0); - + Sys_Shutdown(); + } + if (reset == 1) + Sys_Reboot(); if (btn1.GetState() == STATE_CLICKED) { choice = 1; } else if (btn2.GetState() == STATE_CLICKED) { choice = 0; } + else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + } else if ((arrowUpBtn.GetState()==STATE_CLICKED||arrowUpBtn.GetState()==STATE_HELD) ) { if (long_descriptionTxt.GetFirstLine()>1) long_descriptionTxt.SetFirstLine(long_descriptionTxt.GetFirstLine()-1); diff --git a/source/prompts/TitleBrowser.cpp b/source/prompts/TitleBrowser.cpp index a64e66fc..e4245c7c 100644 --- a/source/prompts/TitleBrowser.cpp +++ b/source/prompts/TitleBrowser.cpp @@ -20,7 +20,6 @@ #include "settings/cfg.h" #include "sys.h" #include "menu.h" -#include "../menu/menus.h" #include "audio.h" #include "wad/wad.h" #include "xml/xml.h" @@ -38,8 +37,14 @@ u32 titleCnt; extern struct discHdr * gameList; extern u32 gameCnt; +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /*** Extern variables ***/ extern GuiWindow * mainWindow; +extern u8 shutdown; +extern u8 reset; extern u32 infilesize; extern wchar_t *gameFilter; @@ -118,7 +123,7 @@ int TitleBrowser(u32 type) { char line[200]; char tmp[50]; snprintf(tmp,50," "); - + //check if the content.bin is on the SD card for that game //if there is content.bin,then the game is on the SDmenu and not the wii sprintf(line,"SD:/private/wii/title/%s/content.bin",text); @@ -290,8 +295,16 @@ int TitleBrowser(u32 type) { wifiBtn.SetAlpha(80); wifiBtn.SetTrigger(&trigA); + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); + HaltGui(); GuiWindow w(screenwidth, screenheight); + w.Append(&screenShotBtn); w.Append(&settingsbackgroundbtn); w.Append(&titleTxt); w.Append(&cancelBtn); @@ -307,7 +320,12 @@ int TitleBrowser(u32 type) { while (!exit) { VIDEO_WaitVSync(); - if (wifiBtn.GetState() == STATE_CLICKED) { + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + else if (wifiBtn.GetState() == STATE_CLICKED) { ResumeNetworkWait(); wifiBtn.ResetState(); @@ -400,7 +418,7 @@ int TitleBrowser(u32 type) { char temp[50]; char filepath[100]; u32 read = 0; - + //make sure there is a folder for this to be saved in struct stat st; snprintf(filepath, sizeof(filepath), "%s/wad/", bootDevice); @@ -410,7 +428,7 @@ int TitleBrowser(u32 type) { } } snprintf(filepath, sizeof(filepath), "%s/wad/tmp.tmp", bootDevice); - + if (infilesize < MB_SIZE) snprintf(filesizetxt, sizeof(filesizetxt), tr("Incoming file %0.2fKB"), infilesize/KB_SIZE); @@ -494,9 +512,9 @@ int TitleBrowser(u32 type) { w.Remove(&wifiBtn); w.Remove(&optionBrowser3); ResumeGui(); - + Wad_Install(file); - + HaltGui(); w.Append(&titleTxt); w.Append(&cancelBtn); @@ -529,6 +547,12 @@ int TitleBrowser(u32 type) { exit = true; ret = -10; } + else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + } } CloseConnection(); diff --git a/source/prompts/filebrowser.cpp b/source/prompts/filebrowser.cpp index 494bb591..07db483b 100644 --- a/source/prompts/filebrowser.cpp +++ b/source/prompts/filebrowser.cpp @@ -20,7 +20,6 @@ #include #include "menu.h" -#include "../menu/menus.h" #include "listfiles.h" #include "language/gettext.h" @@ -28,10 +27,15 @@ #include "libwiigui/gui.h" #include "sys.h" #include "filebrowser.h" -#include "../menu.h" /*** Extern variables ***/ extern GuiWindow * mainWindow; +extern u8 shutdown; +extern u8 reset; + +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); static int curDevice = -1; static std::vector browsers; @@ -313,7 +317,7 @@ int BrowseDevice(char * Path, int Path_size, int Flags, FILTERCASCADE *Filter/*= folderBtn.SetImage(&folderImg); folderBtn.SetTrigger(&trigA); folderBtn.SetEffectGrow(); - + char imgPath[100]; snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); GuiImageData btnOutline(imgPath, button_dialogue_box_png); @@ -389,6 +393,12 @@ int BrowseDevice(char * Path, int Path_size, int Flags, FILTERCASCADE *Filter/*= while (menu == MENU_NONE) { VIDEO_WaitVSync(); + if (shutdown == 1) + Sys_Shutdown(); + + if (reset == 1) + Sys_Reboot(); + for (i=0; iGetState() == STATE_CLICKED) { fileBrowser.fileList[i]->ResetState(); @@ -441,7 +451,6 @@ int BrowseDevice(char * Path, int Path_size, int Flags, FILTERCASCADE *Filter/*= } if (ExitBtn.GetState() == STATE_CLICKED) { - result = 0; break; } else if (okBtn.GetState() == STATE_CLICKED) { @@ -477,7 +486,7 @@ int BrowseDevice(char * Path, int Path_size, int Flags, FILTERCASCADE *Filter/*= char oldfolder[100]; snprintf(newfolder, sizeof(newfolder), "%s%s", browser->rootdir, browser->dir); strcpy(oldfolder,newfolder); - + int result = OnScreenKeyboard(newfolder, sizeof(newfolder), strlen(browser->rootdir)); if ( result == 1 ) { unsigned int len = strlen(newfolder); diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp index 9c5e2976..7e8325c2 100644 --- a/source/prompts/gameinfo.cpp +++ b/source/prompts/gameinfo.cpp @@ -19,16 +19,22 @@ #include "gameinfo.h" #include "usbloader/getentries.h" #include "../gecko.h" -#include "../menu.h" -#include "../menu/menus.h" /*** Extern variables ***/ +extern GuiWindow * mainWindow; +extern GuiSound * bgMusic; +extern u8 shutdown; +extern u8 reset; extern struct gameXMLinfo gameinfo; extern struct gameXMLinfo gameinfo_reset; extern u32 gameCnt; extern struct discHdr * gameList; +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /**************************************************************************** * gameinfo @@ -708,7 +714,7 @@ int showGameInfo(char *ID) { snprintf(linebuf, sizeof(linebuf), "%s:",tr("WiFi Features")); } else { strcpy(linebuf,""); - } + } wifiTxt[0] = new GuiText(linebuf, 16, (GXColor) {0,0,0, 255}); wifiTxt[0]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); wifiTxt[0]->SetPosition(205,200+wifiY); @@ -775,6 +781,13 @@ int showGameInfo(char *ID) { gameinfoWindow.SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 100); + GuiTrigger trigZ; + trigZ.SetButtonOnlyTrigger(-1, WPAD_NUNCHUK_BUTTON_Z | WPAD_CLASSIC_BUTTON_ZL, PAD_TRIGGER_Z); + + GuiButton screenShotBtn(0,0); + screenShotBtn.SetPosition(0,0); + screenShotBtn.SetTrigger(&trigZ); + gameinfoWindow.Append(&screenShotBtn); HaltGui(); //mainWindow->SetState(STATE_DISABLED); mainWindow->Append(&gameinfoWindow); @@ -786,8 +799,13 @@ int showGameInfo(char *ID) { while (choice == -1) { VIDEO_WaitVSync(); + if (shutdown == 1) { + wiilight(0); + Sys_Shutdown(); + } else if (reset == 1) + Sys_Reboot(); - if ((backBtn.GetState()==STATE_CLICKED)||(backBtn.GetState()==STATE_HELD)) { + else if ((backBtn.GetState()==STATE_CLICKED)||(backBtn.GetState()==STATE_HELD)) { backBtn.ResetState(); if (page==1) { choice=1; @@ -798,11 +816,13 @@ int showGameInfo(char *ID) { gameinfoWindow2.Remove(&nextBtn); gameinfoWindow2.Remove(&backBtn); gameinfoWindow2.Remove(&homeBtn); + gameinfoWindow2.Remove(&screenShotBtn); gameinfoWindow2.SetVisible(false); gameinfoWindow.SetVisible(true); gameinfoWindow.Append(&backBtn); gameinfoWindow.Append(&nextBtn); gameinfoWindow.Append(&homeBtn); + gameinfoWindow.Append(&screenShotBtn); mainWindow->Remove(&gameinfoWindow2); ResumeGui(); page=1; @@ -815,12 +835,14 @@ int showGameInfo(char *ID) { gameinfoWindow.Remove(&nextBtn); gameinfoWindow.Remove(&backBtn); gameinfoWindow.Remove(&homeBtn); + gameinfoWindow.Remove(&screenShotBtn); gameinfoWindow.SetVisible(false); gameinfoWindow2.SetVisible(true); coverImg->SetPosition(15,30); gameinfoWindow2.Append(&nextBtn); gameinfoWindow2.Append(&backBtn); gameinfoWindow2.Append(&homeBtn); + gameinfoWindow2.Append(&screenShotBtn); mainWindow->Append(&gameinfoWindow2); ResumeGui(); page=2; @@ -829,11 +851,13 @@ int showGameInfo(char *ID) { gameinfoWindow2.Remove(&nextBtn); gameinfoWindow2.Remove(&backBtn); gameinfoWindow2.Remove(&homeBtn); + gameinfoWindow2.Remove(&screenShotBtn); gameinfoWindow2.SetVisible(false); gameinfoWindow.SetVisible(true); gameinfoWindow.Append(&backBtn); gameinfoWindow.Append(&nextBtn); gameinfoWindow.Append(&homeBtn); + gameinfoWindow.Append(&screenShotBtn); mainWindow->Remove(&gameinfoWindow2); ResumeGui(); page=1; @@ -892,6 +916,12 @@ int showGameInfo(char *ID) { } urlBtn.ResetState(); } + else if (screenShotBtn.GetState() == STATE_CLICKED) { + gprintf("\n\tscreenShotBtn clicked"); + screenShotBtn.ResetState(); + ScreenShot(); + gprintf("...It's easy, mmmmmmKay"); + } } if (page==1) { gameinfoWindow.SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_OUT, 100); @@ -1073,10 +1103,10 @@ bool save_XML_URL() { // save xml url as as txt file for people without wifi sleep(1); return false; } - + char XMLurl[3540]; build_XML_URL(XMLurl,sizeof(XMLurl)); - + fprintf(f, "# USB Loader Has Saved this file\n"); fprintf(f, "# This URL was created based on your list of games and language settings.\n"); fclose(f); diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp index ea20541f..3e1d7384 100644 --- a/source/settings/Settings.cpp +++ b/source/settings/Settings.cpp @@ -13,7 +13,6 @@ #include "cheats/cheatmenu.h" #include "fatmounter.h" #include "menu.h" -#include "menu/menus.h" #include "filelist.h" #include "listfiles.h" #include "sys.h" @@ -24,14 +23,19 @@ #define MAXOPTIONS 13 +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); extern void titles_default(); /*** Extern variables ***/ extern GuiWindow * mainWindow; -extern GuiBGM * bgMusic; +extern GuiSound * bgMusic; extern GuiImage * bgImg; extern GuiImageData * pointer[4]; extern GuiImageData * background; +extern u8 shutdown; +extern u8 reset; extern u8 mountMethod; extern struct discHdr *dvdheader; extern PartList partitions; @@ -72,7 +76,7 @@ int MenuSettings() int opt_override = Settings.titlesOverride; // backup partition index u8 settingspartitionold = Settings.partition; - + enum { @@ -533,7 +537,7 @@ int MenuSettings() snprintf(MainButtonText, sizeof(MainButtonText), "%s", tr("Theme Downloader")); MainButton1Txt.SetText(MainButtonText); - snprintf(MainButtonText, sizeof(MainButtonText), "%s", tr("Partition Format Menu")); + snprintf(MainButtonText, sizeof(MainButtonText), "%s", tr(" ")); MainButton2Txt.SetText(MainButtonText); snprintf(MainButtonText, sizeof(MainButtonText), "%s", tr(" ")); MainButton3Txt.SetText(MainButtonText); @@ -553,7 +557,6 @@ int MenuSettings() w.Append(&GoRightBtn); w.Append(&GoLeftBtn); w.Append(&MainButton1); - w.Append(&MainButton2); PageIndicatorBtn1.SetAlpha(50); PageIndicatorBtn2.SetAlpha(50); @@ -608,6 +611,10 @@ int MenuSettings() { VIDEO_WaitVSync (); + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); if ( pageToDisplay == 1 ) { @@ -651,7 +658,12 @@ int MenuSettings() returnhere = 1; - if (backBtn.GetState() == STATE_CLICKED) + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); exit = true; @@ -853,7 +865,7 @@ int MenuSettings() static const char *opts[settings_screensaver_max] = {trNOOP("OFF"),trNOOP("3 min"),trNOOP("5 min"),trNOOP("10 min"),trNOOP("20 min"),trNOOP("30 min"),trNOOP("1 hour")}; options2.SetValue(Idx,"%s",tr(opts[Settings.screensaver])); } - + if(ret == ++Idx || firstRun) { if(firstRun) options2.SetName(Idx, "%s",tr("Mark new games")); @@ -908,7 +920,12 @@ int MenuSettings() { VIDEO_WaitVSync (); - if (backBtn.GetState() == STATE_CLICKED) + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); exit = true; @@ -993,7 +1010,7 @@ int MenuSettings() else options2.SetValue(Idx, "********"); } - + if (ret == ++Idx || firstRun) { if (firstRun) options2.SetName(Idx, "%s", tr("Partition")); @@ -1005,23 +1022,23 @@ int MenuSettings() } while (!IsValidPartition(partitions.pinfo[Settings.partition].fs_type, Settings.cios)); } - + PartInfo pInfo = partitions.pinfo[Settings.partition]; f32 partition_size = partitions.pentry[Settings.partition].size * (partitions.sector_size / GB_SIZE); - + // Get the partition name and it's size in GB's options2.SetValue(Idx,"%s%d (%.2fGB)", pInfo.fs_type == FS_TYPE_FAT32 ? "FAT" : pInfo.fs_type == FS_TYPE_NTFS ? "NTFS" : "WBFS", pInfo.index, partition_size); } - + if (ret == ++Idx || firstRun) { if (firstRun) options2.SetName(Idx, "%s", tr("FAT: Use directories")); if (ret == Idx) { Settings.FatInstallToDir = Settings.FatInstallToDir == 0 ? 1 : 0; } - options2.SetValue(Idx, "%s", tr(opts_no_yes[Settings.FatInstallToDir])); + options2.SetValue(Idx, "%s", tr(opts_no_yes[Settings.FatInstallToDir])); } if(ret == ++Idx || firstRun) @@ -1102,7 +1119,12 @@ int MenuSettings() { VIDEO_WaitVSync (); - if (backBtn.GetState() == STATE_CLICKED) + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); exit = true; @@ -1145,7 +1167,7 @@ int MenuSettings() { char entered[20]; memset(entered, 0, 20); - + //password check to unlock Install,Delete and Format w.Remove(&optionBrowser2); w.Remove(&backBtn); @@ -1262,6 +1284,9 @@ int MenuSettings() optionBrowser2.SetEffect(EFFECT_FADE, 20); while (optionBrowser2.GetEffect() > 0) usleep(50); + + char * oggfile; + bool firstRun = true; while (!exit) { @@ -1269,7 +1294,11 @@ int MenuSettings() bool returnhere = true; - if (backBtn.GetState() == STATE_CLICKED) + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); exit = true; @@ -1307,7 +1336,8 @@ int MenuSettings() w.SetEffect(EFFECT_FADE, -20); while (w.GetEffect()>0) usleep(50); mainWindow->Remove(&w); - returnhere = MenuBackgroundMusic(); + while (returnhere) + returnhere = MenuOGG(); HaltGui(); mainWindow->Append(&w); w.SetEffect(EFFECT_FADE, 20); @@ -1316,14 +1346,13 @@ int MenuSettings() } else WindowPrompt(tr("No SD-Card inserted!"),tr("Insert an SD-Card to use this option."),tr("OK")); } - char * filename = strrchr(Settings.ogg_path, '/'); - if(filename) - { - filename += 1; - options2.SetValue(Idx, "%s", filename); - } - else + if (!strcmp("notset", Settings.ogg_path)) options2.SetValue(Idx, "%s", tr("Standard")); + else + { + oggfile = strrchr(Settings.ogg_path, '/')+1; + options2.SetValue(Idx, "%s", oggfile); + } } if(ret == ++Idx || firstRun) @@ -1394,45 +1423,6 @@ int MenuSettings() options2.SetValue(Idx,"%s", tr("OFF")); } - if(ret == ++Idx || firstRun) - { - if(firstRun) options2.SetName(Idx, "%s",tr("Music Loop Mode")); - if(ret == Idx) - { - Settings.musicloopmode++; - if (Settings.musicloopmode > 3) - Settings.musicloopmode = 0; - - bgMusic->SetLoop(Settings.musicloopmode); - } - - if (Settings.musicloopmode == ONCE) - options2.SetValue(Idx,"Play Once"); - else if(Settings.musicloopmode == LOOP) - options2.SetValue(Idx,"Loop Music"); - else if(Settings.musicloopmode == DIR_LOOP) - options2.SetValue(Idx,"Loop Directory"); - else if(Settings.musicloopmode == RANDOM_BGM) - options2.SetValue(Idx,"Random Directory Music"); - } - - if(ret == ++Idx || firstRun) - { - if(firstRun) options2.SetName(Idx, "%s",tr("Reset BG Music")); - if(ret == Idx) - { - int result = WindowPrompt(tr("Reset to standard BGM?"), 0, tr("Yes"), tr("No")); - if(result) - { - bgMusic->LoadStandard(); - bgMusic->Play(); - options2.SetValue(0, "%s", tr("Standard")); - } - } - - options2.SetValue(Idx,tr(" ")); - } - firstRun = false; } } @@ -1484,8 +1474,12 @@ int MenuSettings() { VIDEO_WaitVSync (); + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); - if (backBtn.GetState() == STATE_CLICKED) + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); exit = true; @@ -1894,7 +1888,7 @@ int MenuSettings() } options2.SetValue(Idx, "%s", Settings.BcaCodepath); } - + if(ret == ++Idx || firstRun) { if(firstRun) options2.SetName(Idx, "%s", tr("WIP Patches Path")); @@ -2054,20 +2048,6 @@ int MenuSettings() pageToDisplay = 0; break; } - if (MainButton2.GetState() == STATE_CLICKED) - { - if(Settings.godmode == 1) - { - if (isInserted(bootDevice)) - cfg_save_global(); - menu = MENU_FORMAT; - pageToDisplay = 0; - break; - } - else - WindowPrompt(tr("You can't access this menu!"), tr("Unlock the app first."), tr("OK")); - MainButton2.ResetState(); - } } @@ -2166,7 +2146,7 @@ int MenuSettings() w.SetEffect(EFFECT_FADE, -20); while (w.GetEffect()>0) usleep(50); - // if partition has changed, Reinitialize it + // if partition has changed, Reinitialize it PartInfo pinfo = partitions.pinfo[Settings.partition]; partitionEntry pentry = partitions.pentry[Settings.partition]; load_from_fs = pinfo.part_fs; @@ -2174,7 +2154,7 @@ int MenuSettings() WBFS_Close(); WBFS_OpenPart(load_from_fs, pinfo.index, pentry.sector, pentry.size, (char *) &game_partition); } - + // if language has changed, reload titles char opt_langnew[100]; strcpy(opt_langnew,Settings.language_path); @@ -2448,7 +2428,7 @@ int GameSettings(struct discHdr * header) iosChoice = i250; else if (Settings.cios == ios223) iosChoice = i223; - else + else iosChoice = i249; parentalcontrolChoice = 0; fix002 = Settings.error002; @@ -2469,6 +2449,11 @@ int GameSettings(struct discHdr * header) { VIDEO_WaitVSync (); + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + if (MainButton1.GetState() == STATE_CLICKED) { w.Append(&saveBtn); @@ -2504,6 +2489,10 @@ int GameSettings(struct discHdr * header) returnhere = 1; + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); @@ -2773,6 +2762,10 @@ int GameSettings(struct discHdr * header) { VIDEO_WaitVSync (); + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp index 3876df8b..6a87e2c3 100644 --- a/source/settings/SettingsPrompts.cpp +++ b/source/settings/SettingsPrompts.cpp @@ -10,70 +10,305 @@ #include "settings/cfg.h" #include "network/URL_List.h" #include "listfiles.h" -#include "menu/menus.h" #include "main.h" #include "fatmounter.h" #include "filelist.h" -#include "prompts/filebrowser.h" #include "sys.h" -#include "menu/menus.h" +#include "menu.h" + + +/*** Extern variables ***/ +extern GuiWindow * mainWindow; +extern GuiSound * bgMusic; +extern u8 shutdown; +extern u8 reset; + +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); /**************************************************************************** * MenuOGG ***************************************************************************/ -bool MenuBackgroundMusic() -{ - bool ret = false; - char entered[1024]; - int result = -1; - snprintf(entered, sizeof(entered), "%s", Settings.ogg_path); +bool MenuOGG() { + int cnt = 0; + int ret = 0, choice = 0; + int scrollon, nothingchanged = 0; + bool returnhere = false; - if(strcmp(entered, "") == 0) - { - sprintf(entered, "%s", bootDevice); + GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, Settings.sfxvolume); + // because destroy GuiSound must wait while sound playing is finished, we use a global sound + if(!btnClick2) btnClick2=new GuiSound(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + // GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, Settings.sfxvolume); + + char imgPath[100]; + + snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); + GuiImageData btnOutline(imgPath, button_dialogue_box_png); + snprintf(imgPath, sizeof(imgPath), "%ssettings_background.png", CFG.theme_path); + GuiImageData settingsbg(imgPath, settings_background_png); + + GuiTrigger trigA; + trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); + GuiTrigger trigB; + trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B); + GuiTrigger trigMinus; + trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0); + GuiTrigger trigPlus; + trigPlus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_PLUS | WPAD_CLASSIC_BUTTON_PLUS, 0); + + char fullpath[150]; + char shortpath[35]; + int countoggs = GetAllDirFiles(Settings.oggload_path); + + if (!strcmp("", Settings.oggload_path)) { + sprintf(shortpath, "%s", tr("Standard")); + } else { + sprintf(shortpath, "%s", Settings.oggload_path); } - else - { - char * pathptr = strrchr(entered, '/'); - if(pathptr) - { - pathptr++; - int choice = WindowPrompt(tr("Playing Music:"), pathptr, tr("Play Previous"), tr("Play Next"), tr("Change Play Path"), tr("Cancel")); - if(choice == 1) - { - return bgMusic->PlayPrevious(); + + GuiText titleTxt(shortpath, 24, (GXColor) {0, 0, 0, 255}); + titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); + titleTxt.SetPosition(0,0); + GuiButton pathBtn(300, 50); + pathBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + pathBtn.SetPosition(0,28); + pathBtn.SetLabel(&titleTxt); + pathBtn.SetSoundOver(&btnSoundOver); + pathBtn.SetSoundClick(btnClick2); + pathBtn.SetTrigger(&trigA); + pathBtn.SetEffectGrow(); + + GuiImage oggmenubackground(&settingsbg); + oggmenubackground.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + oggmenubackground.SetPosition(0, 0); + + GuiText backBtnTxt(tr("Back") , 22, THEME.prompttext); + backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); + GuiImage backBtnImg(&btnOutline); + if (Settings.wsprompt == yes) { + backBtnTxt.SetWidescreen(CFG.widescreen); + backBtnImg.SetWidescreen(CFG.widescreen); + } + GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); + backBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + backBtn.SetPosition(-180, 400); + backBtn.SetLabel(&backBtnTxt); + backBtn.SetImage(&backBtnImg); + backBtn.SetSoundOver(&btnSoundOver); + backBtn.SetSoundClick(btnClick2); + backBtn.SetTrigger(&trigA); + backBtn.SetTrigger(&trigB); + backBtn.SetEffectGrow(); + + GuiText defaultBtnTxt(tr("Default") , 22, THEME.prompttext); + defaultBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); + GuiImage defaultBtnImg(&btnOutline); + if (Settings.wsprompt == yes) { + defaultBtnTxt.SetWidescreen(CFG.widescreen); + defaultBtnImg.SetWidescreen(CFG.widescreen); + } + GuiButton defaultBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); + defaultBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + defaultBtn.SetPosition(180, 400); + defaultBtn.SetLabel(&defaultBtnTxt); + defaultBtn.SetImage(&defaultBtnImg); + defaultBtn.SetSoundOver(&btnSoundOver); + defaultBtn.SetSoundClick(btnClick2); + defaultBtn.SetTrigger(&trigA); + defaultBtn.SetEffectGrow(); + + customOptionList options2(countoggs); + + for (cnt = 0; cnt < countoggs; cnt++) { + options2.SetValue(cnt, "%s", GetFileName(cnt)); + options2.SetName(cnt,"%i.", cnt+1); + } + + if (cnt < 9) { + scrollon = 0; + } else { + scrollon = 1; + } + + GuiCustomOptionBrowser optionBrowser4(396, 280, &options2, CFG.theme_path, "bg_options_settings.png", bg_options_settings_png, scrollon, 10); + optionBrowser4.SetPosition(0, 90); + optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + + snprintf(imgPath, sizeof(imgPath), "%smp3_stop.png", CFG.theme_path); + GuiImageData stop(imgPath, mp3_stop_png); + snprintf(imgPath, sizeof(imgPath), "%sstartgame_arrow_right.png", CFG.theme_path); + GuiImageData play(imgPath, startgame_arrow_right_png); + + GuiImage playBtnImg(&play); + playBtnImg.SetWidescreen(CFG.widescreen); + GuiButton playBtn(play.GetWidth(), play.GetHeight()); + playBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + playBtn.SetPosition(50, 400); + playBtn.SetImage(&playBtnImg); + playBtn.SetSoundOver(&btnSoundOver); + playBtn.SetSoundClick(btnClick2); + playBtn.SetTrigger(&trigA); + playBtn.SetTrigger(&trigPlus); + playBtn.SetEffectGrow(); + + GuiImage stopBtnImg(&stop); + stopBtnImg.SetWidescreen(CFG.widescreen); + GuiButton stopBtn(stop.GetWidth(), stop.GetHeight()); + stopBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + stopBtn.SetPosition(-15, 400); + stopBtn.SetImage(&stopBtnImg); + stopBtn.SetSoundOver(&btnSoundOver); + stopBtn.SetSoundClick(btnClick2); + stopBtn.SetTrigger(&trigA); + stopBtn.SetTrigger(&trigMinus); + stopBtn.SetEffectGrow(); + + HaltGui(); + GuiWindow w(screenwidth, screenheight); + w.Append(&oggmenubackground); + w.Append(&pathBtn); + w.Append(&backBtn); + w.Append(&playBtn); + w.Append(&stopBtn); + w.Append(&defaultBtn); + w.Append(&optionBrowser4); + mainWindow->Append(&w); + + w.SetEffect(EFFECT_FADE, 20); + ResumeGui(); + + while (w.GetEffect()>0) usleep(50); + + while (!returnhere) { + + if (shutdown == 1) + Sys_Shutdown(); + if (reset == 1) + Sys_Reboot(); + + if (backBtn.GetState() == STATE_CLICKED) { + if (nothingchanged == 1 && countoggs > 0) { + if (strcmp("", Settings.oggload_path) && strcmp("notset", Settings.ogg_path)) { + bgMusic->Load(Settings.ogg_path); + } else { + bgMusic->Load(bg_music_ogg, bg_music_ogg_size, true); + } + bgMusic->Play(); } - else if(choice == 2) - { - return bgMusic->PlayNext(); - } - else if(choice == 3) - { - pathptr[0] = 0; - } - else - return true; + backBtn.ResetState(); + break; } - else - sprintf(entered, "%s", bootDevice); - } - result = BrowseDevice(entered, sizeof(entered), FB_DEFAULT); - - if(result) - { - if (!bgMusic->Load(entered)) - { - WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK")); + if (defaultBtn.GetState() == STATE_CLICKED) { + choice = WindowPrompt(tr("Loading standard music."),0,tr("OK"), tr("Cancel")); + if (choice == 1) { + sprintf(Settings.ogg_path, "notset"); + bgMusic->Load(bg_music_ogg, bg_music_ogg_size, true); + bgMusic->Play(); + bgMusic->SetVolume(Settings.volume); + cfg_save_global(); + } + defaultBtn.ResetState(); + if (countoggs > 0) + optionBrowser4.SetFocus(1); + } + + if (pathBtn.GetState() == STATE_CLICKED) { + w.Remove(&optionBrowser4); + w.Remove(&backBtn); + w.Remove(&pathBtn); + w.Remove(&playBtn); + w.Remove(&stopBtn); + w.Remove(&defaultBtn); + char entered[43] = ""; + strlcpy(entered, Settings.oggload_path, sizeof(entered)); + int result = OnScreenKeyboard(entered,43,0); + w.Append(&optionBrowser4); + w.Append(&pathBtn); + w.Append(&backBtn); + w.Append(&playBtn); + w.Append(&stopBtn); + w.Append(&defaultBtn); + if ( result == 1 ) { + int len = (strlen(entered)-1); + if (entered[len] !='/') + strncat (entered, "/", 1); + strlcpy(Settings.oggload_path, entered, sizeof(Settings.oggload_path)); + WindowPrompt(tr("Backgroundmusic Path changed."),0,tr("OK")); + if (isInserted(bootDevice)) { + if (!strcmp("", Settings.oggload_path)) { + sprintf(Settings.ogg_path, "notset"); + bgMusic->Play(); + } + cfg_save_global(); + returnhere = true; + break; + } else { + WindowPrompt(tr("No SD-Card inserted!"), tr("Insert an SD-Card to save."), tr("OK")); + } + } + if (countoggs > 0) { + optionBrowser4.SetFocus(1); + } + pathBtn.ResetState(); + } + + ret = optionBrowser4.GetClickedOption(); + + if (ret>=0) { + choice = WindowPrompt(tr("Set as backgroundmusic?"),GetFileName(ret),tr("Yes"),tr("No")); + if (choice == 1) { + snprintf(fullpath,150,"%s%s",Settings.oggload_path,GetFileName(ret)); + if (!bgMusic->Load(fullpath)) { + WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK")); + sprintf(Settings.ogg_path, "notset"); + } else { + snprintf(Settings.ogg_path, sizeof(Settings.ogg_path), "%s", fullpath); + cfg_save_global(); + bgMusic->SetVolume(Settings.volume); + nothingchanged = 0; + } + bgMusic->Play(); + bgMusic->SetVolume(Settings.volume); + } + optionBrowser4.SetFocus(1); + } + + if (playBtn.GetState() == STATE_CLICKED && countoggs > 0) { + if (countoggs > 0) { + ret = optionBrowser4.GetSelectedOption(); + snprintf(fullpath, 150,"%s%s", Settings.oggload_path,GetFileName(ret)); + if (!bgMusic->Load(fullpath)) { + WindowPrompt(tr("Not supported format!"), tr("Loading standard music."), tr("OK")); + } + bgMusic->Play(); + bgMusic->SetVolume(Settings.volume); + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + playBtn.ResetState(); + } + + if (stopBtn.GetState() == STATE_CLICKED) { + if (countoggs > 0) { + bgMusic->Stop(); + nothingchanged = 1; + optionBrowser4.SetFocus(1); + } + stopBtn.ResetState(); } - else - ret = true; - bgMusic->Play(); - bgMusic->SetVolume(Settings.volume); } - return ret; + w.SetEffect(EFFECT_FADE, -20); + while (w.GetEffect()>0) usleep(50); + + HaltGui(); + mainWindow->Remove(&w); + ResumeGui(); + + return returnhere; } /**************************************************************************** @@ -218,7 +453,12 @@ int MenuLanguageSelect() { while (!returnhere) { - if (backBtn.GetState() == STATE_CLICKED) { + if (shutdown == 1) + Sys_Shutdown(); + else if (reset == 1) + Sys_Reboot(); + + else if (backBtn.GetState() == STATE_CLICKED) { backBtn.ResetState(); break; diff --git a/source/settings/SettingsPrompts.h b/source/settings/SettingsPrompts.h index d16a12ac..cf7098cc 100644 --- a/source/settings/SettingsPrompts.h +++ b/source/settings/SettingsPrompts.h @@ -8,7 +8,7 @@ #ifndef _SETTINGSPROMPTS_H_ #define _SETTINGSPROMPTS_H_ -bool MenuBackgroundMusic(); +bool MenuOGG(); int MenuLanguageSelect(); #endif diff --git a/source/settings/cfg.c b/source/settings/cfg.c index 7064a85c..4d89cb2b 100644 --- a/source/settings/cfg.c +++ b/source/settings/cfg.c @@ -201,7 +201,8 @@ void CFG_Default(int widescreen) { // -1 = non forced Mode snprintf(Settings.BcaCodepath, sizeof(Settings.BcaCodepath), "%s/bca/", bootDevice); snprintf(Settings.WipCodepath, sizeof(Settings.WipCodepath), "%s/wip/", bootDevice); snprintf(Settings.dolpath, sizeof(Settings.dolpath), "%s/", bootDevice); - strcpy(Settings.ogg_path, ""); + snprintf(Settings.oggload_path, sizeof(Settings.oggload_path), "%s/config/backgroundmusic/", bootDevice); + sprintf(Settings.ogg_path, "notset"); } //always set Theme defaults //all alignments are left top here @@ -357,7 +358,6 @@ void Global_Default(void) { snprintf(Settings.db_language, sizeof(Settings.db_language), empty); Settings.db_JPtoEN = 0; Settings.screensaver = 3; - Settings.musicloopmode = 1; Settings.partition = -1; Settings.marknewtitles = 1; Settings.FatInstallToDir = 0; @@ -579,6 +579,10 @@ void path_set(char *name, char *val) { strlcpy(Settings.dolpath, val, sizeof(Settings.dolpath)); return; } + if (strcmp(name, "oggload_path") == 0) { + strlcpy(Settings.oggload_path, val, sizeof(Settings.oggload_path)); + return; + } if (strcmp(name, "ogg_path") == 0) { strlcpy(Settings.ogg_path, val, sizeof(Settings.ogg_path)); return; @@ -1107,12 +1111,6 @@ void global_cfg_set(char *name, char *val) { Settings.screensaver = i; } return; - } else if (strcmp(name, "musicloopmode") == 0) { - int i; - if (sscanf(val, "%d", &i) == 1) { - Settings.musicloopmode = i; - } - return; } else if (strcmp(name, "partition") == 0) { int i; if (sscanf(val, "%d", &i) == 1) { @@ -1366,6 +1364,7 @@ bool cfg_save_global() { // save global settings fprintf(f, "titlestxt_path = %s\n ", Settings.titlestxt_path); fprintf(f, "gamesound = %d\n ", Settings.gamesound); fprintf(f, "dolpath = %s\n ", Settings.dolpath); + fprintf(f, "oggload_path = %s\n ", Settings.oggload_path); fprintf(f, "ogg_path = %s\n ", Settings.ogg_path); fprintf(f, "wiilight = %d\n ", Settings.wiilight); fprintf(f, "gameDisplay = %d\n ", Settings.gameDisplay); @@ -1381,7 +1380,6 @@ bool cfg_save_global() { // save global settings //fprintf(f, "db_language = %d\n ", Settings.language); fprintf(f, "patchcountrystrings = %d\n ", Settings.patchcountrystrings); fprintf(f, "screensaver = %d\n ", Settings.screensaver); - fprintf(f, "musicloopmode = %d\n ", Settings.musicloopmode); fprintf(f, "error002 = %d\n ", Settings.error002); fprintf(f, "autonetwork = %d\n ", Settings.autonetwork); fprintf(f, "discart = %d\n ", Settings.discart); diff --git a/source/settings/cfg.h b/source/settings/cfg.h index d10c1602..a2a1c764 100644 --- a/source/settings/cfg.h +++ b/source/settings/cfg.h @@ -414,7 +414,6 @@ extern "C" { u8 patchcountrystrings; u8 screensaver; s8 partition; - s8 musicloopmode; short godmode; char covers_path[100]; char covers2d_path[100]; @@ -425,7 +424,8 @@ extern "C" { char titlestxt_path[100]; char language_path[100]; char languagefiles_path[100]; - char ogg_path[250]; + char oggload_path[100]; + char ogg_path[150]; char dolpath[150]; char update_path[150]; char homebrewapps_path[150]; @@ -448,7 +448,7 @@ extern "C" { u8 partitions_to_install; u8 fullcopy; u8 beta_upgrades; - struct SParental parental; + struct SParental parental; }; extern struct SSettings Settings; diff --git a/source/sys.cpp b/source/sys.cpp index 5967d76d..18996532 100644 --- a/source/sys.cpp +++ b/source/sys.cpp @@ -14,13 +14,10 @@ #include "fatmounter.h" #include "sys.h" #include "wpad.h" -#include "menu/menus.h" extern char game_partition[6]; extern u8 load_from_fs; -extern u8 hddState; - //Wiilight stuff static vu32 *_wiilight_reg = (u32*)0xCD0000C0; void wiilight(int enable) { // Toggle wiilight (thanks Bool for wiilight source) @@ -71,51 +68,44 @@ void Sys_Reboot(void) { int Sys_ChangeIos(int ios) { s32 prevIos = IOS_GetVersion(); - + SDCard_deInit(); - if (hddState) - USBDevice_deInit(); - + USBDevice_deInit(); + WPAD_Flush(0); WPAD_Disconnect(0); WPAD_Shutdown(); - if (hddState) - { - WDVD_Close(); - USBStorage_Deinit(); - } - + + WDVD_Close(); + + USBStorage_Deinit(); + s32 ret = IOS_ReloadIOSsafe(ios); if (ret < 0) { ios = prevIos; } - + SDCard_Init(); if (ios == 222 || ios == 223) { load_ehc_module(); } - - if (hddState) - USBDevice_Init(); + USBDevice_Init(); PAD_Init(); Wpad_Init(); WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR); WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight); - if (hddState) - { - WBFS_Init(WBFS_DEVICE_USB); - Disc_Init(); - - if (Sys_IsHermes()) { - WBFS_OpenNamed((char *) &game_partition); - } else { - WBFS_Open(); - } - } - + WBFS_Init(WBFS_DEVICE_USB); + Disc_Init(); + + if (Sys_IsHermes()) { + WBFS_OpenNamed((char *) &game_partition); + } else { + WBFS_Open(); + } + return ret; } @@ -124,22 +114,17 @@ int Sys_IosReload(int IOS) { //shutdown SD and USB before IOS Reload in DiscWait SDCard_deInit(); - if (hddState) - USBDevice_deInit(); + USBDevice_deInit(); WPAD_Flush(0); WPAD_Disconnect(0); WPAD_Shutdown(); - if (hddState) - { - WDVD_Close(); - USBStorage_Deinit(); - } + WDVD_Close(); - ret = IOS_ReloadIOSsafe(IOS); - if (ret < 0) return ret; - if ((IOS == 249 || IOS == 222 || IOS == 223) && hddState) { + USBStorage_Deinit(); + + if (IOS == 249 || IOS == 222 || IOS == 223) { for (int i = 0; i < 10; i++) { ret = IOS_ReloadIOSsafe(IOS); if (ret < 0) return ret; @@ -163,8 +148,7 @@ int Sys_IosReload(int IOS) { WPAD_SetVRes(WPAD_CHAN_ALL, screenwidth, screenheight); //reinitialize SD and USB SDCard_Init(); - if (hddState) - USBDevice_Init(); + USBDevice_Init(); return ret; } @@ -244,34 +228,34 @@ s32 ios250rev = -69; s32 IOS_ReloadIOSsafe(int ios) { if (ios==222) - { + { if (ios222rev == -69) ios222rev = getIOSrev(0x00000001000000dell); - - if (ios222rev >= 0 && !(ios222rev >= 4 && ios222rev < 65280)) return -2; + + if (ios222rev >= 0 && (ios222rev != 4 && ios222rev != 5))return -2; } else if (ios==223) - { + { if (ios223rev == -69) ios223rev = getIOSrev(0x00000001000000dfll); - - if (ios223rev >= 0 && !(ios223rev >= 4 && ios223rev < 65280)) return -2; + + if (ios223rev >= 0 && (ios223rev != 4 && ios223rev != 5))return -2; } else if (ios==249) - { + { if (ios249rev == -69) - ios249rev = getIOSrev(0x00000001000000f9ll); - - if (ios249rev >= 0 && !(ios249rev >= 9 && ios249rev < 65280))return -2; + ios249rev = getIOSrev(0x00000001000000f9ll); + + if (ios249rev >= 0 && !(ios249rev>=9 && ios249rev<65280))return -2; } else if (ios==250) - { + { if (ios250rev == -69) ios250rev = getIOSrev(0x00000001000000fall); - - if (ios250rev >= 0 && !(ios250rev >= 9 && ios250rev < 65280))return -2; + + if (ios250rev >= 0 && !(ios250rev>=9 && ios250rev<65280))return -2; } - + s32 r = IOS_ReloadIOS(ios); if (r >= 0) { WII_Initialize(); @@ -279,90 +263,6 @@ s32 IOS_ReloadIOSsafe(int ios) return r; } - - -s32 CheckForCIOS() -{ - gprintf("\n\tChecking for stub IOS"); - s32 ret = 1; - ios222rev = getIOSrev(0x00000001000000dell); - ios249rev = getIOSrev(0x00000001000000f9ll); - - //if we don't like either of the cIOS then scram - if (!((ios222rev >= 4 && ios222rev < 65280) || (ios249rev >=9 && ios249rev < 65280))) - { - InitTextVideo(); - printf("\x1b[2J"); - if ((ios222rev < 0 && ios222rev != WII_EINSTALL) && (ios249rev < 0 && ios249rev != WII_EINSTALL)) { - printf("\n\n\n\tWARNING!"); - printf("\n\tUSB Loader GX needs unstubbed cIOS 222 v4 or 249 v9+"); - printf("\n\n\tWe cannot determine the versions on your system,\n\tsince you have no patched ios 36 or 236 installed."); - printf("\n\tTherefor, if loading of USB Loader GX fails, you\n\tprobably have installed the 4.2 update,"); - printf("\n\tand you should go figure out how to get some cios action going on\n\tin your Wii."); - printf("\n\n\tThis message will show every time."); - sleep(5); - } else { - printf("\n\n\n\tERROR!"); - printf("\n\tUSB Loader GX needs unstubbed cIOS 222 v4 or 249 v9+"); - printf("\n\n\tI found \n\t\t222 = %d%s",ios222rev,ios222rev==65280?" (Stubbed by 4.2 update)":""); - printf("\n\t\t249 = %d%s",ios249rev,ios249rev==65280?" (Stubbed by 4.2 update)":""); - printf("\n\n\tGo figure out how to get some cIOS action going on\n\tin your Wii and come back and see me."); - - sleep(15); - printf("\n\n\tBye"); - - USBDevice_deInit(); - exit(0); - } - } - - return ret; -} - -int LoadAppCIOS() -{ - s32 ret = 1; - /* Load Custom IOS */ - SDCard_deInit();// unmount SD for reloading IOS - USBDevice_deInit();// unmount USB for reloading IOS - USBStorage_Deinit(); - - //this is needed otherwise IOS_Reload fails - IOS_ReloadIOSsafe(249); - - if (Settings.cios == ios222 && IOS_GetVersion() != 222) - { - printf("\n\tReloading IOS to config setting (222)..."); - ret = IOS_ReloadIOSsafe(222); - printf("%d", ret); - if (ret < 0) - { - Settings.cios = ios249; - IOS_ReloadIOSsafe(249); - } - } - - if ((Settings.cios == ios249 && IOS_GetVersion() != 249) - || (Settings.cios == ios250 && IOS_GetVersion() != 250)) - { - printf("\n\tReloading IOS to config setting (%d)...", (Settings.cios == ios249) ? 249 : 250); - ret = IOS_ReloadIOSsafe((Settings.cios == ios249) ? 249 : 250); - printf("%d", ret); - if (ret < 0) { - Settings.cios = ios222; - ret = IOS_ReloadIOSsafe(222); - } - } - - SDCard_Init(); - if(IOS_GetVersion() == 222) - load_ehc_module(); - - USBDevice_Init(); - - return ret; -} - #include void ScreenShot() diff --git a/source/sys.h b/source/sys.h index e2dd3169..2ee89d1b 100644 --- a/source/sys.h +++ b/source/sys.h @@ -13,8 +13,6 @@ void Sys_LoadMenu(void); void Sys_BackToLoader(void); int Sys_ChangeIos(int ios); int Sys_IosReload(int IOS); -s32 CheckForCIOS(); -int LoadAppCIOS(); bool Sys_IsHermes(); s32 IOS_ReloadIOSsafe(int ios); void ScreenShot(); diff --git a/source/themes/Theme_Downloader.cpp b/source/themes/Theme_Downloader.cpp index e3109dc5..b1d00630 100644 --- a/source/themes/Theme_Downloader.cpp +++ b/source/themes/Theme_Downloader.cpp @@ -24,10 +24,16 @@ #include "ZipFile.h" #include "gecko.h" +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); + /*** Extern variables ***/ extern GuiWindow * mainWindow; extern GuiSound * bgMusic; extern GuiImage * bgImg; +extern u8 shutdown; +extern u8 reset; int DownloadTheme(const char *url, const char *title) @@ -239,6 +245,11 @@ static int Theme_Prompt(const char *title, const char *author, GuiImageData *thu { VIDEO_WaitVSync(); + if (shutdown == 1) + Sys_Shutdown(); + else if (reset == 1) + Sys_Reboot(); + if (downloadBtn.GetState() == STATE_CLICKED) { int choice = WindowPrompt(tr("Do you want to download this theme?"), title, tr("Yes"), tr("Cancel")); @@ -568,7 +579,12 @@ int Theme_Downloader() { VIDEO_WaitVSync (); - if (wifiBtn.GetState() == STATE_CLICKED) + if (shutdown == 1) + Sys_Shutdown(); + else if (reset == 1) + Sys_Reboot(); + + else if (wifiBtn.GetState() == STATE_CLICKED) { Initialize_Network(); wifiBtn.ResetState(); diff --git a/source/usbloader/getentries.cpp b/source/usbloader/getentries.cpp index 4cb26916..afd54079 100644 --- a/source/usbloader/getentries.cpp +++ b/source/usbloader/getentries.cpp @@ -9,7 +9,6 @@ #include "../prompts/TitleBrowser.h" -#include "../gecko.h" #include "wad/wad.h" #include "xml/xml.h" #include "../wad/title.h" @@ -51,9 +50,9 @@ static inline int wcsnicmp(const wchar_t *s1, const wchar_t *s2, int len) if (*s1++ == 0) break; } while (--len != 0); - + return (0); -} +} /**************************************************************************** @@ -132,7 +131,7 @@ int __Menu_GetPrevFilter(int t, wchar_t* gameFilter, u32 gameFiltered, wchar_t * struct discHdr *buffer = NULL; u32 cnt, len, i; s32 ret; - + wchar_t *new_gameFilterPrev = wcsdup_new(gameFilter); @@ -183,8 +182,8 @@ int __Menu_GetPrevFilter(int t, wchar_t* gameFilter, u32 gameFiltered, wchar_t * { // Check game rating in WiiTDB, since the default Wii parental control setting is enabled s32 rating = GetRatingForGame((char *) header->id); - - if ((rating != -1 && rating > Settings.parental.rating) || + + if ((rating != -1 && rating > Settings.parental.rating) || (rating == -1 && get_pegi_block(header) > Settings.parental.rating)) { continue; @@ -194,7 +193,7 @@ int __Menu_GetPrevFilter(int t, wchar_t* gameFilter, u32 gameFiltered, wchar_t * wchar_t *wname = FreeTypeGX::charToWideChar(get_title(header)); if(wname) nameList.push_back(wname); } - + NewTitles::Instance()->Save(); /* delete buffer */ @@ -226,7 +225,7 @@ int __Menu_GetPrevFilter(int t, wchar_t* gameFilter, u32 gameFiltered, wchar_t * /**************************************************************************** * Get GameFilter NextList ***************************************************************************/ - + int int_cmp(const void *a, const void *b) { return *((u32*)a)-*((u32*)b); } int __Menu_GetGameFilter_NextList(discHdr *gameList, u32 gameCnt, wchar_t **PgameFilter, wchar_t **PgameFilterNextList) @@ -249,15 +248,15 @@ int __Menu_GetGameFilter_NextList(discHdr *gameList, u32 gameCnt, wchar_t **Pgam } else if(wcslen(gameName) == filter_len) autofill = false; // no autofill when gameNameLen == filterLen - + nextList[i] = nextFilterChar; } qsort(nextList, gameCnt, sizeof(u32), int_cmp); - + *PgameFilterNextList = new wchar_t[gameCnt+1]; if(*PgameFilterNextList == NULL) goto error; - - + + p = *PgameFilterNextList; lastChar = 0; for(i=0; iid[4]='1'; header->id[5]=(i - + //not using these filters right now, but i left them in just in case // Filters /*if (Settings.fave) { @@ -402,32 +401,32 @@ int buildTitleList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *PgameC if (!game_num || game_num->favorite==0) continue; } - + if (Settings.parentalcontrol && !Settings.godmode) { if (get_block(header) >= Settings.parentalcontrol) continue; }*/ - - if(gameFilter && *gameFilter) { + + if(gameFilter && *gameFilter) { u32 filter_len = wcslen(gameFilter); wchar_t *gameName = FreeTypeGX::charToWideChar(get_title(header)); if (!gameName || wcsnicmp(gameName, gameFilter, filter_len)) { delete [] gameName; continue; - } - } + } + } if(i != cnt2) buffer[cnt2] = buffer[i]; cnt2++; } i++; } - + if (f)fclose(f); Uninstall_FromTitle(TITLE_ID(1, 0)); ISFS_Deinitialize(); - + if(cnt > cnt2) { cnt = cnt2; @@ -435,7 +434,7 @@ int buildTitleList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *PgameC } if (!buffer) return -1; - + if (Settings.sort==pcount) { qsort(buffer, cnt, sizeof(struct discHdr), __Menu_EntryCmpCount); } else if (Settings.fave) { @@ -446,12 +445,12 @@ int buildTitleList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *PgameC /*PgameList = buffer; buffer = NULL; PgameCnt = cnt;*/ - + if(PgameList) *PgameList = buffer; else free(buffer); if(PgameCnt) *PgameCnt = cnt; - + return 0; - + return cnt; } @@ -470,7 +469,7 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg ret = WBFS_GetCount(&cnt); if (ret < 0) return ret; -//gprintf("\n WBFS_GetCount:%d",cnt); + /* Buffer length */ len = sizeof(struct discHdr) * cnt; @@ -488,7 +487,7 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg if (buffer) free(buffer); return ret; } - + for (u32 i = 0; i < cnt; i++) { struct discHdr *header = &buffer[i]; @@ -507,7 +506,7 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg header->id[2]=='C'&&header->id[3]=='F'&& header->id[4]=='G'&&header->id[5]=='_') continue; - + if (Settings.parentalcontrol && !Settings.godmode && t==0) { if (get_block(header) >= Settings.parentalcontrol) continue; @@ -518,13 +517,13 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg { // Check game rating in WiiTDB, since the default Wii parental control setting is enabled s32 rating = GetRatingForGame((char *) header->id); - if ((rating != -1 && rating > Settings.parental.rating) || + if ((rating != -1 && rating > Settings.parental.rating) || (rating == -1 && get_pegi_block(header) > Settings.parental.rating)) { continue; } } - + if(gameFilter && *gameFilter && t==0) { u32 filter_len = wcslen(gameFilter); wchar_t *gameName = FreeTypeGX::charToWideChar(get_title(header)); @@ -538,7 +537,7 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg cnt2++; } NewTitles::Instance()->Save(); - + if(cnt > cnt2) { cnt = cnt2; @@ -546,7 +545,7 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg } if (!buffer) return -1; - + if (Settings.sort==pcount) { qsort(buffer, cnt, sizeof(struct discHdr), __Menu_EntryCmpCount); } else if (Settings.fave) { @@ -558,18 +557,18 @@ int __Menu_GetGameList(int t, wchar_t* gameFilter, discHdr ** PgameList, u32 *Pg /* Set values */ if(PgameList) *PgameList = buffer; else free(buffer); if(PgameCnt) *PgameCnt = cnt; - + return 0; } int __Menu_GetEntries(int t, const wchar_t* Filter) { -//gprintf("\n__Menu_GetEntries()"); + /*if (mountMethod==3) - { + { return buildTitleList(); }*/ - - + + u32 new_gameCnt = 0; struct discHdr *new_gameList = NULL; wchar_t *new_gameFilter = NULL; @@ -577,51 +576,32 @@ int __Menu_GetEntries(int t, const wchar_t* Filter) { wchar_t *new_gameFilterPrev = NULL; new_gameFilter = wcsdup_new(Filter ? Filter : (gameFilter ? gameFilter : L"") ); - if(new_gameFilter == NULL) - { - //gprintf("\nnew_gameFilter == NULL"); - return -1; - } - + if(new_gameFilter == NULL) return -1; + for(;;) { if (mountMethod==3) - { - int butt =buildTitleList(t, new_gameFilter, &new_gameList, &new_gameCnt); - if (butt < 0) - { - gprintf("\nbutt:%d", butt); - return -1; - } - } - - else - { - if(__Menu_GetGameList(t, new_gameFilter, &new_gameList, &new_gameCnt) < 0) - { - gprintf("\n__Menu_GetGameList(t, new_gameFilter, &new_gameList, &new_gameCnt) < 0"); - return -1; - } - } - - + {if(buildTitleList(t, new_gameFilter, &new_gameList, &new_gameCnt) < 0) + return -1;} + + else + {if(__Menu_GetGameList(t, new_gameFilter, &new_gameList, &new_gameCnt) < 0) + return -1;} + + if(new_gameCnt > 0 || new_gameFilter[0] == 0) - { - //gprintf("\nnew_gameCnt:%d",new_gameCnt); break; - } new_gameFilter[wcslen(new_gameFilter)-1] = 0; } - if (mountMethod!=3) - { - /* init GameFilterNextList */ - if(__Menu_GetGameFilter_NextList(new_gameList, new_gameCnt, &new_gameFilter, &new_gameFilterNextList) < 0) - goto error; - /* init GameFilterPrev */ - if(__Menu_GetPrevFilter(t, new_gameFilter, new_gameCnt, &new_gameFilterPrev) < 0) - goto error; - } + /* init GameFilterNextList */ + if(__Menu_GetGameFilter_NextList(new_gameList, new_gameCnt, &new_gameFilter, &new_gameFilterNextList) < 0) + goto error; + + /* init GameFilterPrev */ + if(__Menu_GetPrevFilter(t, new_gameFilter, new_gameCnt, &new_gameFilterPrev) < 0) + goto error; + /* Set values */ if(gameList) free(gameList); if(gameFilter) delete [] gameFilter; @@ -630,19 +610,14 @@ int __Menu_GetEntries(int t, const wchar_t* Filter) { gameList = new_gameList; gameCnt = new_gameCnt; - gameFilter = new_gameFilter; - gameFilterNextList = new_gameFilterNextList; - gameFilterPrev = new_gameFilterPrev; + gameFilter = new_gameFilter; + gameFilterNextList = new_gameFilterNextList; + gameFilterPrev = new_gameFilterPrev; - - /* Reset variables */ + /* Reset variables */ gameSelected = gameStart = 0; - //gprintf("\ncnt:%d", gameCnt); - - - return 0; + return 0; error: // clean up - gprintf("\nERROR"); if(new_gameList) free(new_gameList); if(new_gameFilter) delete [] new_gameFilter; if(new_gameFilterNextList) delete [] new_gameFilterNextList; diff --git a/source/video.cpp b/source/video.cpp index 81edf599..c82226cc 100644 --- a/source/video.cpp +++ b/source/video.cpp @@ -22,20 +22,44 @@ #define DEFAULT_FIFO_SIZE 256 * 1024 static unsigned int *xfb[2] = { NULL, NULL }; // Double buffered -static unsigned int *xfbTxt = NULL; static int whichfb = 0; // Switch static GXRModeObj *vmode; // Menu video mode static unsigned char gp_fifo[DEFAULT_FIFO_SIZE] ATTRIBUTE_ALIGN (32); static Mtx GXmodelView2D; int screenheight; int screenwidth; - -extern bool textVideoInit; -extern bool geckoinit; +u32 frameCount = 0; u8 * gameScreenTex = NULL; // a GX texture screen capture of the game u8 * gameScreenTex2 = NULL; // a GX texture screen capture of the game (copy) +/**************************************************************************** + * UpdatePadsCB + * + * called by postRetraceCallback in InitGCVideo - scans gcpad and wpad + ***************************************************************************/ +static void +UpdatePadsCB () { + frameCount++; + WPAD_ScanPads(); + PAD_ScanPads(); + + for (int i=3; i >= 0; i--) { + memcpy(&userInput[i].wpad, WPAD_Data(i), sizeof(WPADData)); + + userInput[i].chan = i; + userInput[i].pad.btns_d = PAD_ButtonsDown(i); + userInput[i].pad.btns_u = PAD_ButtonsUp(i); + userInput[i].pad.btns_h = PAD_ButtonsHeld(i); + userInput[i].pad.stickX = PAD_StickX(i); + userInput[i].pad.stickY = PAD_StickY(i); + userInput[i].pad.substickX = PAD_SubStickX(i); + userInput[i].pad.substickY = PAD_SubStickY(i); + userInput[i].pad.triggerL = PAD_TriggerL(i); + userInput[i].pad.triggerR = PAD_TriggerR(i); + } +} + /**************************************************************************** * StartGX * @@ -174,45 +198,6 @@ InitVideo () { ResetVideo_Menu(); // Finally, the video is up and ready for use :) } - -void InitTextVideo () -{ - gprintf("\nInitTextVideo ()"); - if (textVideoInit) - { - gprintf("...0"); - return; - } - - VIDEO_Init(); - GXRModeObj *vmode = VIDEO_GetPreferredMode(NULL); // get default video mode - - // widescreen fix - VIDEO_Configure (vmode); - - // Allocate the video buffers - xfbTxt = (u32 *) MEM_K0_TO_K1 (SYS_AllocateFramebuffer (vmode)); - - // A console is always useful while debugging - console_init (xfbTxt, 20, 64, vmode->fbWidth, vmode->xfbHeight, vmode->fbWidth * 2); - - // Clear framebuffers etc. - VIDEO_ClearFrameBuffer (vmode, xfbTxt, COLOR_BLACK); - VIDEO_SetNextFramebuffer (xfbTxt); - - VIDEO_SetBlack (FALSE); - VIDEO_Flush (); - VIDEO_WaitVSync (); - if (vmode->viTVMode & VI_NON_INTERLACE) - VIDEO_WaitVSync (); - - //send console output to the gecko - if (geckoinit)CON_EnableGecko(1, true); - textVideoInit = true; - gprintf("...1"); - -} - static unsigned int *xfbDB = NULL; void InitVideodebug () { @@ -256,8 +241,8 @@ void StopGX() { * * Renders everything current sent to GX, and flushes video ***************************************************************************/ -void Menu_Render() -{ +void Menu_Render() { + whichfb ^= 1; // flip framebuffer GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GX_SetColorUpdate(GX_TRUE); @@ -507,13 +492,6 @@ void Menu_DrawTPLImg(f32 xpos, f32 ypos, f32 zpos, f32 width, f32 height, GXTexO ***************************************************************************/ s32 TakeScreenshot(const char *path) { - //check if it is possible to write - FILE *f = fopen(path, "wb"); - if(!f) - return -1; - else - fclose(f); - gprintf("\nTakeScreenshot(%s)", path); IMGCTX ctx = PNGU_SelectImageFromDevice (path); s32 ret = PNGU_EncodeFromYCbYCr(ctx,vmode->fbWidth, vmode->efbHeight,xfb[whichfb],0); @@ -521,4 +499,3 @@ s32 TakeScreenshot(const char *path) gprintf(":%d", ret); return 1; } - diff --git a/source/video.h b/source/video.h index e4f2e3bb..205f9950 100644 --- a/source/video.h +++ b/source/video.h @@ -13,7 +13,6 @@ void InitVideo (); void InitVideodebug(); -void InitTextVideo(); void StopGX(); void ResetVideo_Menu(); void Menu_Render(); diff --git a/source/wad/wad.cpp b/source/wad/wad.cpp index 78920731..56f353ed 100644 --- a/source/wad/wad.cpp +++ b/source/wad/wad.cpp @@ -8,15 +8,22 @@ #include "utils.h" #include "video.h" #include "wad.h" + + + #include "prompts/PromptWindows.h" #include "libwiigui/gui.h" #include "language/gettext.h" #include "menu.h" #include "filelist.h" - +/*** Extern functions ***/ +extern void ResumeGui(); +extern void HaltGui(); /*** Extern variables ***/ extern GuiWindow * mainWindow; + + /* 'WAD Header' structure */ typedef struct { /* Header length */ @@ -340,9 +347,9 @@ s32 Wad_Install(FILE *fp) snprintf(imgPath, sizeof(imgPath), "%s%d...",tr(">> Installing content #"),content->cid); msg4Txt.SetText(imgPath); // Install content data - while (idx < len) { - - //VIDEO_WaitVSync (); + while (idx < len) { + + //VIDEO_WaitVSync (); u32 size; @@ -364,7 +371,7 @@ s32 Wad_Install(FILE *fp) // Increase variables idx += size; offset += size; - + //snprintf(imgPath, sizeof(imgPath), "%s%d (%d)...",tr(">> Installing content #"),content->cid,idx); //msg4Txt.SetText(imgPath); diff --git a/source/xml/xml.c b/source/xml/xml.c index 40149adc..d9b287f5 100644 --- a/source/xml/xml.c +++ b/source/xml/xml.c @@ -7,18 +7,19 @@ Load game information from XML - Lustar #include #include "unzip/unzip.h" #include "settings/cfg.h" -#include "listfiles.h" -#include "usbloader/partition_usbloader.h" #include "xml/xml.h" - +//#include "cfg.h" +//#include "xml.h" extern struct SSettings Settings; // for loader GX extern void title_set(char *id, char *title); extern char* trimcopy(char *dest, char *src, int size); +extern char game_partition[6]; /* config */ static bool xmldebug = false; +static char xmlcfg_filename[100] = "wiitdb"; static int xmlmaxsize = 1572864; @@ -63,45 +64,22 @@ int xmlloadtime = 0; char * get_nodetext(mxml_node_t *node, char *buffer, int buflen); bool xml_loaded = false; -static void SearchXMLFile(char * pathname) -{ - int i = 0; - char temppath[MAXPATHLEN]; - - for(i = 0; i < 4; i++) - { - snprintf(temppath, sizeof(temppath), "%swiitdb_WBFS%i.zip", pathname, i); - if(checkfile(temppath)) - { - sprintf(pathname, "%s", temppath); - return; - } - snprintf(temppath, sizeof(temppath), "%swiitdb_FAT%i.zip", pathname, i); - if(checkfile(temppath)) - { - sprintf(pathname, "%s", temppath); - return; - } - snprintf(temppath, sizeof(temppath), "%swiitdb_NTFS%i.zip", pathname, i); - if(checkfile(temppath)) - { - sprintf(pathname, "%s", temppath); - return; - } - } - - sprintf(pathname, "%swiitdb.zip", pathname); -} /* load renamed titles from proper names and game info XML, needs to be after cfg_load_games */ bool OpenXMLDatabase(char* xmlfilepath, char* argdblang, bool argJPtoEN, bool openfile, bool loadtitles, bool keepopen) { if (!xml_loaded) { bool opensuccess = false; - char pathname[400]; + char pathname[200]; snprintf(pathname, sizeof(pathname), "%s", xmlfilepath); if (xmlfilepath[strlen(xmlfilepath) - 1] != '/') snprintf(pathname, sizeof(pathname), "%s/",pathname); - SearchXMLFile(pathname); + snprintf(pathname, sizeof(pathname), "%s%s_%s.zip", pathname, xmlcfg_filename, game_partition); if (openfile) opensuccess = OpenXMLFile(pathname); + if (!opensuccess) { + snprintf(pathname, sizeof(pathname), "%s", xmlfilepath); + if (xmlfilepath[strlen(xmlfilepath) - 1] != '/') snprintf(pathname, sizeof(pathname), "%s/",pathname); + snprintf(pathname, sizeof(pathname), "%swiitdb.zip", pathname); + if (openfile) opensuccess = OpenXMLFile(pathname); + } if (!opensuccess && openfile) { CloseXMLDatabase(); return false;