The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-06-29 22:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

*Fixed several theme images being not loaded. Made all recourses from SVN now themable (sounds/fonts/images). They only have to be in the same folder as the theme images.

Browse Source 
*Ignore sector size of wbfs partitions in MBR (some lazy Partition Manager don't change it). Reading it from the partition header now.
*Several small bug fixes and cleanups
*Fixed "Bannersound + BG Music after it" mode
*Updated language files
This commit is contained in:
dimok321 2011-01-08 12:35:41 +00:00
parent 4f7ccef2ec
commit 8943592d0e
42 changed files with 724 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HBC/META.XML
View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>1.0 r1033</version> <version>1.0 r1034</version>
<release_date>201101061900</release_date> <release_date>201101072243</release_date>
<no_ios_reload/> <no_ios_reload/>
<short_description>Loads games from USB-devices</short_description> <short_description>Loads games from USB-devices</short_description>
<long_description>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. <long_description>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.

238
Languages/french.lang
View File

@ -1,26 +1,26 @@
# USB Loader GX language source file. # USB Loader GX language source file.
# French V13.2 r1031 # French V14 r1033
# don't delete/change this line (é). # don't delete/change this line (é).
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:00+0100\n" "POT-Creation-Date: 2011-01-06 19:58+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Cyan\n" "Last-Translator: Andresayang, Cyan, jero\n"
"Language-Team: Badablek, Amour, ikya & Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
msgid " Wad Saved as:" msgid " Wad Saved as:"
msgstr "WAD Sauvegardé sous:" msgstr " WAD sauvegardé sous:"
msgid " could not be downloaded." msgid " could not be downloaded."
msgstr " ne peut pas être téléchargé." msgstr " ne peut pas être téléchargé."
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." 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 " sauvegardé. Certains codes ne peuvent fonctionner conjointement. En cas de mauvais résultats, ouvrez-le avec un réel éditeur de texte pour obtenir plus d'informations." msgstr " sauvegardé. Certains codes ne peuvent fonctionner conjointement. En cas de mauvais résultats, ouvrez-le avec un éditeur de texte pour obtenir plus d'informations."
msgid " is not on the server." msgid " is not on the server."
msgstr " indisponible sur le serveur." msgstr " indisponible sur le serveur."
@ -35,7 +35,7 @@ msgid "1 (Child 7+)"
msgstr "1 (Enfants 7+)" msgstr "1 (Enfants 7+)"
msgid "1 (Unlocked Games Only)" msgid "1 (Unlocked Games Only)"
msgstr "1 (Affiche seulement les jeux déverrouillés)" msgstr "1 (Affiche seulement les jeux non verrouillés)"
msgid "1 hour" msgid "1 hour"
msgstr "1 heure" msgstr "1 heure"
@ -50,7 +50,7 @@ msgid "20 min"
msgstr "20 min." msgstr "20 min."
msgid "2D Cover Path" msgid "2D Cover Path"
msgstr "Dossier Jaquettes 2D" msgstr "Dossier jaquettes 2D"
msgid "3 (Mature 16+)" msgid "3 (Mature 16+)"
msgstr "3 (Matures 16+)" msgstr "3 (Matures 16+)"
@ -62,7 +62,7 @@ msgid "30 min"
msgstr "30 min." msgstr "30 min."
msgid "3D Cover Path" msgid "3D Cover Path"
msgstr "Dossier Jaquettes 3D" msgstr "Dossier jaquettes 3D"
msgid "3D Covers" msgid "3D Covers"
msgstr "Jaquettes 3D" msgstr "Jaquettes 3D"
@ -128,13 +128,13 @@ msgid "All Partitions"
msgstr "Toutes les partitions" msgstr "Toutes les partitions"
msgid "All images downloaded successfully." msgid "All images downloaded successfully."
msgstr "Images correctement telechargées" msgstr "Images correctement téléchargées"
msgid "All the features of USB Loader GX are unlocked." msgid "All the features of USB Loader GX are unlocked."
msgstr "Toutes les fonctionnalités sont déverrouillées." msgstr "Toutes les fonctionnalités sont déverrouillées."
msgid "Alternate DOL" msgid "Alternate DOL"
msgstr "DOL Alternatif" msgstr "DOL alternatif"
msgid "Anti" msgid "Anti"
msgstr "" msgstr ""
@ -161,10 +161,10 @@ msgid "Author:"
msgstr "Auteur:" msgstr "Auteur:"
msgid "AutoInit Network" msgid "AutoInit Network"
msgstr "AutoInit Réseau" msgstr "AutoInit réseau"
msgid "BCA Codes Path" msgid "BCA Codes Path"
msgstr "Dossier Codes BCA" msgstr "Dossier codes BCA"
msgid "BETA revisions" msgid "BETA revisions"
msgstr "Révisions BETA" msgstr "Révisions BETA"
@ -182,7 +182,7 @@ msgid "Big thanks to:"
msgstr "Grand merci à:" msgstr "Grand merci à:"
msgid "Block IOS Reload" msgid "Block IOS Reload"
msgstr "Bloquer IOS Reload" msgstr "Bloquer IOS reload"
msgid "Boot/Standard" msgid "Boot/Standard"
msgstr "" msgstr ""
@ -213,7 +213,7 @@ msgid "Cannot write to destination."
msgstr "Écriture impossible." msgstr "Écriture impossible."
msgid "Change Play Path" msgid "Change Play Path"
msgstr "Changer Dossier" msgstr "Changer dossier"
msgid "Cheatfile is blank" msgid "Cheatfile is blank"
msgstr "Fichier de triche vide" msgstr "Fichier de triche vide"
@ -225,7 +225,7 @@ msgid "Click to Download Covers"
msgstr "Téléchargement des jaquettes" msgstr "Téléchargement des jaquettes"
msgid "Click to change game ID" msgid "Click to change game ID"
msgstr "Changer l'ID du Jeu" msgstr "Changer l'ID du jeu"
msgid "Clock" msgid "Clock"
msgstr "Horloge" msgstr "Horloge"
@ -234,7 +234,7 @@ msgid "Close"
msgstr "Fermer" msgstr "Fermer"
msgid "Code Download" msgid "Code Download"
msgstr "Téléchargement Codes" msgstr "Téléchargement codes"
#, c-format #, c-format
msgid "Coded by: %s" msgid "Coded by: %s"
@ -278,7 +278,7 @@ msgid "Could not find info for this game in the wiitdb.xml."
msgstr "Pas d'information pour ce jeu dans wiitdb.xml." msgstr "Pas d'information pour ce jeu dans wiitdb.xml."
msgid "Could not initialize DIP module!" msgid "Could not initialize DIP module!"
msgstr "Initialisation module DIP impossible !" msgstr "Initialisation du module DIP impossible !"
msgid "Could not initialize network!" msgid "Could not initialize network!"
msgstr "Initialisation réseau impossible !" msgstr "Initialisation réseau impossible !"
@ -290,10 +290,10 @@ msgid "Could not open wiitdb.xml."
msgstr "Impossible d'ouvrir wiitdb.xml." msgstr "Impossible d'ouvrir wiitdb.xml."
msgid "Could not save." msgid "Could not save."
msgstr "Sauvegarde impossible" msgstr "Sauvegarde impossible."
msgid "Cover Download" msgid "Cover Download"
msgstr "Téléchargement Jaquettes" msgstr "Téléchargement jaquettes"
msgid "Create" msgid "Create"
msgstr "Créer" msgstr "Créer"
@ -302,13 +302,13 @@ msgid "Credits"
msgstr "Crédits" msgstr "Crédits"
msgid "Custom Paths" msgid "Custom Paths"
msgstr "Personnalisation Dossiers" msgstr "Personnalisation des dossiers"
msgid "Customs/Original" msgid "Customs/Original"
msgstr "Persos/Originaux" msgstr "Persos/Originaux"
msgid "DOL Path" msgid "DOL Path"
msgstr "Dossier DOL Alternatif" msgstr "Dossier DOL alternatif"
msgid "Dec" msgid "Dec"
msgstr "Déc" msgstr "Déc"
@ -317,10 +317,10 @@ msgid "Default"
msgstr "Par défaut" msgstr "Par défaut"
msgid "Default Gamesettings" msgid "Default Gamesettings"
msgstr "Reset Paramètres Jeu" msgstr "Réinitialiser les paramètres du jeu"
msgid "Default Settings" msgid "Default Settings"
msgstr "Réinitialiser Paramètres" msgstr "Réinitialiser les paramètres"
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
@ -329,16 +329,16 @@ msgid "Delete ?"
msgstr "Supprimer ?" msgstr "Supprimer ?"
msgid "Delete Cheat GCT" msgid "Delete Cheat GCT"
msgstr "Supprimer GCT de Triche" msgstr "Supprimer GCT de triche"
msgid "Delete Cheat TXT" msgid "Delete Cheat TXT"
msgstr "Supprimer TXT de Triche" msgstr "Supprimer TXT de triche"
msgid "Delete Cover Artwork" msgid "Delete Cover Artwork"
msgstr "Supprimer la Jaquette" msgstr "Supprimer la jaquette"
msgid "Delete Disc Artwork" msgid "Delete Disc Artwork"
msgstr "Supprimer le Label DVD" msgstr "Supprimer le label DVD"
msgid "Design:" msgid "Design:"
msgstr "Graphisme:" msgstr "Graphisme:"
@ -350,10 +350,10 @@ msgid "Directory does not exist!"
msgstr "Répertoire inexistant!" msgstr "Répertoire inexistant!"
msgid "Disc Artwork Download" msgid "Disc Artwork Download"
msgstr "Téléch. Labels DVD" msgstr "Téléch. labels DVD"
msgid "Disc Artwork Path" msgid "Disc Artwork Path"
msgstr "Dossier Labels DVD" msgstr "Dossier labels DVD"
msgid "Disc Default" msgid "Disc Default"
msgstr "Disque par défaut" msgstr "Disque par défaut"
@ -362,13 +362,13 @@ msgid "Disc Images"
msgstr "Labels DVD" msgstr "Labels DVD"
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Inversion Disque" msgstr "Inversion disque"
msgid "Display" msgid "Display"
msgstr "Affichage" msgstr "Affichage"
msgid "Display as a carousel" msgid "Display as a carousel"
msgstr "Caroussel" msgstr "Carrousel"
msgid "Display as a grid" msgid "Display as a grid"
msgstr "Grille" msgstr "Grille"
@ -380,7 +380,7 @@ msgid "Display favorites only"
msgstr "Seulement les favoris" msgstr "Seulement les favoris"
msgid "Do you really want to delete:" msgid "Do you really want to delete:"
msgstr "Voulez-vous vraiment supprimer ?" msgstr "Voulez-vous vraiment supprimer:"
msgid "Do you want to apply it now?" msgid "Do you want to apply it now?"
msgstr "L'appliquer maintenant ?" msgstr "L'appliquer maintenant ?"
@ -392,16 +392,16 @@ msgid "Do you want to download this theme?"
msgstr "Voulez-vous télécharger ce thème ?" msgstr "Voulez-vous télécharger ce thème ?"
msgid "Do you want to format:" msgid "Do you want to format:"
msgstr "Voulez-vous formater ?" msgstr "Voulez-vous formater:"
msgid "Do you want to load the default theme?" msgid "Do you want to load the default theme?"
msgstr "" msgstr "Voulez vous charger le thème par défaut ?"
msgid "Do you want to load this theme?" msgid "Do you want to load this theme?"
msgstr "Voulez-vous charger ce thème ?" msgstr "Voulez-vous charger ce thème ?"
msgid "Do you want to use the alternate DOL that is known to be correct?" 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 ?" msgstr "Voulez-vous utiliser le DOL alternatif actuellement connu comme correct ?"
msgid "Do you wish to update/download all language files?" msgid "Do you wish to update/download all language files?"
msgstr "Voulez-vous actualiser/télécharger tous les fichiers langue ?" msgstr "Voulez-vous actualiser/télécharger tous les fichiers langue ?"
@ -416,7 +416,7 @@ msgid "Download Boxart image?"
msgstr "Télécharger les jaquettes ?" msgstr "Télécharger les jaquettes ?"
msgid "Download Discart image?" msgid "Download Discart image?"
msgstr "Télécharger labels DVD ?" msgstr "Télécharger les labels DVD ?"
msgid "Download Now" msgid "Download Now"
msgstr "Télécharger" msgstr "Télécharger"
@ -428,7 +428,7 @@ msgid "Downloading covers"
msgstr "Téléchargement des jaquettes" msgstr "Téléchargement des jaquettes"
msgid "Downloading custom Discarts" msgid "Downloading custom Discarts"
msgstr "Téléchargement des labels DVD perso" msgstr "Téléchargement des labels DVD persos"
msgid "Downloading file" msgid "Downloading file"
msgstr "Téléchargement du fichier" msgstr "Téléchargement du fichier"
@ -443,7 +443,7 @@ msgid "Downloading original Discarts"
msgstr "Téléchargement des labels DVD originaux" msgstr "Téléchargement des labels DVD originaux"
msgid "Downloading pagelist:" msgid "Downloading pagelist:"
msgstr "" msgstr "Téléchargement de la liste:"
msgid "Dutch" msgid "Dutch"
msgstr "Néerlandais" msgstr "Néerlandais"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "ERREUR: Configuration thème impossible." msgstr "ERREUR: Configuration thème impossible."
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "Activer cette option sur une partition FAT peut ralentir le démarrage du loader."
msgid "English" msgid "English"
msgstr "Anglais" msgstr "Anglais"
@ -496,7 +496,7 @@ msgid "Error while transfering data."
msgstr "Erreur durant le transfert de données." msgstr "Erreur durant le transfert de données."
msgid "Error while updating USB Loader GX." msgid "Error while updating USB Loader GX."
msgstr "Erreur lors de la mise à jour de USB Loader GX." msgstr "Erreur lors de la MàJ de USB Loader GX."
msgid "Error writing the data." msgid "Error writing the data."
msgstr "Erreur d'écriture des données" msgstr "Erreur d'écriture des données"
@ -511,7 +511,7 @@ msgid "Exit"
msgstr "Quitter" msgstr "Quitter"
msgid "Exit to where?" msgid "Exit to where?"
msgstr "Quitter vers où?" msgstr "Quitter vers où ?"
msgid "Extracting files..." msgid "Extracting files..."
msgstr "Extraction des fichiers..." msgstr "Extraction des fichiers..."
@ -520,13 +520,13 @@ msgid "Failed formating"
msgstr "Échec du formatage" msgstr "Échec du formatage"
msgid "Failed to extract." msgid "Failed to extract."
msgstr "Extraction échouée." msgstr "Échec de l'extraction"
msgid "Failed to open partition" msgid "Failed to open partition"
msgstr "Échec accès partition" msgstr "Échec accès partition"
msgid "Failed updating" msgid "Failed updating"
msgstr "Echec de la mise à jour" msgstr "Échec de la mise à jour"
msgid "Feb" msgid "Feb"
msgstr "Fév" msgstr "Fév"
@ -536,10 +536,10 @@ msgstr "Fichier introuvable."
#, c-format #, c-format
msgid "Filesize is %i Byte." msgid "Filesize is %i Byte."
msgstr "Taille du ficher: %i Byte." msgstr "Taille du ficher: %i Octets."
msgid "Filesize is 0 Byte." msgid "Filesize is 0 Byte."
msgstr "Fichier de taille 0 Byte" msgstr "Fichier de taille 0 Octet."
msgid "Finishing installation... Ok!" msgid "Finishing installation... Ok!"
msgstr "Finalisation de l'installation... OK!" msgstr "Finalisation de l'installation... OK!"
@ -551,13 +551,13 @@ msgid "Flip-X"
msgstr "Inversion-X" msgstr "Inversion-X"
msgid "Force NTSC" msgid "Force NTSC"
msgstr "" msgstr "Forcer NTSC"
msgid "Force PAL50" msgid "Force PAL50"
msgstr "" msgstr "Forcer PAL50"
msgid "Force PAL60" msgid "Force PAL60"
msgstr "" msgstr "Forcer PAL60"
msgid "Format" msgid "Format"
msgstr "Formater" msgstr "Formater"
@ -566,7 +566,7 @@ msgid "Formatting, please wait..."
msgstr "Formatage en cours, veuillez patienter..." msgstr "Formatage en cours, veuillez patienter..."
msgid "Free Space" msgid "Free Space"
msgstr "Espace restant" msgstr "Espace libre"
msgid "French" msgid "French"
msgstr "Français" msgstr "Français"
@ -578,7 +578,7 @@ msgid "GAMEID_Gamename"
msgstr "IDJEU_NomJeu" msgstr "IDJEU_NomJeu"
msgid "GCT Cheatcodes Path" msgid "GCT Cheatcodes Path"
msgstr "Dossier GCT de Triche" msgstr "Dossier GCT de triche"
msgid "GCT File created" msgid "GCT File created"
msgstr "Fichier GCT créé" msgstr "Fichier GCT créé"
@ -596,7 +596,7 @@ msgid "Game Language"
msgstr "Langue du jeu" msgstr "Langue du jeu"
msgid "Game Load" msgid "Game Load"
msgstr "Chargement Jeux" msgstr "Chargement des jeux"
msgid "Game Lock" msgid "Game Lock"
msgstr "Verrouiller le jeu" msgstr "Verrouiller le jeu"
@ -608,10 +608,10 @@ msgid "Game Size"
msgstr "Taille du jeu" msgstr "Taille du jeu"
msgid "Game Sound Mode" msgid "Game Sound Mode"
msgstr "Mode Son des Jeux" msgstr "Son de présentation"
msgid "Game Sound Volume" msgid "Game Sound Volume"
msgstr "Volume Son des Jeux" msgstr "Volume du son des jeux"
msgid "Game Split Size" msgid "Game Split Size"
msgstr "Découpage des jeux" msgstr "Découpage des jeux"
@ -629,7 +629,7 @@ msgid "GamesLevel"
msgstr "Niv. verrou" msgstr "Niv. verrou"
msgid "Genre:" msgid "Genre:"
msgstr "Genre:" msgstr ""
msgid "German" msgid "German"
msgstr "Allemand" msgstr "Allemand"
@ -653,18 +653,18 @@ msgid "Hour"
msgstr "heures" msgstr "heures"
msgid "How do you want to update?" msgid "How do you want to update?"
msgstr "Comment faire la Mise à Jour ?" msgstr "Comment faire la Mise à jour ?"
msgid "How to Shutdown?" msgid "How to Shutdown?"
msgstr "Arrêt de la Wii ?" msgstr "Arrêt de la Wii ?"
#, c-format #, c-format
msgid "Incoming file %0.2fKB" msgid "Incoming file %0.2fKB"
msgstr "Fichier entrant %0.2fKB" msgstr "Fichier entrant %0.2fKo"
#, c-format #, c-format
msgid "Incoming file %0.2fMB" msgid "Incoming file %0.2fMB"
msgstr "Fichier entrant %0.2fMB" msgstr "Fichier entrant %0.2fMo"
msgid "Initializing Network" msgid "Initializing Network"
msgstr "Initialisation du réseau" msgstr "Initialisation du réseau"
@ -685,7 +685,7 @@ msgid "Install a game"
msgstr "Installer un jeu" msgstr "Installer un jeu"
msgid "Install directories" msgid "Install directories"
msgstr "Dossier d'installation" msgstr "Dossiers d'installation"
msgid "Install partitions" msgid "Install partitions"
msgstr "Installation" msgstr "Installation"
@ -736,16 +736,16 @@ msgid "Korean"
msgstr "Coréen" msgstr "Coréen"
msgid "Language File" msgid "Language File"
msgstr "Langues" msgstr "Fichier de langue"
msgid "Language change:" msgid "Language change:"
msgstr "Changement Langue:" msgstr "Changement de langue:"
msgid "Languagefiles Path" msgid "Languagefiles Path"
msgstr "Dossier Langue" msgstr "Dossier langue"
msgid "Languagepath changed." msgid "Languagepath changed."
msgstr "Dossier Langue changé" msgstr "Dossier langue changé"
msgid "Left" msgid "Left"
msgstr "Gauche" msgstr "Gauche"
@ -757,7 +757,7 @@ msgid "Load"
msgstr "Charger" msgstr "Charger"
msgid "Load From SD/USB" msgid "Load From SD/USB"
msgstr "Charger sur SD/USB" msgstr "Charger depuis SD/USB"
#, c-format #, c-format
msgid "Load file from: %s ?" msgid "Load file from: %s ?"
@ -785,22 +785,22 @@ msgid "Locked"
msgstr "Clic pour déverrouiller" msgstr "Clic pour déverrouiller"
msgid "Loop Directory" msgid "Loop Directory"
msgstr "Répéter Dossier" msgstr "Répéter dossier"
msgid "Loop Music" msgid "Loop Music"
msgstr "Répéter Musique" msgstr "Répéter musique"
msgid "Loop Sound" msgid "Loop Sound"
msgstr "Son en boucle" msgstr "Son en boucle"
msgid "Main tester:" msgid "Main tester:"
msgstr "Testeur principal:" msgstr "Testeur:"
msgid "Mar" msgid "Mar"
msgstr "Mars" msgstr "Mars"
msgid "Mark new games" msgid "Mark new games"
msgstr "Marqueur nouveau jeu" msgstr "Marquer les nouveaux jeux"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
@ -815,10 +815,10 @@ msgid "Mount DVD drive"
msgstr "Lancer DVD" msgstr "Lancer DVD"
msgid "Music Loop Mode" msgid "Music Loop Mode"
msgstr "Mode Boucle Musique" msgstr "Type de boucle"
msgid "Music Volume" msgid "Music Volume"
msgstr "Volume Musique" msgstr "Volume musique"
msgid "Neither" msgid "Neither"
msgstr "Aucun" msgstr "Aucun"
@ -827,7 +827,7 @@ msgid "Network is not initiated."
msgstr "Réseau non initialisé" msgstr "Réseau non initialisé"
msgid "New Disc Detected" msgid "New Disc Detected"
msgstr "Nouveau DVD Détecté" msgstr "Nouveau DVD détecté"
msgid "Next" msgid "Next"
msgstr "Suivant" msgstr "Suivant"
@ -842,13 +842,13 @@ msgid "No DOL file found on disc."
msgstr "Aucun DOL trouvé dans ce jeu." msgstr "Aucun DOL trouvé dans ce jeu."
msgid "No Splitting" msgid "No Splitting"
msgstr "Pas de découpage" msgstr "Aucun"
msgid "No URL or Path specified." msgid "No URL or Path specified."
msgstr "Pas d'adresse ou de chemin spécifié" msgstr "Pas d'adresse ou de chemin spécifié"
msgid "No WBFS or FAT/NTFS/EXT partition found" msgid "No WBFS or FAT/NTFS/EXT partition found"
msgstr "Pas de partition WBFS ou FAT/NTFS/EXT trouvé" msgstr "Partition WBFS ou FAT/NTFS/EXT non trouvée"
msgid "No cheats were selected" msgid "No cheats were selected"
msgstr "Aucune sélection de triche" msgstr "Aucune sélection de triche"
@ -857,13 +857,13 @@ msgid "No data could be read."
msgstr "Lecture des données impossible." msgstr "Lecture des données impossible."
msgid "No favorites selected." msgid "No favorites selected."
msgstr "Pas de favoris sélectionné" msgstr "Pas de favoris sélectionnés"
msgid "No file missing!" msgid "No file missing!"
msgstr "Aucun fichier manquant !" msgstr "Aucun fichier manquant !"
msgid "No new updates." msgid "No new updates."
msgstr "Pas de nouvelle Mise à Jour." msgstr "Pas de nouvelle mise à jour."
msgid "No themes found on the site." msgid "No themes found on the site."
msgstr "Aucun thème trouvé sur le site." msgstr "Aucun thème trouvé sur le site."
@ -923,7 +923,7 @@ msgid "Oct"
msgstr "" msgstr ""
msgid "Official Site:" msgid "Official Site:"
msgstr "Site Officiel:" msgstr "Site officiel:"
msgid "Offset" msgid "Offset"
msgstr "" msgstr ""
@ -944,7 +944,7 @@ msgid "Original/Customs"
msgstr "Originaux/Persos" msgstr "Originaux/Persos"
msgid "Parental Control" msgid "Parental Control"
msgstr "Contrôle Parental" msgstr "Contrôle parental"
msgid "Partition" msgid "Partition"
msgstr "" msgstr ""
@ -959,7 +959,7 @@ msgid "Password has been changed"
msgstr "Le mot de passe a été modifié" msgstr "Le mot de passe a été modifié"
msgid "Patch Country Strings" msgid "Patch Country Strings"
msgstr "Patch Jeux Import" msgstr "Patch jeux import"
msgid "Path Changed" msgid "Path Changed"
msgstr "Chemin changé" msgstr "Chemin changé"
@ -968,19 +968,19 @@ msgid "Pick from a list"
msgstr "Sélectionner" msgstr "Sélectionner"
msgid "Play Count" msgid "Play Count"
msgstr "Utilisation" msgstr "Utilisations"
msgid "Play Next" msgid "Play Next"
msgstr "Jouer Suiv." msgstr "Jouer suiv."
msgid "Play Once" msgid "Play Once"
msgstr "Jouer 1 fois" msgstr "Jouer 1 fois"
msgid "Play Previous" msgid "Play Previous"
msgstr "Jouer Précéd." msgstr "Jouer précéd."
msgid "Playing Music:" msgid "Playing Music:"
msgstr "Musique Actuelle:" msgstr "Musique actuelle:"
msgid "Please wait..." msgid "Please wait..."
msgstr "Veuillez patienter..." msgstr "Veuillez patienter..."
@ -1010,7 +1010,7 @@ msgid "Receiving file from:"
msgstr "Réception du fichier de:" msgstr "Réception du fichier de:"
msgid "Region Patch" msgid "Region Patch"
msgstr "" msgstr "Région patch"
msgid "Released" msgid "Released"
msgstr "Date de sortie" msgstr "Date de sortie"
@ -1019,7 +1019,7 @@ msgid "Reload SD"
msgstr "Recharger la SD" msgstr "Recharger la SD"
msgid "Remove update" msgid "Remove update"
msgstr "Supprimer Mise à Jour" msgstr "Supprimer MàJ"
msgid "Rename Game on WBFS" msgid "Rename Game on WBFS"
msgstr "Renommer un jeu" msgstr "Renommer un jeu"
@ -1028,10 +1028,10 @@ msgid "Reset BG Music"
msgstr "Fond sonore par defaut" msgstr "Fond sonore par defaut"
msgid "Reset Playcounter" msgid "Reset Playcounter"
msgstr "Réinitialiser le compteur d'utilisation" msgstr "Remise à zéro du compteur d'utilisations"
msgid "Reset to default BGM?" msgid "Reset to default BGM?"
msgstr "Réinitialiser le fond sonore ?" msgstr "Remettre le fond sonore par defaut ?"
msgid "Restarting..." msgid "Restarting..."
msgstr "Redémarrage..." msgstr "Redémarrage..."
@ -1040,7 +1040,7 @@ msgid "Return"
msgstr "Retour" msgstr "Retour"
msgid "Return To" msgid "Return To"
msgstr "Revenir à:" msgstr "Retourner vers"
msgid "Return to Wii Menu" msgid "Return to Wii Menu"
msgstr "Retourner au menu Wii" msgstr "Retourner au menu Wii"
@ -1082,7 +1082,7 @@ msgid "Select a DOL"
msgstr "Choisir un DOL" msgstr "Choisir un DOL"
msgid "Select a DOL from Game" msgid "Select a DOL from Game"
msgstr "Sélectionner un DOL a partir du jeu" msgstr "Sélectionner un DOL à partir du jeu"
msgid "Sept" msgid "Sept"
msgstr "" msgstr ""
@ -1100,13 +1100,13 @@ msgid "Shutdown System"
msgstr "Arrêt" msgstr "Arrêt"
msgid "Shutdown Wii" msgid "Shutdown Wii"
msgstr "Eteindre la Wii" msgstr "Éteindre la Wii"
msgid "Sort alphabetically" msgid "Sort alphabetically"
msgstr "Ordre Alphabétique" msgstr "Ordre alphabétique"
msgid "Sort by rank" msgid "Sort by rank"
msgstr "Classement Favoris" msgstr "Classement favoris"
msgid "Sort order by most played" msgid "Sort order by most played"
msgstr "Les plus joués" msgstr "Les plus joués"
@ -1130,10 +1130,10 @@ msgid "Special thanks to:"
msgstr "Remerciements spéciaux à:" msgstr "Remerciements spéciaux à:"
msgid "Split each 2GB" msgid "Split each 2GB"
msgstr "Découper tous les 2GB" msgstr "2Go"
msgid "Split each 4GB" msgid "Split each 4GB"
msgstr "Découper tous les 4GB" msgstr "4Go"
msgid "Standby" msgid "Standby"
msgstr "Veille" msgstr "Veille"
@ -1148,10 +1148,10 @@ msgid "Successfully Saved"
msgstr "Enregistré avec succès" msgstr "Enregistré avec succès"
msgid "Successfully Updated" msgid "Successfully Updated"
msgstr "Mise à Jour terminée" msgstr "Mise à jour terminée"
msgid "Successfully Updated thanks to www.techjawa.com" msgid "Successfully Updated thanks to www.techjawa.com"
msgstr "Mise à Jour terminée. Merci www.techjawa.com" msgstr "Mise à jour terminée. Merci à www.techjawa.com"
msgid "Successfully deleted:" msgid "Successfully deleted:"
msgstr "Supprimé avec succès:" msgstr "Supprimé avec succès:"
@ -1163,16 +1163,16 @@ msgid "Successfully installed:"
msgstr "Installé avec succès:" msgstr "Installé avec succès:"
msgid "System Default" msgid "System Default"
msgstr "Système par défaut" msgstr "Console par défaut"
msgid "TChinese" msgid "TChinese"
msgstr "Chinois traditionnel" msgstr "Chinois traditionnel"
msgid "TXT Cheatcodes Path" msgid "TXT Cheatcodes Path"
msgstr "Dossier TXT de Triche" msgstr "Dossier TXT de triches"
msgid "The .them file was not found in the zip." msgid "The .them file was not found in the zip."
msgstr "Fichier .them introuvable dans le zip." msgstr "Fichier .them non trouvé dans le zip."
msgid "The entered directory does not exist. Would you like to create it?" msgid "The entered directory does not exist. Would you like to create it?"
msgstr "Répertoire indiqué inexistant. Souhaitez-vous le créer ?" msgstr "Répertoire indiqué inexistant. Souhaitez-vous le créer ?"
@ -1185,13 +1185,13 @@ msgid "The wad installation failed with error %i"
msgstr "L'installation du wad a échoué avec l'erreur %i" msgstr "L'installation du wad a échoué avec l'erreur %i"
msgid "Theme Downloader" msgid "Theme Downloader"
msgstr "Téléchargement Thèmes" msgstr "Téléchargement des thèmes"
msgid "Theme Path" msgid "Theme Path"
msgstr "Dossier Thème" msgstr "Dossier thème"
msgid "Theme Title:" msgid "Theme Title:"
msgstr "Titre du Thème:" msgstr "Titre du thème:"
msgid "Theme path is changed." msgid "Theme path is changed."
msgstr "Dossier thème changé" msgstr "Dossier thème changé"
@ -1236,10 +1236,10 @@ msgid "Uninstall"
msgstr "Désinstaller" msgstr "Désinstaller"
msgid "Uninstall Game" msgid "Uninstall Game"
msgstr "Désinstaller le Jeu" msgstr "Désinstaller le jeu"
msgid "Uninstall Menu" msgid "Uninstall Menu"
msgstr "Menu Suppression" msgstr "Menu suppression"
msgid "Uninstalling wad" msgid "Uninstalling wad"
msgstr "Désinstallation wad" msgstr "Désinstallation wad"
@ -1248,7 +1248,7 @@ msgid "Unknown"
msgstr "Inconnu" msgstr "Inconnu"
msgid "Unlock USB Loader GX" msgid "Unlock USB Loader GX"
msgstr "Déverouiller USB Loader GX" msgstr "Déverrouiller USB Loader GX"
msgid "Unlock console to use this option." msgid "Unlock console to use this option."
msgstr "Cette option requiert le déverrouillage de l'interface." msgstr "Cette option requiert le déverrouillage de l'interface."
@ -1260,7 +1260,7 @@ msgid "Unsupported format, try to extract manually TempTheme.zip."
msgstr "Format non supporté, essayez d'extraire manuellement TempTheme.zip." msgstr "Format non supporté, essayez d'extraire manuellement TempTheme.zip."
msgid "Update" msgid "Update"
msgstr "Mise à Jour" msgstr "Mise à jour"
msgid "Update All" msgid "Update All"
msgstr "Totale" msgstr "Totale"
@ -1272,19 +1272,19 @@ msgid "Update Files"
msgstr "MàJ Fichiers" msgstr "MàJ Fichiers"
msgid "Update Path" msgid "Update Path"
msgstr "Dossier Mise à Jour" msgstr "Dossier de mise à jour"
msgid "Update all Language Files" msgid "Update all Language Files"
msgstr "Mise à Jour tous fichiers Langue" msgstr "Mise à jour des fichiers de langue"
msgid "Update failed" msgid "Update failed"
msgstr "Mise à Jour échouée" msgstr "Échec de la mise à jour"
msgid "Update successfull" msgid "Update successfull"
msgstr "Mise à jour réussie" msgstr "Mise à jour réussie"
msgid "Updating Language Files:" msgid "Updating Language Files:"
msgstr "Mise à Jour Fichiers Langue:" msgstr "Mise à jour du fichier de langue:"
msgid "Uploaded ZIP file installed to homebrew directory." msgid "Uploaded ZIP file installed to homebrew directory."
msgstr "Fichier ZIP envoyé et installé dans le répertoire homebrew." msgstr "Fichier ZIP envoyé et installé dans le répertoire homebrew."
@ -1300,7 +1300,7 @@ msgid "Video Mode"
msgstr "Mode vidéo" msgstr "Mode vidéo"
msgid "WIP Patches Path" msgid "WIP Patches Path"
msgstr "Dossier Patchs WIP" msgstr "Dossier patchs WIP"
msgid "Waiting..." msgid "Waiting..."
msgstr "En attente..." msgstr "En attente..."
@ -1309,7 +1309,7 @@ msgid "Warning:"
msgstr "Attention:" msgstr "Attention:"
msgid "What do you want to update?" msgid "What do you want to update?"
msgstr "Choix Mise à Jour" msgstr "Choix de la mise à jour"
msgid "WiFi Features" msgid "WiFi Features"
msgstr "Connexion WiFi" msgstr "Connexion WiFi"
@ -1324,7 +1324,7 @@ msgid "Wii Settings"
msgstr "Paramètres Wii" msgstr "Paramètres Wii"
msgid "WiiTDB Files" msgid "WiiTDB Files"
msgstr "WiiTDB" msgstr "Fichier WiiTDB"
msgid "WiiTDB Path" msgid "WiiTDB Path"
msgstr "Dossier WiiTDB" msgstr "Dossier WiiTDB"
@ -1342,13 +1342,13 @@ msgid "Yes"
msgstr "Oui" msgstr "Oui"
msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 18. This is not supported. Continue on your own risk." msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 18. This is not supported. Continue on your own risk."
msgstr "Vous éssayez de sélectionner une partition FAT32/NTFS/EXT avec un cIOS 249 Rev < 18 (non supporté). Continuez à vos risques." msgstr "Vous essayez de sélectionner une partition FAT32/NTFS/EXT avec un cIOS 249 Rev < 18 (non supporté). Continuez à vos risques."
msgid "You need to select or format a partition" msgid "You need to select or format a partition"
msgstr "Vous devez choisir ou formater une partition" msgstr "Vous devez choisir ou formater une partition"
msgid "and translators for language files updates" msgid "and translators for language files updates"
msgstr "et les traducteurs pour la mise à jour des fichiers langue" msgstr "et les traducteurs pour la MàJ des fichiers langue"
msgid "available" msgid "available"
msgstr "disponible" msgstr "disponible"
@ -1420,7 +1420,7 @@ msgstr "secondes restantes"
#~ msgstr "Veille" #~ msgstr "Veille"
#~ msgid "Shutdown?" #~ msgid "Shutdown?"
#~ msgstr "Eteindre ?" #~ msgstr "Éteindre ?"
#~ msgid "Your URL has been saved in %sWiiTDB_URL.txt." #~ msgid "Your URL has been saved in %sWiiTDB_URL.txt."
#~ msgstr "Sauvegarde de l'URL sous %sWiiTDB_URL.txt." #~ msgstr "Sauvegarde de l'URL sous %sWiiTDB_URL.txt."
@ -1486,7 +1486,7 @@ msgstr "secondes restantes"
#~ msgstr "Confirmation activation du Contrôle Parental ?" #~ msgstr "Confirmation activation du Contrôle Parental ?"
#~ msgid "Checking for Updates" #~ msgid "Checking for Updates"
#~ msgstr "Recherche de Mise à Jour" #~ msgstr "Recherche de Mise à jour"
#~ msgid "Downloading" #~ msgid "Downloading"
#~ msgstr "Téléchargement" #~ msgstr "Téléchargement"
@ -1513,13 +1513,13 @@ msgstr "secondes restantes"
#~ msgstr "vers la" #~ msgstr "vers la"
#~ msgid "Updating" #~ msgid "Updating"
#~ msgstr "Mise à Jour" #~ msgstr "Mise à jour"
#~ msgid "Updating Language Files..." #~ msgid "Updating Language Files..."
#~ msgstr "Mise à Jour Fichiers Langue..." #~ msgstr "Mise à jour des fichiers Langue..."
#~ msgid "Updating WiiTDB.zip" #~ msgid "Updating WiiTDB.zip"
#~ msgstr "Mise à Jour WiiTDB.zip" #~ msgstr "Mise à jour de WiiTDB.zip"
#~ msgid "You don't have Parental Control enabled. If you wish to use Parental Control, enable it in the Wii Settings." #~ 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." #~ msgstr "Contrôle Parental désactivé. Si vous voulez l'utiliser, activez-le dans les Paramètres de votre Wii."
@ -1642,7 +1642,7 @@ msgstr "secondes restantes"
#~ msgstr "USB Loader GX fonctionne avec le CIOS d'Hermès rev4 seulement! Assurez-vous qu'il soit installé!" #~ msgstr "USB Loader GX fonctionne avec le CIOS d'Hermès rev4 seulement! Assurez-vous qu'il soit installé!"
#~ msgid "Update Path changed." #~ msgid "Update Path changed."
#~ msgstr "Dossier de Mise à Jour modifié." #~ msgstr "Dossier de mise à jour modifié."
#~ msgid "WIP Patches Path changed" #~ msgid "WIP Patches Path changed"
#~ msgstr "Dossier Patchs WIP modifié" #~ msgstr "Dossier Patchs WIP modifié"

11
Languages/german.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:00+0100\n" "POT-Creation-Date: 2011-01-06 19:58+0100\n"
"PO-Revision-Date: 2010-07-03 17:35-0800\n" "PO-Revision-Date: 2010-07-03 17:35-0800\n"
"Last-Translator: TheRealVisitor\n" "Last-Translator: TheRealVisitor\n"
"Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n" "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@ -395,7 +395,7 @@ msgid "Do you want to format:"
msgstr "Formatieren:" msgstr "Formatieren:"
msgid "Do you want to load the default theme?" msgid "Do you want to load the default theme?"
msgstr "" msgstr "Soll das DEFAULT Theme geladen werden?"
msgid "Do you want to load this theme?" msgid "Do you want to load this theme?"
msgstr "Soll dieses Theme geladen werden?" msgstr "Soll dieses Theme geladen werden?"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "FEHLER: Theme kann nicht eingerichtet werden." msgstr "FEHLER: Theme kann nicht eingerichtet werden."
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "Das Aktivieren dieser Option auf einer FAT Partition könnte das Starten des Loaders verlangsamen."
msgid "English" msgid "English"
msgstr "Englisch" msgstr "Englisch"
@ -629,7 +629,7 @@ msgid "GamesLevel"
msgstr "Spiele Level" msgstr "Spiele Level"
msgid "Genre:" msgid "Genre:"
msgstr "" msgstr "Genre:"
msgid "German" msgid "German"
msgstr "Deutsch" msgstr "Deutsch"
@ -1404,9 +1404,6 @@ msgstr "von"
msgid "seconds left" msgid "seconds left"
msgstr "Sekunden verbleiben" msgstr "Sekunden verbleiben"
#~ msgid "Gerne:"
#~ msgstr "Genre:"
#~ msgid "Full Shutdown" #~ msgid "Full Shutdown"
#~ msgstr "Komplett ausschalten" #~ msgstr "Komplett ausschalten"

14
Languages/italian.lang
View File

@ -1,12 +1,12 @@
# USB Loader GX language source file. # USB Loader GX language source file.
# italian.lang - v63 - r1031 # italian.lang - v65 - r1033
# don't delete/change this line (é). # don't delete/change this line (é).
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:00+0100\n" "POT-Creation-Date: 2011-01-07 14:00+0100\n"
"PO-Revision-Date: 2011-01-03 01:30+0200\n" "PO-Revision-Date: 2011-01-08 08:30+0200\n"
"Last-Translator: Cambo \n" "Last-Translator: Cambo \n"
"Language-Team: Cambo\n" "Language-Team: Cambo\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -182,7 +182,7 @@ msgid "Big thanks to:"
msgstr "Grazie mille a:" msgstr "Grazie mille a:"
msgid "Block IOS Reload" msgid "Block IOS Reload"
msgstr "Ricarica l'IOS" msgstr "Blocca Ricarica IOS"
msgid "Boot/Standard" msgid "Boot/Standard"
msgstr "Riavvio/Standard" msgstr "Riavvio/Standard"
@ -395,7 +395,7 @@ msgid "Do you want to format:"
msgstr "Vuoi formattare:" msgstr "Vuoi formattare:"
msgid "Do you want to load the default theme?" msgid "Do you want to load the default theme?"
msgstr "" msgstr "Vuoi caricare il tema predefinito?"
msgid "Do you want to load this theme?" msgid "Do you want to load this theme?"
msgstr "Vuoi caricare questo tema?" msgstr "Vuoi caricare questo tema?"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "ERRORE: Impossibile configurare il tema." msgstr "ERRORE: Impossibile configurare il tema."
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "Abilitando questa opzione su una partizione FAT potresti rallentare l'avvio del loader."
msgid "English" msgid "English"
msgstr "Inglese" msgstr "Inglese"
@ -596,7 +596,7 @@ msgid "Game Language"
msgstr "Lingua Gioco" msgstr "Lingua Gioco"
msgid "Game Load" msgid "Game Load"
msgstr "Impostazioni Giochi" msgstr "Impostazioni Gioco"
msgid "Game Lock" msgid "Game Lock"
msgstr "Bloccaggio Gioco" msgstr "Bloccaggio Gioco"
@ -1239,7 +1239,7 @@ msgid "Uninstall Game"
msgstr "Disinstalla il gioco" msgstr "Disinstalla il gioco"
msgid "Uninstall Menu" msgid "Uninstall Menu"
msgstr "Disinstalla Menu" msgstr "Menu Disinstallazioni"
msgid "Uninstalling wad" msgid "Uninstalling wad"
msgstr "Disinstalla WAD" msgstr "Disinstalla WAD"

4
Languages/japanese.lang
View File

@ -395,7 +395,7 @@ msgid "Do you want to format:"
msgstr "初期化しますか?" msgstr "初期化しますか?"
msgid "Do you want to load the default theme?" msgid "Do you want to load the default theme?"
msgstr "" msgstr "標準のテーマを読み込みますか?"
msgid "Do you want to load this theme?" msgid "Do you want to load this theme?"
msgstr "このテーマを読み込みますか?" msgstr "このテーマを読み込みますか?"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "テーマを適用できませんでした" msgstr "テーマを適用できませんでした"
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "FAT領域でこれを有効にするとローダーの起動が遅くなります"
msgid "English" msgid "English"
msgstr "英語" msgstr "英語"

12
Languages/schinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:00+0100\n" "POT-Creation-Date: 2011-01-08 13:01+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: knife.hu kavid emul8ion\n" "Last-Translator: knife.hu kavid emul8ion\n"
"Language-Team: kavid\n" "Language-Team: kavid\n"
@ -395,7 +395,7 @@ msgid "Do you want to format:"
msgstr "是否格式化:" msgstr "是否格式化:"
msgid "Do you want to load the default theme?" msgid "Do you want to load the default theme?"
msgstr "" msgstr "要加载默认主题吗?"
msgid "Do you want to load this theme?" msgid "Do you want to load this theme?"
msgstr "是否载入这个主题？" msgstr "是否载入这个主题？"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "错误: 无法设置主题." msgstr "错误: 无法设置主题."
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "在FAT分区启用这个选项会使Loader启动变慢."
msgid "English" msgid "English"
msgstr "英文" msgstr "英文"
@ -644,10 +644,10 @@ msgid "Homebrew Apps Path"
msgstr "自制程序路径" msgstr "自制程序路径"
msgid "Homebrew Channel" msgid "Homebrew Channel"
msgstr "Homebrew 频道" msgstr "Homebrew频道"
msgid "Homebrew Launcher" msgid "Homebrew Launcher"
msgstr "Homebrew 管理器" msgstr "Homebrew管理器"
msgid "Hour" msgid "Hour"
msgstr "小时" msgstr "小时"
@ -1348,7 +1348,7 @@ msgid "You need to select or format a partition"
msgstr "你需要选择或者格式化一个分区" msgstr "你需要选择或者格式化一个分区"
msgid "and translators for language files updates" msgid "and translators for language files updates"
msgstr "" msgstr "以及翻译人员的语言文件更新"
msgid "available" msgid "available"
msgstr "允许" msgstr "允许"

10
Languages/tchinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:00+0100\n" "POT-Creation-Date: 2011-01-08 09:04+0100\n"
"PO-Revision-Date: 2010-02-15 21:00+0800\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n"
"Last-Translator: Jane.H\n" "Last-Translator: Jane.H\n"
"Language-Team: kyogc, Miller, Mika Li, Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@ -344,7 +344,7 @@ msgid "Design:"
msgstr "設計者：" msgstr "設計者："
msgid "Developed by" msgid "Developed by"
msgstr "開發者" msgstr "開發商"
msgid "Directory does not exist!" msgid "Directory does not exist!"
msgstr "目錄不存在" msgstr "目錄不存在"
@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme."
msgstr "錯誤：無法設定佈景主題。" msgstr "錯誤：無法設定佈景主題。"
msgid "Enabling this option on a FAT partition might slow the startup of the loader." msgid "Enabling this option on a FAT partition might slow the startup of the loader."
msgstr "" msgstr "在FAT磁區開啟這選項可能造成loader啟動緩慢。"
msgid "English" msgid "English"
msgstr "英文" msgstr "英文"
@ -995,7 +995,7 @@ msgid "Prompts Buttons"
msgstr "顯示校正" msgstr "顯示校正"
msgid "Published by" msgid "Published by"
msgstr "發布者" msgstr "出版商"
msgid "Quick Boot" msgid "Quick Boot"
msgstr "快速啟動" msgstr "快速啟動"
@ -1013,7 +1013,7 @@ msgid "Region Patch"
msgstr "區碼修正" msgstr "區碼修正"
msgid "Released" msgid "Released"
msgstr "發表" msgstr "發行"
msgid "Reload SD" msgid "Reload SD"
msgstr "重新載入 SD 卡" msgstr "重新載入 SD 卡"

813
Themes/Default.them
View File

@ -1,406 +1,407 @@
# USB Loader GX theme source file. # USB Loader GX theme source file.
# don't delete/change this line (é). # don't delete/change this line (é).
# ONLY the value before the '-' char needs to be entered in msgstr "" # ONLY the value before the '-' char needs to be entered in msgstr ""
# not the complete text. # not the complete text.
# It is important that the image folder is defined for the images to load. # It is important that the image folder is defined for the images to load.
# The image folder should be in the same folder as the .them file and include the theme images. # The image folder should be in the same folder as the .them file and include the theme images.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-07 14:09+0100\n" "POT-Creation-Date: 2011-01-08 13:01+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Theme-Title: Example\n" "Theme-Title: Example\n"
"Image-Folder: Example\n" "Image-Folder: Example\n"
"Last-Themer: Example\n" "Last-Themer: Example\n"
"Theme-Team: Example\n" "Theme-Team: Example\n"
"Theme-Version: Example\n"
msgid "r=0 g=0 b=0 a=255 - prompt windows text color"
msgstr "" msgid "r=0 g=0 b=0 a=255 - prompt windows text color"
msgstr ""
msgid "r=0 g=0 b=0 a=255 - settings text color"
msgstr "" msgid "r=0 g=0 b=0 a=255 - settings text color"
msgstr ""
msgid "9 - game list browser page size"
msgstr "" msgid "9 - game list browser page size"
msgstr ""
msgid "r=0 g=0 b=0 a=255 - game browser list text color"
msgstr "" msgid "r=0 g=0 b=0 a=255 - game browser list text color"
msgstr ""
msgid "r=0 g=0 b=0 a=255 - game browser list text color over"
msgstr "" msgid "r=0 g=0 b=0 a=255 - game browser list text color over"
msgstr ""
msgid "r=55 g=190 b=237 a=255 - carousel game name text color"
msgstr "" msgid "r=55 g=190 b=237 a=255 - carousel game name text color"
msgstr ""
msgid "0 - game grid layout pos x"
msgstr "" msgid "0 - game grid layout pos x"
msgstr ""
msgid "20 - game grid layout pos y"
msgstr "" msgid "20 - game grid layout pos y"
msgstr ""
msgid "255 - tooltip alpha"
msgstr "" msgid "255 - tooltip alpha"
msgstr ""
msgid "r=55 g=190 b=237 a=255 - hdd info color"
msgstr "" msgid "r=55 g=190 b=237 a=255 - hdd info color"
msgstr ""
msgid "center - hdd info align hor"
msgstr "" msgid "center - hdd info align hor"
msgstr ""
msgid "top - hdd info align ver"
msgstr "" msgid "top - hdd info align ver"
msgstr ""
msgid "0 - hdd info pos x"
msgstr "" msgid "0 - hdd info pos x"
msgstr ""
msgid "400 - hdd info pos y"
msgstr "" msgid "400 - hdd info pos y"
msgstr ""
msgid "r=55 g=190 b=237 a=255 - game count color"
msgstr "" msgid "r=55 g=190 b=237 a=255 - game count color"
msgstr ""
msgid "center - game count align hor"
msgstr "" msgid "center - game count align hor"
msgstr ""
msgid "top - game count align ver"
msgstr "" msgid "top - game count align ver"
msgstr ""
msgid "0 - game count pos x"
msgstr "" msgid "0 - game count pos x"
msgstr ""
msgid "420 - game count pos y"
msgstr "" msgid "420 - game count pos y"
msgstr ""
msgid "16 - install btn pos x"
msgstr "" msgid "16 - install btn pos x"
msgstr ""
msgid "355 - install btn pos y"
msgstr "" msgid "355 - install btn pos y"
msgstr ""
msgid "371 - settings btn pos y"
msgstr "" msgid "371 - settings btn pos y"
msgstr ""
msgid "64 - settings btn pos x"
msgstr "" msgid "64 - settings btn pos x"
msgstr ""
msgid "371 - home menu btn pos y"
msgstr "" msgid "371 - home menu btn pos y"
msgstr ""
msgid "489 - home menu btn pos x"
msgstr "" msgid "489 - home menu btn pos x"
msgstr ""
msgid "355 - power off btn pos y"
msgstr "" msgid "355 - power off btn pos y"
msgstr ""
msgid "576 - power off btn pos x"
msgstr "" msgid "576 - power off btn pos x"
msgstr ""
msgid "160 - sd card btn pos x"
msgstr "" msgid "160 - sd card btn pos x"
msgstr ""
msgid "395 - sd card btn pos y"
msgstr "" msgid "395 - sd card btn pos y"
msgstr ""
msgid "405 - HBC btn pos y"
msgstr "" msgid "405 - HBC btn pos y"
msgstr ""
msgid "410 - HBC btn pos x"
msgstr "" msgid "410 - HBC btn pos x"
msgstr ""
msgid "26 - cover/download btn pos x"
msgstr "" msgid "26 - cover/download btn pos x"
msgstr ""
msgid "58 - cover/download btn pos y"
msgstr "" msgid "58 - cover/download btn pos y"
msgstr ""
msgid "305 - gameID btn pos y"
msgstr "" msgid "305 - gameID btn pos y"
msgstr ""
msgid "68 - gameID btn pos x"
msgstr "" msgid "68 - gameID btn pos x"
msgstr ""
msgid "r=138 g=138 b=138 a=240 - clock color"
msgstr "" msgid "r=138 g=138 b=138 a=240 - clock color"
msgstr ""
msgid "left - clock align hor"
msgstr "" msgid "left - clock align hor"
msgstr ""
msgid "top - clock align ver"
msgstr "" msgid "top - clock align ver"
msgstr ""
msgid "275 - clock pos x"
msgstr "" msgid "275 - clock pos x"
msgstr ""
msgid "335 - clock pos y"
msgstr "" msgid "335 - clock pos y"
msgstr ""
msgid "260 - list layout favorite btn pos x"
msgstr "" msgid "260 - list layout favorite btn pos x"
msgstr ""
msgid "288 - list layout favorite btn pos x widescreen"
msgstr "" msgid "288 - list layout favorite btn pos x widescreen"
msgstr ""
msgid "13 - list layout favorite btn pos y"
msgstr "" msgid "13 - list layout favorite btn pos y"
msgstr ""
msgid "300 - list layout search btn pos x"
msgstr "" msgid "300 - list layout search btn pos x"
msgstr ""
msgid "320 - list layout search btn pos x widescreen"
msgstr "" msgid "320 - list layout search btn pos x widescreen"
msgstr ""
msgid "13 - list layout search btn pos x"
msgstr "" msgid "13 - list layout search btn pos x"
msgstr ""
msgid "340 - list layout abc/sort btn pos x"
msgstr "" msgid "340 - list layout abc/sort btn pos x"
msgstr ""
msgid "352 - list layout abc/sort btn pos x widescreen"
msgstr "" msgid "352 - list layout abc/sort btn pos x widescreen"
msgstr ""
msgid "13 - list layout abc/sort btn pos y"
msgstr "" msgid "13 - list layout abc/sort btn pos y"
msgstr ""
msgid "380 - list layout list btn pos x"
msgstr "" msgid "380 - list layout list btn pos x"
msgstr ""
msgid "384 - list layout list btn pos x widescreen"
msgstr "" msgid "384 - list layout list btn pos x widescreen"
msgstr ""
msgid "13 - list layout list btn pos y"
msgstr "" msgid "13 - list layout list btn pos y"
msgstr ""
msgid "416 - list layout grid btn pos x widescreen"
msgstr "" msgid "416 - list layout grid btn pos x widescreen"
msgstr ""
msgid "420 - list layout grid btn pos x"
msgstr "" msgid "420 - list layout grid btn pos x"
msgstr ""
msgid "13 - list layout grid btn pos y"
msgstr "" msgid "13 - list layout grid btn pos y"
msgstr ""
msgid "448 - list layout carousel btn pos x widescreen"
msgstr "" msgid "448 - list layout carousel btn pos x widescreen"
msgstr ""
msgid "460 - list layout carousel btn pos x"
msgstr "" msgid "460 - list layout carousel btn pos x"
msgstr ""
msgid "13 - list layout carousel btn pos y"
msgstr "" msgid "13 - list layout carousel btn pos y"
msgstr ""
msgid "480 - list layout lock btn pos x widescreen"
msgstr "" msgid "480 - list layout lock btn pos x widescreen"
msgstr ""
msgid "500 - list layout lock btn pos x"
msgstr "" msgid "500 - list layout lock btn pos x"
msgstr ""
msgid "13 - list layout lock btn pos y"
msgstr "" msgid "13 - list layout lock btn pos y"
msgstr ""
msgid "512 - list layout dvd btn pos x widescreen"
msgstr "" msgid "512 - list layout dvd btn pos x widescreen"
msgstr ""
msgid "540 - list layout dvd btn pos x"
msgstr "" msgid "540 - list layout dvd btn pos x"
msgstr ""
msgid "13 - list layout dvd btn pos y"
msgstr "" msgid "13 - list layout dvd btn pos y"
msgstr ""
msgid "280 - game list layout height"
msgstr "" msgid "280 - game list layout height"
msgstr ""
msgid "396 - game list layout width"
msgstr "" msgid "396 - game list layout width"
msgstr ""
msgid "200 - game list layout pos x"
msgstr "" msgid "200 - game list layout pos x"
msgstr ""
msgid "49 - game list layout pos y"
msgstr "" msgid "49 - game list layout pos y"
msgstr ""
msgid "200 - grid layout favorite btn pos x"
msgstr "" msgid "200 - grid layout favorite btn pos x"
msgstr ""
msgid "224 - grid layout favorite btn pos x widescreen"
msgstr "" msgid "224 - grid layout favorite btn pos x widescreen"
msgstr ""
msgid "13 - grid layout favorite btn pos y"
msgstr "" msgid "13 - grid layout favorite btn pos y"
msgstr ""
msgid "240 - grid layout search btn pos x"
msgstr "" msgid "240 - grid layout search btn pos x"
msgstr ""
msgid "256 - grid layout search btn pos x widescreen"
msgstr "" msgid "256 - grid layout search btn pos x widescreen"
msgstr ""
msgid "13 - grid layout search btn pos y"
msgstr "" msgid "13 - grid layout search btn pos y"
msgstr ""
msgid "280 - grid layout abc/sort btn pos x"
msgstr "" msgid "280 - grid layout abc/sort btn pos x"
msgstr ""
msgid "288 - grid layout abc/sort btn pos x widescreen"
msgstr "" msgid "288 - grid layout abc/sort btn pos x widescreen"
msgstr ""
msgid "13 - grid layout abc/sort btn pos y"
msgstr "" msgid "13 - grid layout abc/sort btn pos y"
msgstr ""
msgid "320 - grid layout list btn pos x"
msgstr "" msgid "320 - grid layout list btn pos x"
msgstr ""
msgid "320 - grid layout list btn pos x widescreen"
msgstr "" msgid "320 - grid layout list btn pos x widescreen"
msgstr ""
msgid "13 - grid layout list btn pos y"
msgstr "" msgid "13 - grid layout list btn pos y"
msgstr ""
msgid "352 - grid layout grid btn pos x widescreen"
msgstr "" msgid "352 - grid layout grid btn pos x widescreen"
msgstr ""
msgid "360 - grid layout grid btn pos x"
msgstr "" msgid "360 - grid layout grid btn pos x"
msgstr ""
msgid "13 - grid layout grid btn pos y"
msgstr "" msgid "13 - grid layout grid btn pos y"
msgstr ""
msgid "384 - grid layout carousel btn pos x widescreen"
msgstr "" msgid "384 - grid layout carousel btn pos x widescreen"
msgstr ""
msgid "400 - grid layout carousel btn pos x"
msgstr "" msgid "400 - grid layout carousel btn pos x"
msgstr ""
msgid "13 - grid layout carousel btn pos y"
msgstr "" msgid "13 - grid layout carousel btn pos y"
msgstr ""
msgid "416 - grid layout lock btn pos x widescreen"
msgstr "" msgid "416 - grid layout lock btn pos x widescreen"
msgstr ""
msgid "440 - grid layout lock btn pos x"
msgstr "" msgid "440 - grid layout lock btn pos x"
msgstr ""
msgid "13 - grid layout lock btn pos y"
msgstr "" msgid "13 - grid layout lock btn pos y"
msgstr ""
msgid "448 - grid layout dvd btn pos x widescreen"
msgstr "" msgid "448 - grid layout dvd btn pos x widescreen"
msgstr ""
msgid "480 - grid layout dvd btn pos x"
msgstr "" msgid "480 - grid layout dvd btn pos x"
msgstr ""
msgid "13 - grid layout dvd btn pos y"
msgstr "" msgid "13 - grid layout dvd btn pos y"
msgstr ""
msgid "400 - game grid layout height"
msgstr "" msgid "400 - game grid layout height"
msgstr ""
msgid "640 - game grid layout width"
msgstr "" msgid "640 - game grid layout width"
msgstr ""
msgid "200 - carousel layout favorite btn pos x"
msgstr "" msgid "200 - carousel layout favorite btn pos x"
msgstr ""
msgid "224 - carousel layout favorite btn pos x widescreen"
msgstr "" msgid "224 - carousel layout favorite btn pos x widescreen"
msgstr ""
msgid "13 - carousel layout favorite btn pos y"
msgstr "" msgid "13 - carousel layout favorite btn pos y"
msgstr ""
msgid "240 - carousel layout search btn pos x"
msgstr "" msgid "240 - carousel layout search btn pos x"
msgstr ""
msgid "256 - carousel layout search btn pos x widescreen"
msgstr "" msgid "256 - carousel layout search btn pos x widescreen"
msgstr ""
msgid "13 - carousel layout search btn pos y"
msgstr "" msgid "13 - carousel layout search btn pos y"
msgstr ""
msgid "280 - carousel layout abc/sort btn pos x"
msgstr "" msgid "280 - carousel layout abc/sort btn pos x"
msgstr ""
msgid "288 - carousel layout abc/sort btn pos x widescreen"
msgstr "" msgid "288 - carousel layout abc/sort btn pos x widescreen"
msgstr ""
msgid "13 - carousel layout abc/sort btn pos y"
msgstr "" msgid "13 - carousel layout abc/sort btn pos y"
msgstr ""
msgid "320 - carousel layout list btn pos x"
msgstr "" msgid "320 - carousel layout list btn pos x"
msgstr ""
msgid "320 - carousel layout list btn pos x widescreen"
msgstr "" msgid "320 - carousel layout list btn pos x widescreen"
msgstr ""
msgid "13 - carousel layout list btn pos y"
msgstr "" msgid "13 - carousel layout list btn pos y"
msgstr ""
msgid "352 - carousel layout grid btn pos x widescreen"
msgstr "" msgid "352 - carousel layout grid btn pos x widescreen"
msgstr ""
msgid "360 - carousel layout grid btn pos x"
msgstr "" msgid "360 - carousel layout grid btn pos x"
msgstr ""
msgid "13 - carousel layout grid btn pos y"
msgstr "" msgid "13 - carousel layout grid btn pos y"
msgstr ""
msgid "384 - carousel layout carousel btn pos x widescreen"
msgstr "" msgid "384 - carousel layout carousel btn pos x widescreen"
msgstr ""
msgid "400 - carousel layout carousel btn pos x"
msgstr "" msgid "400 - carousel layout carousel btn pos x"
msgstr ""
msgid "13 - carousel layout carousel btn pos y"
msgstr "" msgid "13 - carousel layout carousel btn pos y"
msgstr ""
msgid "416 - carousel layout lock btn pos x widescreen"
msgstr "" msgid "416 - carousel layout lock btn pos x widescreen"
msgstr ""
msgid "440 - carousel layout lock btn pos x"
msgstr "" msgid "440 - carousel layout lock btn pos x"
msgstr ""
msgid "13 - carousel layout lock btn pos y"
msgstr "" msgid "13 - carousel layout lock btn pos y"
msgstr ""
msgid "448 - carousel layout dvd btn pos x widescreen"
msgstr "" msgid "448 - carousel layout dvd btn pos x widescreen"
msgstr ""
msgid "480 - carousel layout dvd btn pos x"
msgstr "" msgid "480 - carousel layout dvd btn pos x"
msgstr ""
msgid "13 - carousel layout dvd btn pos y"
msgstr "" msgid "13 - carousel layout dvd btn pos y"
msgstr ""
msgid "400 - game carousel layout height"
msgstr "" msgid "400 - game carousel layout height"
msgstr ""
msgid "640 - game carousel layout width"
msgstr "" msgid "640 - game carousel layout width"
msgstr ""
msgid "0 - game carousel layout pos x"
msgstr "" msgid "-20 - game carousel layout pos y"
msgstr ""
msgid "0 - game carousel layout pos y"
msgstr "" msgid "0 - game carousel layout pos x"
msgstr ""
msgid "1 - show hdd info: 1 for on and 0 for off"
msgstr "" msgid "1 - show hdd info: 1 for on and 0 for off"
msgstr ""
msgid "1 - show game count: 1 for on and 0 for off"
msgstr "" msgid "1 - show game count: 1 for on and 0 for off"
msgstr ""
msgid "r=55 g=190 b=237 a=255 - game id text color"
msgstr "" msgid "r=55 g=190 b=237 a=255 - game id text color"
msgstr ""
msgid "r=55 g=190 b=237 a=255 - region info text color"
msgstr "" msgid "r=55 g=190 b=237 a=255 - region info text color"
msgstr ""
msgid "30 - region info text pos y"
msgstr "" msgid "30 - region info text pos y"
msgstr ""
msgid "68 - region info text pos x"
msgstr "" msgid "68 - region info text pos x"
msgstr ""
msgid "1 - Enable tooltips: 0 for off and 1 for on"
msgstr "" msgid "1 - Enable tooltips: 0 for off and 1 for on"
msgstr ""

2
source/Controls/PartitionHandle.cpp
View File

@ -332,6 +332,8 @@ void PartitionHandle::AddPartition(const char * name, u64 lba_start, u64 sec_cou
{ {
name = "WBFS"; name = "WBFS";
part_type = 0xBF; //Override partition type on WBFS part_type = 0xBF; //Override partition type on WBFS
sec_count = wbfs_ntohl(head->n_hd_sec);
} }
else if(*((u16 *) (buffer + 0x1FE)) == 0x55AA) else if(*((u16 *) (buffer + 0x1FE)) == 0x55AA)
{ {

4
source/GameBootProcess.cpp
View File

@ -28,7 +28,7 @@
u32 AppEntrypoint = 0; u32 AppEntrypoint = 0;
struct discHdr *dvdheader = NULL; struct discHdr *dvdheader = NULL;
extern int load_from_fs; extern int wbfs_part_fs;
extern int mountMethod; extern int mountMethod;
@ -181,7 +181,7 @@ int BootGame(const char * gameID)
if (reloadblock == ON && IosLoader::IsHermesIOS()) if (reloadblock == ON && IosLoader::IsHermesIOS())
{ {
enable_ES_ioctlv_vector(); enable_ES_ioctlv_vector();
if (load_from_fs == PART_FS_WBFS) if (wbfs_part_fs == PART_FS_WBFS)
mload_close(); mload_close();
} }

16
source/SoundOperations/gui_bgm.cpp
View File

@ -5,14 +5,13 @@
* Backgroundmusic * Backgroundmusic
***************************************************************************/ ***************************************************************************/
#include <sys/dir.h> #include <sys/dir.h>
#include "themes/CTheme.h"
#include "gui_bgm.h" #include "gui_bgm.h"
#include "menu.h" #include "menu.h"
GuiBGM::GuiBGM(const u8 *s, int l, int v) : GuiBGM::GuiBGM(const u8 *s, int l, int v) :
GuiSound(s, l, v, false, 0) GuiSound(s, l, v, false, 0)
{ {
loop = 0;
loopMode = ONCE;
currentPath = NULL; currentPath = NULL;
currentPlaying = 0; currentPlaying = 0;
voice = 0; voice = 0;
@ -25,13 +24,6 @@ GuiBGM::~GuiBGM()
ClearList(); ClearList();
} }
void GuiBGM::SetLoop(u8 l)
{
loopMode = l;
GuiSound::SetLoop(l == LOOP);
}
bool GuiBGM::Load(const char *path) bool GuiBGM::Load(const char *path)
{ {
if (!path) if (!path)
@ -65,7 +57,7 @@ bool GuiBGM::LoadStandard()
strcpy(Settings.ogg_path, ""); strcpy(Settings.ogg_path, "");
bool ret = GuiSound::Load(bg_music_ogg, bg_music_ogg_size, false); bool ret = GuiSound::Load(Resources::GetFile("bg_music.ogg"), Resources::GetFileSize("bg_music.ogg"), false);
if (ret) Play(); if (ret) Play();
@ -211,11 +203,11 @@ void GuiBGM::UpdateState()
{ {
if (!IsPlaying()) if (!IsPlaying())
{ {
if (loopMode == DIR_LOOP) if (loop == DIR_LOOP)
{ {
PlayNext(); PlayNext();
} }
else if (loopMode == RANDOM_BGM) else if (loop == RANDOM_BGM)
{ {
PlayRandom(); PlayRandom();
} }

2
source/SoundOperations/gui_bgm.h
View File

@ -27,14 +27,12 @@ class GuiBGM: public GuiSound
bool PlayNext(); bool PlayNext();
bool PlayPrevious(); bool PlayPrevious();
bool PlayRandom(); bool PlayRandom();
void SetLoop(u8 l);
void UpdateState(); void UpdateState();
protected: protected:
void AddEntrie(const char * filename); void AddEntrie(const char * filename);
void ClearList(); void ClearList();
int currentPlaying; int currentPlaying;
int loopMode;
char * currentPath; char * currentPath;
std::vector<char *> PlayList; std::vector<char *> PlayList;
}; };

4
source/SoundOperations/gui_sound.cpp
View File

@ -86,7 +86,7 @@ GuiSound::GuiSound(const char * filepath)
volume = 255; volume = 255;
SoundEffectLength = 0; SoundEffectLength = 0;
loop = false; loop = 0;
allocated = false; allocated = false;
Load(filepath); Load(filepath);
} }
@ -105,7 +105,7 @@ GuiSound::GuiSound(const u8 * snd, s32 len, int vol, bool isallocated, int v)
volume = vol; volume = vol;
SoundEffectLength = 0; SoundEffectLength = 0;
loop = false; loop = 0;
allocated = false; allocated = false;
Load(snd, len, isallocated); Load(snd, len, isallocated);
} }

4
source/SoundOperations/gui_sound.h
View File

@ -40,7 +40,7 @@ class GuiSound
//!Destructor //!Destructor
~GuiSound(); ~GuiSound();
//!Load a file and replace the old one //!Load a file and replace the old one
bool Load(const char * filepath); virtual bool Load(const char * filepath);
//!Load a file and replace the old one //!Load a file and replace the old one
bool Load(const u8 * sound, int filesize, bool allocated = true); bool Load(const u8 * sound, int filesize, bool allocated = true);
//!For quick playback of the internal soundeffects //!For quick playback of the internal soundeffects
@ -62,7 +62,7 @@ class GuiSound
//!\param v Sound volume (0-100) //!\param v Sound volume (0-100)
void SetVolume(int v); void SetVolume(int v);
//!\param l Loop (true to loop) //!\param l Loop (true to loop)
void SetLoop(u8 l); virtual void SetLoop(u8 l);
//!Special sound case for sound.bin //!Special sound case for sound.bin
void UncompressSoundbin(const u8 * snd, int len, bool isallocated); void UncompressSoundbin(const u8 * snd, int len, bool isallocated);
protected: protected:

8
source/cheats/cheatmenu.cpp
View File

@ -9,17 +9,9 @@
#include "themes/CTheme.h" #include "themes/CTheme.h"
#include "FileOperations/fileops.h" #include "FileOperations/fileops.h"
#include "menu.h" #include "menu.h"
#include "filelist.h"
#include "sys.h" #include "sys.h"
#include "gct.h" #include "gct.h"
/*** Extern functions ***/
extern void ResumeGui();
extern void HaltGui();
/*** Extern variables ***/
extern GuiWindow * mainWindow;
/**************************************************************************** /****************************************************************************
* CheatMenu * CheatMenu
***************************************************************************/ ***************************************************************************/

13
source/libwiigui/gui.h
View File

@ -43,7 +43,6 @@
#include "gui_imagedata.h" #include "gui_imagedata.h"
#include "FreeTypeGX.h" #include "FreeTypeGX.h"
#include "video.h" #include "video.h"
#include "filelist.h"
#include "input.h" #include "input.h"
#include "OptionList.hpp" #include "OptionList.hpp"
#include "SoundOperations/gui_sound.h" #include "SoundOperations/gui_sound.h"
@ -750,9 +749,12 @@ class GuiTooltip: public GuiElement
void Draw(); void Draw();
protected: protected:
GuiImage leftImage; //!< Tooltip left-image GuiImageData * tooltipLeft;
GuiImage tileImage; //!< Tooltip tile-image GuiImageData * tooltipTile;
GuiImage rightImage; //!< Tooltip right-image GuiImageData * tooltipRight;
GuiImage * leftImage; //!< Tooltip left-image
GuiImage * tileImage; //!< Tooltip tile-image
GuiImage * rightImage; //!< Tooltip right-image
GuiText *text; GuiText *text;
}; };
@ -932,9 +934,7 @@ class GuiKeyboard: public GuiWindow
GuiImageData * key; GuiImageData * key;
GuiImageData * keyOver; GuiImageData * keyOver;
GuiImageData * keyMedium; GuiImageData * keyMedium;
GuiImageData * keyMediumOver;
GuiImageData * keyLarge; GuiImageData * keyLarge;
GuiImageData * keyLargeOver;
GuiTrigger * trigA; GuiTrigger * trigA;
GuiTrigger * trigB; GuiTrigger * trigB;
}; };
@ -967,7 +967,6 @@ class GuiNumpad: public GuiWindow
GuiText * keyTxt[11]; GuiText * keyTxt[11];
GuiImageData * keyTextbox; GuiImageData * keyTextbox;
GuiImageData * keyMedium; GuiImageData * keyMedium;
GuiImageData * keyMediumOver;
GuiTrigger * trigA; GuiTrigger * trigA;
GuiTrigger * trigB; GuiTrigger * trigB;
}; };

