diff --git a/HBC/META.XML b/HBC/META.XML index ac50fcfd..7f3e5b2f 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 1.0 r1020 - 201012270947 + 1.0 r1021 + 201012271830 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. diff --git a/Languages/czech.lang b/Languages/czech.lang index 14f3cec0..bfecd5d3 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Language-Team: r823 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "Kvet" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Chybející soubory" diff --git a/Languages/danish.lang b/Languages/danish.lang index 66573993..e9d86d8a 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: dorf[dk]\n" "Language-Team: dorf[dk]\n" @@ -675,6 +675,9 @@ msgstr "Makér nye spil" msgid "May" msgstr "Maj" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Manglende filer" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index c4e8a304..1d8ef56c 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2010-04-12 07:37+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" @@ -675,6 +675,9 @@ msgstr "Markeer nieuwe spellen" msgid "May" msgstr "Mei" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Missende bestanden" diff --git a/Languages/english.lang b/Languages/english.lang index 3f9c5141..6039a91f 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 912ecf6f..17e08df2 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "touko" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "tiedostoja puuttuu" diff --git a/Languages/french.lang b/Languages/french.lang index 06cbe4c4..312027df 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -675,6 +675,9 @@ msgstr "Marqueur nouveau jeu" msgid "May" msgstr "Mai" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Fichier(s) manquant(s)" diff --git a/Languages/german.lang b/Languages/german.lang index a97ca3b8..7efce13f 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ZEN.13\n" "Language-Team: Snoozer, wishmasterf, Bertilax, ZEN.13\n" @@ -675,6 +675,9 @@ msgstr "Neue Spiele markieren" msgid "May" msgstr "Mai" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Fehlende Dateien" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 9a8425c1..9ad0566c 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" @@ -675,6 +675,9 @@ msgstr "Új játékok megjelölése" msgid "May" msgstr "Máj" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Hiányzó fájl" diff --git a/Languages/italian.lang b/Languages/italian.lang index 6082aa9e..7276b1f0 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2010-02-21 08:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: FoxeJoe, Cambo\n" @@ -675,6 +675,9 @@ msgstr "Evidenzia i nuovi giochi" msgid "May" msgstr "maggio" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "File Mancante/i" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index f58df13c..4447e954 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: hosigumayuugi\n" "Language-Team: hosigumayuugi\n" @@ -675,6 +675,9 @@ msgstr "Newマークの表示機能" msgid "May" msgstr "5月" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "個の画像" diff --git a/Languages/korean.lang b/Languages/korean.lang index 8b9a467b..2dd3ccc2 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "5월" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "파일 누락" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 3e129289..8b6c4f23 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "Mai" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Manglende filer" diff --git a/Languages/polish.lang b/Languages/polish.lang index 29ba4fec..2000b03b 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -675,6 +675,9 @@ msgstr "Oznacz nowe gry" msgid "May" msgstr "Maj" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Brakuje plikow" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index b79b3d09..c586159a 100644 --- a/Languages/portuguese_br.lang +++ b/Languages/portuguese_br.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: aniemotion\n" "Language-Team: boto12, aniemotion\n" @@ -675,6 +675,9 @@ msgstr "Marcar games novos" msgid "May" msgstr "Mai" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Faltando arquivos" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index c3545a66..8ce9fd98 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2010-03-22 10:55-0000\n" "Last-Translator: Sky8000\n" "Language-Team: Sky8000 \n" @@ -675,6 +675,9 @@ msgstr "Marcar jogos novos" msgid "May" msgstr "Mai" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Ficheiros em falta" diff --git a/Languages/russian.lang b/Languages/russian.lang index b60178bb..a51061f4 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n" @@ -675,6 +675,9 @@ msgstr "Отметить новые игры" msgid "May" msgstr "Май" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Отсутствующие файлы" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index b1a28711..6080d0d2 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid\n" "Language-Team: kavid\n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "五月" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "缺少的文件" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 4c6f3a6a..600241a2 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: SirPalax\n" "Language-Team: Penn, SirPalax\n" @@ -675,6 +675,9 @@ msgstr "Marcar juegos nuevos" msgid "May" msgstr "" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Archivo(s) pendiente(s)" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 3af57706..abced01e 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -675,6 +675,9 @@ msgstr "Markera nya spel" msgid "May" msgstr "Maj" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Filer som saknas" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index 1a7e089c..a468731e 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+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" @@ -675,6 +675,9 @@ msgstr "標示新遊戲" msgid "May" msgstr "五月" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "缺少的文件" diff --git a/Languages/thai.lang b/Languages/thai.lang index e6ed4bea..3b07eade 100644 --- a/Languages/thai.lang +++ b/Languages/thai.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -675,6 +675,9 @@ msgstr "" msgid "May" msgstr "พค." +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "ไฟล์ที่หาไม่พบ" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index 66faabcd..75d45ee5 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-26 16:16+0100\n" +"POT-Creation-Date: 2010-12-27 21:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -675,6 +675,9 @@ msgstr "Yeni oyunlari imle" msgid "May" msgstr "" +msgid "Messageboard Update" +msgstr "" + msgid "Missing files" msgstr "Kayıp dosyalar" diff --git a/Themes/Default.them b/Themes/Default.them index fafa6b55..6ac1375b 100644 --- a/Themes/Default.them +++ b/Themes/Default.them @@ -1,405 +1,405 @@ -# 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: 2010-12-26 16:16+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" -"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 ver" -msgstr "" - -msgid "top - hdd info align hor" -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 ver" -msgstr "" - -msgid "top - game count align hor" -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 x" -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 ver" -msgstr "" - -msgid "top - clock align hor" -msgstr "" - -msgid "275 - clock pos x" -msgstr "" - -msgid "275 - 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 x" -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 x" -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 x" -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: 2010-12-27 22:39+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" +"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 ver" +msgstr "" + +msgid "top - hdd info align hor" +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 ver" +msgstr "" + +msgid "top - game count align hor" +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 ver" +msgstr "" + +msgid "top - clock align hor" +msgstr "" + +msgid "275 - clock pos x" +msgstr "" + +msgid "275 - 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 x" +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 x" +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 x" +msgstr "" + +msgid "68 - region info text pos x" +msgstr "" + +msgid "1 - Enable tooltips: 0 for off and 1 for on" +msgstr "" diff --git a/gui.pnproj b/gui.pnproj index fcca93dd..8f58c63d 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/FontSystem.cpp b/source/FontSystem.cpp deleted file mode 100644 index 74ede3a1..00000000 --- a/source/FontSystem.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - * Copyright (C) 2010 - * by Dimok - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any - * damages arising from the use of this software. - * - * Permission is granted to anyone to use this software for any - * purpose, including commercial applications, and to alter it and - * redistribute it freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you - * must not claim that you wrote the original software. If you use - * this software in a product, an acknowledgment in the product - * documentation would be appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and - * must not be misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. - * - * for WiiXplorer 2010 - ***************************************************************************/ -#include "FreeTypeGX.h" -#include "filelist.h" - -FreeTypeGX * fontSystem = NULL; -static FT_Byte * MainFont = (FT_Byte *) font_ttf; -static u32 MainFontSize = font_ttf_size; - -void ClearFontData() -{ - 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; - } -} - -bool SetupDefaultFont(const char *path) -{ - bool result = false; - FILE *pfile = NULL; - char FontPath[300]; - - ClearFontData(); - - snprintf(FontPath, sizeof(FontPath), "%sfont.ttf", path); - - pfile = fopen(FontPath, "rb"); - - if (pfile) - { - fseek(pfile, 0, SEEK_END); - MainFontSize = ftell(pfile); - rewind(pfile); - - MainFont = new (std::nothrow) FT_Byte[MainFontSize]; - if (!MainFont) - { - MainFont = (FT_Byte *) font_ttf; - MainFontSize = font_ttf_size; - } - else - { - fread(MainFont, 1, MainFontSize, pfile); - result = true; - } - fclose(pfile); - } - - fontSystem = new FreeTypeGX(MainFont, MainFontSize); - - return result; -} diff --git a/source/FontSystem.h b/source/FontSystem.h deleted file mode 100644 index e68b43a9..00000000 --- a/source/FontSystem.h +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** - * Copyright (C) 2010 - * by Dimok - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any - * damages arising from the use of this software. - * - * Permission is granted to anyone to use this software for any - * purpose, including commercial applications, and to alter it and - * redistribute it freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you - * must not claim that you wrote the original software. If you use - * this software in a product, an acknowledgment in the product - * documentation would be appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and - * must not be misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. - * - * for WiiXplorer 2010 - ***************************************************************************/ -#ifndef FONTSYSTEM_H_ -#define FONTSYSTEM_H_ - -bool SetupDefaultFont(const char *path); -void ClearFontData(); - -#endif diff --git a/source/GameBootProcess.cpp b/source/GameBootProcess.cpp index 1fd13964..4c4634ac 100644 --- a/source/GameBootProcess.cpp +++ b/source/GameBootProcess.cpp @@ -21,7 +21,6 @@ #include "menu/menus.h" #include "memory/memory.h" #include "fatmounter.h" -#include "FontSystem.h" #include "sys.h" //appentrypoint has to be global because of asm @@ -209,8 +208,7 @@ int BootGame(const char * gameID) } shadow_mload(); - UnmountNTFS(); - UnmountEXT(); + WBFS_Close(); SDCard_deInit(); USBDevice_deInit(); USB_Deinitialize(); diff --git a/source/fatmounter.c b/source/fatmounter.c index 846c7085..51a88acd 100644 --- a/source/fatmounter.c +++ b/source/fatmounter.c @@ -40,15 +40,6 @@ sec_t fat_sd_sec = 0; // u32 int fat_usb_mount = 0; sec_t fat_usb_sec = 0; -int fat_wbfs_mount = 0; -sec_t fat_wbfs_sec = 0; - -int fs_ntfs_mount = 0; -sec_t fs_ntfs_sec = 0; - -int fs_ext_mount = 0; -sec_t fs_ext_sec = 0; - int USBDevice_Init() { //closing all open Files write back the cache and then shutdown em! @@ -124,30 +115,6 @@ void USBDevice_deInit() fat_usb_sec = 0; } -int WBFSDevice_Init(u32 sector) -{ - //closing all open Files write back the cache and then shutdown em! - fatUnmount("WBFS:/"); - - if (!fatMount("WBFS", &__io_usbstorage2, 0, CACHE, SECTORS)) - { - return -1; - } - - fat_wbfs_mount = 1; - fat_wbfs_sec = _FAT_startSector; - - return 0; -} - -void WBFSDevice_deInit() -{ - fatUnmount("WBFS:/"); - - fat_wbfs_mount = 0; - fat_wbfs_sec = 0; -} - int isInserted(const char *path) { if (!strncmp(path, "USB:", 4)) return 1; @@ -189,83 +156,3 @@ void SDCard_deInit() fat_sd_mount = MOUNT_NONE; fat_sd_sec = 0; } - -s32 MountNTFS(u32 sector) -{ - s32 ret; - - if (fs_ntfs_mount) - return 0; - - if (wbfsDev == WBFS_DEVICE_USB) - { - ret = ntfsMount("NTFS", &__io_usbstorage2, sector, CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER); - if (!ret) - return -2; - } - else if (wbfsDev == WBFS_DEVICE_SDHC) - { - if (sdhc_mode_sd == 0) - { - ret = ntfsMount("NTFS", &__io_sdhc, 0, CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER); - } - else - { - ret = ntfsMount("NTFS", &__io_sdhc, 0, CACHE, SECTORS_SD, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER); - } - if (!ret) - { - return -5; - } - } - - // ntfsInit() resets locals - // which breaks unicode in console - // so we change it back to C-UTF-8 - setlocale(LC_CTYPE, "C-UTF-8"); - setlocale(LC_MESSAGES, "C-UTF-8"); - - fs_ntfs_mount = 1; - fs_ntfs_sec = sector; - - return 0; -} - -s32 UnmountNTFS(void) -{ - /* Unmount device */ - ntfsUnmount("NTFS:/", true); - - fs_ntfs_mount = 0; - fs_ntfs_sec = 0; - - return 0; -} - -s32 MountEXT(u32 sector) -{ - s32 ret; - - if (fs_ext_mount) - return 0; - - ret = ext2Mount("EXT", &__io_usbstorage2, sector, CACHE, SECTORS, EXT2_FLAG_DEFAULT); - if (!ret) - return -2; - - fs_ext_mount = 1; - fs_ext_sec = sector; - - return 0; -} - -s32 UnmountEXT(void) -{ - /* Unmount device */ - ext2Unmount("EXT:/"); - - fs_ext_mount = 0; - fs_ext_sec = 0; - - return 0; -} diff --git a/source/libs/libext2fs/libcustomext2fs.a b/source/libs/libext2fs/libcustomext2fs.a index da332bc6..c0af64b5 100644 Binary files a/source/libs/libext2fs/libcustomext2fs.a and b/source/libs/libext2fs/libcustomext2fs.a differ diff --git a/source/libwiigui/gui_gamecarousel.cpp b/source/libwiigui/gui_gamecarousel.cpp index 1ab4f42b..61661832 100644 --- a/source/libwiigui/gui_gamecarousel.cpp +++ b/source/libwiigui/gui_gamecarousel.cpp @@ -47,7 +47,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) : - noCover(nocover_png, nocover_png_size) + noCover(Resources::GetFile("nocover.png"), Resources::GetFileSize("nocover.png")) { width = w; height = h; diff --git a/source/libwiigui/gui_gamegrid.cpp b/source/libwiigui/gui_gamegrid.cpp index 73793830..e6203c2e 100644 --- a/source/libwiigui/gui_gamegrid.cpp +++ b/source/libwiigui/gui_gamegrid.cpp @@ -203,7 +203,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) : - noCover(nocoverFlat_png, nocoverFlat_png_size) + noCover(Resources::GetFile("nocoverFlat.png"), Resources::GetFileSize("nocoverFlat.png")) { width = w; height = h; diff --git a/source/main.cpp b/source/main.cpp index 830780cf..f9c818e0 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -23,8 +23,6 @@ #include "language/gettext.h" #include "mload/mload.h" #include "mload/mload_modules.h" -#include "FreeTypeGX.h" -#include "FontSystem.h" #include "video.h" #include "audio.h" #include "menu/menus.h" @@ -91,7 +89,6 @@ int main(int argc, char *argv[]) printf("\tLoading game settings...%s\n", GameSettings.Load(Settings.ConfigPath) ? "done" : "failed"); printf("\tLoading game statistics...%s\n", GameStatistics.Load(Settings.ConfigPath) ? "done" : "failed"); printf("\tLoading theme...%s\n", Theme::Load(Settings.theme_path) ? "done" : "failed (using default)"); - printf("\tLoading font system...%s\n", SetupDefaultFont(Settings.theme_path) ? "done" : "failed (using default)"); VIDEO_SetWidescreen(Settings.widescreen); diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp index 0e8de255..e4dc4b8d 100644 --- a/source/menu/GameBrowseMenu.cpp +++ b/source/menu/GameBrowseMenu.cpp @@ -166,7 +166,7 @@ GameBrowseMenu::GameBrowseMenu() homeBtnImgOver = new GuiImage(btnhomeOver); homeBtnImgOver->SetWidescreen(Settings.widescreen); homeBtn = new GuiButton(homeBtnImg, homeBtnImgOver, 0, 3, - thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos x"), + thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos y"), trigA, btnSoundOver, btnSoundClick2, 1, homeBtnTT, 15, -30, 1, 5); homeBtn->RemoveSoundClick(); homeBtn->SetTrigger(trigHome); diff --git a/source/menu/menu_partition_selection.cpp b/source/menu/menu_partition_selection.cpp index f2c2ea8a..d3e83093 100644 --- a/source/menu/menu_partition_selection.cpp +++ b/source/menu/menu_partition_selection.cpp @@ -69,7 +69,7 @@ int SelectPartitionMenu() exitBtnImg.SetWidescreen(Settings.widescreen); exitBtnImgOver.SetWidescreen(Settings.widescreen); GuiButton exitBtn(&exitBtnImg, &exitBtnImgOver, 0, 3, - thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos x"), + thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos y"), &trigA, btnSoundOver, btnSoundClick2, 1); exitBtn.SetTrigger(&trigHome); diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp index 426d6e47..67227584 100644 --- a/source/prompts/GameWindow.cpp +++ b/source/prompts/GameWindow.cpp @@ -472,9 +472,6 @@ int GameWindow::MainLoop() } else if (gameBtn->GetState() == STATE_CLICKED) { - struct discHdr * header = (mountMethod ? dvdheader : gameList[gameSelected]); - GameStatistics.SetPlayCount(header->id, GameStatistics.GetPlayCount(header->id)+1); - GameStatistics.Save(); returnVal = 1; } else if (backBtn->GetState() == STATE_CLICKED) //back diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp index 51f3cec8..13420c99 100644 --- a/source/settings/SettingsPrompts.cpp +++ b/source/settings/SettingsPrompts.cpp @@ -272,14 +272,13 @@ int MenuLanguageSelect() w.Append( &pathBtn ); w.Append( &backBtn ); w.Append( &defaultBtn ); - if ( result == 1 ) + if (result == 1) { - int len = ( strlen( entered ) - 1 ); - if ( entered[len] != '/' ) - strncat ( entered, "/", 1 ); - strlcpy( Settings.languagefiles_path, entered, sizeof( Settings.languagefiles_path ) ); - WindowPrompt( tr( "Languagepath changed." ), 0, tr( "OK" ) ); - if ( isInserted( Settings.BootDevice ) ) + if (entered[strlen(entered)-1] != '/') + strcat (entered, "/"); + snprintf(Settings.languagefiles_path, sizeof(Settings.languagefiles_path), entered); + WindowPrompt(tr("Languagepath changed."), 0, tr("OK")); + if (isInserted(Settings.BootDevice)) { Settings.Save(); returnhere = 1; @@ -299,19 +298,19 @@ int MenuLanguageSelect() ret = optionBrowser4.GetClickedOption(); - if ( ret >= 0 ) + if (ret >= 0) { choice = WindowPrompt( tr( "Do you want to change language?" ), 0, tr( "Yes" ), tr( "Cancel" ) ); - if ( choice == 1 ) + if (choice == 1) { char newLangPath[150]; - snprintf( Settings.languagefiles_path, sizeof( Settings.languagefiles_path ), "%s", Dir.GetFilepath(ret)); + snprintf(Settings.languagefiles_path, sizeof( Settings.languagefiles_path ), "%s", Dir.GetFilepath(ret)); char * ptr = strrchr(Settings.languagefiles_path, '/'); if(ptr) ptr[1] = 0; - snprintf( newLangPath, sizeof( newLangPath ), "%s", Dir.GetFilepath(ret)); - if ( !CheckFile( newLangPath ) ) + snprintf(newLangPath, sizeof(newLangPath), "%s", Dir.GetFilepath(ret)); + if (!CheckFile(newLangPath)) { - WindowPrompt( tr( "File not found." ), tr( "Loading standard language." ), tr( "OK" ) ); + WindowPrompt(tr("File not found."), tr("Loading standard language."), tr("OK")); Settings.LoadLanguage(NULL, APP_DEFAULT); } else @@ -521,7 +520,9 @@ int MenuThemeSelect() } else { + HaltGui(); Theme::Load(Settings.theme_path); + ResumeGui(); } Settings.Save(); returnVal = 1; diff --git a/source/sys.cpp b/source/sys.cpp index 1006054c..0f3b48ab 100644 --- a/source/sys.cpp +++ b/source/sys.cpp @@ -9,7 +9,8 @@ #include "network/networkops.h" #include "utils/ResourceManager.h" #include "usbloader/playlog.h" -#include "FontSystem.h" +#include "usbloader/wbfs.h" +#include "themes/CTheme.h" #include "audio.h" #include "fatmounter.h" #include "lstub.h" @@ -77,7 +78,7 @@ void AppCleanUp(void) gettextCleanUp(); CloseXMLDatabase(); - ClearFontData(); + Theme::CleanUp(); NewTitles::DestroyInstance(); DeinitNetwork(); @@ -94,8 +95,7 @@ void AppCleanUp(void) void ExitApp(void) { AppCleanUp(); - UnmountNTFS(); - UnmountEXT(); + WBFS_Close(); SDCard_deInit(); USBDevice_deInit(); USB_Deinitialize(); diff --git a/source/themes/CTheme.cpp b/source/themes/CTheme.cpp index 1914c343..6e398843 100644 --- a/source/themes/CTheme.cpp +++ b/source/themes/CTheme.cpp @@ -28,30 +28,45 @@ #include "CTheme.h" #include "libwiigui/gui.h" +#include "FileOperations/fileops.h" +#include "FreeTypeGX.h" + +FreeTypeGX * fontSystem = NULL; +static FT_Byte * MainFont = (FT_Byte *) font_ttf; +static u32 MainFontSize = font_ttf_size; bool Theme::ShowTooltips = true; -void Theme::SetDefault() +void Theme::CleanUp() { - Theme::ShowTooltips = true; ThemeCleanUp(); Resources::Clear(); + ClearFontData(); +} + +void Theme::SetDefault() +{ + ShowTooltips = true; + CleanUp(); + LoadFont(""); } bool Theme::Load(const char * theme_file_path) { - bool result = LoadTheme(theme_file_path); - if(!result) - return result; - - Theme::ShowTooltips = (thInt("1 - Enable tooltips: 0 for off and 1 for on") != 0); - char theme_path[300]; snprintf(theme_path, sizeof(theme_path), theme_file_path); char * ptr = strrchr(theme_path, '/'); if(ptr) *ptr = '\0'; + Theme::LoadFont(theme_path); //! support old font style + + bool result = LoadTheme(theme_file_path); + if(!result) + return result; + + Theme::ShowTooltips = (thInt("1 - Enable tooltips: 0 for off and 1 for on") != 0); + FILE * file = fopen(theme_file_path, "rb"); if(!file) return false; @@ -85,5 +100,62 @@ bool Theme::Load(const char * theme_file_path) snprintf(theme_path, sizeof(theme_path), "%s/%s", theme_path, Foldername); Resources::LoadFiles(theme_path); + //! Override font.ttf with the theme font.ttf if it exists in the image folder + char FontPath[300]; + snprintf(FontPath, sizeof(FontPath), "%s/font.ttf", theme_path); + + if(CheckFile(FontPath)) + Theme::LoadFont(theme_path); + return result; } + +bool Theme::LoadFont(const char *path) +{ + char FontPath[300]; + bool result = false; + FILE *pfile = NULL; + + ClearFontData(); + + snprintf(FontPath, sizeof(FontPath), "%s/font.ttf", path); + + pfile = fopen(FontPath, "rb"); + + if (pfile) + { + fseek(pfile, 0, SEEK_END); + MainFontSize = ftell(pfile); + rewind(pfile); + + MainFont = new (std::nothrow) FT_Byte[MainFontSize]; + if (!MainFont) + { + MainFont = (FT_Byte *) font_ttf; + MainFontSize = font_ttf_size; + } + else + { + fread(MainFont, 1, MainFontSize, pfile); + result = true; + } + fclose(pfile); + } + + fontSystem = new FreeTypeGX(MainFont, MainFontSize); + + return result; +} + +void Theme::ClearFontData() +{ + 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; + } +} diff --git a/source/themes/CTheme.h b/source/themes/CTheme.h index 86a3c48b..0e2d3f39 100644 --- a/source/themes/CTheme.h +++ b/source/themes/CTheme.h @@ -14,8 +14,16 @@ class Theme static void SetDefault(); //!Load static bool Load(const char * path); + //!Load font data + static bool LoadFont(const char *path); + //!Clear all image/font/theme data and free the memory + static void CleanUp(); + //!Enable tooltips: special case treaded because it is called every frame static bool ShowTooltips; + private: + //!Clear the font data and free the memory + static void ClearFontData(); }; #endif diff --git a/source/usbloader/frag.c b/source/usbloader/frag.c index 988467d8..c68d41bb 100644 --- a/source/usbloader/frag.c +++ b/source/usbloader/frag.c @@ -18,8 +18,8 @@ #define SAFE_FREE(x) if(x) { free(x); x = NULL; } -extern sec_t fs_ntfs_sec; -extern sec_t fs_ext_sec; +extern sec_t ntfs_wbfs_sec; +extern sec_t ext_wbfs_sec; static FragList *frag_list = NULL; @@ -212,7 +212,7 @@ int get_frag_list_for_file(char *fname, u8 *id) } // offset to start of partition for (j=0; jnum; j++) { - fs->frag[j].sector += fs_ntfs_sec; + fs->frag[j].sector += ntfs_wbfs_sec; } } else if (wbfs_part_fs == PART_FS_EXT) { ret = _EXT2_get_fragments(fname, &_frag_append, fs); @@ -222,7 +222,7 @@ int get_frag_list_for_file(char *fname, u8 *id) } // offset to start of partition for (j=0; jnum; j++) { - fs->frag[j].sector += fs_ext_sec; + fs->frag[j].sector += ext_wbfs_sec; } } frag_concat(fa, fs); diff --git a/source/usbloader/wbfs/wbfs_base.cpp b/source/usbloader/wbfs/wbfs_base.cpp index af78fa90..a8ab809b 100644 --- a/source/usbloader/wbfs/wbfs_base.cpp +++ b/source/usbloader/wbfs/wbfs_base.cpp @@ -71,17 +71,6 @@ s32 Wbfs::Init(u32 device) return 0; } -void Wbfs::Close() -{ - if (hdd) - { - wbfs_close(hdd); - hdd = NULL; - } - - WBFSDevice_deInit(); -} - // Default behavior: can't format s32 Wbfs::Format() { diff --git a/source/usbloader/wbfs/wbfs_base.h b/source/usbloader/wbfs/wbfs_base.h index 670bfd46..aa85110a 100644 --- a/source/usbloader/wbfs/wbfs_base.h +++ b/source/usbloader/wbfs/wbfs_base.h @@ -5,6 +5,9 @@ #include "usbloader/utils.h" #include "usbloader/frag.h" +#define CACHE_SIZE 32 +#define CACHED_SECTORS 64 + class Wbfs { public: @@ -12,7 +15,6 @@ class Wbfs void GetProgressValue(s32 * d, s32 * m); static s32 Init(u32); - void Close(); s32 CheckGame(u8 *); s32 GameSize(u8 *, f32 *); wbfs_t *GetHddInfo(void); @@ -21,6 +23,7 @@ class Wbfs virtual bool ShowFreeSpace(void); virtual s32 Open() = 0; + virtual void Close() = 0; virtual wbfs_disc_t* OpenDisc(u8 *discid) = 0; virtual void CloseDisc(wbfs_disc_t *disc) = 0; virtual s32 Format(); diff --git a/source/usbloader/wbfs/wbfs_ext.cpp b/source/usbloader/wbfs/wbfs_ext.cpp new file mode 100644 index 00000000..125b07a6 --- /dev/null +++ b/source/usbloader/wbfs/wbfs_ext.cpp @@ -0,0 +1,37 @@ +#include +#include "usbloader/usbstorage2.h" +#include "wbfs_ext.h" + +sec_t ext_wbfs_sec = 0; + +s32 Wbfs_Ext::Open() +{ + Close(); + strcpy(wbfs_fs_drive, "EXT:"); + + if (Mounted) + return 0; + + Mounted = ext2Mount("EXT", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS, EXT2_FLAG_DEFAULT); + if (!Mounted) + return -2; + + ext_wbfs_sec = lba; + + return 0; +} + +void Wbfs_Ext::Close() +{ + if (hdd) + { + wbfs_close(hdd); + hdd = NULL; + } + + /* Unmount device */ + ext2Unmount("EXT:/"); + + Mounted = false; + ext_wbfs_sec = 0; +} diff --git a/source/usbloader/wbfs/wbfs_ext.h b/source/usbloader/wbfs/wbfs_ext.h index 6bf2c730..82ad2810 100644 --- a/source/usbloader/wbfs/wbfs_ext.h +++ b/source/usbloader/wbfs/wbfs_ext.h @@ -13,12 +13,8 @@ class Wbfs_Ext: public Wbfs_Fat { } - virtual s32 Open() - { - strcpy(wbfs_fs_drive, "EXT:"); - return MountEXT(lba); - }; - + virtual s32 Open(); + virtual void Close(); bool ShowFreeSpace(void) { return true; }; }; diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp index 9686b8fb..51bedf2a 100644 --- a/source/usbloader/wbfs/wbfs_fat.cpp +++ b/source/usbloader/wbfs/wbfs_fat.cpp @@ -10,10 +10,13 @@ #include #include #include +#include #include "settings/CSettings.h" #include "settings/GameTitles.h" #include "usbloader/disc.h" +#include "usbloader/usbstorage2.h" +#include "libs/libfat/fatfile_frag.h" #include "fatmounter.h" #include "wbfs_fat.h" #include "prompts/ProgressWindow.h" @@ -26,44 +29,59 @@ using namespace std; +sec_t fat_wbfs_sec = 0; + char Wbfs_Fat::wbfs_fs_drive[16]; char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs"; char Wbfs_Fat::invalid_path[] = "/\\:|<>?*\"'"; struct discHdr *Wbfs_Fat::fat_hdr_list = NULL; u32 Wbfs_Fat::fat_hdr_count = 0; - -extern "C" -{ - int _FAT_get_fragments(const char *path, _frag_append_t append_fragment, void *callback_data); - extern FragList *frag_list; -} - u32 Wbfs_Fat::fat_sector_size = 512; Wbfs_Fat::Wbfs_Fat(u32 device, u32 lba, u32 size) : - Wbfs(device, lba, size) + Wbfs(device, lba, size), Mounted(false) { } s32 Wbfs_Fat::Open() { + Close(); + if (device == WBFS_DEVICE_USB && lba == fat_usb_sec) { strcpy(wbfs_fs_drive, "USB:"); - } - else if (device == WBFS_DEVICE_SDHC && lba == fat_sd_sec) - { - strcpy(wbfs_fs_drive, "SD:"); + Mounted = true; } else { - if (WBFSDevice_Init(lba)) return -1; - strcpy(wbfs_fs_drive, "WBFS:"); + //closing all open Files write back the cache and then shutdown em! + fatUnmount("FAT32:/"); + + Mounted = fatMount("FAT32", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS); + if (!Mounted) + return -1; + + fat_wbfs_sec = lba; + + strcpy(wbfs_fs_drive, "FAT32:"); } return 0; } +void Wbfs_Fat::Close() +{ + if (hdd) + { + wbfs_close(hdd); + hdd = NULL; + } + + fatUnmount("FAT32:/"); + Mounted = false; + fat_wbfs_sec = 0; +} + wbfs_disc_t* Wbfs_Fat::OpenDisc(u8 *discid) { char fname[MAX_FAT_PATH]; diff --git a/source/usbloader/wbfs/wbfs_fat.h b/source/usbloader/wbfs/wbfs_fat.h index 6e2783be..32395bdb 100644 --- a/source/usbloader/wbfs/wbfs_fat.h +++ b/source/usbloader/wbfs/wbfs_fat.h @@ -13,6 +13,7 @@ class Wbfs_Fat: public Wbfs ~Wbfs_Fat(); virtual s32 Open(); + virtual void Close(); wbfs_disc_t* OpenDisc(u8 *); void CloseDisc(wbfs_disc_t *); @@ -34,6 +35,7 @@ class Wbfs_Fat: public Wbfs protected: static char wbfs_fs_drive[16]; + bool Mounted; private: split_info_t split; diff --git a/source/usbloader/wbfs/wbfs_ntfs.cpp b/source/usbloader/wbfs/wbfs_ntfs.cpp index 456a7f09..bb22ecf5 100644 --- a/source/usbloader/wbfs/wbfs_ntfs.cpp +++ b/source/usbloader/wbfs/wbfs_ntfs.cpp @@ -1,14 +1,44 @@ +#include +#include #include "wbfs_ntfs.h" -#include "fatmounter.h" -#include "libs/libntfs/ntfsfile_frag.h" +#include "usbloader/usbstorage2.h" + +sec_t ntfs_wbfs_sec = 0; s32 Wbfs_Ntfs::Open() { + Close(); + strcpy(wbfs_fs_drive, "NTFS:"); - return MountNTFS(lba); + + if (Mounted) + return 0; + + Mounted = ntfsMount("NTFS", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER); + if (!Mounted) + return -2; + + // ntfsInit() resets locals + // which breaks unicode in console + // so we change it back to C-UTF-8 + setlocale(LC_CTYPE, "C-UTF-8"); + setlocale(LC_MESSAGES, "C-UTF-8"); + + ntfs_wbfs_sec = lba; + + return 0; } -bool Wbfs_Ntfs::ShowFreeSpace(void) +void Wbfs_Ntfs::Close() { - return true; + if (hdd) + { + wbfs_close(hdd); + hdd = NULL; + } + + ntfsUnmount("NTFS:/", true); + + Mounted = false; + ntfs_wbfs_sec = 0; } diff --git a/source/usbloader/wbfs/wbfs_ntfs.h b/source/usbloader/wbfs/wbfs_ntfs.h index 2551c7a9..f5d598e6 100644 --- a/source/usbloader/wbfs/wbfs_ntfs.h +++ b/source/usbloader/wbfs/wbfs_ntfs.h @@ -12,8 +12,9 @@ class Wbfs_Ntfs: public Wbfs_Fat } virtual s32 Open(); + virtual void Close(); - bool ShowFreeSpace(void); + bool ShowFreeSpace(void) { return true; }; }; #endif //_WBFS_NTFS_H diff --git a/source/usbloader/wbfs/wbfs_wbfs.cpp b/source/usbloader/wbfs/wbfs_wbfs.cpp index 27c98aec..f3b85d9e 100644 --- a/source/usbloader/wbfs/wbfs_wbfs.cpp +++ b/source/usbloader/wbfs/wbfs_wbfs.cpp @@ -23,6 +23,15 @@ s32 Wbfs_Wbfs::Open() return 0; } +void Wbfs_Wbfs::Close() +{ + if (hdd) + { + wbfs_close(hdd); + hdd = NULL; + } +} + wbfs_disc_t* Wbfs_Wbfs::OpenDisc(u8 *discid) { /* No device open */ diff --git a/source/usbloader/wbfs/wbfs_wbfs.h b/source/usbloader/wbfs/wbfs_wbfs.h index 7cbee6eb..b2490d98 100644 --- a/source/usbloader/wbfs/wbfs_wbfs.h +++ b/source/usbloader/wbfs/wbfs_wbfs.h @@ -13,6 +13,7 @@ class Wbfs_Wbfs: public Wbfs } s32 Open(); + virtual void Close(); wbfs_disc_t* OpenDisc(u8 *); void CloseDisc(wbfs_disc_t *); diff --git a/source/utils/wifi_gecko.c b/source/utils/wifi_gecko.c index a5dc92dd..ec6e649f 100644 --- a/source/utils/wifi_gecko.c +++ b/source/utils/wifi_gecko.c @@ -69,7 +69,7 @@ int WifiGecko_Connect() int WifiGecko_Send(const char * data, int datasize) { - if(!WifiGecko_Connect()) + if(WifiGecko_Connect() < 0) return connection; int ret = 0, done = 0, blocksize = 1024;