From 8943592d0e31f6d6f8fa92031e843a06fa03869f Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Sat, 8 Jan 2011 12:35:41 +0000 Subject: [PATCH] *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. *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 --- HBC/META.XML | 4 +- Languages/french.lang | 238 ++++---- Languages/german.lang | 11 +- Languages/italian.lang | 14 +- Languages/japanese.lang | 4 +- Languages/schinese.lang | 12 +- Languages/tchinese.lang | 10 +- Themes/Default.them | 813 +++++++++++++------------- source/Controls/PartitionHandle.cpp | 2 + source/GameBootProcess.cpp | 4 +- source/SoundOperations/gui_bgm.cpp | 16 +- source/SoundOperations/gui_bgm.h | 2 - source/SoundOperations/gui_sound.cpp | 4 +- source/SoundOperations/gui_sound.h | 4 +- source/cheats/cheatmenu.cpp | 8 - source/libwiigui/gui.h | 13 +- source/libwiigui/gui_gamecarousel.cpp | 2 +- source/libwiigui/gui_gamecarousel.h | 2 +- source/libwiigui/gui_gamegrid.cpp | 2 +- source/libwiigui/gui_gamegrid.h | 2 +- source/libwiigui/gui_keyboard.cpp | 29 +- source/libwiigui/gui_numpad.cpp | 50 +- source/libwiigui/gui_searchbar.cpp | 4 +- source/libwiigui/gui_tooltip.cpp | 52 +- source/menu.cpp | 21 +- source/menu/GameBrowseMenu.cpp | 10 +- source/menu/menu_install.cpp | 2 +- source/menu/menus.h | 1 - source/prompts/DiscBrowser.cpp | 1 - source/prompts/GameWindow.cpp | 31 +- source/prompts/PromptWindows.cpp | 25 +- source/prompts/TitleBrowser.cpp | 1 - source/prompts/gameinfo.cpp | 1 - source/settings/SettingsPrompts.cpp | 1 - source/themes/CTheme.cpp | 28 +- source/themes/Resources.cpp | 10 + source/themes/Resources.h | 1 - source/usbloader/wbfs.cpp | 5 + source/usbloader/wbfs/wbfs_fat.cpp | 6 +- source/utils/ResourceManager.h | 1 - source/utils/rockout.cpp | 13 +- source/wad/wad.cpp | 7 - 42 files changed, 724 insertions(+), 743 deletions(-) diff --git a/HBC/META.XML b/HBC/META.XML index 55e2680a..37f0dda4 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 1.0 r1033 - 201101061900 + 1.0 r1034 + 201101072243 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. diff --git a/Languages/french.lang b/Languages/french.lang index 88d6e157..5ce1757e 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,26 +1,26 @@ # USB Loader GX language source file. -# French V13.2 r1031 +# French V14 r1033 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\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" -"Last-Translator: Cyan\n" +"Last-Translator: Andresayang, Cyan, jero\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" msgid " Wad Saved as:" -msgstr "WAD Sauvegardé sous:" +msgstr " WAD sauvegardé sous:" msgid " could not be downloaded." 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." -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." msgstr " indisponible sur le serveur." @@ -35,7 +35,7 @@ msgid "1 (Child 7+)" msgstr "1 (Enfants 7+)" 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" msgstr "1 heure" @@ -50,7 +50,7 @@ msgid "20 min" msgstr "20 min." msgid "2D Cover Path" -msgstr "Dossier Jaquettes 2D" +msgstr "Dossier jaquettes 2D" msgid "3 (Mature 16+)" msgstr "3 (Matures 16+)" @@ -62,7 +62,7 @@ msgid "30 min" msgstr "30 min." msgid "3D Cover Path" -msgstr "Dossier Jaquettes 3D" +msgstr "Dossier jaquettes 3D" msgid "3D Covers" msgstr "Jaquettes 3D" @@ -128,13 +128,13 @@ msgid "All Partitions" msgstr "Toutes les partitions" 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." msgstr "Toutes les fonctionnalités sont déverrouillées." msgid "Alternate DOL" -msgstr "DOL Alternatif" +msgstr "DOL alternatif" msgid "Anti" msgstr "" @@ -161,10 +161,10 @@ msgid "Author:" msgstr "Auteur:" msgid "AutoInit Network" -msgstr "AutoInit Réseau" +msgstr "AutoInit réseau" msgid "BCA Codes Path" -msgstr "Dossier Codes BCA" +msgstr "Dossier codes BCA" msgid "BETA revisions" msgstr "Révisions BETA" @@ -182,7 +182,7 @@ msgid "Big thanks to:" msgstr "Grand merci à:" msgid "Block IOS Reload" -msgstr "Bloquer IOS Reload" +msgstr "Bloquer IOS reload" msgid "Boot/Standard" msgstr "" @@ -213,7 +213,7 @@ msgid "Cannot write to destination." msgstr "Écriture impossible." msgid "Change Play Path" -msgstr "Changer Dossier" +msgstr "Changer dossier" msgid "Cheatfile is blank" msgstr "Fichier de triche vide" @@ -225,7 +225,7 @@ msgid "Click to Download Covers" msgstr "Téléchargement des jaquettes" msgid "Click to change game ID" -msgstr "Changer l'ID du Jeu" +msgstr "Changer l'ID du jeu" msgid "Clock" msgstr "Horloge" @@ -234,7 +234,7 @@ msgid "Close" msgstr "Fermer" msgid "Code Download" -msgstr "Téléchargement Codes" +msgstr "Téléchargement codes" #, c-format 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." msgid "Could not initialize DIP module!" -msgstr "Initialisation module DIP impossible !" +msgstr "Initialisation du module DIP impossible !" msgid "Could not initialize network!" msgstr "Initialisation réseau impossible !" @@ -290,10 +290,10 @@ msgid "Could not open wiitdb.xml." msgstr "Impossible d'ouvrir wiitdb.xml." msgid "Could not save." -msgstr "Sauvegarde impossible" +msgstr "Sauvegarde impossible." msgid "Cover Download" -msgstr "Téléchargement Jaquettes" +msgstr "Téléchargement jaquettes" msgid "Create" msgstr "Créer" @@ -302,13 +302,13 @@ msgid "Credits" msgstr "Crédits" msgid "Custom Paths" -msgstr "Personnalisation Dossiers" +msgstr "Personnalisation des dossiers" msgid "Customs/Original" msgstr "Persos/Originaux" msgid "DOL Path" -msgstr "Dossier DOL Alternatif" +msgstr "Dossier DOL alternatif" msgid "Dec" msgstr "Déc" @@ -317,10 +317,10 @@ msgid "Default" msgstr "Par défaut" msgid "Default Gamesettings" -msgstr "Reset Paramètres Jeu" +msgstr "Réinitialiser les paramètres du jeu" msgid "Default Settings" -msgstr "Réinitialiser Paramètres" +msgstr "Réinitialiser les paramètres" msgid "Delete" msgstr "Supprimer" @@ -329,16 +329,16 @@ msgid "Delete ?" msgstr "Supprimer ?" msgid "Delete Cheat GCT" -msgstr "Supprimer GCT de Triche" +msgstr "Supprimer GCT de triche" msgid "Delete Cheat TXT" -msgstr "Supprimer TXT de Triche" +msgstr "Supprimer TXT de triche" msgid "Delete Cover Artwork" -msgstr "Supprimer la Jaquette" +msgstr "Supprimer la jaquette" msgid "Delete Disc Artwork" -msgstr "Supprimer le Label DVD" +msgstr "Supprimer le label DVD" msgid "Design:" msgstr "Graphisme:" @@ -350,10 +350,10 @@ msgid "Directory does not exist!" msgstr "Répertoire inexistant!" msgid "Disc Artwork Download" -msgstr "Téléch. Labels DVD" +msgstr "Téléch. labels DVD" msgid "Disc Artwork Path" -msgstr "Dossier Labels DVD" +msgstr "Dossier labels DVD" msgid "Disc Default" msgstr "Disque par défaut" @@ -362,13 +362,13 @@ msgid "Disc Images" msgstr "Labels DVD" msgid "DiskFlip" -msgstr "Inversion Disque" +msgstr "Inversion disque" msgid "Display" msgstr "Affichage" msgid "Display as a carousel" -msgstr "Caroussel" +msgstr "Carrousel" msgid "Display as a grid" msgstr "Grille" @@ -380,7 +380,7 @@ msgid "Display favorites only" msgstr "Seulement les favoris" 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?" 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 ?" msgid "Do you want to format:" -msgstr "Voulez-vous formater ?" +msgstr "Voulez-vous formater:" 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?" msgstr "Voulez-vous charger ce thème ?" 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?" 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 ?" msgid "Download Discart image?" -msgstr "Télécharger labels DVD ?" +msgstr "Télécharger les labels DVD ?" msgid "Download Now" msgstr "Télécharger" @@ -428,7 +428,7 @@ msgid "Downloading covers" msgstr "Téléchargement des jaquettes" msgid "Downloading custom Discarts" -msgstr "Téléchargement des labels DVD perso" +msgstr "Téléchargement des labels DVD persos" msgid "Downloading file" msgstr "Téléchargement du fichier" @@ -443,7 +443,7 @@ msgid "Downloading original Discarts" msgstr "Téléchargement des labels DVD originaux" msgid "Downloading pagelist:" -msgstr "" +msgstr "Téléchargement de la liste:" msgid "Dutch" msgstr "Néerlandais" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "ERREUR: Configuration thème impossible." 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" msgstr "Anglais" @@ -496,7 +496,7 @@ msgid "Error while transfering data." msgstr "Erreur durant le transfert de données." 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." msgstr "Erreur d'écriture des données" @@ -511,7 +511,7 @@ msgid "Exit" msgstr "Quitter" msgid "Exit to where?" -msgstr "Quitter vers où?" +msgstr "Quitter vers où ?" msgid "Extracting files..." msgstr "Extraction des fichiers..." @@ -520,13 +520,13 @@ msgid "Failed formating" msgstr "Échec du formatage" msgid "Failed to extract." -msgstr "Extraction échouée." +msgstr "Échec de l'extraction" msgid "Failed to open partition" msgstr "Échec accès partition" msgid "Failed updating" -msgstr "Echec de la mise à jour" +msgstr "Échec de la mise à jour" msgid "Feb" msgstr "Fév" @@ -536,10 +536,10 @@ msgstr "Fichier introuvable." #, c-format msgid "Filesize is %i Byte." -msgstr "Taille du ficher: %i Byte." +msgstr "Taille du ficher: %i Octets." msgid "Filesize is 0 Byte." -msgstr "Fichier de taille 0 Byte" +msgstr "Fichier de taille 0 Octet." msgid "Finishing installation... Ok!" msgstr "Finalisation de l'installation... OK!" @@ -551,13 +551,13 @@ msgid "Flip-X" msgstr "Inversion-X" msgid "Force NTSC" -msgstr "" +msgstr "Forcer NTSC" msgid "Force PAL50" -msgstr "" +msgstr "Forcer PAL50" msgid "Force PAL60" -msgstr "" +msgstr "Forcer PAL60" msgid "Format" msgstr "Formater" @@ -566,7 +566,7 @@ msgid "Formatting, please wait..." msgstr "Formatage en cours, veuillez patienter..." msgid "Free Space" -msgstr "Espace restant" +msgstr "Espace libre" msgid "French" msgstr "Français" @@ -578,7 +578,7 @@ msgid "GAMEID_Gamename" msgstr "IDJEU_NomJeu" msgid "GCT Cheatcodes Path" -msgstr "Dossier GCT de Triche" +msgstr "Dossier GCT de triche" msgid "GCT File created" msgstr "Fichier GCT créé" @@ -596,7 +596,7 @@ msgid "Game Language" msgstr "Langue du jeu" msgid "Game Load" -msgstr "Chargement Jeux" +msgstr "Chargement des jeux" msgid "Game Lock" msgstr "Verrouiller le jeu" @@ -608,10 +608,10 @@ msgid "Game Size" msgstr "Taille du jeu" msgid "Game Sound Mode" -msgstr "Mode Son des Jeux" +msgstr "Son de présentation" msgid "Game Sound Volume" -msgstr "Volume Son des Jeux" +msgstr "Volume du son des jeux" msgid "Game Split Size" msgstr "Découpage des jeux" @@ -629,7 +629,7 @@ msgid "GamesLevel" msgstr "Niv. verrou" msgid "Genre:" -msgstr "Genre:" +msgstr "" msgid "German" msgstr "Allemand" @@ -653,18 +653,18 @@ msgid "Hour" msgstr "heures" msgid "How do you want to update?" -msgstr "Comment faire la Mise à Jour ?" +msgstr "Comment faire la Mise à jour ?" msgid "How to Shutdown?" msgstr "Arrêt de la Wii ?" #, c-format msgid "Incoming file %0.2fKB" -msgstr "Fichier entrant %0.2fKB" +msgstr "Fichier entrant %0.2fKo" #, c-format msgid "Incoming file %0.2fMB" -msgstr "Fichier entrant %0.2fMB" +msgstr "Fichier entrant %0.2fMo" msgid "Initializing Network" msgstr "Initialisation du réseau" @@ -685,7 +685,7 @@ msgid "Install a game" msgstr "Installer un jeu" msgid "Install directories" -msgstr "Dossier d'installation" +msgstr "Dossiers d'installation" msgid "Install partitions" msgstr "Installation" @@ -736,16 +736,16 @@ msgid "Korean" msgstr "Coréen" msgid "Language File" -msgstr "Langues" +msgstr "Fichier de langue" msgid "Language change:" -msgstr "Changement Langue:" +msgstr "Changement de langue:" msgid "Languagefiles Path" -msgstr "Dossier Langue" +msgstr "Dossier langue" msgid "Languagepath changed." -msgstr "Dossier Langue changé" +msgstr "Dossier langue changé" msgid "Left" msgstr "Gauche" @@ -757,7 +757,7 @@ msgid "Load" msgstr "Charger" msgid "Load From SD/USB" -msgstr "Charger sur SD/USB" +msgstr "Charger depuis SD/USB" #, c-format msgid "Load file from: %s ?" @@ -785,22 +785,22 @@ msgid "Locked" msgstr "Clic pour déverrouiller" msgid "Loop Directory" -msgstr "Répéter Dossier" +msgstr "Répéter dossier" msgid "Loop Music" -msgstr "Répéter Musique" +msgstr "Répéter musique" msgid "Loop Sound" msgstr "Son en boucle" msgid "Main tester:" -msgstr "Testeur principal:" +msgstr "Testeur:" msgid "Mar" msgstr "Mars" msgid "Mark new games" -msgstr "Marqueur nouveau jeu" +msgstr "Marquer les nouveaux jeux" msgid "May" msgstr "Mai" @@ -815,10 +815,10 @@ msgid "Mount DVD drive" msgstr "Lancer DVD" msgid "Music Loop Mode" -msgstr "Mode Boucle Musique" +msgstr "Type de boucle" msgid "Music Volume" -msgstr "Volume Musique" +msgstr "Volume musique" msgid "Neither" msgstr "Aucun" @@ -827,7 +827,7 @@ msgid "Network is not initiated." msgstr "Réseau non initialisé" msgid "New Disc Detected" -msgstr "Nouveau DVD Détecté" +msgstr "Nouveau DVD détecté" msgid "Next" msgstr "Suivant" @@ -842,13 +842,13 @@ msgid "No DOL file found on disc." msgstr "Aucun DOL trouvé dans ce jeu." msgid "No Splitting" -msgstr "Pas de découpage" +msgstr "Aucun" msgid "No URL or Path specified." msgstr "Pas d'adresse ou de chemin spécifié" 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" msgstr "Aucune sélection de triche" @@ -857,13 +857,13 @@ msgid "No data could be read." msgstr "Lecture des données impossible." msgid "No favorites selected." -msgstr "Pas de favoris sélectionné" +msgstr "Pas de favoris sélectionnés" msgid "No file missing!" msgstr "Aucun fichier manquant !" msgid "No new updates." -msgstr "Pas de nouvelle Mise à Jour." +msgstr "Pas de nouvelle mise à jour." msgid "No themes found on the site." msgstr "Aucun thème trouvé sur le site." @@ -923,7 +923,7 @@ msgid "Oct" msgstr "" msgid "Official Site:" -msgstr "Site Officiel:" +msgstr "Site officiel:" msgid "Offset" msgstr "" @@ -944,7 +944,7 @@ msgid "Original/Customs" msgstr "Originaux/Persos" msgid "Parental Control" -msgstr "Contrôle Parental" +msgstr "Contrôle parental" msgid "Partition" msgstr "" @@ -959,7 +959,7 @@ msgid "Password has been changed" msgstr "Le mot de passe a été modifié" msgid "Patch Country Strings" -msgstr "Patch Jeux Import" +msgstr "Patch jeux import" msgid "Path Changed" msgstr "Chemin changé" @@ -968,19 +968,19 @@ msgid "Pick from a list" msgstr "Sélectionner" msgid "Play Count" -msgstr "Utilisation" +msgstr "Utilisations" msgid "Play Next" -msgstr "Jouer Suiv." +msgstr "Jouer suiv." msgid "Play Once" msgstr "Jouer 1 fois" msgid "Play Previous" -msgstr "Jouer Précéd." +msgstr "Jouer précéd." msgid "Playing Music:" -msgstr "Musique Actuelle:" +msgstr "Musique actuelle:" msgid "Please wait..." msgstr "Veuillez patienter..." @@ -1010,7 +1010,7 @@ msgid "Receiving file from:" msgstr "Réception du fichier de:" msgid "Region Patch" -msgstr "" +msgstr "Région patch" msgid "Released" msgstr "Date de sortie" @@ -1019,7 +1019,7 @@ msgid "Reload SD" msgstr "Recharger la SD" msgid "Remove update" -msgstr "Supprimer Mise à Jour" +msgstr "Supprimer MàJ" msgid "Rename Game on WBFS" msgstr "Renommer un jeu" @@ -1028,10 +1028,10 @@ msgid "Reset BG Music" msgstr "Fond sonore par defaut" msgid "Reset Playcounter" -msgstr "Réinitialiser le compteur d'utilisation" +msgstr "Remise à zéro du compteur d'utilisations" msgid "Reset to default BGM?" -msgstr "Réinitialiser le fond sonore ?" +msgstr "Remettre le fond sonore par defaut ?" msgid "Restarting..." msgstr "Redémarrage..." @@ -1040,7 +1040,7 @@ msgid "Return" msgstr "Retour" msgid "Return To" -msgstr "Revenir à:" +msgstr "Retourner vers" msgid "Return to Wii Menu" msgstr "Retourner au menu Wii" @@ -1082,7 +1082,7 @@ msgid "Select a DOL" msgstr "Choisir un DOL" 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" msgstr "" @@ -1100,13 +1100,13 @@ msgid "Shutdown System" msgstr "Arrêt" msgid "Shutdown Wii" -msgstr "Eteindre la Wii" +msgstr "Éteindre la Wii" msgid "Sort alphabetically" -msgstr "Ordre Alphabétique" +msgstr "Ordre alphabétique" msgid "Sort by rank" -msgstr "Classement Favoris" +msgstr "Classement favoris" msgid "Sort order by most played" msgstr "Les plus joués" @@ -1130,10 +1130,10 @@ msgid "Special thanks to:" msgstr "Remerciements spéciaux à:" msgid "Split each 2GB" -msgstr "Découper tous les 2GB" +msgstr "2Go" msgid "Split each 4GB" -msgstr "Découper tous les 4GB" +msgstr "4Go" msgid "Standby" msgstr "Veille" @@ -1148,10 +1148,10 @@ msgid "Successfully Saved" msgstr "Enregistré avec succès" msgid "Successfully Updated" -msgstr "Mise à Jour terminée" +msgstr "Mise à jour terminée" 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:" msgstr "Supprimé avec succès:" @@ -1163,16 +1163,16 @@ msgid "Successfully installed:" msgstr "Installé avec succès:" msgid "System Default" -msgstr "Système par défaut" +msgstr "Console par défaut" msgid "TChinese" msgstr "Chinois traditionnel" msgid "TXT Cheatcodes Path" -msgstr "Dossier TXT de Triche" +msgstr "Dossier TXT de triches" 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?" 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" msgid "Theme Downloader" -msgstr "Téléchargement Thèmes" +msgstr "Téléchargement des thèmes" msgid "Theme Path" -msgstr "Dossier Thème" +msgstr "Dossier thème" msgid "Theme Title:" -msgstr "Titre du Thème:" +msgstr "Titre du thème:" msgid "Theme path is changed." msgstr "Dossier thème changé" @@ -1236,10 +1236,10 @@ msgid "Uninstall" msgstr "Désinstaller" msgid "Uninstall Game" -msgstr "Désinstaller le Jeu" +msgstr "Désinstaller le jeu" msgid "Uninstall Menu" -msgstr "Menu Suppression" +msgstr "Menu suppression" msgid "Uninstalling wad" msgstr "Désinstallation wad" @@ -1248,7 +1248,7 @@ msgid "Unknown" msgstr "Inconnu" msgid "Unlock USB Loader GX" -msgstr "Déverouiller USB Loader GX" +msgstr "Déverrouiller USB Loader GX" msgid "Unlock console to use this option." 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." msgid "Update" -msgstr "Mise à Jour" +msgstr "Mise à jour" msgid "Update All" msgstr "Totale" @@ -1272,19 +1272,19 @@ msgid "Update Files" msgstr "MàJ Fichiers" msgid "Update Path" -msgstr "Dossier Mise à Jour" +msgstr "Dossier de mise à jour" msgid "Update all Language Files" -msgstr "Mise à Jour tous fichiers Langue" +msgstr "Mise à jour des fichiers de langue" msgid "Update failed" -msgstr "Mise à Jour échouée" +msgstr "Échec de la mise à jour" msgid "Update successfull" msgstr "Mise à jour réussie" msgid "Updating Language Files:" -msgstr "Mise à Jour Fichiers Langue:" +msgstr "Mise à jour du fichier de langue:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Fichier ZIP envoyé et installé dans le répertoire homebrew." @@ -1300,7 +1300,7 @@ msgid "Video Mode" msgstr "Mode vidéo" msgid "WIP Patches Path" -msgstr "Dossier Patchs WIP" +msgstr "Dossier patchs WIP" msgid "Waiting..." msgstr "En attente..." @@ -1309,7 +1309,7 @@ msgid "Warning:" msgstr "Attention:" msgid "What do you want to update?" -msgstr "Choix Mise à Jour" +msgstr "Choix de la mise à jour" msgid "WiFi Features" msgstr "Connexion WiFi" @@ -1324,7 +1324,7 @@ msgid "Wii Settings" msgstr "Paramètres Wii" msgid "WiiTDB Files" -msgstr "WiiTDB" +msgstr "Fichier WiiTDB" msgid "WiiTDB Path" msgstr "Dossier WiiTDB" @@ -1342,13 +1342,13 @@ msgid "Yes" 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." -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" msgstr "Vous devez choisir ou formater une partition" 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" msgstr "disponible" @@ -1420,7 +1420,7 @@ msgstr "secondes restantes" #~ msgstr "Veille" #~ msgid "Shutdown?" -#~ msgstr "Eteindre ?" +#~ msgstr "Éteindre ?" #~ msgid "Your URL has been saved in %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 ?" #~ msgid "Checking for Updates" -#~ msgstr "Recherche de Mise à Jour" +#~ msgstr "Recherche de Mise à jour" #~ msgid "Downloading" #~ msgstr "Téléchargement" @@ -1513,13 +1513,13 @@ msgstr "secondes restantes" #~ msgstr "vers la" #~ msgid "Updating" -#~ msgstr "Mise à Jour" +#~ msgstr "Mise à jour" #~ msgid "Updating Language Files..." -#~ msgstr "Mise à Jour Fichiers Langue..." +#~ msgstr "Mise à jour des fichiers Langue..." #~ 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." #~ 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é!" #~ msgid "Update Path changed." -#~ msgstr "Dossier de Mise à Jour modifié." +#~ msgstr "Dossier de mise à jour modifié." #~ msgid "WIP Patches Path changed" #~ msgstr "Dossier Patchs WIP modifié" diff --git a/Languages/german.lang b/Languages/german.lang index 5676726a..bd99d9fc 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 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" "Last-Translator: TheRealVisitor\n" "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n" @@ -395,7 +395,7 @@ msgid "Do you want to format:" msgstr "Formatieren:" 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?" msgstr "Soll dieses Theme geladen werden?" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "FEHLER: Theme kann nicht eingerichtet werden." 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" msgstr "Englisch" @@ -629,7 +629,7 @@ msgid "GamesLevel" msgstr "Spiele Level" msgid "Genre:" -msgstr "" +msgstr "Genre:" msgid "German" msgstr "Deutsch" @@ -1404,9 +1404,6 @@ msgstr "von" msgid "seconds left" msgstr "Sekunden verbleiben" -#~ msgid "Gerne:" -#~ msgstr "Genre:" - #~ msgid "Full Shutdown" #~ msgstr "Komplett ausschalten" diff --git a/Languages/italian.lang b/Languages/italian.lang index 2d3944dd..69523500 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -1,12 +1,12 @@ # USB Loader GX language source file. -# italian.lang - v63 - r1031 +# italian.lang - v65 - r1033 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \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" "Language-Team: Cambo\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ msgid "Big thanks to:" msgstr "Grazie mille a:" msgid "Block IOS Reload" -msgstr "Ricarica l'IOS" +msgstr "Blocca Ricarica IOS" msgid "Boot/Standard" msgstr "Riavvio/Standard" @@ -395,7 +395,7 @@ msgid "Do you want to format:" msgstr "Vuoi formattare:" msgid "Do you want to load the default theme?" -msgstr "" +msgstr "Vuoi caricare il tema predefinito?" msgid "Do you want to load this theme?" msgstr "Vuoi caricare questo tema?" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "ERRORE: Impossibile configurare il tema." 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" msgstr "Inglese" @@ -596,7 +596,7 @@ msgid "Game Language" msgstr "Lingua Gioco" msgid "Game Load" -msgstr "Impostazioni Giochi" +msgstr "Impostazioni Gioco" msgid "Game Lock" msgstr "Bloccaggio Gioco" @@ -1239,7 +1239,7 @@ msgid "Uninstall Game" msgstr "Disinstalla il gioco" msgid "Uninstall Menu" -msgstr "Disinstalla Menu" +msgstr "Menu Disinstallazioni" msgid "Uninstalling wad" msgstr "Disinstalla WAD" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index 95bf1236..a0b588eb 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -395,7 +395,7 @@ msgid "Do you want to format:" msgstr "初期化しますか?" msgid "Do you want to load the default theme?" -msgstr "" +msgstr "標準のテーマを読み込みますか?" msgid "Do you want to load this theme?" msgstr "このテーマを読み込みますか?" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "テーマを適用できませんでした" msgid "Enabling this option on a FAT partition might slow the startup of the loader." -msgstr "" +msgstr "FAT領域でこれを有効にするとローダーの起動が遅くなります" msgid "English" msgstr "英語" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index d2a6abc6..5d8b9929 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 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" "Last-Translator: knife.hu kavid emul8ion\n" "Language-Team: kavid\n" @@ -395,7 +395,7 @@ msgid "Do you want to format:" msgstr "是否格式化:" msgid "Do you want to load the default theme?" -msgstr "" +msgstr "要加载默认主题吗?" msgid "Do you want to load this theme?" msgstr "是否载入这个主题？" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "错误: 无法设置主题." msgid "Enabling this option on a FAT partition might slow the startup of the loader." -msgstr "" +msgstr "在FAT分区启用这个选项会使Loader启动变慢." msgid "English" msgstr "英文" @@ -644,10 +644,10 @@ msgid "Homebrew Apps Path" msgstr "自制程序路径" msgid "Homebrew Channel" -msgstr "Homebrew 频道" +msgstr "Homebrew频道" msgid "Homebrew Launcher" -msgstr "Homebrew 管理器" +msgstr "Homebrew管理器" msgid "Hour" msgstr "小时" @@ -1348,7 +1348,7 @@ msgid "You need to select or format a partition" msgstr "你需要选择或者格式化一个分区" msgid "and translators for language files updates" -msgstr "" +msgstr "以及翻译人员的语言文件更新" msgid "available" msgstr "允许" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index d8ff5e4f..6c718d17 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 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" "Last-Translator: Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n" @@ -344,7 +344,7 @@ msgid "Design:" msgstr "設計者：" msgid "Developed by" -msgstr "開發者" +msgstr "開發商" msgid "Directory does not exist!" msgstr "目錄不存在" @@ -458,7 +458,7 @@ msgid "ERROR: Can't set up theme." msgstr "錯誤：無法設定佈景主題。" msgid "Enabling this option on a FAT partition might slow the startup of the loader." -msgstr "" +msgstr "在FAT磁區開啟這選項可能造成loader啟動緩慢。" msgid "English" msgstr "英文" @@ -995,7 +995,7 @@ msgid "Prompts Buttons" msgstr "顯示校正" msgid "Published by" -msgstr "發布者" +msgstr "出版商" msgid "Quick Boot" msgstr "快速啟動" @@ -1013,7 +1013,7 @@ msgid "Region Patch" msgstr "區碼修正" msgid "Released" -msgstr "發表" +msgstr "發行" msgid "Reload SD" msgstr "重新載入 SD 卡" diff --git a/Themes/Default.them b/Themes/Default.them index 971e95e9..097d78e0 100644 --- a/Themes/Default.them +++ b/Themes/Default.them @@ -1,406 +1,407 @@ -# USB Loader GX theme source file. -# don't delete/change this line (é). -# ONLY the value before the '-' char needs to be entered in msgstr "" -# not the complete text. -# 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. -msgid "" -msgstr "" -"Project-Id-Version: USB Loader GX\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-07 14:09+0100\n" -"PO-Revision-Date: 2009-10-01 01:00+0200\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Theme-Title: Example\n" -"Image-Folder: Example\n" -"Last-Themer: Example\n" -"Theme-Team: 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 - settings text color" -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 over" -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 "20 - game grid layout pos y" -msgstr "" - -msgid "255 - tooltip alpha" -msgstr "" - -msgid "r=55 g=190 b=237 a=255 - hdd info color" -msgstr "" - -msgid "center - hdd info align hor" -msgstr "" - -msgid "top - hdd info align ver" -msgstr "" - -msgid "0 - hdd info pos x" -msgstr "" - -msgid "400 - hdd info pos y" -msgstr "" - -msgid "r=55 g=190 b=237 a=255 - game count color" -msgstr "" - -msgid "center - game count align hor" -msgstr "" - -msgid "top - game count align ver" -msgstr "" - -msgid "0 - game count pos x" -msgstr "" - -msgid "420 - game count pos y" -msgstr "" - -msgid "16 - install btn pos x" -msgstr "" - -msgid "355 - install btn pos y" -msgstr "" - -msgid "371 - settings btn pos y" -msgstr "" - -msgid "64 - settings btn pos x" -msgstr "" - -msgid "371 - home menu btn pos y" -msgstr "" - -msgid "489 - home menu btn pos x" -msgstr "" - -msgid "355 - power off btn pos y" -msgstr "" - -msgid "576 - power off btn pos x" -msgstr "" - -msgid "160 - sd card btn pos x" -msgstr "" - -msgid "395 - sd card btn pos y" -msgstr "" - -msgid "405 - HBC btn pos y" -msgstr "" - -msgid "410 - HBC btn pos x" -msgstr "" - -msgid "26 - cover/download btn pos x" -msgstr "" - -msgid "58 - cover/download btn pos y" -msgstr "" - -msgid "305 - gameID btn pos y" -msgstr "" - -msgid "68 - gameID btn pos x" -msgstr "" - -msgid "r=138 g=138 b=138 a=240 - clock color" -msgstr "" - -msgid "left - clock align hor" -msgstr "" - -msgid "top - clock align ver" -msgstr "" - -msgid "275 - clock pos x" -msgstr "" - -msgid "335 - clock pos y" -msgstr "" - -msgid "260 - list layout favorite btn pos x" -msgstr "" - -msgid "288 - list layout favorite btn pos x widescreen" -msgstr "" - -msgid "13 - list layout favorite btn pos y" -msgstr "" - -msgid "300 - list layout search btn pos x" -msgstr "" - -msgid "320 - list layout search btn pos x widescreen" -msgstr "" - -msgid "13 - list layout search 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 "13 - list layout abc/sort btn pos y" -msgstr "" - -msgid "380 - list layout list btn pos x" -msgstr "" - -msgid "384 - list layout list btn pos x widescreen" -msgstr "" - -msgid "13 - list layout list btn pos y" -msgstr "" - -msgid "416 - list layout grid btn pos x widescreen" -msgstr "" - -msgid "420 - list layout grid btn pos x" -msgstr "" - -msgid "13 - list layout grid btn pos y" -msgstr "" - -msgid "448 - list layout carousel btn pos x widescreen" -msgstr "" - -msgid "460 - list layout carousel btn pos x" -msgstr "" - -msgid "13 - list layout carousel btn pos y" -msgstr "" - -msgid "480 - list layout lock btn pos x widescreen" -msgstr "" - -msgid "500 - list layout lock btn pos x" -msgstr "" - -msgid "13 - list layout lock btn pos y" -msgstr "" - -msgid "512 - list layout dvd btn pos x widescreen" -msgstr "" - -msgid "540 - list layout dvd btn pos x" -msgstr "" - -msgid "13 - list layout dvd btn pos y" -msgstr "" - -msgid "280 - game list layout height" -msgstr "" - -msgid "396 - game list layout width" -msgstr "" - -msgid "200 - game list layout pos x" -msgstr "" - -msgid "49 - game list layout pos y" -msgstr "" - -msgid "200 - grid layout favorite btn pos x" -msgstr "" - -msgid "224 - grid layout favorite btn pos x widescreen" -msgstr "" - -msgid "13 - grid layout favorite btn pos y" -msgstr "" - -msgid "240 - grid layout search btn pos x" -msgstr "" - -msgid "256 - grid layout search btn pos x widescreen" -msgstr "" - -msgid "13 - grid layout search btn pos y" -msgstr "" - -msgid "280 - grid layout abc/sort btn pos x" -msgstr "" - -msgid "288 - grid layout abc/sort btn pos x widescreen" -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 widescreen" -msgstr "" - -msgid "13 - grid layout list btn pos y" -msgstr "" - -msgid "352 - grid layout grid btn pos x widescreen" -msgstr "" - -msgid "360 - grid layout grid btn pos x" -msgstr "" - -msgid "13 - grid layout grid btn pos y" -msgstr "" - -msgid "384 - grid layout carousel btn pos x widescreen" -msgstr "" - -msgid "400 - grid layout carousel btn pos x" -msgstr "" - -msgid "13 - grid layout carousel btn pos y" -msgstr "" - -msgid "416 - grid layout lock btn pos x widescreen" -msgstr "" - -msgid "440 - grid layout lock btn pos x" -msgstr "" - -msgid "13 - grid layout lock btn pos y" -msgstr "" - -msgid "448 - grid layout dvd btn pos x widescreen" -msgstr "" - -msgid "480 - grid layout dvd btn pos x" -msgstr "" - -msgid "13 - grid layout dvd btn pos y" -msgstr "" - -msgid "400 - game grid layout height" -msgstr "" - -msgid "640 - game grid layout width" -msgstr "" - -msgid "200 - carousel layout favorite btn pos x" -msgstr "" - -msgid "224 - carousel layout favorite btn pos x widescreen" -msgstr "" - -msgid "13 - carousel layout favorite btn pos y" -msgstr "" - -msgid "240 - carousel layout search btn pos x" -msgstr "" - -msgid "256 - carousel layout search btn pos x widescreen" -msgstr "" - -msgid "13 - carousel layout search btn pos y" -msgstr "" - -msgid "280 - carousel layout abc/sort btn pos x" -msgstr "" - -msgid "288 - carousel layout abc/sort btn pos x widescreen" -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 widescreen" -msgstr "" - -msgid "13 - carousel layout list btn pos y" -msgstr "" - -msgid "352 - carousel layout grid btn pos x widescreen" -msgstr "" - -msgid "360 - carousel layout grid btn pos x" -msgstr "" - -msgid "13 - carousel layout grid btn pos y" -msgstr "" - -msgid "384 - carousel layout carousel btn pos x widescreen" -msgstr "" - -msgid "400 - carousel layout carousel btn pos x" -msgstr "" - -msgid "13 - carousel layout carousel btn pos y" -msgstr "" - -msgid "416 - carousel layout lock btn pos x widescreen" -msgstr "" - -msgid "440 - carousel layout lock btn pos x" -msgstr "" - -msgid "13 - carousel layout lock btn pos y" -msgstr "" - -msgid "448 - carousel layout dvd btn pos x widescreen" -msgstr "" - -msgid "480 - carousel layout dvd btn pos x" -msgstr "" - -msgid "13 - carousel layout dvd btn pos y" -msgstr "" - -msgid "400 - game carousel layout height" -msgstr "" - -msgid "640 - game carousel layout width" -msgstr "" - -msgid "0 - game carousel layout pos x" -msgstr "" - -msgid "0 - game carousel layout pos y" -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 "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 "30 - region info text pos y" -msgstr "" - -msgid "68 - region info text pos x" -msgstr "" - -msgid "1 - Enable tooltips: 0 for off and 1 for on" -msgstr "" +# USB Loader GX theme source file. +# don't delete/change this line (é). +# ONLY the value before the '-' char needs to be entered in msgstr "" +# not the complete text. +# 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. +msgid "" +msgstr "" +"Project-Id-Version: USB Loader GX\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-01-08 13:01+0100\n" +"PO-Revision-Date: 2009-10-01 01:00+0200\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Theme-Title: Example\n" +"Image-Folder: Example\n" +"Last-Themer: 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 - settings text color" +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 over" +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 "20 - game grid layout pos y" +msgstr "" + +msgid "255 - tooltip alpha" +msgstr "" + +msgid "r=55 g=190 b=237 a=255 - hdd info color" +msgstr "" + +msgid "center - hdd info align hor" +msgstr "" + +msgid "top - hdd info align ver" +msgstr "" + +msgid "0 - hdd info pos x" +msgstr "" + +msgid "400 - hdd info pos y" +msgstr "" + +msgid "r=55 g=190 b=237 a=255 - game count color" +msgstr "" + +msgid "center - game count align hor" +msgstr "" + +msgid "top - game count align ver" +msgstr "" + +msgid "0 - game count pos x" +msgstr "" + +msgid "420 - game count pos y" +msgstr "" + +msgid "16 - install btn pos x" +msgstr "" + +msgid "355 - install btn pos y" +msgstr "" + +msgid "371 - settings btn pos y" +msgstr "" + +msgid "64 - settings btn pos x" +msgstr "" + +msgid "371 - home menu btn pos y" +msgstr "" + +msgid "489 - home menu btn pos x" +msgstr "" + +msgid "355 - power off btn pos y" +msgstr "" + +msgid "576 - power off btn pos x" +msgstr "" + +msgid "160 - sd card btn pos x" +msgstr "" + +msgid "395 - sd card btn pos y" +msgstr "" + +msgid "405 - HBC btn pos y" +msgstr "" + +msgid "410 - HBC btn pos x" +msgstr "" + +msgid "26 - cover/download btn pos x" +msgstr "" + +msgid "58 - cover/download btn pos y" +msgstr "" + +msgid "305 - gameID btn pos y" +msgstr "" + +msgid "68 - gameID btn pos x" +msgstr "" + +msgid "r=138 g=138 b=138 a=240 - clock color" +msgstr "" + +msgid "left - clock align hor" +msgstr "" + +msgid "top - clock align ver" +msgstr "" + +msgid "275 - clock pos x" +msgstr "" + +msgid "335 - clock pos y" +msgstr "" + +msgid "260 - list layout favorite btn pos x" +msgstr "" + +msgid "288 - list layout favorite btn pos x widescreen" +msgstr "" + +msgid "13 - list layout favorite btn pos y" +msgstr "" + +msgid "300 - list layout search btn pos x" +msgstr "" + +msgid "320 - list layout search btn pos x widescreen" +msgstr "" + +msgid "13 - list layout search 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 "13 - list layout abc/sort btn pos y" +msgstr "" + +msgid "380 - list layout list btn pos x" +msgstr "" + +msgid "384 - list layout list btn pos x widescreen" +msgstr "" + +msgid "13 - list layout list btn pos y" +msgstr "" + +msgid "416 - list layout grid btn pos x widescreen" +msgstr "" + +msgid "420 - list layout grid btn pos x" +msgstr "" + +msgid "13 - list layout grid btn pos y" +msgstr "" + +msgid "448 - list layout carousel btn pos x widescreen" +msgstr "" + +msgid "460 - list layout carousel btn pos x" +msgstr "" + +msgid "13 - list layout carousel btn pos y" +msgstr "" + +msgid "480 - list layout lock btn pos x widescreen" +msgstr "" + +msgid "500 - list layout lock btn pos x" +msgstr "" + +msgid "13 - list layout lock btn pos y" +msgstr "" + +msgid "512 - list layout dvd btn pos x widescreen" +msgstr "" + +msgid "540 - list layout dvd btn pos x" +msgstr "" + +msgid "13 - list layout dvd btn pos y" +msgstr "" + +msgid "280 - game list layout height" +msgstr "" + +msgid "396 - game list layout width" +msgstr "" + +msgid "200 - game list layout pos x" +msgstr "" + +msgid "49 - game list layout pos y" +msgstr "" + +msgid "200 - grid layout favorite btn pos x" +msgstr "" + +msgid "224 - grid layout favorite btn pos x widescreen" +msgstr "" + +msgid "13 - grid layout favorite btn pos y" +msgstr "" + +msgid "240 - grid layout search btn pos x" +msgstr "" + +msgid "256 - grid layout search btn pos x widescreen" +msgstr "" + +msgid "13 - grid layout search btn pos y" +msgstr "" + +msgid "280 - grid layout abc/sort btn pos x" +msgstr "" + +msgid "288 - grid layout abc/sort btn pos x widescreen" +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 widescreen" +msgstr "" + +msgid "13 - grid layout list btn pos y" +msgstr "" + +msgid "352 - grid layout grid btn pos x widescreen" +msgstr "" + +msgid "360 - grid layout grid btn pos x" +msgstr "" + +msgid "13 - grid layout grid btn pos y" +msgstr "" + +msgid "384 - grid layout carousel btn pos x widescreen" +msgstr "" + +msgid "400 - grid layout carousel btn pos x" +msgstr "" + +msgid "13 - grid layout carousel btn pos y" +msgstr "" + +msgid "416 - grid layout lock btn pos x widescreen" +msgstr "" + +msgid "440 - grid layout lock btn pos x" +msgstr "" + +msgid "13 - grid layout lock btn pos y" +msgstr "" + +msgid "448 - grid layout dvd btn pos x widescreen" +msgstr "" + +msgid "480 - grid layout dvd btn pos x" +msgstr "" + +msgid "13 - grid layout dvd btn pos y" +msgstr "" + +msgid "400 - game grid layout height" +msgstr "" + +msgid "640 - game grid layout width" +msgstr "" + +msgid "200 - carousel layout favorite btn pos x" +msgstr "" + +msgid "224 - carousel layout favorite btn pos x widescreen" +msgstr "" + +msgid "13 - carousel layout favorite btn pos y" +msgstr "" + +msgid "240 - carousel layout search btn pos x" +msgstr "" + +msgid "256 - carousel layout search btn pos x widescreen" +msgstr "" + +msgid "13 - carousel layout search btn pos y" +msgstr "" + +msgid "280 - carousel layout abc/sort btn pos x" +msgstr "" + +msgid "288 - carousel layout abc/sort btn pos x widescreen" +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 widescreen" +msgstr "" + +msgid "13 - carousel layout list btn pos y" +msgstr "" + +msgid "352 - carousel layout grid btn pos x widescreen" +msgstr "" + +msgid "360 - carousel layout grid btn pos x" +msgstr "" + +msgid "13 - carousel layout grid btn pos y" +msgstr "" + +msgid "384 - carousel layout carousel btn pos x widescreen" +msgstr "" + +msgid "400 - carousel layout carousel btn pos x" +msgstr "" + +msgid "13 - carousel layout carousel btn pos y" +msgstr "" + +msgid "416 - carousel layout lock btn pos x widescreen" +msgstr "" + +msgid "440 - carousel layout lock btn pos x" +msgstr "" + +msgid "13 - carousel layout lock btn pos y" +msgstr "" + +msgid "448 - carousel layout dvd btn pos x widescreen" +msgstr "" + +msgid "480 - carousel layout dvd btn pos x" +msgstr "" + +msgid "13 - carousel layout dvd btn pos y" +msgstr "" + +msgid "400 - game carousel layout height" +msgstr "" + +msgid "640 - game carousel layout width" +msgstr "" + +msgid "-20 - 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 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 - region info text color" +msgstr "" + +msgid "30 - region info text pos y" +msgstr "" + +msgid "68 - region info text pos x" +msgstr "" + +msgid "1 - Enable tooltips: 0 for off and 1 for on" +msgstr "" diff --git a/source/Controls/PartitionHandle.cpp b/source/Controls/PartitionHandle.cpp index 48502e17..82da0edd 100644 --- a/source/Controls/PartitionHandle.cpp +++ b/source/Controls/PartitionHandle.cpp @@ -332,6 +332,8 @@ void PartitionHandle::AddPartition(const char * name, u64 lba_start, u64 sec_cou { name = "WBFS"; part_type = 0xBF; //Override partition type on WBFS + sec_count = wbfs_ntohl(head->n_hd_sec); + } else if(*((u16 *) (buffer + 0x1FE)) == 0x55AA) { diff --git a/source/GameBootProcess.cpp b/source/GameBootProcess.cpp index 0a800836..e9571ab8 100644 --- a/source/GameBootProcess.cpp +++ b/source/GameBootProcess.cpp @@ -28,7 +28,7 @@ u32 AppEntrypoint = 0; struct discHdr *dvdheader = NULL; -extern int load_from_fs; +extern int wbfs_part_fs; extern int mountMethod; @@ -181,7 +181,7 @@ int BootGame(const char * gameID) if (reloadblock == ON && IosLoader::IsHermesIOS()) { enable_ES_ioctlv_vector(); - if (load_from_fs == PART_FS_WBFS) + if (wbfs_part_fs == PART_FS_WBFS) mload_close(); } diff --git a/source/SoundOperations/gui_bgm.cpp b/source/SoundOperations/gui_bgm.cpp index b4136a0f..316db100 100644 --- a/source/SoundOperations/gui_bgm.cpp +++ b/source/SoundOperations/gui_bgm.cpp @@ -5,14 +5,13 @@ * Backgroundmusic ***************************************************************************/ #include +#include "themes/CTheme.h" #include "gui_bgm.h" #include "menu.h" GuiBGM::GuiBGM(const u8 *s, int l, int v) : GuiSound(s, l, v, false, 0) { - loop = 0; - loopMode = ONCE; currentPath = NULL; currentPlaying = 0; voice = 0; @@ -25,13 +24,6 @@ GuiBGM::~GuiBGM() ClearList(); } -void GuiBGM::SetLoop(u8 l) -{ - loopMode = l; - - GuiSound::SetLoop(l == LOOP); -} - bool GuiBGM::Load(const char *path) { if (!path) @@ -65,7 +57,7 @@ bool GuiBGM::LoadStandard() 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(); @@ -211,11 +203,11 @@ void GuiBGM::UpdateState() { if (!IsPlaying()) { - if (loopMode == DIR_LOOP) + if (loop == DIR_LOOP) { PlayNext(); } - else if (loopMode == RANDOM_BGM) + else if (loop == RANDOM_BGM) { PlayRandom(); } diff --git a/source/SoundOperations/gui_bgm.h b/source/SoundOperations/gui_bgm.h index 741ce36a..eb54791a 100644 --- a/source/SoundOperations/gui_bgm.h +++ b/source/SoundOperations/gui_bgm.h @@ -27,14 +27,12 @@ class GuiBGM: public GuiSound bool PlayNext(); bool PlayPrevious(); bool PlayRandom(); - void SetLoop(u8 l); void UpdateState(); protected: void AddEntrie(const char * filename); void ClearList(); int currentPlaying; - int loopMode; char * currentPath; std::vector PlayList; }; diff --git a/source/SoundOperations/gui_sound.cpp b/source/SoundOperations/gui_sound.cpp index 350ecaaf..a9b8aa8a 100644 --- a/source/SoundOperations/gui_sound.cpp +++ b/source/SoundOperations/gui_sound.cpp @@ -86,7 +86,7 @@ GuiSound::GuiSound(const char * filepath) volume = 255; SoundEffectLength = 0; - loop = false; + loop = 0; allocated = false; Load(filepath); } @@ -105,7 +105,7 @@ GuiSound::GuiSound(const u8 * snd, s32 len, int vol, bool isallocated, int v) volume = vol; SoundEffectLength = 0; - loop = false; + loop = 0; allocated = false; Load(snd, len, isallocated); } diff --git a/source/SoundOperations/gui_sound.h b/source/SoundOperations/gui_sound.h index 1101b16b..becfa948 100644 --- a/source/SoundOperations/gui_sound.h +++ b/source/SoundOperations/gui_sound.h @@ -40,7 +40,7 @@ class GuiSound //!Destructor ~GuiSound(); //!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 bool Load(const u8 * sound, int filesize, bool allocated = true); //!For quick playback of the internal soundeffects @@ -62,7 +62,7 @@ class GuiSound //!\param v Sound volume (0-100) void SetVolume(int v); //!\param l Loop (true to loop) - void SetLoop(u8 l); + virtual void SetLoop(u8 l); //!Special sound case for sound.bin void UncompressSoundbin(const u8 * snd, int len, bool isallocated); protected: diff --git a/source/cheats/cheatmenu.cpp b/source/cheats/cheatmenu.cpp index 56a3baf3..28e824e9 100644 --- a/source/cheats/cheatmenu.cpp +++ b/source/cheats/cheatmenu.cpp @@ -9,17 +9,9 @@ #include "themes/CTheme.h" #include "FileOperations/fileops.h" #include "menu.h" -#include "filelist.h" #include "sys.h" #include "gct.h" -/*** Extern functions ***/ -extern void ResumeGui(); -extern void HaltGui(); - -/*** Extern variables ***/ -extern GuiWindow * mainWindow; - /**************************************************************************** * CheatMenu ***************************************************************************/ diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h index a7ab4ec2..1643f2e8 100644 --- a/source/libwiigui/gui.h +++ b/source/libwiigui/gui.h @@ -43,7 +43,6 @@ #include "gui_imagedata.h" #include "FreeTypeGX.h" #include "video.h" -#include "filelist.h" #include "input.h" #include "OptionList.hpp" #include "SoundOperations/gui_sound.h" @@ -750,9 +749,12 @@ class GuiTooltip: public GuiElement void Draw(); protected: - GuiImage leftImage; //!< Tooltip left-image - GuiImage tileImage; //!< Tooltip tile-image - GuiImage rightImage; //!< Tooltip right-image + GuiImageData * tooltipLeft; + GuiImageData * tooltipTile; + GuiImageData * tooltipRight; + GuiImage * leftImage; //!< Tooltip left-image + GuiImage * tileImage; //!< Tooltip tile-image + GuiImage * rightImage; //!< Tooltip right-image GuiText *text; }; @@ -932,9 +934,7 @@ class GuiKeyboard: public GuiWindow GuiImageData * key; GuiImageData * keyOver; GuiImageData * keyMedium; - GuiImageData * keyMediumOver; GuiImageData * keyLarge; - GuiImageData * keyLargeOver; GuiTrigger * trigA; GuiTrigger * trigB; }; @@ -967,7 +967,6 @@ class GuiNumpad: public GuiWindow GuiText * keyTxt[11]; GuiImageData * keyTextbox; GuiImageData * keyMedium; - GuiImageData * keyMediumOver; GuiTrigger * trigA; GuiTrigger * trigB; }; diff --git a/source/libwiigui/gui_gamecarousel.cpp b/source/libwiigui/gui_gamecarousel.cpp index 61661832..3da97333 100644 --- a/source/libwiigui/gui_gamecarousel.cpp +++ b/source/libwiigui/gui_gamecarousel.cpp @@ -46,7 +46,7 @@ static GuiImageData *GameCarouselLoadCoverImage(void * Arg) /** * 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")) { width = w; diff --git a/source/libwiigui/gui_gamecarousel.h b/source/libwiigui/gui_gamecarousel.h index 489a98dc..dc245e93 100644 --- a/source/libwiigui/gui_gamecarousel.h +++ b/source/libwiigui/gui_gamecarousel.h @@ -8,7 +8,7 @@ class GuiImageAsync; class GuiGameCarousel: public GuiElement { 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(); int FindMenuItem(int c, int d); int GetClickedOption(); diff --git a/source/libwiigui/gui_gamegrid.cpp b/source/libwiigui/gui_gamegrid.cpp index 310db367..a8ae0605 100644 --- a/source/libwiigui/gui_gamegrid.cpp +++ b/source/libwiigui/gui_gamegrid.cpp @@ -201,7 +201,7 @@ static GuiImageData *GameGridLoadCoverImage(void * Arg) /** * 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")) { width = w; diff --git a/source/libwiigui/gui_gamegrid.h b/source/libwiigui/gui_gamegrid.h index 092233d8..e44d7f92 100644 --- a/source/libwiigui/gui_gamegrid.h +++ b/source/libwiigui/gui_gamegrid.h @@ -9,7 +9,7 @@ class GuiImageAsync; class GuiGameGrid: public GuiElement { 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(); int FindMenuItem(int c, int d); int GetClickedOption(); diff --git a/source/libwiigui/gui_keyboard.cpp b/source/libwiigui/gui_keyboard.cpp index b4e2183c..90026067 100644 --- a/source/libwiigui/gui_keyboard.cpp +++ b/source/libwiigui/gui_keyboard.cpp @@ -13,6 +13,7 @@ #include "../settings/CSettings.h" #include #include +#include "themes/CTheme.h" #include "menu.h" /** * Constructor for the GuiKeyboard class. @@ -118,7 +119,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang) 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->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); 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); this->Append(kbText); - key = new GuiImageData(keyboard_key_png, keyboard_key_png_size); - keyOver = new GuiImageData(keyboard_key_over_png, keyboard_key_over_png_size); - keyMedium = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); - keyMediumOver = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); - keyLarge = new GuiImageData(keyboard_largekey_over_png, keyboard_largekey_over_png_size); - keyLargeOver = new GuiImageData(keyboard_largekey_over_png, keyboard_largekey_over_png_size); + key = Resources::GetImageData("keyboard_key.png"); + keyOver = Resources::GetImageData("keyboard_key_over.png"); + keyMedium = Resources::GetImageData("keyboard_mediumkey_over.png"); + keyLarge = Resources::GetImageData("keyboard_largekey_over.png"); trigA = new GuiTrigger; 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); - keyBackOverImg = new GuiImage(keyMediumOver); + keyBackOverImg = new GuiImage(keyMedium); if (mode == 3) { keyBackText = new GuiText("Retour", 20, ( GXColor ) @@ -182,7 +181,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang) this->Append(keyBack); keyClearImg = new GuiImage(keyMedium); - keyClearOverImg = new GuiImage(keyMediumOver); + keyClearOverImg = new GuiImage(keyMedium); if (mode == 3) { keyClearText = new GuiText("Effacer", 20, ( GXColor ) @@ -207,7 +206,7 @@ GuiKeyboard::GuiKeyboard(char * t, u32 max, int min, int lang) this->Append(keyClear); keyAltImg = new GuiImage(keyMedium); - keyAltOverImg = new GuiImage(keyMediumOver); + keyAltOverImg = new GuiImage(keyMedium); keyAltText = new GuiText("Alt Gr", 20, ( GXColor ) { 0, 0, 0, 0xff}); 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); - keyAlt2OverImg = new GuiImage(keyMediumOver); + keyAlt2OverImg = new GuiImage(keyMedium); keyAlt2Text = new GuiText("Accent", 20, ( GXColor ) { 0, 0, 0, 0xff}); 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); - keyCapsOverImg = new GuiImage(keyMediumOver); + keyCapsOverImg = new GuiImage(keyMedium); keyCapsText = new GuiText("Caps", 20, ( GXColor ) { 0, 0, 0, 0xff}); 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); keyShiftImg = new GuiImage(keyMedium); - keyShiftOverImg = new GuiImage(keyMediumOver); + keyShiftOverImg = new GuiImage(keyMedium); keyShiftText = new GuiText("Shift", 20, ( GXColor ) { 0, 0, 0, 0xff}); 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); 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, btnSoundClick, 1); //keySpace = new GuiButton(keyLarge->GetWidth(), keyLarge->GetHeight()); @@ -360,9 +359,7 @@ GuiKeyboard::~GuiKeyboard() delete key; delete keyOver; delete keyMedium; - delete keyMediumOver; delete keyLarge; - delete keyLargeOver; delete trigA; delete trigB; diff --git a/source/libwiigui/gui_numpad.cpp b/source/libwiigui/gui_numpad.cpp index 5e770305..726b3aaa 100644 --- a/source/libwiigui/gui_numpad.cpp +++ b/source/libwiigui/gui_numpad.cpp @@ -17,8 +17,6 @@ * Constructor for the GuiNumpad class. */ -#define SAFEFREE(p) if(p){free(p);p=NULL;} - GuiNumpad::GuiNumpad(char * t, u32 max) { 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' }; 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->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); keyTextboxImg->SetPosition(0, 40);//(0,0); @@ -48,8 +46,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max) kbText->SetPassChar('*'); this->Append(kbText); - keyMedium = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); - keyMediumOver = new GuiImageData(keyboard_mediumkey_over_png, keyboard_mediumkey_over_png_size); + keyMedium = new GuiImageData("keyboard_mediumkey_over.png"); trigA = new GuiTrigger; 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); keyBackImg = new GuiImage(keyMedium); - keyBackOverImg = new GuiImage(keyMediumOver); + keyBackOverImg = new GuiImage(keyMedium); keyBackText = new GuiText("Back", 20, ( GXColor ) { 0, 0, 0, 0xff}); @@ -67,7 +64,7 @@ GuiNumpad::GuiNumpad(char * t, u32 max) this->Append(keyBack); keyClearImg = new GuiImage(keyMedium); - keyClearOverImg = new GuiImage(keyMediumOver); + keyClearOverImg = new GuiImage(keyMedium); keyClearText = new GuiText("Clear", 20, ( GXColor ) { 0, 0, 0, 0xff}); 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; keyImg[i] = new GuiImage(keyMedium); - keyImgOver[i] = new GuiImage(keyMediumOver); + keyImgOver[i] = new GuiImage(keyMedium); txt[0] = keys[i]; keyTxt[i] = new GuiText(txt, 20, ( GXColor ) { 0, 0, 0, 0xff}); @@ -103,30 +100,29 @@ GuiNumpad::GuiNumpad(char * t, u32 max) */ GuiNumpad::~GuiNumpad() { - SAFEFREE( kbText ) - SAFEFREE( keyTextbox ) - SAFEFREE( keyTextboxImg ) - SAFEFREE( keyBackText ) - SAFEFREE( keyBackImg ) - SAFEFREE( keyBackOverImg ) - SAFEFREE( keyBack ) - SAFEFREE( keyClear ) - SAFEFREE( keyClearImg ) - SAFEFREE( keyClearOverImg ) - SAFEFREE( keyClearText ) - SAFEFREE( keyMedium ) - SAFEFREE( keyMediumOver ) - SAFEFREE( trigA ) - SAFEFREE( trigB ) + delete kbText; + delete keyTextbox; + delete keyTextboxImg; + delete keyBackText; + delete keyBackImg; + delete keyBackOverImg; + delete keyBack; + delete keyClear; + delete keyClearImg; + delete keyClearOverImg; + delete keyClearText; + delete keyMedium; + delete trigA; + delete trigB; for (int i = 0; i < 11; i++) { if (keys[i] != '\0') { - SAFEFREE( keyImg[i] ) - SAFEFREE( keyImgOver[i] ) - SAFEFREE( keyTxt[i] ) - SAFEFREE( keyBtn[i] ) + delete keyImg[i]; + delete keyImgOver[i]; + delete keyTxt[i]; + delete keyBtn[i]; } } } diff --git a/source/libwiigui/gui_searchbar.cpp b/source/libwiigui/gui_searchbar.cpp index 0f17ac26..96dca82b 100644 --- a/source/libwiigui/gui_searchbar.cpp +++ b/source/libwiigui/gui_searchbar.cpp @@ -31,7 +31,9 @@ class cSearchButton GuiSearchBar::GuiSearchBar(const wchar_t *SearchChars) : 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); SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); diff --git a/source/libwiigui/gui_tooltip.cpp b/source/libwiigui/gui_tooltip.cpp index b3fa5365..76729258 100644 --- a/source/libwiigui/gui_tooltip.cpp +++ b/source/libwiigui/gui_tooltip.cpp @@ -9,25 +9,26 @@ ***************************************************************************/ #include "gui.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); - +#include "themes/CTheme.h" /** * Constructor for the GuiTooltip class. */ -GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/) : - leftImage(&tooltipLeft), tileImage(&tooltipTile), rightImage(&tooltipRight) +GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/) { + 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; - height = leftImage.GetHeight(); - leftImage.SetParent(this); - tileImage.SetParent(this); - rightImage.SetParent(this); - leftImage.SetParentAngle(false); - tileImage.SetParentAngle(false); - rightImage.SetParentAngle(false); + height = leftImage->GetHeight(); + leftImage->SetParent(this); + tileImage->SetParent(this); + rightImage->SetParent(this); + leftImage->SetParentAngle(false); + tileImage->SetParentAngle(false); + rightImage->SetParentAngle(false); SetText(t); SetAlpha(Alpha); } @@ -38,6 +39,13 @@ GuiTooltip::GuiTooltip(const char *t, int Alpha/*=255*/) : GuiTooltip::~GuiTooltip() { if (text) delete text; + + delete tooltipLeft; + delete tooltipTile; + delete tooltipRight; + delete leftImage; + delete tileImage; + delete rightImage; } float GuiTooltip::GetScale() @@ -63,13 +71,13 @@ void GuiTooltip::SetText(const char * t) { 0, 0, 0, 255}))) { text->SetParent(this); - tile_cnt = (text->GetTextWidth() - 12) / tileImage.GetWidth(); + tile_cnt = (text->GetTextWidth() - 12) / tileImage->GetWidth(); if (tile_cnt < 0) tile_cnt = 0; } - tileImage.SetPosition(leftImage.GetWidth(), 0); - tileImage.SetTile(tile_cnt); - rightImage.SetPosition(leftImage.GetWidth() + tile_cnt * tileImage.GetWidth(), 0); - width = leftImage.GetWidth() + tile_cnt * tileImage.GetWidth() + rightImage.GetWidth(); + tileImage->SetPosition(leftImage->GetWidth(), 0); + tileImage->SetTile(tile_cnt); + rightImage->SetPosition(leftImage->GetWidth() + tile_cnt * tileImage->GetWidth(), 0); + width = leftImage->GetWidth() + tile_cnt * tileImage->GetWidth() + rightImage->GetWidth(); } void GuiTooltip::SetWidescreen(bool ) @@ -83,9 +91,9 @@ void GuiTooltip::Draw() LOCK( this ); if (!this->IsVisible()) return; - leftImage.Draw(); - tileImage.Draw(); - rightImage.Draw(); + leftImage->Draw(); + tileImage->Draw(); + rightImage->Draw(); if (text) text->Draw(); this->UpdateEffects(); diff --git a/source/menu.cpp b/source/menu.cpp index 19d37f26..c5819efe 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -48,24 +48,13 @@ GuiSound *btnSoundClick = NULL; GuiSound *btnSoundClick2 = NULL; GuiSound *btnSoundOver = NULL; -int currentMenu; +int currentMenu = 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 bool guiHalt = true; static bool ExitRequested = false; -/*** Extern variables ***/ -extern u8 shutdown; -extern u8 reset; -extern s32 gameSelected, gameStart; - /**************************************************************************** * ResumeGui * @@ -190,9 +179,9 @@ int MainMenu(int menu) if (Settings.autonetwork) ResumeNetworkThread(); - btnSoundClick = new GuiSound(button_click_wav, button_click_wav_size, Settings.sfxvolume); - btnSoundClick2 = new GuiSound(button_click2_wav, button_click2_wav_size, Settings.sfxvolume); - btnSoundOver = new GuiSound(button_over_wav, button_over_wav_size, Settings.sfxvolume); + btnSoundClick = new GuiSound(Resources::GetFile("button_click.wav"), Resources::GetFileSize("button_click.wav"), Settings.sfxvolume); + btnSoundClick2 = new GuiSound(Resources::GetFile("button_click2.wav"), Resources::GetFileSize("button_click2.wav"), 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[1] = Resources::GetImageData("player2_point.png"); @@ -208,7 +197,7 @@ int MainMenu(int menu) 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->Load(Settings.ogg_path); bgMusic->Play(); diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp index e56062a9..357d5bb9 100644 --- a/source/menu/GameBrowseMenu.cpp +++ b/source/menu/GameBrowseMenu.cpp @@ -287,12 +287,12 @@ GameBrowseMenu::GameBrowseMenu() 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->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->SetAlignment(thAlign("left - clock align hor"), thAlign("top - clock align ver")); 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(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"), 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->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"), 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->SetPosition(thInt("0 - game carousel layout pos x"), thInt("0 - game carousel layout pos y")); + 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("-20 - game carousel layout pos y")); gameCarousel->SetAlignment(ALIGN_LEFT, ALIGN_CENTRE); } diff --git a/source/menu/menu_install.cpp b/source/menu/menu_install.cpp index 470447a9..6bfe2a9d 100644 --- a/source/menu/menu_install.cpp +++ b/source/menu/menu_install.cpp @@ -100,7 +100,7 @@ int MenuInstall() gameList.FilterList(); GuiSound * instsuccess = NULL; 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->SetLoop(0); instsuccess->Play(); diff --git a/source/menu/menus.h b/source/menu/menus.h index fbb2f825..0137b780 100644 --- a/source/menu/menus.h +++ b/source/menu/menus.h @@ -6,7 +6,6 @@ #include "prompts/PromptWindows.h" #include "menu.h" #include "gecko.h" -#include "filelist.h" #include "sys.h" extern u8 shutdown; diff --git a/source/prompts/DiscBrowser.cpp b/source/prompts/DiscBrowser.cpp index 17cb35d9..19360e4a 100644 --- a/source/prompts/DiscBrowser.cpp +++ b/source/prompts/DiscBrowser.cpp @@ -9,7 +9,6 @@ #include "libwiigui/gui.h" #include "libwiigui/gui_customoptionbrowser.h" #include "prompts/PromptWindows.h" -#include "filelist.h" #include "menu.h" #include "usbloader/disc.h" #include "usbloader/fstfile.h" diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp index 67227584..88444d8a 100644 --- a/source/prompts/GameWindow.cpp +++ b/source/prompts/GameWindow.cpp @@ -456,20 +456,6 @@ int GameWindow::MainLoop() wiilight(0); 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) { returnVal = 1; @@ -579,6 +565,23 @@ int GameWindow::MainLoop() 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) { if(FavoriteBtn[i]->GetState() == STATE_CLICKED) diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 4164bc29..16426911 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -30,7 +30,6 @@ #include "FileOperations/fileops.h" #include "menu.h" #include "menu.h" -#include "filelist.h" #include "sys.h" #include "wpad.h" #include "wad/wad.h" @@ -209,7 +208,7 @@ void WindowCredits() 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->SetLoop(1); creditsMusic->Play(); @@ -222,12 +221,12 @@ void WindowCredits() GuiWindow creditsWindowBox(580, 448); 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); creditsBoxImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); 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); starImg.SetWidescreen(Settings.widescreen); //added starImg.SetAlignment(ALIGN_LEFT, ALIGN_TOP); @@ -802,13 +801,13 @@ int WindowExitPrompt() bgMusic->Pause(); 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->SetLoop(0); homein->Play(); 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->SetLoop(0); @@ -821,13 +820,13 @@ int WindowExitPrompt() GuiWindow promptWindow(640, 480); promptWindow.SetAlignment(ALIGN_LEFT, ALIGN_TOP); promptWindow.SetPosition(0, 0); - GuiImageData top(exit_top_png, exit_top_png_size); - GuiImageData topOver(exit_top_over_png, exit_top_over_png_size); - GuiImageData bottom(exit_bottom_png, exit_bottom_png_size); - GuiImageData bottomOver(exit_bottom_over_png, exit_bottom_over_png_size); - GuiImageData button(exit_button_png, exit_button_png_size); - GuiImageData wiimote(wiimote_png, wiimote_png_size); - GuiImageData close(closebutton_png, closebutton_png_size); + GuiImageData top(Resources::GetFile("exit_top.png"), Resources::GetFileSize("exit_top.png")); + GuiImageData topOver(Resources::GetFile("exit_top_over.png"), Resources::GetFileSize("exit_top_over.png")); + GuiImageData bottom(Resources::GetFile("exit_bottom.png"), Resources::GetFileSize("exit_bottom.png")); + GuiImageData bottomOver(Resources::GetFile("exit_bottom_over.png"), Resources::GetFileSize("exit_bottom_over.png")); + GuiImageData button(Resources::GetFile("exit_button.png"), Resources::GetFileSize("exit_button.png")); + GuiImageData wiimote(Resources::GetFile("wiimote.png"), Resources::GetFileSize("wiimote.png")); + GuiImageData close(Resources::GetFile("closebutton.png"), Resources::GetFileSize("closebutton.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")); diff --git a/source/prompts/TitleBrowser.cpp b/source/prompts/TitleBrowser.cpp index 39776bfd..04c78ad2 100644 --- a/source/prompts/TitleBrowser.cpp +++ b/source/prompts/TitleBrowser.cpp @@ -15,7 +15,6 @@ #include "prompts/ProgressWindow.h" #include "network/networkops.h" #include "network/http.h" -#include "filelist.h" #include "FileOperations/fileops.h" #include "themes/CTheme.h" #include "sys.h" diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp index 7b6c1e9f..d23729a6 100644 --- a/source/prompts/gameinfo.cpp +++ b/source/prompts/gameinfo.cpp @@ -12,7 +12,6 @@ #include "xml/xml.h" #include "menu.h" #include "menu/menus.h" -#include "filelist.h" #include "sys.h" #include "wpad.h" #include "FileOperations/fileops.h" diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp index aaf09c5c..4041e76e 100644 --- a/source/settings/SettingsPrompts.cpp +++ b/source/settings/SettingsPrompts.cpp @@ -15,7 +15,6 @@ #include "FileOperations/fileops.h" #include "FileOperations/DirList.h" #include "main.h" -#include "filelist.h" #include "prompts/filebrowser.h" #include "sys.h" #include "menu/menus.h" diff --git a/source/themes/CTheme.cpp b/source/themes/CTheme.cpp index 22213ef9..94a9044c 100644 --- a/source/themes/CTheme.cpp +++ b/source/themes/CTheme.cpp @@ -33,8 +33,8 @@ #include "FreeTypeGX.h" FreeTypeGX * fontSystem = NULL; -static FT_Byte * MainFont = (FT_Byte *) font_ttf; -static u32 MainFontSize = font_ttf_size; +static FT_Byte * MainFont = NULL; +static u32 MainFontSize = 0; bool Theme::ShowTooltips = true; @@ -142,12 +142,7 @@ bool Theme::LoadFont(const char *path) rewind(pfile); MainFont = new (std::nothrow) FT_Byte[MainFontSize]; - if (!MainFont) - { - MainFont = (FT_Byte *) font_ttf; - MainFontSize = font_ttf_size; - } - else + if (MainFont) { fread(MainFont, 1, MainFontSize, pfile); result = true; @@ -155,20 +150,21 @@ bool Theme::LoadFont(const char *path) 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; } void Theme::ClearFontData() { - if (fontSystem) delete fontSystem; + if (fontSystem) + delete fontSystem; fontSystem = NULL; - if (MainFont != (FT_Byte *) font_ttf) - { - if (MainFont != NULL) delete [] MainFont; - MainFont = (FT_Byte *) font_ttf; - MainFontSize = font_ttf_size; - } + if (MainFont) + delete [] MainFont; + MainFont = NULL; } diff --git a/source/themes/Resources.cpp b/source/themes/Resources.cpp index 5fec594e..26926a03 100644 --- a/source/themes/Resources.cpp +++ b/source/themes/Resources.cpp @@ -172,6 +172,16 @@ RecourceFile Resources::RecourceFiles[] = {"unlock.png", unlock_png, unlock_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}, + {"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} }; diff --git a/source/themes/Resources.h b/source/themes/Resources.h index 62978921..0702622c 100644 --- a/source/themes/Resources.h +++ b/source/themes/Resources.h @@ -2,7 +2,6 @@ #define RECOURCES_H_ #include "libwiigui/gui_imagedata.h" -#include "filelist.h" typedef struct _RecourceFile { diff --git a/source/usbloader/wbfs.cpp b/source/usbloader/wbfs.cpp index ad9d9af5..a8cdccc0 100644 --- a/source/usbloader/wbfs.cpp +++ b/source/usbloader/wbfs.cpp @@ -66,6 +66,11 @@ s32 WBFS_OpenPart(int part_num) { current = new Wbfs_Wbfs(wbfsDev, usbHandle->GetLBAStart(part_num), usbHandle->GetSecCount(part_num)); } + else + { + return -1; + } + if (current->Open()) { delete current; diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp index 0b0f33e6..6d972119 100644 --- a/source/usbloader/wbfs/wbfs_fat.cpp +++ b/source/usbloader/wbfs/wbfs_fat.cpp @@ -34,7 +34,7 @@ using namespace std; -int wbfs_part_fs; +int wbfs_part_fs = -1; char Wbfs_Fat::wbfs_fs_drive[16]; char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs"; @@ -571,6 +571,10 @@ s32 Wbfs_Fat::GetHeadersCount() // succes: add tmpHdr to list: add_hdr: memset(&st, 0, sizeof(st)); //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_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)); diff --git a/source/utils/ResourceManager.h b/source/utils/ResourceManager.h index 320ca910..e1897087 100644 --- a/source/utils/ResourceManager.h +++ b/source/utils/ResourceManager.h @@ -27,7 +27,6 @@ #include #include "libwiigui/gui.h" -#include "filelist.h" #include diff --git a/source/utils/rockout.cpp b/source/utils/rockout.cpp index 1f69025c..5391cdb9 100644 --- a/source/utils/rockout.cpp +++ b/source/utils/rockout.cpp @@ -8,9 +8,11 @@ extern GuiImageData * pointer[4]; void rockout(int gameSelected, int f) { + static bool rockoutSet = false; + 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]), "rock"))) { @@ -20,16 +22,19 @@ void rockout(int gameSelected, int f) pointer[1] = Resources::GetImageData("rplayer2_point.png"); pointer[2] = Resources::GetImageData("rplayer3_point.png"); pointer[3] = Resources::GetImageData("rplayer4_point.png"); - } - else - { + rockoutSet = true; + } + else if(rockoutSet) + { for (int i = 0; i < 4; i++) delete pointer[i]; pointer[0] = Resources::GetImageData("player1_point.png"); pointer[1] = Resources::GetImageData("player2_point.png"); pointer[2] = Resources::GetImageData("player3_point.png"); pointer[3] = Resources::GetImageData("player4_point.png"); + + rockoutSet = false; } ResumeGui(); } diff --git a/source/wad/wad.cpp b/source/wad/wad.cpp index c0389df1..831c1d13 100644 --- a/source/wad/wad.cpp +++ b/source/wad/wad.cpp @@ -14,15 +14,8 @@ #include "libwiigui/gui.h" #include "language/gettext.h" #include "menu.h" -#include "filelist.h" #include "themes/CTheme.h" -/*** Extern functions ***/ -extern void ResumeGui(); -extern void HaltGui(); -/*** Extern variables ***/ -extern GuiWindow * mainWindow; - /* 'WAD Header' structure */ typedef struct {