2
source/libwiigui/gui_gamecarousel.cpp
View File

@ -46,7 +46,7 @@ static GuiImageData *GameCarouselLoadCoverImage(void * Arg)
/** /**
* Constructor for the GuiGameCarousel class. * Constructor for the GuiGameCarousel class.
*/ */
GuiGameCarousel::GuiGameCarousel(int w, int h, const char *themePath, const u8 *imagebg, int imagebgsize, int selectedGame) : GuiGameCarousel::GuiGameCarousel(int w, int h, const char *themePath, int selectedGame) :
noCover(Resources::GetFile("nocover.png"), Resources::GetFileSize("nocover.png")) noCover(Resources::GetFile("nocover.png"), Resources::GetFileSize("nocover.png"))
{ {
width = w; width = w;

2
source/libwiigui/gui_gamecarousel.h
View File

@ -8,7 +8,7 @@ class GuiImageAsync;
class GuiGameCarousel: public GuiElement class GuiGameCarousel: public GuiElement
{ {
public: public:
GuiGameCarousel(int w, int h, const char *themePath, const u8 *imagebg, int imagebgsize, int selectedGame = 0); GuiGameCarousel(int w, int h, const char *themePath, int selectedGame = 0);
~GuiGameCarousel(); ~GuiGameCarousel();
int FindMenuItem(int c, int d); int FindMenuItem(int c, int d);
int GetClickedOption(); int GetClickedOption();

2
source/libwiigui/gui_gamegrid.cpp
View File

@ -201,7 +201,7 @@ static GuiImageData *GameGridLoadCoverImage(void * Arg)
/** /**
* Constructor for the GuiGamegrid class. * Constructor for the GuiGamegrid class.
*/ */
GuiGameGrid::GuiGameGrid(int w, int h, const char *themePath, const u8 *imagebg, int selectedGame) : GuiGameGrid::GuiGameGrid(int w, int h, const char *themePath, int selectedGame) :
noCover(Resources::GetFile("nocoverFlat.png"), Resources::GetFileSize("nocoverFlat.png")) noCover(Resources::GetFile("nocoverFlat.png"), Resources::GetFileSize("nocoverFlat.png"))
{ {
width = w; width = w;

2
source/libwiigui/gui_gamegrid.h
View File

@ -9,7 +9,7 @@ class GuiImageAsync;
class GuiGameGrid: public GuiElement class GuiGameGrid: public GuiElement
{ {
public: public:
GuiGameGrid(int w, int h, const char *themePath, const u8 *imagebg, int selectedGame = 0); GuiGameGrid(int w, int h, const char *themePath, int selectedGame = 0);
~GuiGameGrid(); ~GuiGameGrid();
int FindMenuItem(int c, int d); int FindMenuItem(int c, int d);
int GetClickedOption(); int GetClickedOption();

29
source/libwiigui/gui_keyboard.cpp
View File

@ -13,6 +13,7 @@
#include "../settings/CSettings.h" #include "../settings/CSettings.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "themes/CTheme.h"
#include "menu.h" #include "menu.h"
/** /**
* Constructor for the GuiKeyboard class. * Constructor for the GuiKeyboard class.
@ -118,7 +119,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
memcpy(keys, thekeys, sizeof(thekeys)); memcpy(keys, thekeys, sizeof(thekeys));
} }
keyTextbox = new GuiImageData(keyboard_textbox_png, keyboard_textbox_png_size); keyTextbox = Resources::GetImageData("keyboard_textbox.png");
keyTextboxImg = new GuiImage(keyTextbox); keyTextboxImg = new GuiImage(keyTextbox);
keyTextboxImg->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); keyTextboxImg->SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
keyTextboxImg->SetPosition(0, 40);//(0,0); keyTextboxImg->SetPosition(0, 40);//(0,0);
@ -130,12 +131,10 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
kbText->SetPosition(0, 53);//(0, 13); kbText->SetPosition(0, 53);//(0, 13);
this->Append(kbText); this->Append(kbText);
key = new GuiImageData(keyboard_key_png, keyboard_key_png_size); key = Resources::GetImageData("keyboard_key.png");
keyOver = new GuiImageData(keyboard_key_over_png, keyboard_key_over_png_size); keyOver = Resources::GetImageData("keyboard_key_over.png");
keyMedium = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); keyMedium = Resources::GetImageData("keyboard_mediumkey_over.png");
keyMediumOver = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); keyLarge = Resources::GetImageData("keyboard_largekey_over.png");
keyLarge = new GuiImageData(keyboard_largekey_over_png, keyboard_largekey_over_png_size);
keyLargeOver = new GuiImageData(keyboard_largekey_over_png, keyboard_largekey_over_png_size);
trigA = new GuiTrigger; trigA = new GuiTrigger;
trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
@ -149,7 +148,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
} }
keyBackImg = new GuiImage(keyMedium); keyBackImg = new GuiImage(keyMedium);
keyBackOverImg = new GuiImage(keyMediumOver); keyBackOverImg = new GuiImage(keyMedium);
if (mode == 3) if (mode == 3)
{ {
keyBackText = new GuiText("Retour", 20, ( GXColor ) keyBackText = new GuiText("Retour", 20, ( GXColor )
@ -182,7 +181,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
this->Append(keyBack); this->Append(keyBack);
keyClearImg = new GuiImage(keyMedium); keyClearImg = new GuiImage(keyMedium);
keyClearOverImg = new GuiImage(keyMediumOver); keyClearOverImg = new GuiImage(keyMedium);
if (mode == 3) if (mode == 3)
{ {
keyClearText = new GuiText("Effacer", 20, ( GXColor ) keyClearText = new GuiText("Effacer", 20, ( GXColor )
@ -207,7 +206,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
this->Append(keyClear); this->Append(keyClear);
keyAltImg = new GuiImage(keyMedium); keyAltImg = new GuiImage(keyMedium);
keyAltOverImg = new GuiImage(keyMediumOver); keyAltOverImg = new GuiImage(keyMedium);
keyAltText = new GuiText("Alt Gr", 20, ( GXColor ) keyAltText = new GuiText("Alt Gr", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
keyAlt = new GuiButton(keyAltImg, keyAltOverImg, 0, 3, 84 + eurocheck, 4 * 42 + 120, trigA, btnSoundOver, keyAlt = new GuiButton(keyAltImg, keyAltOverImg, 0, 3, 84 + eurocheck, 4 * 42 + 120, trigA, btnSoundOver,
@ -227,7 +226,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
} }
keyAlt2Img = new GuiImage(keyMedium); keyAlt2Img = new GuiImage(keyMedium);
keyAlt2OverImg = new GuiImage(keyMediumOver); keyAlt2OverImg = new GuiImage(keyMedium);
keyAlt2Text = new GuiText("Accent", 20, ( GXColor ) keyAlt2Text = new GuiText("Accent", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
keyAlt2 = new GuiButton(keyAlt2Img, keyAlt2OverImg, 0, 3, (8 * 42 + 40) + eurocheck, 4 * 42 + 120, trigA, keyAlt2 = new GuiButton(keyAlt2Img, keyAlt2OverImg, 0, 3, (8 * 42 + 40) + eurocheck, 4 * 42 + 120, trigA,
@ -247,7 +246,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
} }
keyCapsImg = new GuiImage(keyMedium); keyCapsImg = new GuiImage(keyMedium);
keyCapsOverImg = new GuiImage(keyMediumOver); keyCapsOverImg = new GuiImage(keyMedium);
keyCapsText = new GuiText("Caps", 20, ( GXColor ) keyCapsText = new GuiText("Caps", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
keyCaps = new GuiButton(keyCapsImg, keyCapsOverImg, 0, 3, 0 + eurocheck, 2 * 42 + 120, trigA, btnSoundOver, keyCaps = new GuiButton(keyCapsImg, keyCapsOverImg, 0, 3, 0 + eurocheck, 2 * 42 + 120, trigA, btnSoundOver,
@ -264,7 +263,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
this->Append(keyCaps); this->Append(keyCaps);
keyShiftImg = new GuiImage(keyMedium); keyShiftImg = new GuiImage(keyMedium);
keyShiftOverImg = new GuiImage(keyMediumOver); keyShiftOverImg = new GuiImage(keyMedium);
keyShiftText = new GuiText("Shift", 20, ( GXColor ) keyShiftText = new GuiText("Shift", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
keyShift = new GuiButton(keyShiftImg, keyShiftOverImg, 0, 3, 21 + eurocheck, 3 * 42 + 120, trigA, btnSoundOver, keyShift = new GuiButton(keyShiftImg, keyShiftOverImg, 0, 3, 21 + eurocheck, 3 * 42 + 120, trigA, btnSoundOver,
@ -281,7 +280,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang)
this->Append(keyShift); this->Append(keyShift);
keySpaceImg = new GuiImage(keyLarge); keySpaceImg = new GuiImage(keyLarge);
keySpaceOverImg = new GuiImage(keyLargeOver); keySpaceOverImg = new GuiImage(keyLarge);
keySpace = new GuiButton(keySpaceImg, keySpaceOverImg, 2, 3, 0 + eurocheck, 4 * 42 + 120, trigA, btnSoundOver, keySpace = new GuiButton(keySpaceImg, keySpaceOverImg, 2, 3, 0 + eurocheck, 4 * 42 + 120, trigA, btnSoundOver,
btnSoundClick, 1); btnSoundClick, 1);
//keySpace = new GuiButton(keyLarge->GetWidth(), keyLarge->GetHeight()); //keySpace = new GuiButton(keyLarge->GetWidth(), keyLarge->GetHeight());
@ -360,9 +359,7 @@ GuiKeyboard::~GuiKeyboard()
delete key; delete key;
delete keyOver; delete keyOver;
delete keyMedium; delete keyMedium;
delete keyMediumOver;
delete keyLarge; delete keyLarge;
delete keyLargeOver;
delete trigA; delete trigA;
delete trigB; delete trigB;

50
source/libwiigui/gui_numpad.cpp
View File

@ -17,8 +17,6 @@
* Constructor for the GuiNumpad class. * Constructor for the GuiNumpad class.
*/ */
#define SAFEFREE(p) if(p){free(p);p=NULL;}
GuiNumpad::GuiNumpad(char * t, u32 max) GuiNumpad::GuiNumpad(char * t, u32 max)
{ {
width = 400; width = 400;
@ -35,7 +33,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
char thekeys[11] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '\0', '0' }; char thekeys[11] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '\0', '0' };
memcpy(keys, thekeys, sizeof(thekeys)); memcpy(keys, thekeys, sizeof(thekeys));
keyTextbox = new GuiImageData(keyboard_textbox_png, keyboard_textbox_png_size); keyTextbox = new GuiImageData("keyboard_textbox.png");
keyTextboxImg = new GuiImage(keyTextbox); keyTextboxImg = new GuiImage(keyTextbox);
keyTextboxImg->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); keyTextboxImg->SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
keyTextboxImg->SetPosition(0, 40);//(0,0); keyTextboxImg->SetPosition(0, 40);//(0,0);
@ -48,8 +46,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
kbText->SetPassChar('*'); kbText->SetPassChar('*');
this->Append(kbText); this->Append(kbText);
keyMedium = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); keyMedium = new GuiImageData("keyboard_mediumkey_over.png");
keyMediumOver = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size);
trigA = new GuiTrigger; trigA = new GuiTrigger;
trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA->SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
@ -57,7 +54,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
trigB->SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B); trigB->SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B);
keyBackImg = new GuiImage(keyMedium); keyBackImg = new GuiImage(keyMedium);
keyBackOverImg = new GuiImage(keyMediumOver); keyBackOverImg = new GuiImage(keyMedium);
keyBackText = new GuiText("Back", 20, ( GXColor ) keyBackText = new GuiText("Back", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
@ -67,7 +64,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
this->Append(keyBack); this->Append(keyBack);
keyClearImg = new GuiImage(keyMedium); keyClearImg = new GuiImage(keyMedium);
keyClearOverImg = new GuiImage(keyMediumOver); keyClearOverImg = new GuiImage(keyMedium);
keyClearText = new GuiText("Clear", 20, ( GXColor ) keyClearText = new GuiText("Clear", 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
keyClear = new GuiButton(keyClearImg, keyClearOverImg, ALIGN_CENTRE, ALIGN_MIDDLE, -90, 80, trigA, btnSoundOver, btnSoundClick, 1); keyClear = new GuiButton(keyClearImg, keyClearOverImg, ALIGN_CENTRE, ALIGN_MIDDLE, -90, 80, trigA, btnSoundOver, btnSoundClick, 1);
@ -83,7 +80,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
int row = i / 3; int row = i / 3;
keyImg[i] = new GuiImage(keyMedium); keyImg[i] = new GuiImage(keyMedium);
keyImgOver[i] = new GuiImage(keyMediumOver); keyImgOver[i] = new GuiImage(keyMedium);
txt[0] = keys[i]; txt[0] = keys[i];
keyTxt[i] = new GuiText(txt, 20, ( GXColor ) keyTxt[i] = new GuiText(txt, 20, ( GXColor )
{ 0, 0, 0, 0xff}); { 0, 0, 0, 0xff});
@ -103,30 +100,29 @@ GuiNumpad::GuiNumpad(char * t, u32 max)
*/ */
GuiNumpad::~GuiNumpad() GuiNumpad::~GuiNumpad()
{ {
SAFEFREE( kbText ) delete kbText;
SAFEFREE( keyTextbox ) delete keyTextbox;
SAFEFREE( keyTextboxImg ) delete keyTextboxImg;
SAFEFREE( keyBackText ) delete keyBackText;
SAFEFREE( keyBackImg ) delete keyBackImg;
SAFEFREE( keyBackOverImg ) delete keyBackOverImg;
SAFEFREE( keyBack ) delete keyBack;
SAFEFREE( keyClear ) delete keyClear;
SAFEFREE( keyClearImg ) delete keyClearImg;
SAFEFREE( keyClearOverImg ) delete keyClearOverImg;
SAFEFREE( keyClearText ) delete keyClearText;
SAFEFREE( keyMedium ) delete keyMedium;
SAFEFREE( keyMediumOver ) delete trigA;
SAFEFREE( trigA ) delete trigB;
SAFEFREE( trigB )
for (int i = 0; i < 11; i++) for (int i = 0; i < 11; i++)
{ {
if (keys[i] != '\0') if (keys[i] != '\0')
{ {
SAFEFREE( keyImg[i] ) delete keyImg[i];
SAFEFREE( keyImgOver[i] ) delete keyImgOver[i];
SAFEFREE( keyTxt[i] ) delete keyTxt[i];
SAFEFREE( keyBtn[i] ) delete keyBtn[i];
} }
} }
} }

4
source/libwiigui/gui_searchbar.cpp
View File

@ -31,7 +31,9 @@ class cSearchButton
GuiSearchBar::GuiSearchBar(const wchar_t *SearchChars) : GuiSearchBar::GuiSearchBar(const wchar_t *SearchChars) :
inSide(0), text((char *) NULL, 22, ( GXColor ) inSide(0), text((char *) NULL, 22, ( GXColor )
{ 0, 0, 0, 255}), buttons(0), keyImageData(keyboard_key_png, keyboard_key_png_size), keyOverImageData(keyboard_key_over_png, keyboard_key_over_png_size) { 0, 0, 0, 255}), buttons(0),
keyImageData(Resources::GetFile("keyboard_key.png"), Resources::GetFileSize("keyboard_key.png")),
keyOverImageData(Resources::GetFile("keyboard_key_over.png"), Resources::GetFileSize("keyboard_key_over.png"))
{ {
trig.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trig.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);

52
source/libwiigui/gui_tooltip.cpp
View File

@ -9,25 +9,26 @@
***************************************************************************/ ***************************************************************************/
#include "gui.h" #include "gui.h"
#include "themes/CTheme.h"
static GuiImageData tooltipLeft(tooltip_left_png, tooltip_left_png_size);
static GuiImageData tooltipTile(tooltip_tile_png, tooltip_left_png_size);
static GuiImageData tooltipRight(tooltip_right_png, tooltip_right_png_size);
/** /**
* Constructor for the GuiTooltip class. * Constructor for the GuiTooltip class.
*/ */
GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/) : GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/)
leftImage(&tooltipLeft), tileImage(&tooltipTile), rightImage(&tooltipRight)
{ {
tooltipLeft = Resources::GetImageData("tooltip_left.png");
tooltipTile = Resources::GetImageData("tooltip_tile.png");
tooltipRight = Resources::GetImageData("tooltip_right.png");
leftImage = new GuiImage(tooltipLeft);
tileImage = new GuiImage(tooltipTile);
rightImage = new GuiImage(tooltipRight);
text = NULL; text = NULL;
height = leftImage.GetHeight(); height = leftImage->GetHeight();
leftImage.SetParent(this); leftImage->SetParent(this);
tileImage.SetParent(this); tileImage->SetParent(this);
rightImage.SetParent(this); rightImage->SetParent(this);
leftImage.SetParentAngle(false); leftImage->SetParentAngle(false);
tileImage.SetParentAngle(false); tileImage->SetParentAngle(false);
rightImage.SetParentAngle(false); rightImage->SetParentAngle(false);
SetText(t); SetText(t);
SetAlpha(Alpha); SetAlpha(Alpha);
} }
@ -38,6 +39,13 @@ GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/) :
GuiTooltip::~GuiTooltip() GuiTooltip::~GuiTooltip()
{ {
if (text) delete text; if (text) delete text;
delete tooltipLeft;
delete tooltipTile;
delete tooltipRight;
delete leftImage;
delete tileImage;
delete rightImage;
} }
float GuiTooltip::GetScale() float GuiTooltip::GetScale()
@ -63,13 +71,13 @@ void GuiTooltip::SetText(const char * t)
{ 0, 0, 0, 255}))) { 0, 0, 0, 255})))
{ {
text->SetParent(this); text->SetParent(this);
tile_cnt = (text->GetTextWidth() - 12) / tileImage.GetWidth(); tile_cnt = (text->GetTextWidth() - 12) / tileImage->GetWidth();
if (tile_cnt < 0) tile_cnt = 0; if (tile_cnt < 0) tile_cnt = 0;
} }
tileImage.SetPosition(leftImage.GetWidth(), 0); tileImage->SetPosition(leftImage->GetWidth(), 0);
tileImage.SetTile(tile_cnt); tileImage->SetTile(tile_cnt);
rightImage.SetPosition(leftImage.GetWidth() + tile_cnt * tileImage.GetWidth(), 0); rightImage->SetPosition(leftImage->GetWidth() + tile_cnt * tileImage->GetWidth(), 0);
width = leftImage.GetWidth() + tile_cnt * tileImage.GetWidth() + rightImage.GetWidth(); width = leftImage->GetWidth() + tile_cnt * tileImage->GetWidth() + rightImage->GetWidth();
} }
void GuiTooltip::SetWidescreen(bool ) void GuiTooltip::SetWidescreen(bool )
@ -83,9 +91,9 @@ void GuiTooltip::Draw()
LOCK( this ); LOCK( this );
if (!this->IsVisible()) return; if (!this->IsVisible()) return;
leftImage.Draw(); leftImage->Draw();
tileImage.Draw(); tileImage->Draw();
rightImage.Draw(); rightImage->Draw();
if (text) text->Draw(); if (text) text->Draw();
this->UpdateEffects(); this->UpdateEffects();

