From 6022ad060de39656f7195945ee28d99ca54f09f4 Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Fri, 31 Dec 2010 13:13:14 +0000 Subject: [PATCH] *Added ThreadedTask instance class for easy one time run operations on another thread *Added Free Space show option to the settings (can be enabled even on FAT partitions) *Moved partition free space determination to a ThreadedTask because it takes up to 10 seconds on FAT. This speeds up the build up of the main game menu (on start and on change from other menu) on all partitions. *Removed double "waiting for slow HDD" screens *Fixed scrollbar in settings --- HBC/META.XML | 5 +- Languages/czech.lang | 29 +++++---- Languages/danish.lang | 29 +++++---- Languages/dutch.lang | 29 +++++---- Languages/english.lang | 17 ++---- Languages/finnish.lang | 29 +++++---- Languages/french.lang | 29 +++++---- Languages/german.lang | 29 +++++---- Languages/hungarian.lang | 29 +++++---- Languages/italian.lang | 29 +++++---- Languages/japanese.lang | 29 +++++---- Languages/korean.lang | 29 +++++---- Languages/norwegian.lang | 29 +++++---- Languages/polish.lang | 29 +++++---- Languages/portuguese_br.lang | 29 +++++---- Languages/portuguese_pt.lang | 29 +++++---- Languages/russian.lang | 29 +++++---- Languages/schinese.lang | 29 +++++---- Languages/spanish.lang | 29 +++++---- Languages/swedish.lang | 29 +++++---- Languages/tchinese.lang | 29 +++++---- Languages/thai.lang | 29 +++++---- Languages/turkish.lang | 29 +++++---- gui.pnproj | 2 +- source/Controls/DeviceHandler.cpp | 30 ++++++++-- source/Controls/DeviceHandler.hpp | 4 +- source/Controls/PartitionHandle.cpp | 16 ++++- source/Controls/PartitionHandle.h | 2 +- source/StartUpProcess.cpp | 4 +- source/libwiigui/gui_customoptionbrowser.cpp | 10 ++-- source/menu/GameBrowseMenu.cpp | 55 ++++++++++------- source/menu/GameBrowseMenu.hpp | 32 +++++----- source/settings/CSettings.cpp | 9 ++- source/settings/CSettings.h | 1 + source/settings/menus/GUISettingsMenu.cpp | 10 ++++ source/sys.cpp | 2 + source/usbloader/alternatedol.c | 11 ---- source/usbloader/wbfs.cpp | 6 +- source/usbloader/wbfs/wbfs_fat.cpp | 25 ++++++-- source/utils/Callback.hpp | 62 ++++++++++++++++++++ source/utils/ThreadedTask.cpp | 36 ++++++++++++ source/utils/ThreadedTask.hpp | 28 +++++++++ 42 files changed, 618 insertions(+), 358 deletions(-) create mode 100644 source/utils/Callback.hpp create mode 100644 source/utils/ThreadedTask.cpp create mode 100644 source/utils/ThreadedTask.hpp diff --git a/HBC/META.XML b/HBC/META.XML index 22688c96..c5091ed5 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,9 @@ USB Loader GX USB Loader GX Team - 1.0 r1023 - 201012291022 + 1.0 r1025 + 201012302350 + 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 ab5d0991..71c6d53c 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+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" @@ -678,12 +678,6 @@ msgstr "Vložte disk" msgid "Insert a Wii Disc!" msgstr "Vložte Wii disk" -msgid "Insert an SD-Card to save." -msgstr "Vložte SD kartu pro uložení." - -msgid "Insert an SD-Card to use this option." -msgstr "Vložte SD kartu pro tuto možnost" - msgid "Install" msgstr "Instalace" @@ -844,9 +838,6 @@ msgstr "Nebyl nalezen soubor s cheaty" msgid "No DOL file found on disc." msgstr "Na disku nebyl nalezen DOL soubor." -msgid "No SD-Card inserted!" -msgstr "Není vložena SD karta" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Nastavit vyhledávací filtr" msgid "Settings" msgstr "Nastavení" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Ukoncit systém" @@ -1314,9 +1308,6 @@ msgstr "Video mód" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "Cekám na zarízení USB" - msgid "Waiting..." msgstr "Cekám..." @@ -1423,6 +1414,18 @@ msgstr "z " msgid "seconds left" msgstr "sekund zbývá" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Vložte SD kartu pro uložení." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Vložte SD kartu pro tuto možnost" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Není vložena SD karta" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Cekám na zarízení USB" + #~ msgid "Back to Loader" #~ msgstr "Zpet do spouštece" diff --git a/Languages/danish.lang b/Languages/danish.lang index a789c31d..8fcf50f4 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: dorf[dk]\n" "Language-Team: dorf[dk]\n" @@ -678,12 +678,6 @@ msgstr "Indsæt en DVD" msgid "Insert a Wii Disc!" msgstr "Indsæt en Wii-DVD!" -msgid "Insert an SD-Card to save." -msgstr "Indsæt et SD-kort for at gemme." - -msgid "Insert an SD-Card to use this option." -msgstr "Indsæt et SD-kort for at bruge denne indstilling." - msgid "Install" msgstr "Installér" @@ -844,9 +838,6 @@ msgstr "Cheat-fil ikke fundet" msgid "No DOL file found on disc." msgstr "Der blev ikke fundet nogle DOL-filer på DVDen." -msgid "No SD-Card inserted!" -msgstr "Intet SD-kort fundet!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Søgefilter" msgid "Settings" msgstr "Indstillinger" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Sluk (rødt lys)" @@ -1314,9 +1308,6 @@ msgstr "Video-mode" msgid "WIP Patches Path" msgstr "Sti til WIP patches" -msgid "Waiting for USB Device" -msgstr "Venter på USB-enhed" - msgid "Waiting..." msgstr "Venter..." @@ -1423,6 +1414,18 @@ msgstr "af" msgid "seconds left" msgstr "sekunder tilbage" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Indsæt et SD-kort for at gemme." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Indsæt et SD-kort for at bruge denne indstilling." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Intet SD-kort fundet!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Venter på USB-enhed" + #~ msgid "Back to Loader" #~ msgstr "Tilbage til Loaderen" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 147f6e9c..43c4c6e4 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2010-04-12 07:37+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" @@ -678,12 +678,6 @@ msgstr "Voer een disk in" msgid "Insert a Wii Disc!" msgstr "Voer een Wii disk in!" -msgid "Insert an SD-Card to save." -msgstr "Voer een SD kaart in om op te slaan." - -msgid "Insert an SD-Card to use this option." -msgstr "Voer een SD kaart in om deze optie te gebruiken." - msgid "Install" msgstr "Installeer" @@ -844,9 +838,6 @@ msgstr "Geen cheatbestand gevonden" msgid "No DOL file found on disc." msgstr "Geen DOL bestand gevonden op disk." -msgid "No SD-Card inserted!" -msgstr "Geen SD kaart gevonden!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Zoekfilter instellen" msgid "Settings" msgstr "Instellingen" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Systeem uitzetten" @@ -1314,9 +1308,6 @@ msgstr "" msgid "WIP Patches Path" msgstr "Locatie WIP patches" -msgid "Waiting for USB Device" -msgstr "Wachten op USB apparaat" - msgid "Waiting..." msgstr "Wachten..." @@ -1423,6 +1414,18 @@ msgstr "van" msgid "seconds left" msgstr "seconden over" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Voer een SD kaart in om op te slaan." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Voer een SD kaart in om deze optie te gebruiken." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Geen SD kaart gevonden!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Wachten op USB apparaat" + #~ msgid "Back to Loader" #~ msgstr "Terug naar lader" diff --git a/Languages/english.lang b/Languages/english.lang index 5a33a0d7..ac4dcfc2 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -678,12 +678,6 @@ msgstr "" msgid "Insert a Wii Disc!" msgstr "" -msgid "Insert an SD-Card to save." -msgstr "" - -msgid "Insert an SD-Card to use this option." -msgstr "" - msgid "Install" msgstr "" @@ -844,9 +838,6 @@ msgstr "" msgid "No DOL file found on disc." msgstr "" -msgid "No SD-Card inserted!" -msgstr "" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "" msgid "Settings" msgstr "" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "" @@ -1314,9 +1308,6 @@ msgstr "" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "" - msgid "Waiting..." msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 3a58b9c6..bd6698d2 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -678,12 +678,6 @@ msgstr "Aseta levy Wiihin" msgid "Insert a Wii Disc!" msgstr "Aseta Wii-levy!" -msgid "Insert an SD-Card to save." -msgstr "Aseta SD-kortti tallentaaksesi asetuksia." - -msgid "Insert an SD-Card to use this option." -msgstr "Aseta SD-kortti käyttääksesi tätä vaihtoehtoa" - msgid "Install" msgstr "Asenna" @@ -844,9 +838,6 @@ msgstr "Kooditiedostoa ei löydy" msgid "No DOL file found on disc." msgstr "Levyltä ei löydy dol tiedostoa" -msgid "No SD-Card inserted!" -msgstr "SD-korttia ei ole asetettu wiihin!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "" msgid "Settings" msgstr "Asetukset" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Sammuta järjestelmä" @@ -1314,9 +1308,6 @@ msgstr "Videotila" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "Odottaa USB-laitetta..." - msgid "Waiting..." msgstr "Odottaa..." @@ -1423,6 +1414,18 @@ msgstr "josta" msgid "seconds left" msgstr "sekuntia jäljellä" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Aseta SD-kortti tallentaaksesi asetuksia." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Aseta SD-kortti käyttääksesi tätä vaihtoehtoa" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "SD-korttia ei ole asetettu wiihin!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Odottaa USB-laitetta..." + #~ msgid "Back to Loader" #~ msgstr "HBC" diff --git a/Languages/french.lang b/Languages/french.lang index 692d6674..f9bdfa36 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -678,12 +678,6 @@ msgstr "Insérez un disque" msgid "Insert a Wii Disc!" msgstr "Insérez un disque Wii !" -msgid "Insert an SD-Card to save." -msgstr "Insérez une carte SD pour enregistrer." - -msgid "Insert an SD-Card to use this option." -msgstr "Insérez une carte SD pour utiliser cette option." - msgid "Install" msgstr "Installer" @@ -844,9 +838,6 @@ msgstr "Aucun fichier de triche trouvé" msgid "No DOL file found on disc." msgstr "Aucun DOL trouvé dans ce jeu." -msgid "No SD-Card inserted!" -msgstr "Aucune carte SD insérée !" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Filtre de Recherche" msgid "Settings" msgstr "Paramètres" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Arrêt" @@ -1314,9 +1308,6 @@ msgstr "Mode vidéo" msgid "WIP Patches Path" msgstr "Dossier Patchs WIP" -msgid "Waiting for USB Device" -msgstr "Attente d'un périphérique USB" - msgid "Waiting..." msgstr "En attente..." @@ -1423,6 +1414,18 @@ msgstr "sur" msgid "seconds left" msgstr "secondes restantes" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Insérez une carte SD pour enregistrer." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Insérez une carte SD pour utiliser cette option." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Aucune carte SD insérée !" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Attente d'un périphérique USB" + #~ msgid "Back to Loader" #~ msgstr "Chaîne Homebrew" diff --git a/Languages/german.lang b/Languages/german.lang index 6164dc85..eb66cf77 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+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" @@ -678,12 +678,6 @@ msgstr "Disc einlegen" msgid "Insert a Wii Disc!" msgstr "Eine Wii Disc einlegen!" -msgid "Insert an SD-Card to save." -msgstr "SD Karte einlegen um zu Speichern." - -msgid "Insert an SD-Card to use this option." -msgstr "SD Karte einlegen um diese Option zu nutzen." - msgid "Install" msgstr "Installieren" @@ -844,9 +838,6 @@ msgstr "Keine Cheatdatei gefunden." msgid "No DOL file found on disc." msgstr "Keine DOL auf der Disc gefunden." -msgid "No SD-Card inserted!" -msgstr "Keine SD Karte eingelegt!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Suche" msgid "Settings" msgstr "Einstellungen" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "System herunterfahren" @@ -1314,9 +1308,6 @@ msgstr "Videomodus" msgid "WIP Patches Path" msgstr "WIP Patches" -msgid "Waiting for USB Device" -msgstr "Warte auf USB Gerät" - msgid "Waiting..." msgstr "Warte..." @@ -1423,6 +1414,18 @@ msgstr "von" msgid "seconds left" msgstr "Sekunden verbleiben" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "SD Karte einlegen um zu Speichern." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "SD Karte einlegen um diese Option zu nutzen." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Keine SD Karte eingelegt!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Warte auf USB Gerät" + #~ msgid "Back to Loader" #~ msgstr "Homebrew Kanal" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 0e3a8d58..ec0154a9 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" @@ -678,12 +678,6 @@ msgstr "Helyezz be egy lemezt" msgid "Insert a Wii Disc!" msgstr "Helyezz be Wii lemezt!" -msgid "Insert an SD-Card to save." -msgstr "Helyezz be egy SD Kártyát, hogy ments," - -msgid "Insert an SD-Card to use this option." -msgstr "Helyezz be egy SD Kártyát, hogy használhasd ezt a lehetõséget." - msgid "Install" msgstr "Telepítés" @@ -844,9 +838,6 @@ msgstr "Kód nem található" msgid "No DOL file found on disc." msgstr "Nem található DOL fájl a lemezen." -msgid "No SD-Card inserted!" -msgstr "Nincs SD kártya behelyezve!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Keresés" msgid "Settings" msgstr "Beállítások" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Leállítás" @@ -1314,9 +1308,6 @@ msgstr "Videó Mód" msgid "WIP Patches Path" msgstr "WIP Patch útvonal" -msgid "Waiting for USB Device" -msgstr "Várakozás az USB Meghajtóra" - msgid "Waiting..." msgstr "Várakozás..." @@ -1423,6 +1414,18 @@ msgstr "./" msgid "seconds left" msgstr "hátralévõ másodperc" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Helyezz be egy SD Kártyát, hogy ments," + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Helyezz be egy SD Kártyát, hogy használhasd ezt a lehetõséget." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Nincs SD kártya behelyezve!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Várakozás az USB Meghajtóra" + #~ msgid "Back to Loader" #~ msgstr "HBC" diff --git a/Languages/italian.lang b/Languages/italian.lang index 68e9a78a..bb4dff49 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2010-02-21 08:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: FoxeJoe, Cambo\n" @@ -678,12 +678,6 @@ msgstr "Inserisci Disco" msgid "Insert a Wii Disc!" msgstr "Inserisci un Disco nella Wii!" -msgid "Insert an SD-Card to save." -msgstr "Inserisci una scheda SD per Salvare." - -msgid "Insert an SD-Card to use this option." -msgstr "Inserire scheda SD per questa opzione" - msgid "Install" msgstr "Installa" @@ -844,9 +838,6 @@ msgstr "Nessun file trucchi trovato" msgid "No DOL file found on disc." msgstr "Nessun file DOL trovato sul disco." -msgid "No SD-Card inserted!" -msgstr "Nessuna scheda SD inserita!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Cerca Gioco" msgid "Settings" msgstr "Impostazioni" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Spegnimento" @@ -1314,9 +1308,6 @@ msgstr "Modalità Video" msgid "WIP Patches Path" msgstr "Percorso Patch WIP" -msgid "Waiting for USB Device" -msgstr "Caricamento Dispositivo USB" - msgid "Waiting..." msgstr "Caricamento..." @@ -1423,6 +1414,18 @@ msgstr "di" msgid "seconds left" msgstr "secondi mancanti" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Inserisci una scheda SD per Salvare." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Inserire scheda SD per questa opzione" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Nessuna scheda SD inserita!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Caricamento Dispositivo USB" + #~ msgid "Back to Loader" #~ msgstr "Canale HomeBrew" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index 6c256ead..1eeba9df 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: hosigumayuugi\n" "Language-Team: hosigumayuugi\n" @@ -678,12 +678,6 @@ msgstr "ﾃﾞｨｽｸを入れてください" msgid "Insert a Wii Disc!" msgstr "Wiiﾃﾞｨｽｸを挿入して下さい!" -msgid "Insert an SD-Card to save." -msgstr "保存するためにSDを挿入して下さい" - -msgid "Insert an SD-Card to use this option." -msgstr "このｵﾌﾟｼｮﾝを使用するためSDｶｰﾄﾞを挿入して下さい" - msgid "Install" msgstr "ｲﾝｽﾄｰﾙ" @@ -844,9 +838,6 @@ msgstr "ﾁｰﾄﾌｧｲﾙが見つかりません" msgid "No DOL file found on disc." msgstr "ﾃﾞｨｽｸ内に.DOLがありません" -msgid "No SD-Card inserted!" -msgstr "SDｶｰﾄﾞが挿入されていません!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "検索" msgid "Settings" msgstr "設定" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "シャットダウン" @@ -1314,9 +1308,6 @@ msgstr "映像の出力方法" msgid "WIP Patches Path" msgstr "WIPパッチのパス" -msgid "Waiting for USB Device" -msgstr "USBﾃﾞﾊﾞｲｽの応答待ち" - msgid "Waiting..." msgstr "待機中…" @@ -1423,6 +1414,18 @@ msgstr "中" msgid "seconds left" msgstr "秒で完了" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "保存するためにSDを挿入して下さい" + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "このｵﾌﾟｼｮﾝを使用するためSDｶｰﾄﾞを挿入して下さい" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "SDｶｰﾄﾞが挿入されていません!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "USBﾃﾞﾊﾞｲｽの応答待ち" + #~ msgid "Back to Loader" #~ msgstr "HBCへ" diff --git a/Languages/korean.lang b/Languages/korean.lang index e44ff146..b0c380a4 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -678,12 +678,6 @@ msgstr "디스크를 넣어주세요" msgid "Insert a Wii Disc!" msgstr "Wii 디스크를 넣으세요!" -msgid "Insert an SD-Card to save." -msgstr "저장할 SD카드를 넣으세요." - -msgid "Insert an SD-Card to use this option." -msgstr "이 옵션을 사용할 SD카드를 넣으세요." - msgid "Install" msgstr "설치" @@ -844,9 +838,6 @@ msgstr "치트화일 없음" msgid "No DOL file found on disc." msgstr "디스크에 DOL화일이 없음." -msgid "No SD-Card inserted!" -msgstr "SD카드가 없습니다!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "" msgid "Settings" msgstr "설정" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "시스템 종료" @@ -1314,9 +1308,6 @@ msgstr "비디오 모드" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "USB 장치를 기다리는 중" - msgid "Waiting..." msgstr "기다리는 중..." @@ -1423,6 +1414,18 @@ msgstr "중" msgid "seconds left" msgstr "초 남았습니다" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "저장할 SD카드를 넣으세요." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "이 옵션을 사용할 SD카드를 넣으세요." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "SD카드가 없습니다!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "USB 장치를 기다리는 중" + #~ msgid "Back to Loader" #~ msgstr "로더로 돌아감" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index fbcedcc8..2b71889b 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -678,12 +678,6 @@ msgstr "Sett inn plate" msgid "Insert a Wii Disc!" msgstr "Sett inn en Wii plate!" -msgid "Insert an SD-Card to save." -msgstr "Sett inn et SD-kort for å lagre." - -msgid "Insert an SD-Card to use this option." -msgstr "Sett inn et SD-kort for å bruke innstillingen." - msgid "Install" msgstr "Installér" @@ -844,9 +838,6 @@ msgstr "Ingen juksefil funnet" msgid "No DOL file found on disc." msgstr "Ingen DOL fil funnet på plate." -msgid "No SD-Card inserted!" -msgstr "Intet SD-kort satt i!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Angi søkefilter" msgid "Settings" msgstr "Innstillinger" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Skru helt av" @@ -1314,9 +1308,6 @@ msgstr "Video modus" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "Venter på USB enhet" - msgid "Waiting..." msgstr "Venter..." @@ -1423,6 +1414,18 @@ msgstr "av" msgid "seconds left" msgstr "sekunder gjenstår" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Sett inn et SD-kort for å lagre." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Sett inn et SD-kort for å bruke innstillingen." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Intet SD-kort satt i!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Venter på USB enhet" + #~ msgid "Back to Loader" #~ msgstr "HBC/Loader" diff --git a/Languages/polish.lang b/Languages/polish.lang index b351867d..7e628852 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -678,12 +678,6 @@ msgstr "Wloz plyte" msgid "Insert a Wii Disc!" msgstr "Wloz plyte Wii!" -msgid "Insert an SD-Card to save." -msgstr "Wloz karte SD, aby zapisac" - -msgid "Insert an SD-Card to use this option." -msgstr "Wloz karte SD, aby uzyc tej opcji" - msgid "Install" msgstr "Zainstaluj" @@ -844,9 +838,6 @@ msgstr "Nie znaleziono plikow z kodami" msgid "No DOL file found on disc." msgstr "Brak plikow DOL na dysku" -msgid "No SD-Card inserted!" -msgstr "Nie wlozono karty SD!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Ustaw filtr wyszukiwania" msgid "Settings" msgstr "Ustawienia" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Wylacz" @@ -1314,9 +1308,6 @@ msgstr "Tryb video" msgid "WIP Patches Path" msgstr "Sciezka patchy WIP" -msgid "Waiting for USB Device" -msgstr "Oczekiwanie na urzadzenie USB" - msgid "Waiting..." msgstr "Oczekiwanie..." @@ -1423,6 +1414,18 @@ msgstr "z" msgid "seconds left" msgstr "sekund pozostalo" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Wloz karte SD, aby zapisac" + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Wloz karte SD, aby uzyc tej opcji" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Nie wlozono karty SD!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Oczekiwanie na urzadzenie USB" + #~ msgid "Back to Loader" #~ msgstr "Powrot do HBC" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index ea6dbdd0..1c0cb8f8 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: aniemotion\n" "Language-Team: boto12, aniemotion\n" @@ -678,12 +678,6 @@ msgstr "Insira o Disco" msgid "Insert a Wii Disc!" msgstr "Insira um Disco do Wii!" -msgid "Insert an SD-Card to save." -msgstr "Insira um cartão SD para salvar." - -msgid "Insert an SD-Card to use this option." -msgstr "Insira um cartão SD para usar esta funcionalidade." - msgid "Install" msgstr "Instalar" @@ -844,9 +838,6 @@ msgstr "Arquivo de truques não encontrado" msgid "No DOL file found on disc." msgstr "Não foi encontrado nenhum arquivo dol no disco" -msgid "No SD-Card inserted!" -msgstr "Cartão SD não inserido!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Usar filtro de busca" msgid "Settings" msgstr "Configurações" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Desligar" @@ -1314,9 +1308,6 @@ msgstr "Modo de Vídeo" msgid "WIP Patches Path" msgstr "Caminho WIP Patches" -msgid "Waiting for USB Device" -msgstr "Aguardando pelo Dispositivo USB" - msgid "Waiting..." msgstr "Aguardando..." @@ -1423,6 +1414,18 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Insira um cartão SD para salvar." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Insira um cartão SD para usar esta funcionalidade." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Cartão SD não inserido!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Aguardando pelo Dispositivo USB" + #~ msgid "Back to Loader" #~ msgstr "Loader" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index 8bc18dcc..2c3bd62b 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2010-03-22 10:55-0000\n" "Last-Translator: Sky8000\n" "Language-Team: Sky8000 \n" @@ -678,12 +678,6 @@ msgstr "Insira o Disco" msgid "Insert a Wii Disc!" msgstr "Insira um Disco da Wii!" -msgid "Insert an SD-Card to save." -msgstr "Insira um cartão SD para guardar." - -msgid "Insert an SD-Card to use this option." -msgstr "Insira um cartão SD para usar esta funcionalidade." - msgid "Install" msgstr "Instalar" @@ -844,9 +838,6 @@ msgstr "Ficheiro de truques não encontrado" msgid "No DOL file found on disc." msgstr "Não foi encontrado nenhum ficheiro DOL no disco" -msgid "No SD-Card inserted!" -msgstr "Cartão SD não inserido!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Filtro de pesquisa" msgid "Settings" msgstr "Configurações" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Desligar" @@ -1314,9 +1308,6 @@ msgstr "Modo de Vídeo" msgid "WIP Patches Path" msgstr "Pasta Patches WIP" -msgid "Waiting for USB Device" -msgstr "Aguardando pelo Dispositivo USB" - msgid "Waiting..." msgstr "Aguardando..." @@ -1423,6 +1414,18 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Insira um cartão SD para guardar." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Insira um cartão SD para usar esta funcionalidade." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Cartão SD não inserido!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Aguardando pelo Dispositivo USB" + #~ msgid "Back to Loader" #~ msgstr "Loader" diff --git a/Languages/russian.lang b/Languages/russian.lang index 7eec5d99..3a1cc549 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n" @@ -678,12 +678,6 @@ msgstr "Вставьте диск" msgid "Insert a Wii Disc!" msgstr "Вставьте диск Wii!" -msgid "Insert an SD-Card to save." -msgstr "Для сохранения вставьте SD карту." - -msgid "Insert an SD-Card to use this option." -msgstr "Для использования этой функции нужна SD карта" - msgid "Install" msgstr "Установка" @@ -844,9 +838,6 @@ msgstr "Не найден файл с читами" msgid "No DOL file found on disc." msgstr "DOL-файл не найден на диске." -msgid "No SD-Card inserted!" -msgstr "SD карта не вставлена!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Установить фильтр для поиска" msgid "Settings" msgstr "Установки" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Выключить систему" @@ -1314,9 +1308,6 @@ msgstr "Видео режим" msgid "WIP Patches Path" msgstr "Путь к патчам QIP" -msgid "Waiting for USB Device" -msgstr "Ожидание USB устройства" - msgid "Waiting..." msgstr "Ожидание..." @@ -1423,6 +1414,18 @@ msgstr "из" msgid "seconds left" msgstr "секунд осталось" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Для сохранения вставьте SD карту." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Для использования этой функции нужна SD карта" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "SD карта не вставлена!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Ожидание USB устройства" + #~ msgid "Back to Loader" #~ msgstr "Вернуться в загрузчик" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index e7053fd2..08c54180 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid\n" "Language-Team: kavid\n" @@ -678,12 +678,6 @@ msgstr "插入光盘" msgid "Insert a Wii Disc!" msgstr "插入 Wii 光盘!" -msgid "Insert an SD-Card to save." -msgstr "插入 SD卡以保存." - -msgid "Insert an SD-Card to use this option." -msgstr "插入 SD 卡使用此功能." - msgid "Install" msgstr "安装" @@ -844,9 +838,6 @@ msgstr "作弊码文件没找到" msgid "No DOL file found on disc." msgstr "光盘中未找到 DOL 文件." -msgid "No SD-Card inserted!" -msgstr "未插入 SD 卡!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "设置搜索过滤器" msgid "Settings" msgstr "设置" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "关闭系统" @@ -1314,9 +1308,6 @@ msgstr "视频制式" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "等待 USB 设备" - msgid "Waiting..." msgstr "等待中..." @@ -1423,6 +1414,18 @@ msgstr "的" msgid "seconds left" msgstr "剩余秒数" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "插入 SD卡以保存." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "插入 SD 卡使用此功能." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "未插入 SD 卡!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "等待 USB 设备" + #~ msgid "Back to Loader" #~ msgstr "返回 Loader" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 7f73bc77..43808bb6 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: SirPalax\n" "Language-Team: Penn, SirPalax\n" @@ -678,12 +678,6 @@ msgstr "Inserta el Disco" msgid "Insert a Wii Disc!" msgstr "¡Inserta un Disco Wii!" -msgid "Insert an SD-Card to save." -msgstr "Insertar SD para guardar." - -msgid "Insert an SD-Card to use this option." -msgstr "Insertar SD para usar esta opción" - msgid "Install" msgstr "Instalar" @@ -844,9 +838,6 @@ msgstr "No se encontró el archivo de Trucos" msgid "No DOL file found on disc." msgstr "No se encontró el archivo DOL en el Disco" -msgid "No SD-Card inserted!" -msgstr "¡SD no insertada!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Usar filtro de búsqueda" msgid "Settings" msgstr "Configuración" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Apagar Sistema" @@ -1314,9 +1308,6 @@ msgstr "Modo Vídeo" msgid "WIP Patches Path" msgstr "Ruta Parches WIP" -msgid "Waiting for USB Device" -msgstr "Esperando al Dispositivo USB" - msgid "Waiting..." msgstr "Esperando..." @@ -1423,6 +1414,18 @@ msgstr "de" msgid "seconds left" msgstr "segundos restantes" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Insertar SD para guardar." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Insertar SD para usar esta opción" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "¡SD no insertada!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Esperando al Dispositivo USB" + #~ msgid "Back to Loader" #~ msgstr "Volver al HBC" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 23342bec..47264044 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -678,12 +678,6 @@ msgstr "Sätt i en skiva" msgid "Insert a Wii Disc!" msgstr "Sätt i en Wii-skiva!" -msgid "Insert an SD-Card to save." -msgstr "Sätt i ett SD-kort för att spara." - -msgid "Insert an SD-Card to use this option." -msgstr "Sätt i ett SD-kort för att använda denna inställning" - msgid "Install" msgstr "Installera" @@ -844,9 +838,6 @@ msgstr "Ingen fuskfil hittades" msgid "No DOL file found on disc." msgstr "Ingen DOL-fil hittades på skivan." -msgid "No SD-Card inserted!" -msgstr "Inget SD-kort isatt!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Ställ in sök-filter" msgid "Settings" msgstr "Inställningar" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Stäng av helt" @@ -1314,9 +1308,6 @@ msgstr "Video-läge" msgid "WIP Patches Path" msgstr "WIP patchssökväg" -msgid "Waiting for USB Device" -msgstr "Väntar på USB-enhet" - msgid "Waiting..." msgstr "Väntar..." @@ -1423,6 +1414,18 @@ msgstr "av" msgid "seconds left" msgstr "sekunder kvar" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Sätt i ett SD-kort för att spara." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Sätt i ett SD-kort för att använda denna inställning" + +#~ msgid "No SD-Card inserted!" +#~ msgstr "Inget SD-kort isatt!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "Väntar på USB-enhet" + #~ msgid "Back to Loader" #~ msgstr "Tillbaka till loader" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index d2a51e50..abe70940 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n" "Last-Translator: Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n" @@ -678,12 +678,6 @@ msgstr "插入光碟" msgid "Insert a Wii Disc!" msgstr "插入 Wii 光碟!" -msgid "Insert an SD-Card to save." -msgstr "插入 SD 卡以儲存." - -msgid "Insert an SD-Card to use this option." -msgstr "插入 SD 卡使用此功能." - msgid "Install" msgstr "安裝" @@ -844,9 +838,6 @@ msgstr "金手指文件沒找到" msgid "No DOL file found on disc." msgstr "光碟中未找到 DOL 文件." -msgid "No SD-Card inserted!" -msgstr "未插入 SD 卡!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "關鍵字篩選" msgid "Settings" msgstr "設定" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "關閉系統" @@ -1314,9 +1308,6 @@ msgstr "影像格式" msgid "WIP Patches Path" msgstr "WIP 補丁路徑" -msgid "Waiting for USB Device" -msgstr "等待 USB 設備" - msgid "Waiting..." msgstr "等待中..." @@ -1423,6 +1414,18 @@ msgstr "的" msgid "seconds left" msgstr "剩餘秒數" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "插入 SD 卡以儲存." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "插入 SD 卡使用此功能." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "未插入 SD 卡!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "等待 USB 設備" + #~ msgid "Back to Loader" #~ msgstr "返回 Loader" diff --git a/Languages/thai.lang b/Languages/thai.lang index 2475b0f6..f3c4a948 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -678,12 +678,6 @@ msgstr "ใส่แผ่น" msgid "Insert a Wii Disc!" msgstr "ใส่แผ่น Wii !" -msgid "Insert an SD-Card to save." -msgstr "ใส่ SD card เพื่อบันทึก" - -msgid "Insert an SD-Card to use this option." -msgstr "ใส่ SD card เพื่อใช้ตัวเลือกนี้ " - msgid "Install" msgstr "ติดตั้ง" @@ -844,9 +838,6 @@ msgstr "ไม่พบไฟล์โกงเกมส์" msgid "No DOL file found on disc." msgstr "ไม่มีไฟล์ DOL ในแผ่น" -msgid "No SD-Card inserted!" -msgstr "ไม่ได้เสียบ SD card!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "กำหนดเงื่อนไขการค้นหา" msgid "Settings" msgstr "กำหนดค่า" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "ปิดระบบ" @@ -1314,9 +1308,6 @@ msgstr "โหมดการแสดงผลภาพ" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "กำลังรออุปกรณ์ USB" - msgid "Waiting..." msgstr "กำลังรอ..." @@ -1423,6 +1414,18 @@ msgstr "จาก" msgid "seconds left" msgstr "วินาทีที่เหลือ" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "ใส่ SD card เพื่อบันทึก" + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "ใส่ SD card เพื่อใช้ตัวเลือกนี้ " + +#~ msgid "No SD-Card inserted!" +#~ msgstr "ไม่ได้เสียบ SD card!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "กำลังรออุปกรณ์ USB" + #~ msgid "Back to Loader" #~ msgstr "กลับไปที่ Loader" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index facfbb05..1feccb3a 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-12-29 16:38+0100\n" +"POT-Creation-Date: 2010-12-31 14:05+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -678,12 +678,6 @@ msgstr "Diski Takın" msgid "Insert a Wii Disc!" msgstr "Bir Wii Diski Takın!" -msgid "Insert an SD-Card to save." -msgstr "Kaydedebilmek için SD takın." - -msgid "Insert an SD-Card to use this option." -msgstr "Bu seçeneği kullanmak için SD takın." - msgid "Install" msgstr "Kur" @@ -844,9 +838,6 @@ msgstr "Hile dosyası bulunamadı" msgid "No DOL file found on disc." msgstr "Diskte DOL dosyası bulunamadı" -msgid "No SD-Card inserted!" -msgstr "SD-Card takılı değil!" - msgid "No Splitting" msgstr "" @@ -1102,6 +1093,9 @@ msgstr "Arama Filtresi Ayarla" msgid "Settings" msgstr "Ayarlar" +msgid "Show Free Space" +msgstr "" + msgid "Shutdown System" msgstr "Sistemi Kapat" @@ -1314,9 +1308,6 @@ msgstr "Video Modu" msgid "WIP Patches Path" msgstr "" -msgid "Waiting for USB Device" -msgstr "USB Aygıtı için Bekleniyor" - msgid "Waiting..." msgstr "Beklemede..." @@ -1423,6 +1414,18 @@ msgstr "./" msgid "seconds left" msgstr "saniye kaldı" +#~ msgid "Insert an SD-Card to save." +#~ msgstr "Kaydedebilmek için SD takın." + +#~ msgid "Insert an SD-Card to use this option." +#~ msgstr "Bu seçeneği kullanmak için SD takın." + +#~ msgid "No SD-Card inserted!" +#~ msgstr "SD-Card takılı değil!" + +#~ msgid "Waiting for USB Device" +#~ msgstr "USB Aygıtı için Bekleniyor" + #~ msgid "Back to Loader" #~ msgstr "Yükleyiciye dönüş" diff --git a/gui.pnproj b/gui.pnproj index 9f987429..ed6ed0d3 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/Controls/DeviceHandler.cpp b/source/Controls/DeviceHandler.cpp index db05dd85..99687fb1 100644 --- a/source/Controls/DeviceHandler.cpp +++ b/source/Controls/DeviceHandler.cpp @@ -130,11 +130,30 @@ bool DeviceHandler::MountSD() } //! Mount only one SD Partition - return sd->Mount(0, DeviceName[SD]); + return sd->Mount(0, DeviceName[SD], true); } -bool DeviceHandler::MountUSB(int pos) +static inline bool USBSpinUp() { + bool started = false; + int retries = 400; + // wait 20 sec for the USB to spin up...stupid slow ass HDD + do + { + started = __io_usbstorage2.startup(); + if(started) break; + usleep(50000); + } + while(--retries > 0); + + return started; +} + +bool DeviceHandler::MountUSB(int pos, bool spinup) +{ + if(spinup && !USBSpinUp()) + return false; + if(!usb) usb = new PartitionHandle(&__io_usbstorage2); @@ -151,8 +170,11 @@ bool DeviceHandler::MountUSB(int pos) return usb->Mount(pos, DeviceName[USB1+pos]); } -bool DeviceHandler::MountAllUSB() +bool DeviceHandler::MountAllUSB(bool spinup) { + if(spinup && !USBSpinUp()) + return false; + if(!usb) usb = new PartitionHandle(&__io_usbstorage2); @@ -160,7 +182,7 @@ bool DeviceHandler::MountAllUSB() for(int i = 0; i < usb->GetPartitionCount(); i++) { - if(MountUSB(i)) + if(MountUSB(i, false)) result = true; } diff --git a/source/Controls/DeviceHandler.hpp b/source/Controls/DeviceHandler.hpp index 75b994b5..2ac294e9 100644 --- a/source/Controls/DeviceHandler.hpp +++ b/source/Controls/DeviceHandler.hpp @@ -69,8 +69,8 @@ class DeviceHandler //! Individual Mounts/UnMounts... bool MountSD(); - bool MountAllUSB(); - bool MountUSB(int part); + bool MountAllUSB(bool spinUp = true); + bool MountUSB(int part, bool spinUp = true); bool SD_Inserted() { if(sd) return sd->IsInserted(); return false; }; bool USB_Inserted() { if(usb) return usb->IsInserted(); return false; }; void UnMountSD() { if(sd) delete sd; sd = NULL; }; diff --git a/source/Controls/PartitionHandle.cpp b/source/Controls/PartitionHandle.cpp index b4a572d0..cd69bd9e 100644 --- a/source/Controls/PartitionHandle.cpp +++ b/source/Controls/PartitionHandle.cpp @@ -103,7 +103,7 @@ bool PartitionHandle::IsMounted(int pos) return true; } -bool PartitionHandle::Mount(int pos, const char * name) +bool PartitionHandle::Mount(int pos, const char * name, bool forceFAT) { if(!valid(pos)) return false; @@ -118,6 +118,20 @@ bool PartitionHandle::Mount(int pos, const char * name) MountNameList[pos] = name; + //! Some stupid partition manager think they don't need to edit the freaken MBR. + //! So we need to check the first 64 sectors and see if some partition is there. + //! libfat does that by default so let's use it. + //! We do that only on sd not on usb. + if(forceFAT && (!GetFSName(pos) || strcmp(GetFSName(pos), "Unknown") == 0)) + { + if (fatMount(MountNameList[pos].c_str(), interface, 0, CACHE, SECTORS)) + { + extern sec_t _FAT_startSector; + AddPartition("FAT", _FAT_startSector, 0xdeadbeaf, true, 0x0c, 0); + return true; + } + } + if(strncmp(GetFSName(pos), "FAT", 3) == 0 || strcmp(GetFSName(pos), "GUID-Entry") == 0) { if (fatMount(MountNameList[pos].c_str(), interface, GetLBAStart(pos), CACHE, SECTORS)) diff --git a/source/Controls/PartitionHandle.h b/source/Controls/PartitionHandle.h index 0c47a797..995dfee5 100644 --- a/source/Controls/PartitionHandle.h +++ b/source/Controls/PartitionHandle.h @@ -124,7 +124,7 @@ class PartitionHandle //! Is the partition Mounted bool IsMounted(int pos); //! Mount a specific Partition - bool Mount(int pos, const char * name); + bool Mount(int pos, const char * name, bool forceFAT = false); //! UnMount a specific Partition void UnMount(int pos); //! UnMount all Partition diff --git a/source/StartUpProcess.cpp b/source/StartUpProcess.cpp index e7c62fc6..5c51cdd0 100644 --- a/source/StartUpProcess.cpp +++ b/source/StartUpProcess.cpp @@ -94,7 +94,7 @@ bool StartUpProcess::USBSpinUp() // wait 10 sec for the USB to spin up...stupid slow ass HDD do { - started = (__io_usbstorage2.startup() && __io_usbstorage2.isInserted()); + started = __io_usbstorage2.startup(); usleep(50000); if(retries < 400 && retries % 20 == 0) @@ -139,7 +139,7 @@ bool StartUpProcess::Execute() SetTextf("Initialize usb device\n"); USBSpinUp(); - DeviceHandler::Instance()->MountAllUSB(); + DeviceHandler::Instance()->MountAllUSB(false); SetTextf("Loading config files"); gprintf("\tLoading config...%s\n", Settings.Load() ? "done" : "failed"); diff --git a/source/libwiigui/gui_customoptionbrowser.cpp b/source/libwiigui/gui_customoptionbrowser.cpp index 331bca49..3cbb8d80 100644 --- a/source/libwiigui/gui_customoptionbrowser.cpp +++ b/source/libwiigui/gui_customoptionbrowser.cpp @@ -13,6 +13,7 @@ #include "../settings/CSettings.h" #include "gui_customoptionbrowser.h" #include "themes/CTheme.h" +#include "utils/tools.h" #include "menu.h" #include @@ -340,7 +341,7 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t) int next, prev, length = options->GetLength(); int old_listOffset = listOffset; - if (length < PAGESIZE) + if (scrollbaron) { // update the location of the scroll box based on the position in the option list arrowUpBtn->Update(t); @@ -485,9 +486,11 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t) { scrollbarBoxBtn->SetPosition(width / 2 - 18 + 7, 0); - int position = t->wpad.ir.y - 50 - scrollbarBoxBtn->GetTop(); + int position = t->wpad.ir.y - scrollbarBoxBtn->GetHeight()/2 - scrollbarBoxBtn->GetTop(); + position = cut_bounds(position, 0, 237); - listOffset = (position * length) / 180 - selectedItem; + listOffset = (int) (((float) position / 237.0f)*length); + selectedItem = (int) (((float) listOffset / (float) length)*(PAGESIZE-1)); if (listOffset <= 0) { @@ -497,7 +500,6 @@ void GuiCustomOptionBrowser::Update(GuiTrigger * t) else if (listOffset + PAGESIZE >= length) { listOffset = length - PAGESIZE; - selectedItem = PAGESIZE - 1; } } int positionbar = 237 * (listOffset + selectedItem) / length; diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp index 657cd6b1..857a78cd 100644 --- a/source/menu/GameBrowseMenu.cpp +++ b/source/menu/GameBrowseMenu.cpp @@ -38,14 +38,15 @@ extern struct discHdr *dvdheader; extern int cntMissFiles; static int lastSelectedGame = 0; +static int Exiting = false; GameBrowseMenu::GameBrowseMenu() : GuiWindow(screenwidth, screenheight) { - float freespace = 0.0, used = 0.0; returnMenu = MENU_NONE; gameSelectedOld = -1; lastrawtime = 0; + Exiting = false; show_searchwindow = false; gameBrowser = NULL; gameGrid = NULL; @@ -60,9 +61,6 @@ GameBrowseMenu::GameBrowseMenu() wString oldFilter(gameList.GetCurrentFilter()); gameList.FilterList(oldFilter.c_str()); - if (WBFS_ShowFreeSpace()) - WBFS_DiskSpace(&used, &freespace); - btnInstall = Resources::GetImageData("button_install.png"); btnInstallOver = Resources::GetImageData("button_install_over.png"); btnSettings = Resources::GetImageData("settings_button.png"); @@ -106,26 +104,12 @@ GameBrowseMenu::GameBrowseMenu() trig1 = new GuiTrigger; trig1->SetButtonOnlyTrigger(-1, WPAD_BUTTON_1 | WPAD_CLASSIC_BUTTON_Y, 0); - char spaceinfo[30]; - if (load_from_fs == PART_FS_FAT) - { - memset(spaceinfo, 0, 30); - } - else - { - if (strcmp(Settings.db_language, "JA") == 0) - { - // needs to be "total...used" for Japanese - sprintf(spaceinfo, "%.2fGB %s %.2fGB %s", (freespace + used), tr( "of" ), freespace, tr( "free" )); - } - else - { - sprintf(spaceinfo, "%.2fGB %s %.2fGB %s", freespace, tr( "of" ), (freespace + used), tr( "free" )); - } - } - usedSpaceTxt = new GuiText(spaceinfo, 18, thColor("r=55 g=190 b=237 a=255 - hdd info color")); + usedSpaceTxt = new GuiText(" ", 18, thColor("r=55 g=190 b=237 a=255 - hdd info color")); usedSpaceTxt->SetAlignment(thAlign("center - hdd info align ver"), thAlign("top - hdd info align hor")); usedSpaceTxt->SetPosition(thInt("0 - hdd info pos x"), thInt("400 - hdd info pos y")); + HDDSizeCallback.SetCallback(this, &GameBrowseMenu::UpdateFreeSpace); + ThreadedTask::Instance()->AddCallback(&HDDSizeCallback); + ThreadedTask::Instance()->Execute(); gamecntTxt = new GuiText((char *) NULL, 18, thColor("r=55 g=190 b=237 a=255 - game count color")); gamecntBtn = new GuiButton(100, 18); @@ -328,6 +312,7 @@ GameBrowseMenu::GameBrowseMenu() GameBrowseMenu::~GameBrowseMenu() { + Exiting = true; ResumeGui(); SetEffect(EFFECT_FADE, -20); @@ -1369,3 +1354,29 @@ void GameBrowseMenu::UpdateCallback(void * e) } } } + +void GameBrowseMenu::UpdateFreeSpace(void * arg) +{ + char spaceinfo[30]; + memset(spaceinfo, 0, 30); + + if(Settings.ShowFreeSpace) + { + float freespace = 0.0, used = 0.0; + WBFS_DiskSpace(&used, &freespace); + if (strcmp(Settings.db_language, "JA") == 0) + { + // needs to be "total...used" for Japanese + sprintf(spaceinfo, "%.2fGB %s %.2fGB %s", (freespace + used), tr( "of" ), freespace, tr( "free" )); + } + else + { + sprintf(spaceinfo, "%.2fGB %s %.2fGB %s", freespace, tr( "of" ), (freespace + used), tr( "free" )); + } + } + + if(Exiting) + return; + + usedSpaceTxt->SetText(spaceinfo); +} diff --git a/source/menu/GameBrowseMenu.hpp b/source/menu/GameBrowseMenu.hpp index c1539138..f02b4e62 100644 --- a/source/menu/GameBrowseMenu.hpp +++ b/source/menu/GameBrowseMenu.hpp @@ -6,6 +6,7 @@ #include "libwiigui/gui_gamegrid.h" #include "libwiigui/gui_gamecarousel.h" #include "libwiigui/gui_searchbar.h" +#include "utils/ThreadedTask.hpp" class GameBrowseMenu : public GuiWindow { @@ -24,9 +25,26 @@ class GameBrowseMenu : public GuiWindow void CheckAlternativeDOL(const char * IDfull); void CheckOcarina(const char * IDfull); void CheckDiscSlotUpdate(); + void UpdateFreeSpace(void *arg); void UpdateClock(); static void UpdateCallback(void * e); + TCallback HDDSizeCallback; + u32 DiscDriveCoverOld; + int returnMenu; + int gameSelectedOld; + int gameClicked; + time_t lastrawtime; + time_t ScreensaverTimer; + bool show_searchwindow; + wchar_t searchChar; + std::vector ToolBar; + + GuiGameBrowser * gameBrowser; + GuiGameGrid * gameGrid; + GuiGameCarousel * gameCarousel; + GuiSearchBar * searchBar; + GuiImageData * btnInstall; GuiImageData * btnInstallOver; GuiImageData * btnSettings; @@ -138,20 +156,6 @@ class GameBrowseMenu : public GuiWindow GuiTooltip * homebrewBtnTT; GuiTooltip * DownloadBtnTT; GuiTooltip * IDBtnTT; - - GuiGameBrowser * gameBrowser; - GuiGameGrid * gameGrid; - GuiGameCarousel * gameCarousel; - GuiSearchBar * searchBar; - u32 DiscDriveCoverOld; - int returnMenu; - int gameSelectedOld; - int gameClicked; - time_t lastrawtime; - time_t ScreensaverTimer; - bool show_searchwindow; - wchar_t searchChar; - std::vector ToolBar; }; #endif diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp index 9565667b..df556c14 100644 --- a/source/settings/CSettings.cpp +++ b/source/settings/CSettings.cpp @@ -104,7 +104,8 @@ void CSettings::SetDefault() musicloopmode = 1; partition = -1; marknewtitles = 1; - InstallToDir = 0; + ShowFreeSpace = 1; + InstallToDir = INSTALL_TO_NAME_GAMEID; GameSplit = GAMESPLIT_4GB; InstallPartitions = ONLY_GAME_PARTITION; beta_upgrades = 0; @@ -215,6 +216,7 @@ bool CSettings::Save() fprintf(file, "discart = %d\n ", discart); fprintf(file, "partition = %d\n ", partition); fprintf(file, "marknewtitles = %d\n ", marknewtitles); + fprintf(file, "ShowFreeSpace = %d\n ", ShowFreeSpace); fprintf(file, "InstallToDir = %d\n ", InstallToDir); fprintf(file, "GameSplit = %d\n ", GameSplit); fprintf(file, "InstallPartitions = %08X\n ", InstallPartitions); @@ -418,6 +420,11 @@ bool CSettings::SetSetting(char *name, char *value) if (sscanf(value, "%d", &i) == 1) marknewtitles = i; return true; } + else if (strcmp(name, "ShowFreeSpace") == 0) + { + if (sscanf(value, "%d", &i) == 1) ShowFreeSpace = i; + return true; + } else if (strcmp(name, "patchcountrystrings") == 0) { if (sscanf(value, "%d", &i) == 1) patchcountrystrings = i; diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h index 3614b812..8fbff302 100644 --- a/source/settings/CSettings.h +++ b/source/settings/CSettings.h @@ -111,6 +111,7 @@ class CSettings u32 InstallPartitions; short beta_upgrades; short PlaylogUpdate; + short ShowFreeSpace; char returnTo[20]; protected: bool SetSetting(char *name, char *value); diff --git a/source/settings/menus/GUISettingsMenu.cpp b/source/settings/menus/GUISettingsMenu.cpp index 79ad78a3..5c4a576f 100644 --- a/source/settings/menus/GUISettingsMenu.cpp +++ b/source/settings/menus/GUISettingsMenu.cpp @@ -113,6 +113,7 @@ GuiSettingsMenu::GuiSettingsMenu() Options->SetName(Idx++, "%s", tr( "Titles from WiiTDB" )); Options->SetName(Idx++, "%s", tr( "Screensaver" )); Options->SetName(Idx++, "%s", tr( "Mark new games" )); + Options->SetName(Idx++, "%s", tr( "Show Free Space" )); SetOptionValues(); @@ -185,6 +186,9 @@ void GuiSettingsMenu::SetOptionValues() //! Settings: Mark new games Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.marknewtitles] )); + + //! Settings: Show Free Space + Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.ShowFreeSpace] )); } int GuiSettingsMenu::GetMenuInternal() @@ -320,6 +324,12 @@ int GuiSettingsMenu::GetMenuInternal() if (++Settings.marknewtitles >= MAX_ON_OFF) Settings.marknewtitles = 0; } + //! Settings: Show Free Space + else if (ret == ++Idx) + { + if (++Settings.ShowFreeSpace >= MAX_ON_OFF) Settings.ShowFreeSpace = 0; + } + SetOptionValues(); return MENU_NONE; diff --git a/source/sys.cpp b/source/sys.cpp index 4eec4609..b6ca7eff 100644 --- a/source/sys.cpp +++ b/source/sys.cpp @@ -12,6 +12,7 @@ #include "usbloader/playlog.h" #include "usbloader/wbfs.h" #include "themes/CTheme.h" +#include "utils/ThreadedTask.hpp" #include "audio.h" #include "lstub.h" #include "menu.h" @@ -80,6 +81,7 @@ void AppCleanUp(void) CloseXMLDatabase(); Theme::CleanUp(); NewTitles::DestroyInstance(); + ThreadedTask::DestroyInstance(); DeinitNetwork(); StopGX(); diff --git a/source/usbloader/alternatedol.c b/source/usbloader/alternatedol.c index c0fbc26b..9e46c74b 100644 --- a/source/usbloader/alternatedol.c +++ b/source/usbloader/alternatedol.c @@ -24,16 +24,11 @@ bool Load_Dol(void **buffer, int* dollen, char * filepath) memcpy(gameidbuffer6, (char*) 0x80000000, 6); snprintf(fullpath, 200, "%s%s.dol", filepath, gameidbuffer6); - // SDCard_Init(); - // USBDevice_Init(); - file = fopen(fullpath, "rb"); if (file == NULL) { fclose(file); - // SDCard_deInit(); - // USBDevice_deInit(); return false; } @@ -46,8 +41,6 @@ bool Load_Dol(void **buffer, int* dollen, char * filepath) if (dol_buffer == NULL) { fclose(file); - // SDCard_deInit(); - // USBDevice_deInit(); return false; } ret = fread(dol_buffer, 1, filesize, file); @@ -55,14 +48,10 @@ bool Load_Dol(void **buffer, int* dollen, char * filepath) { free(dol_buffer); fclose(file); - // SDCard_deInit(); - // USBDevice_deInit(); return false; } fclose(file); - // SDCard_deInit(); - // USBDevice_deInit(); *buffer = dol_buffer; *dollen = filesize; return true; diff --git a/source/usbloader/wbfs.cpp b/source/usbloader/wbfs.cpp index 89e00662..3374540f 100644 --- a/source/usbloader/wbfs.cpp +++ b/source/usbloader/wbfs.cpp @@ -178,7 +178,7 @@ bool WBFS_ShowFreeSpace(void) int MountWBFS(bool ShowGUI) { if(ShowGUI) - return DiscWait(tr( "Waiting for USB Device" ), 0, 0, 0, 1); + return WBFS_Init(WBFS_DEVICE_USB); int ret = -1; time_t currTime = time(0); @@ -189,9 +189,9 @@ int MountWBFS(bool ShowGUI) printf("%i...", int(time(0) - currTime)); if (ret < 0) sleep(1); - else + else break; - + DeviceHandler::Instance()->UnMountAllUSB(); DeviceHandler::Instance()->MountAllUSB(); } diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp index 2e4cb862..73f87f1e 100644 --- a/source/usbloader/wbfs/wbfs_fat.cpp +++ b/source/usbloader/wbfs/wbfs_fat.cpp @@ -24,6 +24,7 @@ #include "wbfs_fat.h" #include "prompts/ProgressWindow.h" #include "usbloader/wbfs.h" +#include "usbloader/GameList.h" #include "wbfs_rw.h" #include "gecko.h" @@ -239,19 +240,35 @@ s32 Wbfs_Fat::RemoveGame(u8 *discid) s32 Wbfs_Fat::DiskSpace(f32 *used, f32 *free) { + static f32 used_cached = 0.0; + static f32 free_cached = 0.0; + static int game_count = 0; + + //! Since it's freaken slow, only refresh on new gamecount + if(used_cached == 0.0 || game_count != gameList.GameCount()) + { + game_count = gameList.GameCount(); + } + else + { + *used = used_cached; + *free = free_cached; + return 0; + } + f32 size; int ret; struct statvfs wbfs_fat_vfs; - *used = 0; - *free = 0; + *used = used_cached = 0.0; + *free = free_cached = 0.0; ret = statvfs(wbfs_fs_drive, &wbfs_fat_vfs); if (ret) return -1; /* FS size in GB */ size = (f32) wbfs_fat_vfs.f_frsize * (f32) wbfs_fat_vfs.f_blocks / GB_SIZE; - *free = (f32) wbfs_fat_vfs.f_frsize * (f32) wbfs_fat_vfs.f_bfree / GB_SIZE; - *used = size - *free; + *free = free_cached = (f32) wbfs_fat_vfs.f_frsize * (f32) wbfs_fat_vfs.f_bfree / GB_SIZE; + *used = used_cached = size - *free; return 0; } diff --git a/source/utils/Callback.hpp b/source/utils/Callback.hpp new file mode 100644 index 00000000..ab76dccd --- /dev/null +++ b/source/utils/Callback.hpp @@ -0,0 +1,62 @@ +/**************************************************************************** + * Copyright (C) 2010 + * by Dimok + * + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any + * damages arising from the use of this software. + * + * Permission is granted to anyone to use this software for any + * purpose, including commercial applications, and to alter it and + * redistribute it freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you + * must not claim that you wrote the original software. If you use + * this software in a product, an acknowledgment in the product + * documentation would be appreciated but is not required. + * + * 2. Altered source versions must be plainly marked as such, and + * must not be misrepresented as being the original software. + * + * 3. This notice may not be removed or altered from any source + * distribution. + * + * WiiXplorer 2010 + ***************************************************************************/ +#ifndef _CPP_CALLBACK_HPP +#define _CPP_CALLBACK_HPP + +class cCallback +{ + public: + virtual void Execute(void * arg) const =0; +}; + +template +class TCallback : public cCallback +{ + public: + TCallback() : cInst(0), pFunction(0) // constructor + { + } + + typedef void (cInstance::*tFunction)(void * arg); + + virtual void Execute(void * arg) const + { + if (pFunction) + (cInst->*pFunction)(arg); + } + + void SetCallback (cInstance * cInstancePointer, tFunction pFunctionPointer) + { + cInst = cInstancePointer; + pFunction = pFunctionPointer; + } + + private: + cInstance *cInst; + tFunction pFunction; +}; + +#endif diff --git a/source/utils/ThreadedTask.cpp b/source/utils/ThreadedTask.cpp new file mode 100644 index 00000000..58c9f68b --- /dev/null +++ b/source/utils/ThreadedTask.cpp @@ -0,0 +1,36 @@ +#include "ThreadedTask.hpp" + +ThreadedTask * ThreadedTask::instance = NULL; + +ThreadedTask::ThreadedTask() + : ExitRequested(false) +{ + LWP_CreateThread (&Thread, ThreadCallback, this, NULL, 16384, 80); +} + +ThreadedTask::~ThreadedTask() +{ + ExitRequested = true; + Execute(); + LWP_JoinThread(Thread, NULL); +} + +void * ThreadedTask::ThreadCallback(void *arg) +{ + ThreadedTask * myInstance = (ThreadedTask *) arg; + + while(!myInstance->ExitRequested) + { + LWP_SuspendThread(myInstance->Thread); + + while(!myInstance->CallbackList.empty()) + { + myInstance->CallbackList[0]->Execute(myInstance->ArgList[0]); + + myInstance->CallbackList.erase(myInstance->CallbackList.begin()); + myInstance->ArgList.erase(myInstance->ArgList.begin()); + } + } + + return NULL; +} diff --git a/source/utils/ThreadedTask.hpp b/source/utils/ThreadedTask.hpp new file mode 100644 index 00000000..76549d9e --- /dev/null +++ b/source/utils/ThreadedTask.hpp @@ -0,0 +1,28 @@ +#ifndef THREADED_TASK_HPP_ +#define THREADED_TASK_HPP_ + +#include +#include +#include "Callback.hpp" + +class ThreadedTask +{ + public: + static ThreadedTask * Instance() { if(!instance) instance = new ThreadedTask(); return instance; }; + static void DestroyInstance() { delete instance; instance = NULL; }; + void AddCallback(cCallback * c, void * arg = 0) { CallbackList.push_back(c); ArgList.push_back(arg); }; + void Execute() { LWP_ResumeThread(Thread); }; + private: + ThreadedTask(); + ~ThreadedTask(); + void ThreadLoop(void *arg); + static void * ThreadCallback(void *arg); + + static ThreadedTask *instance; + lwp_t Thread; + bool ExitRequested; + std::vector CallbackList; + std::vector ArgList; +}; + +#endif