21
source/menu.cpp
View File

@ -48,24 +48,13 @@ GuiSound *btnSoundClick = NULL;
GuiSound *btnSoundClick2 = NULL; GuiSound *btnSoundClick2 = NULL;
GuiSound *btnSoundOver = NULL; GuiSound *btnSoundOver = NULL;
int currentMenu; int currentMenu = 0;
u8 mountMethod = 0; u8 mountMethod = 0;
char game_partition[6];
int load_from_fs;
/*** Variables used only in the menus ***/
bool altdoldefault = true;
static lwp_t guithread = LWP_THREAD_NULL; static lwp_t guithread = LWP_THREAD_NULL;
static bool guiHalt = true; static bool guiHalt = true;
static bool ExitRequested = false; static bool ExitRequested = false;
/*** Extern variables ***/
extern u8 shutdown;
extern u8 reset;
extern s32 gameSelected, gameStart;
/**************************************************************************** /****************************************************************************
* ResumeGui * ResumeGui
* *
@ -190,9 +179,9 @@ int MainMenu(int menu)
if (Settings.autonetwork) if (Settings.autonetwork)
ResumeNetworkThread(); ResumeNetworkThread();
btnSoundClick = new GuiSound(button_click_wav, button_click_wav_size, Settings.sfxvolume); btnSoundClick = new GuiSound(Resources::GetFile("button_click.wav"), Resources::GetFileSize("button_click.wav"), Settings.sfxvolume);
btnSoundClick2 = new GuiSound(button_click2_wav, button_click2_wav_size, Settings.sfxvolume); btnSoundClick2 = new GuiSound(Resources::GetFile("button_click2.wav"), Resources::GetFileSize("button_click2.wav"), Settings.sfxvolume);
btnSoundOver = new GuiSound(button_over_wav, button_over_wav_size, Settings.sfxvolume); btnSoundOver = new GuiSound(Resources::GetFile("button_over.wav"), Resources::GetFileSize("button_over.wav"), Settings.sfxvolume);
pointer[0] = Resources::GetImageData("player1_point.png"); pointer[0] = Resources::GetImageData("player1_point.png");
pointer[1] = Resources::GetImageData("player2_point.png"); pointer[1] = Resources::GetImageData("player2_point.png");
@ -208,7 +197,7 @@ int MainMenu(int menu)
ResumeGui(); ResumeGui();
bgMusic = new GuiBGM(bg_music_ogg, bg_music_ogg_size, Settings.volume); bgMusic = new GuiBGM(Resources::GetFile("bg_music.ogg"), Resources::GetFileSize("bg_music.ogg"), Settings.volume);
bgMusic->SetLoop(Settings.musicloopmode); //loop music bgMusic->SetLoop(Settings.musicloopmode); //loop music
bgMusic->Load(Settings.ogg_path); bgMusic->Load(Settings.ogg_path);
bgMusic->Play(); bgMusic->Play();

10
source/menu/GameBrowseMenu.cpp
View File

@ -287,12 +287,12 @@ GameBrowseMenu::GameBrowseMenu()
clockTimeBack = new GuiText("88:88", 40, (GXColor) {clockColor.r, clockColor.g, clockColor.b, clockColor.a / 6}); clockTimeBack = new GuiText("88:88", 40, (GXColor) {clockColor.r, clockColor.g, clockColor.b, clockColor.a / 6});
clockTimeBack->SetAlignment(thAlign("left - clock align hor"), thAlign("top - clock align ver")); clockTimeBack->SetAlignment(thAlign("left - clock align hor"), thAlign("top - clock align ver"));
clockTimeBack->SetPosition(thInt("275 - clock pos x"), thInt("335 - clock pos y")); clockTimeBack->SetPosition(thInt("275 - clock pos x"), thInt("335 - clock pos y"));
clockTimeBack->SetFont(clock_ttf, clock_ttf_size); clockTimeBack->SetFont(Resources::GetFile("clock.ttf"), Resources::GetFileSize("clock.ttf"));
clockTime = new GuiText("", 40, clockColor); clockTime = new GuiText("", 40, clockColor);
clockTime->SetAlignment(thAlign("left - clock align hor"), thAlign("top - clock align ver")); clockTime->SetAlignment(thAlign("left - clock align hor"), thAlign("top - clock align ver"));
clockTime->SetPosition(thInt("275 - clock pos x"), thInt("335 - clock pos y")); clockTime->SetPosition(thInt("275 - clock pos x"), thInt("335 - clock pos y"));
clockTime->SetFont(clock_ttf, clock_ttf_size); clockTime->SetFont(Resources::GetFile("clock.ttf"), Resources::GetFileSize("clock.ttf"));
ToolBar.push_back(favoriteBtn); ToolBar.push_back(favoriteBtn);
ToolBar.push_back(searchBtn); ToolBar.push_back(searchBtn);
@ -616,7 +616,7 @@ void GameBrowseMenu::ReloadBrowser()
dvdBtn->SetPosition(Settings.widescreen ? thInt("448 - grid layout dvd btn pos x widescreen") : thInt("480 - grid layout dvd btn pos x"), dvdBtn->SetPosition(Settings.widescreen ? thInt("448 - grid layout dvd btn pos x widescreen") : thInt("480 - grid layout dvd btn pos x"),
thInt("13 - grid layout dvd btn pos y")); thInt("13 - grid layout dvd btn pos y"));
gameGrid = new GuiGameGrid(thInt("640 - game grid layout width"), thInt("400 - game grid layout height"), Settings.theme_path, bg_options_png, lastSelectedGame); gameGrid = new GuiGameGrid(thInt("640 - game grid layout width"), thInt("400 - game grid layout height"), Settings.theme_path, lastSelectedGame);
gameGrid->SetPosition(thInt("0 - game grid layout pos x"), thInt("20 - game grid layout pos y")); gameGrid->SetPosition(thInt("0 - game grid layout pos x"), thInt("20 - game grid layout pos y"));
gameGrid->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); gameGrid->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE);
} }
@ -649,8 +649,8 @@ void GameBrowseMenu::ReloadBrowser()
dvdBtn->SetPosition(Settings.widescreen ? thInt("448 - carousel layout dvd btn pos x widescreen") : thInt("480 - carousel layout dvd btn pos x"), dvdBtn->SetPosition(Settings.widescreen ? thInt("448 - carousel layout dvd btn pos x widescreen") : thInt("480 - carousel layout dvd btn pos x"),
thInt("13 - carousel layout dvd btn pos y")); thInt("13 - carousel layout dvd btn pos y"));
gameCarousel = new GuiGameCarousel(thInt("640 - game carousel layout width"), thInt("400 - game carousel layout height"), Settings.theme_path, bg_options_png, lastSelectedGame); gameCarousel = new GuiGameCarousel(thInt("640 - game carousel layout width"), thInt("400 - game carousel layout height"), Settings.theme_path, lastSelectedGame);
gameCarousel->SetPosition(thInt("0 - game carousel layout pos x"), thInt("0 - game carousel layout pos y")); gameCarousel->SetPosition(thInt("0 - game carousel layout pos x"), thInt("-20 - game carousel layout pos y"));
gameCarousel->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); gameCarousel->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE);
} }

2
source/menu/menu_install.cpp
View File

@ -100,7 +100,7 @@ int MenuInstall()
gameList.FilterList(); gameList.FilterList();
GuiSound * instsuccess = NULL; GuiSound * instsuccess = NULL;
bgMusic->Pause(); bgMusic->Pause();
instsuccess = new GuiSound(success_ogg, success_ogg_size, Settings.sfxvolume); instsuccess = new GuiSound(Resources::GetFile("success.ogg"), Resources::GetFileSize("success.ogg"), Settings.sfxvolume);
instsuccess->SetVolume(Settings.sfxvolume); instsuccess->SetVolume(Settings.sfxvolume);
instsuccess->SetLoop(0); instsuccess->SetLoop(0);
instsuccess->Play(); instsuccess->Play();

1
source/menu/menus.h
View File

@ -6,7 +6,6 @@
#include "prompts/PromptWindows.h" #include "prompts/PromptWindows.h"
#include "menu.h" #include "menu.h"
#include "gecko.h" #include "gecko.h"
#include "filelist.h"
#include "sys.h" #include "sys.h"
extern u8 shutdown; extern u8 shutdown;

1
source/prompts/DiscBrowser.cpp
View File

@ -9,7 +9,6 @@
#include "libwiigui/gui.h" #include "libwiigui/gui.h"
#include "libwiigui/gui_customoptionbrowser.h" #include "libwiigui/gui_customoptionbrowser.h"
#include "prompts/PromptWindows.h" #include "prompts/PromptWindows.h"
#include "filelist.h"
#include "menu.h" #include "menu.h"
#include "usbloader/disc.h" #include "usbloader/disc.h"
#include "usbloader/fstfile.h" #include "usbloader/fstfile.h"

31
source/prompts/GameWindow.cpp
View File

@ -456,20 +456,6 @@ int GameWindow::MainLoop()
wiilight(0); wiilight(0);
Sys_Reboot(); Sys_Reboot();
} }
else if (reducedVol)
{
if (gameSound)
{
if (Settings.gamesound == 1 && !gameSound->IsPlaying())
bgMusic->SetVolume(Settings.volume);
}
else
{
bgMusic->SetVolume(Settings.volume);
}
reducedVol = false;
}
else if (gameBtn->GetState() == STATE_CLICKED) else if (gameBtn->GetState() == STATE_CLICKED)
{ {
returnVal = 1; returnVal = 1;
@ -579,6 +565,23 @@ int GameWindow::MainLoop()
btnLeft->ResetState(); btnLeft->ResetState();
} }
if (reducedVol)
{
if (gameSound)
{
if (Settings.gamesound == 1 && !gameSound->IsPlaying())
{
bgMusic->SetVolume(Settings.volume);
reducedVol = false;
}
}
else
{
bgMusic->SetVolume(Settings.volume);
reducedVol = false;
}
}
for(int i = 0; i < FAVORITE_STARS; ++i) for(int i = 0; i < FAVORITE_STARS; ++i)
{ {
if(FavoriteBtn[i]->GetState() == STATE_CLICKED) if(FavoriteBtn[i]->GetState() == STATE_CLICKED)

25
source/prompts/PromptWindows.cpp
View File

@ -30,7 +30,6 @@
#include "FileOperations/fileops.h" #include "FileOperations/fileops.h"
#include "menu.h" #include "menu.h"
#include "menu.h" #include "menu.h"
#include "filelist.h"
#include "sys.h" #include "sys.h"
#include "wpad.h" #include "wpad.h"
#include "wad/wad.h" #include "wad/wad.h"
@ -209,7 +208,7 @@ void WindowCredits()
bgMusic->Pause(); bgMusic->Pause();
creditsMusic = new GuiSound(credits_music_ogg, credits_music_ogg_size, 55); creditsMusic = new GuiSound(Resources::GetFile("credits_music.ogg"), Resources::GetFileSize("credits_music.ogg"), 55);
creditsMusic->SetVolume(60); creditsMusic->SetVolume(60);
creditsMusic->SetLoop(1); creditsMusic->SetLoop(1);
creditsMusic->Play(); creditsMusic->Play();
@ -222,12 +221,12 @@ void WindowCredits()
GuiWindow creditsWindowBox(580, 448); GuiWindow creditsWindowBox(580, 448);
creditsWindowBox.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); creditsWindowBox.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
GuiImageData creditsBox(credits_bg_png, credits_bg_png_size); GuiImageData creditsBox(Resources::GetFile("credits_bg.png"), Resources::GetFileSize("credits_bg.png"));
GuiImage creditsBoxImg(&creditsBox); GuiImage creditsBoxImg(&creditsBox);
creditsBoxImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); creditsBoxImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
creditsWindowBox.Append(&creditsBoxImg); creditsWindowBox.Append(&creditsBoxImg);
GuiImageData star(little_star_png, little_star_png_size); GuiImageData star(Resources::GetFile("little_star.png"), Resources::GetFileSize("little_star.png"));
GuiImage starImg(&star); GuiImage starImg(&star);
starImg.SetWidescreen(Settings.widescreen); //added starImg.SetWidescreen(Settings.widescreen); //added
starImg.SetAlignment(ALIGN_LEFT, ALIGN_TOP); starImg.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
@ -802,13 +801,13 @@ int WindowExitPrompt()
bgMusic->Pause(); bgMusic->Pause();
GuiSound * homein = NULL; GuiSound * homein = NULL;
homein = new GuiSound(menuin_ogg, menuin_ogg_size, Settings.sfxvolume); homein = new GuiSound(Resources::GetFile("menuin.ogg"), Resources::GetFileSize("menuin.ogg"), Settings.sfxvolume);
homein->SetVolume(Settings.sfxvolume); homein->SetVolume(Settings.sfxvolume);
homein->SetLoop(0); homein->SetLoop(0);
homein->Play(); homein->Play();
GuiSound * homeout = NULL; GuiSound * homeout = NULL;
homeout = new GuiSound(menuout_ogg, menuout_ogg_size, Settings.sfxvolume); homeout = new GuiSound(Resources::GetFile("menuout.ogg"), Resources::GetFileSize("menuout.ogg"), Settings.sfxvolume);
homeout->SetVolume(Settings.sfxvolume); homeout->SetVolume(Settings.sfxvolume);
homeout->SetLoop(0); homeout->SetLoop(0);
@ -821,13 +820,13 @@ int WindowExitPrompt()
GuiWindow promptWindow(640, 480); GuiWindow promptWindow(640, 480);
promptWindow.SetAlignment(ALIGN_LEFT, ALIGN_TOP); promptWindow.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
promptWindow.SetPosition(0, 0); promptWindow.SetPosition(0, 0);
GuiImageData top(exit_top_png, exit_top_png_size); GuiImageData top(Resources::GetFile("exit_top.png"), Resources::GetFileSize("exit_top.png"));
GuiImageData topOver(exit_top_over_png, exit_top_over_png_size); GuiImageData topOver(Resources::GetFile("exit_top_over.png"), Resources::GetFileSize("exit_top_over.png"));
GuiImageData bottom(exit_bottom_png, exit_bottom_png_size); GuiImageData bottom(Resources::GetFile("exit_bottom.png"), Resources::GetFileSize("exit_bottom.png"));
GuiImageData bottomOver(exit_bottom_over_png, exit_bottom_over_png_size); GuiImageData bottomOver(Resources::GetFile("exit_bottom_over.png"), Resources::GetFileSize("exit_bottom_over.png"));
GuiImageData button(exit_button_png, exit_button_png_size); GuiImageData button(Resources::GetFile("exit_button.png"), Resources::GetFileSize("exit_button.png"));
GuiImageData wiimote(wiimote_png, wiimote_png_size); GuiImageData wiimote(Resources::GetFile("wiimote.png"), Resources::GetFileSize("wiimote.png"));
GuiImageData close(closebutton_png, closebutton_png_size); GuiImageData close(Resources::GetFile("closebutton.png"), Resources::GetFileSize("closebutton.png"));
GuiImageData battery(Resources::GetFile("battery_white.png"), Resources::GetFileSize("battery_white.png")); GuiImageData battery(Resources::GetFile("battery_white.png"), Resources::GetFileSize("battery_white.png"));
GuiImageData batteryBar(Resources::GetFile("battery_bar_white.png"), Resources::GetFileSize("battery_bar_white.png")); GuiImageData batteryBar(Resources::GetFile("battery_bar_white.png"), Resources::GetFileSize("battery_bar_white.png"));

1
source/prompts/TitleBrowser.cpp
View File

@ -15,7 +15,6 @@
#include "prompts/ProgressWindow.h" #include "prompts/ProgressWindow.h"
#include "network/networkops.h" #include "network/networkops.h"
#include "network/http.h" #include "network/http.h"
#include "filelist.h"
#include "FileOperations/fileops.h" #include "FileOperations/fileops.h"
#include "themes/CTheme.h" #include "themes/CTheme.h"
#include "sys.h" #include "sys.h"

1
source/prompts/gameinfo.cpp
View File

@ -12,7 +12,6 @@
#include "xml/xml.h" #include "xml/xml.h"
#include "menu.h" #include "menu.h"
#include "menu/menus.h" #include "menu/menus.h"
#include "filelist.h"
#include "sys.h" #include "sys.h"
#include "wpad.h" #include "wpad.h"
#include "FileOperations/fileops.h" #include "FileOperations/fileops.h"

1
source/settings/SettingsPrompts.cpp
View File

@ -15,7 +15,6 @@
#include "FileOperations/fileops.h" #include "FileOperations/fileops.h"
#include "FileOperations/DirList.h" #include "FileOperations/DirList.h"
#include "main.h" #include "main.h"
#include "filelist.h"
#include "prompts/filebrowser.h" #include "prompts/filebrowser.h"
#include "sys.h" #include "sys.h"
#include "menu/menus.h" #include "menu/menus.h"

28
source/themes/CTheme.cpp
View File

@ -33,8 +33,8 @@
#include "FreeTypeGX.h" #include "FreeTypeGX.h"
FreeTypeGX * fontSystem = NULL; FreeTypeGX * fontSystem = NULL;
static FT_Byte * MainFont = (FT_Byte *) font_ttf; static FT_Byte * MainFont = NULL;
static u32 MainFontSize = font_ttf_size; static u32 MainFontSize = 0;
bool Theme::ShowTooltips = true; bool Theme::ShowTooltips = true;
@ -142,12 +142,7 @@ bool Theme::LoadFont(const char *path)
rewind(pfile); rewind(pfile);
MainFont = new (std::nothrow) FT_Byte[MainFontSize]; MainFont = new (std::nothrow) FT_Byte[MainFontSize];
if (!MainFont) if (MainFont)
{
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
else
{ {
fread(MainFont, 1, MainFontSize, pfile); fread(MainFont, 1, MainFontSize, pfile);
result = true; result = true;
@ -155,20 +150,21 @@ bool Theme::LoadFont(const char *path)
fclose(pfile); fclose(pfile);
} }
fontSystem = new FreeTypeGX(MainFont, MainFontSize); FT_Byte * loadedFont = MainFont ? MainFont : (FT_Byte *) Resources::GetFile("font.ttf");
u32 loadedFontSize = MainFont ? MainFontSize : Resources::GetFileSize("font.ttf");
fontSystem = new FreeTypeGX(loadedFont, loadedFontSize);
return result; return result;
} }
void Theme::ClearFontData() void Theme::ClearFontData()
{ {
if (fontSystem) delete fontSystem; if (fontSystem)
delete fontSystem;
fontSystem = NULL; fontSystem = NULL;
if (MainFont != (FT_Byte *) font_ttf) if (MainFont)
{ delete [] MainFont;
if (MainFont != NULL) delete [] MainFont; MainFont = NULL;
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
} }

10
source/themes/Resources.cpp
View File

@ -172,6 +172,16 @@ RecourceFile Resources::RecourceFiles[] =
{"unlock.png", unlock_png, unlock_png_size, NULL, 0}, {"unlock.png", unlock_png, unlock_png_size, NULL, 0},
{"unlock_gray.png", unlock_gray_png, unlock_gray_png_size, NULL, 0}, {"unlock_gray.png", unlock_gray_png, unlock_gray_png_size, NULL, 0},
{"Channel_btn.png", Channel_btn_png, Channel_btn_png_size, NULL, 0}, {"Channel_btn.png", Channel_btn_png, Channel_btn_png_size, NULL, 0},
{"button_click.wav", button_click_wav, button_click_wav_size, NULL, 0},
{"button_click2.wav", button_click2_wav, button_click2_wav_size, NULL, 0},
{"button_over.wav", button_over_wav, button_over_wav_size, NULL, 0},
{"bg_music.ogg", bg_music_ogg, bg_music_ogg_size, NULL, 0},
{"credits_music.ogg", credits_music_ogg, credits_music_ogg_size, NULL, 0},
{"menuin.ogg", menuin_ogg, menuin_ogg_size, NULL, 0},
{"menuout.ogg", menuout_ogg, menuout_ogg_size, NULL, 0},
{"success.ogg", success_ogg, success_ogg_size, NULL, 0},
{"font.ttf", font_ttf, font_ttf_size, NULL, 0},
{"clock.ttf", clock_ttf, clock_ttf_size, NULL, 0},
{NULL, NULL, 0, NULL, 0} {NULL, NULL, 0, NULL, 0}
}; };

1
source/themes/Resources.h
View File

@ -2,7 +2,6 @@
#define RECOURCES_H_ #define RECOURCES_H_
#include "libwiigui/gui_imagedata.h" #include "libwiigui/gui_imagedata.h"
#include "filelist.h"
typedef struct _RecourceFile typedef struct _RecourceFile
{ {

5
source/usbloader/wbfs.cpp
View File

@ -66,6 +66,11 @@ s32 WBFS_OpenPart(int part_num)
{ {
current = new Wbfs_Wbfs(wbfsDev, usbHandle->GetLBAStart(part_num), usbHandle->GetSecCount(part_num)); current = new Wbfs_Wbfs(wbfsDev, usbHandle->GetLBAStart(part_num), usbHandle->GetSecCount(part_num));
} }
else
{
return -1;
}
if (current->Open()) if (current->Open())
{ {
delete current; delete current;

6
source/usbloader/wbfs/wbfs_fat.cpp
View File

@ -34,7 +34,7 @@
using namespace std; using namespace std;
int wbfs_part_fs; int wbfs_part_fs = -1;
char Wbfs_Fat::wbfs_fs_drive[16]; char Wbfs_Fat::wbfs_fs_drive[16];
char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs"; char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs";
@ -571,6 +571,10 @@ s32 Wbfs_Fat::GetHeadersCount()
// succes: add tmpHdr to list: // succes: add tmpHdr to list:
add_hdr: memset(&st, 0, sizeof(st)); add_hdr: memset(&st, 0, sizeof(st));
//printf("added: %.6s %.20s\n", tmpHdr.id, tmpHdr.title); Wpad_WaitButtons(); //printf("added: %.6s %.20s\n", tmpHdr.id, tmpHdr.title); Wpad_WaitButtons();
//! First allocate before reallocating
if(!fat_hdr_list)
fat_hdr_list = (struct discHdr *) malloc(sizeof(struct discHdr));
fat_hdr_count++; fat_hdr_count++;
fat_hdr_list = (struct discHdr *) realloc(fat_hdr_list, fat_hdr_count * sizeof(struct discHdr)); fat_hdr_list = (struct discHdr *) realloc(fat_hdr_list, fat_hdr_count * sizeof(struct discHdr));
memcpy(&fat_hdr_list[fat_hdr_count - 1], &tmpHdr, sizeof(struct discHdr)); memcpy(&fat_hdr_list[fat_hdr_count - 1], &tmpHdr, sizeof(struct discHdr));

1
source/utils/ResourceManager.h
View File

@ -27,7 +27,6 @@
#include <gccore.h> #include <gccore.h>
#include "libwiigui/gui.h" #include "libwiigui/gui.h"
#include "filelist.h"
#include <map> #include <map>

13
source/utils/rockout.cpp
View File

@ -8,9 +8,11 @@ extern GuiImageData * pointer[4];
void rockout(int gameSelected, int f) void rockout(int gameSelected, int f)
{ {
static bool rockoutSet = false;
HaltGui(); HaltGui();
if (gameSelected >= 0 && gameSelected < gameList.size() && (strcasestr(GameTitles.GetTitle(gameList[gameSelected]), "guitar") if (gameSelected >= 0 && gameSelected < gameList.size() && !rockoutSet && (strcasestr(GameTitles.GetTitle(gameList[gameSelected]), "guitar")
|| strcasestr(GameTitles.GetTitle(gameList[gameSelected]), "band") || strcasestr(GameTitles.GetTitle(gameList[gameSelected]), || strcasestr(GameTitles.GetTitle(gameList[gameSelected]), "band") || strcasestr(GameTitles.GetTitle(gameList[gameSelected]),
"rock"))) "rock")))
{ {
@ -20,16 +22,19 @@ void rockout(int gameSelected, int f)
pointer[1] = Resources::GetImageData("rplayer2_point.png"); pointer[1] = Resources::GetImageData("rplayer2_point.png");
pointer[2] = Resources::GetImageData("rplayer3_point.png"); pointer[2] = Resources::GetImageData("rplayer3_point.png");
pointer[3] = Resources::GetImageData("rplayer4_point.png"); pointer[3] = Resources::GetImageData("rplayer4_point.png");
}
else
{
rockoutSet = true;
}
else if(rockoutSet)
{
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
delete pointer[i]; delete pointer[i];
pointer[0] = Resources::GetImageData("player1_point.png"); pointer[0] = Resources::GetImageData("player1_point.png");
pointer[1] = Resources::GetImageData("player2_point.png"); pointer[1] = Resources::GetImageData("player2_point.png");
pointer[2] = Resources::GetImageData("player3_point.png"); pointer[2] = Resources::GetImageData("player3_point.png");
pointer[3] = Resources::GetImageData("player4_point.png"); pointer[3] = Resources::GetImageData("player4_point.png");
rockoutSet = false;
} }
ResumeGui(); ResumeGui();
} }

7
source/wad/wad.cpp
View File

@ -14,15 +14,8 @@
#include "libwiigui/gui.h" #include "libwiigui/gui.h"
#include "language/gettext.h" #include "language/gettext.h"
#include "menu.h" #include "menu.h"
#include "filelist.h"
#include "themes/CTheme.h" #include "themes/CTheme.h"
/*** Extern functions ***/
extern void ResumeGui();
extern void HaltGui();
/*** Extern variables ***/
extern GuiWindow * mainWindow;
/* 'WAD Header' structure */ /* 'WAD Header' structure */
typedef struct typedef struct
{ {