From ca430264b6e9d5560701fccf7f8472cf34974fdd Mon Sep 17 00:00:00 2001 From: cyan Date: Mon, 24 Jan 2011 21:47:56 +0000 Subject: [PATCH] *Fixed prompt crash on widescreen fix (Dimok) *Fixed prompt button position on widescreen fix (Dimok) *Language files update --- HBC/META.XML | 4 +-- Languages/danish.lang | 24 ++++++------- Languages/dutch.lang | 20 +++++------ Languages/french.lang | 14 ++++---- Languages/german.lang | 28 +++++++-------- Languages/italian.lang | 58 +++++++++++++++---------------- Languages/japanese.lang | 14 ++++---- Languages/schinese.lang | 14 ++++---- Languages/tchinese.lang | 26 +++++++------- source/prompts/CheckboxPrompt.cpp | 58 ++++++++++++++++++++++--------- source/prompts/PromptWindow.cpp | 19 +++++----- 11 files changed, 153 insertions(+), 126 deletions(-) diff --git a/HBC/META.XML b/HBC/META.XML index 06789296..1ed5d61c 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 2.0 r1054 - 201101222117 + 2.0 r1055 + 201101242033 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/danish.lang b/Languages/danish.lang index 5f65c342..b498b3fb 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -292,7 +292,7 @@ msgid "Console Locked" msgstr "Konsollen er låst" msgid "Console must be unlocked for this option." -msgstr "Konsollen skal være oplåst for denne mulighed." +msgstr "Konsollen skal være låst op for denne mulighed." msgid "Console should be unlocked to modify it." msgstr "Konsollen skal være låst op for ændre dette." @@ -344,7 +344,7 @@ msgid "Credits" msgstr "Lavet af:" msgid "Custom Disc Images" -msgstr "" +msgstr "Tilpasset DVD billede" msgid "Custom Paths" msgstr "Sti-indstillinger" @@ -464,13 +464,13 @@ msgid "Download finished" msgstr "Download færdig" msgid "Downloading 3D Covers" -msgstr "" +msgstr "Downloader 3D Covers" msgid "Downloading Flat Covers" -msgstr "" +msgstr "Downloader Flade Covers" msgid "Downloading custom Discarts" -msgstr "Downloader custom DVD billeder" +msgstr "Downloader tilpasset DVD billeder" msgid "Downloading file" msgstr "Downloader fil" @@ -611,7 +611,7 @@ msgid "French" msgstr "Fransk" msgid "Full Menu" -msgstr "" +msgstr "Fuld Menu" msgid "Full shutdown" msgstr "Luk helt ned" @@ -644,7 +644,7 @@ msgid "Game Lock" msgstr "Spil låst" msgid "Game Only" -msgstr "" +msgstr "Kun Spil" msgid "Game Region" msgstr "Region" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "Kun til installering" msgid "Original Disc Images" -msgstr "" +msgstr "Originale DVD billeder" msgid "Original/Customs" msgstr "Originale/Tilpassede" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "Omdøb spil på WBFS" msgid "Reset" -msgstr "" +msgstr "Nulstil" msgid "Reset BG Music" msgstr "Nulstil BG-musik" @@ -1299,7 +1299,7 @@ msgid "Uninstall Menu" msgstr "Afinstallationsmenu" msgid "Uninstall all" -msgstr "" +msgstr "Afinstaller alle" msgid "Uninstalling wad" msgstr "Afinstallerer WAD" @@ -1375,7 +1375,7 @@ msgid "What do you want to update?" msgstr "Hvad skal opdateres?" msgid "What should be deleted for this game title:" -msgstr "" +msgstr "Hvad skal der slettes for dette spil:" msgid "WiFi Features" msgstr "WiFi-indstillinger" @@ -1486,7 +1486,7 @@ msgstr "sekunder tilbage" #~ msgstr "Kun originale" #~ msgid "Trying custom Discarts" -#~ msgstr "Prøver custom DVD billeder" +#~ msgstr "Prøver tilpassede DVD billeder" #~ msgid "Trying original Discarts" #~ msgstr "Prøver orginale DVD billeder" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index d5588748..e6634c4d 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-23 21:03+0100\n" -"PO-Revision-Date: 2011-01-21 13:52+0100\n" +"PO-Revision-Date: 2011-01-24 07:20+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" "MIME-Version: 1.0\n" @@ -203,7 +203,7 @@ msgid "Block Loader Settings" msgstr "Blokkeer Loader Instellingen" msgid "Block Parental Settings" -msgstr "Blokkeer Ouderlijk toezicht instellingen" +msgstr "Blokkeer Ouderlijk toezicht" msgid "Block Reset Settings" msgstr "Blokkeer Reset Instellingen" @@ -344,7 +344,7 @@ msgid "Credits" msgstr "" msgid "Custom Disc Images" -msgstr "" +msgstr "Aangepaste Disk Labels" msgid "Custom Paths" msgstr "Bestandslocaties" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "Download voltooid" msgid "Downloading 3D Covers" -msgstr "" +msgstr "3D hoesjes aan het downloaden" msgid "Downloading Flat Covers" -msgstr "" +msgstr "Platte hoesjes aan het downloaden" msgid "Downloading custom Discarts" msgstr "Aangepaste disc afbeeldingen downloaden" @@ -611,7 +611,7 @@ msgid "French" msgstr "Frans" msgid "Full Menu" -msgstr "" +msgstr "Volledig Menu" msgid "Full shutdown" msgstr "Volledig uitzetten" @@ -644,7 +644,7 @@ msgid "Game Lock" msgstr "Spel vergrendelen" msgid "Game Only" -msgstr "" +msgstr "Alleen Spel" msgid "Game Region" msgstr "Spel Regio" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "Alleen bij installeren" msgid "Original Disc Images" -msgstr "" +msgstr "Originele Disk Labels" msgid "Original/Customs" msgstr "Origineel/Aangepast" @@ -1299,7 +1299,7 @@ msgid "Uninstall Menu" msgstr "Verwijderen" msgid "Uninstall all" -msgstr "" +msgstr "Verwijder alle" msgid "Uninstalling wad" msgstr "Wad verwijderen" @@ -1375,7 +1375,7 @@ msgid "What do you want to update?" msgstr "Wat wil je updaten?" msgid "What should be deleted for this game title:" -msgstr "" +msgstr "Wat er verwijderd moet worden voor deze spel titel:" msgid "WiFi Features" msgstr "WiFi functies" diff --git a/Languages/french.lang b/Languages/french.lang index 4388bf61..83e3f47c 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,5 +1,5 @@ # USB Loader GX language source file. -# French.lang for r1053 +# French.lang for r1055 # don't delete/change this line (é). msgid "" msgstr "" @@ -335,7 +335,7 @@ msgid "Could not save." msgstr "Sauvegarde impossible." msgid "Cover Download" -msgstr "Téléchargement jaquettes" +msgstr "Téléchargement des jaquettes" msgid "Create" msgstr "Créer" @@ -344,7 +344,7 @@ msgid "Credits" msgstr "Crédits" msgid "Custom Disc Images" -msgstr "" +msgstr "Labels DVD persos" msgid "Custom Paths" msgstr "Personnalisation des dossiers" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "Téléchargement terminé" msgid "Downloading 3D Covers" -msgstr "" +msgstr "Téléchargement des jaquettes 3D" msgid "Downloading Flat Covers" -msgstr "" +msgstr "Téléchargement des jaquettes 2D" msgid "Downloading custom Discarts" msgstr "Téléch. des labels DVD persos" @@ -863,7 +863,7 @@ msgid "Motion+ Video" msgstr "Vidéo Motion+" msgid "Mount DVD drive" -msgstr "Lancer DVD" +msgstr "Charger le DVD" msgid "Music Loop Mode" msgstr "Type de boucle" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "Uniquement à l'installation" msgid "Original Disc Images" -msgstr "" +msgstr "Labels DVD originaux" msgid "Original/Customs" msgstr "Originaux/Persos" diff --git a/Languages/german.lang b/Languages/german.lang index 406dd679..466e7a50 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -1,5 +1,5 @@ # USB Loader GX -# german language source file - r1052 +# german language source file - r1054 # don't delete/change this line (é). msgid "" msgstr "" @@ -173,31 +173,31 @@ msgid "Big thanks to:" msgstr "Großen Dank an:" msgid "Block Cover Downloads" -msgstr "Blocke Cover Downloads" +msgstr "Blocke Cover-Downloads" msgid "Block Custom Paths" msgstr "Blocke eigene Pfade" msgid "Block Game Install" -msgstr "Blocke Spiele Installation" +msgstr "Blocke Spieleinstallation" msgid "Block Game Settings" -msgstr "Blocke Spiele Optionen" +msgstr "Blocke Spieleoptionen" msgid "Block GameID Change" -msgstr "Blocke SpieleID Änderung" +msgstr "Blocke SpieleID-Änderung" msgid "Block Global Settings" msgstr "Blocke globale Optionen" msgid "Block Gui Settings" -msgstr "Blocke GUI Optionen" +msgstr "Blocke GUI-Optionen" msgid "Block HBC Menu" msgstr "Blocke HBC Menü" msgid "Block IOS Reload" -msgstr "Blocke IOS Neuladen" +msgstr "Blocke IOS-Neuladen" msgid "Block Loader Settings" msgstr "Blocke Loaderoptionen" @@ -344,7 +344,7 @@ msgid "Credits" msgstr "Danksagungen" msgid "Custom Disc Images" -msgstr "" +msgstr "Eigene DVD Bilder" msgid "Custom Paths" msgstr "Pfade anpassen" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "Download abgeschlossen" msgid "Downloading 3D Covers" -msgstr "" +msgstr "Lade 3D Cover herunter" msgid "Downloading Flat Covers" -msgstr "" +msgstr "Lade 2D Cover herunter" msgid "Downloading custom Discarts" msgstr "Lade Community Diskcovers herunter" @@ -611,10 +611,10 @@ msgid "French" msgstr "Französisch" msgid "Full Menu" -msgstr "" +msgstr "Ganzes Menü" msgid "Full shutdown" -msgstr "Komplett ausschalten" +msgstr "Ausschalten" msgid "GAMEID_Gamename" msgstr "SPIELID_Spielname" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "Nur beim Installieren" msgid "Original Disc Images" -msgstr "" +msgstr "Original DVD Bilder" msgid "Original/Customs" msgstr "Original/Community" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "Spiel umbenennen" msgid "Reset" -msgstr "" +msgstr "Zurücksetzen" msgid "Reset BG Music" msgstr "Musik zurücksetzen" diff --git a/Languages/italian.lang b/Languages/italian.lang index 761fba60..4fb58797 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -1,12 +1,12 @@ # USB Loader GX language source file. -# italian.lang - v68 - r1045 +# italian.lang - v69 - r1053 # 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-23 21:03+0100\n" -"PO-Revision-Date: 2011-01-16 16:00+0200\n" +"POT-Creation-Date: 2011-01-24 21:19+0100\n" +"PO-Revision-Date: 2011-01-22 20:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: Cambo\n" "MIME-Version: 1.0\n" @@ -173,55 +173,55 @@ msgid "Big thanks to:" msgstr "Grazie mille a:" msgid "Block Cover Downloads" -msgstr "" +msgstr "Blocca Scaricam. Copertine" msgid "Block Custom Paths" -msgstr "" +msgstr "Blocca Modifica Cartelle" msgid "Block Game Install" -msgstr "" +msgstr "Blocca Install. Giochi" msgid "Block Game Settings" -msgstr "" +msgstr "Blocca Impost. Gioco" msgid "Block GameID Change" -msgstr "" +msgstr "Blocca Modif. ID Gioco" msgid "Block Global Settings" -msgstr "" +msgstr "Blocca Impost. Globali" msgid "Block Gui Settings" -msgstr "" +msgstr "Blocca Interf. Grafica" msgid "Block HBC Menu" -msgstr "" +msgstr "Blocca Menu HBC" msgid "Block IOS Reload" msgstr "Blocca Ricarica cIOS" msgid "Block Loader Settings" -msgstr "" +msgstr "Blocca Impost. Loader" msgid "Block Parental Settings" -msgstr "" +msgstr "Blocca Contr. Genitori" msgid "Block Reset Settings" -msgstr "" +msgstr "Blocca Impost. Predef." msgid "Block Sound Settings" -msgstr "" +msgstr "Blocca Impost. Audio" msgid "Block Theme Downloader" -msgstr "" +msgstr "Blocca Scaricam. Temi" msgid "Block Theme Menu" -msgstr "" +msgstr "Blocca Menu Temi" msgid "Block Title Launcher" -msgstr "" +msgstr "Blocca Avvio Gioco" msgid "Block Updates" -msgstr "" +msgstr "Blocca Aggiornamenti" msgid "Boot/Standard" msgstr "cIOS Predefinito" @@ -292,7 +292,7 @@ msgid "Console Locked" msgstr "Console Bloccata" msgid "Console must be unlocked for this option." -msgstr "" +msgstr "La Wii deve essere sbloccata per questa opzione." msgid "Console should be unlocked to modify it." msgstr "Sbloccare la Console per Modificarla." @@ -611,7 +611,7 @@ msgid "French" msgstr "Francese" msgid "Full Menu" -msgstr "" +msgstr "Menu Completo" msgid "Full shutdown" msgstr "Completo" @@ -644,7 +644,7 @@ msgid "Game Lock" msgstr "Bloccaggio Gioco" msgid "Game Only" -msgstr "" +msgstr "Solo Gioco" msgid "Game Region" msgstr "Regione Gioco" @@ -860,7 +860,7 @@ msgid "Missing files" msgstr "File Mancante/i" msgid "Motion+ Video" -msgstr "" +msgstr "Video Motion+" msgid "Mount DVD drive" msgstr "Avvia DVD" @@ -1013,7 +1013,7 @@ msgid "Path Changed" msgstr "Cartella Modificata" msgid "Permission denied." -msgstr "" +msgstr "Permesso vietato." msgid "Pick from a list" msgstr "Seleziona da un elenco" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "Rinomina Gioco su WBFS" msgid "Reset" -msgstr "" +msgstr "Resetta" msgid "Reset BG Music" msgstr "Resetta Musica Sottof." @@ -1238,7 +1238,7 @@ msgid "The entered directory does not exist. Would you like to create it?" msgstr "La cartella indicata non esiste. Vuoi crearla?" msgid "The game installation is disabled under this IOS because of instability in usb write." -msgstr "" +msgstr "L'installazione dei giochi è disabilitata poiché la scrittura sul disco USB è instabile usando questo IOS" msgid "The wad file was installed" msgstr "File wad installato" @@ -1299,7 +1299,7 @@ msgid "Uninstall Menu" msgstr "Menu Disinstallazioni" msgid "Uninstall all" -msgstr "" +msgstr "Disinstalla tutto" msgid "Uninstalling wad" msgstr "Disinstalla WAD" @@ -1375,7 +1375,7 @@ msgid "What do you want to update?" msgstr "Che cosa vuoi aggiornare?" msgid "What should be deleted for this game title:" -msgstr "" +msgstr "Cosa vuoi eliminare per questo gioco?" msgid "WiFi Features" msgstr "Caratteristiche WiFi" @@ -1408,7 +1408,7 @@ msgid "Yes" msgstr "Sì" msgid "You are currently using IOS" -msgstr "" +msgstr "Al momento stai utilizzando l'IOS" 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 "Stai cercando di accedere ad una partizione FAT32/NTFS/EXT con un cIOS 249 di versione inferiore alla rev18. Ciò è non supportato. Continua a tuo rischio." diff --git a/Languages/japanese.lang b/Languages/japanese.lang index f7db105d..e02373fb 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -7,7 +7,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-23 21:03+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" -"Last-Translator: hosigumayuugi\n" +"Last-Translator: ichiroling\n" "Language-Team: hosigumayuugi, papa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -344,7 +344,7 @@ msgid "Credits" msgstr "提供･協力" msgid "Custom Disc Images" -msgstr "" +msgstr "カスタムレーベル" msgid "Custom Paths" msgstr "パスを変更" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "ダウンロードが終了しました" msgid "Downloading 3D Covers" -msgstr "" +msgstr "両面ｶﾊﾞｰをﾀﾞｳﾝﾛｰﾄﾞ中" msgid "Downloading Flat Covers" -msgstr "" +msgstr "片面ｶﾊﾞｰをﾀﾞｳﾝﾛｰﾄﾞ中" msgid "Downloading custom Discarts" msgstr "カスタムカバーをダウンロード中" @@ -611,7 +611,7 @@ msgid "French" msgstr "フランス語" msgid "Full Menu" -msgstr "" +msgstr "フルメニュー" msgid "Full shutdown" msgstr "シャットダウン" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "インストール中のみ" msgid "Original Disc Images" -msgstr "" +msgstr "純正レーベル" msgid "Original/Customs" msgstr "公式を優先" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "WBFS内のゲーム名を変更" msgid "Reset" -msgstr "" +msgstr "リセット" msgid "Reset BG Music" msgstr "BGMをリセット" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index d97e5ba6..0982caed 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-23 21:03+0100\n" +"POT-Creation-Date: 2011-01-24 21:19+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid emul8ion\n" "Language-Team: kavid\n" @@ -344,7 +344,7 @@ msgid "Credits" msgstr "作者信息" msgid "Custom Disc Images" -msgstr "" +msgstr "自定义光盘图片" msgid "Custom Paths" msgstr "自定义路径" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "下载完成" msgid "Downloading 3D Covers" -msgstr "" +msgstr "正在下载3D封面" msgid "Downloading Flat Covers" -msgstr "" +msgstr "正在下载2D封面" msgid "Downloading custom Discarts" msgstr "正在下载自制光盘封面" @@ -611,7 +611,7 @@ msgid "French" msgstr "法文" msgid "Full Menu" -msgstr "" +msgstr "完整菜单" msgid "Full shutdown" msgstr "完全关机" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "仅安装" msgid "Original Disc Images" -msgstr "" +msgstr "官方光盘图片" msgid "Original/Customs" msgstr "官方/自制" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "改变 WBFS (硬盘)上的游戏名称" msgid "Reset" -msgstr "" +msgstr "重启" msgid "Reset BG Music" msgstr "重置背景音乐" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index 6202bbb8..0d249411 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -344,7 +344,7 @@ msgid "Credits" msgstr "作者信息" msgid "Custom Disc Images" -msgstr "" +msgstr "自製光碟圖片" msgid "Custom Paths" msgstr "自訂路徑" @@ -464,10 +464,10 @@ msgid "Download finished" msgstr "下載完成" msgid "Downloading 3D Covers" -msgstr "" +msgstr "下載 3D封面" msgid "Downloading Flat Covers" -msgstr "" +msgstr "下載一般封面" msgid "Downloading custom Discarts" msgstr "下載自製光碟圖片" @@ -611,7 +611,7 @@ msgid "French" msgstr "法文" msgid "Full Menu" -msgstr "" +msgstr "完整選單" msgid "Full shutdown" msgstr "關機" @@ -644,7 +644,7 @@ msgid "Game Lock" msgstr "遊戲上鎖" msgid "Game Only" -msgstr "" +msgstr "僅遊戲" msgid "Game Region" msgstr "遊戲區碼" @@ -860,7 +860,7 @@ msgid "Missing files" msgstr "缺少的檔案" msgid "Motion+ Video" -msgstr "" +msgstr "移動+視訊" msgid "Mount DVD drive" msgstr "掛載DVD光碟" @@ -986,7 +986,7 @@ msgid "Only for Install" msgstr "安裝遊戲時" msgid "Original Disc Images" -msgstr "" +msgstr "原始光碟圖片" msgid "Original/Customs" msgstr "原始/自製" @@ -1076,7 +1076,7 @@ msgid "Rename Game on WBFS" msgstr "變更WBFS上的遊戲名稱" msgid "Reset" -msgstr "" +msgstr "重新啟動" msgid "Reset BG Music" msgstr "重設 BG 音樂" @@ -1293,13 +1293,13 @@ msgid "Uninstall" msgstr "移除" msgid "Uninstall Game" -msgstr "刪除遊戲" +msgstr "移除遊戲" msgid "Uninstall Menu" -msgstr "刪除選單" +msgstr "移除選單" msgid "Uninstall all" -msgstr "" +msgstr "移除全部" msgid "Uninstalling wad" msgstr "移除 WAD" @@ -1375,7 +1375,7 @@ msgid "What do you want to update?" msgstr "更新何者？" msgid "What should be deleted for this game title:" -msgstr "" +msgstr "這遊戲title應刪除什麼：" msgid "WiFi Features" msgstr "WiFi功能設定" @@ -1780,4 +1780,4 @@ msgstr "剩餘秒數" #~ msgstr "不存在!檔案錯誤" #~ msgid "file left" -#~ msgstr "剩餘文件" +#~ msgstr "剩餘文件" \ No newline at end of file diff --git a/source/prompts/CheckboxPrompt.cpp b/source/prompts/CheckboxPrompt.cpp index f7fc5a2d..dcbd2e6f 100644 --- a/source/prompts/CheckboxPrompt.cpp +++ b/source/prompts/CheckboxPrompt.cpp @@ -76,25 +76,51 @@ void CheckboxPrompt::AddCheckBox(const char *text) Checkbox[size]->SetTrigger(trigA); Append(Checkbox[size]); - if(size == 0) + if (Settings.wsprompt && Settings.widescreen) { - Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - Checkbox[size]->SetPosition(60, -170); + if(size == 0) + { + Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(80, -170); + } + else if(size == 1) + { + Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(80, -115); + } + else if(size == 2) + { + Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(-210, -170); + } + else if(size == 3) + { + Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(-210, -115); + } } - else if(size == 1) + else { - Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - Checkbox[size]->SetPosition(60, -115); - } - else if(size == 2) - { - Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - Checkbox[size]->SetPosition(-170, -170); - } - else if(size == 3) - { - Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - Checkbox[size]->SetPosition(-170, -115); + if(size == 0) + { + Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(40, -170); + } + else if(size == 1) + { + Checkbox[size]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(40, -115); + } + else if(size == 2) + { + Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(-210, -170); + } + else if(size == 3) + { + Checkbox[size]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); + Checkbox[size]->SetPosition(-210, -115); + } } } diff --git a/source/prompts/PromptWindow.cpp b/source/prompts/PromptWindow.cpp index 593b2b48..cac125eb 100644 --- a/source/prompts/PromptWindow.cpp +++ b/source/prompts/PromptWindow.cpp @@ -115,12 +115,13 @@ void PromptWindow::PositionButtons() break; case 1: Button[0]->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); - Button[0]->SetPosition(0, -80); + Button[0]->SetPosition(0, -55); + break; case 2: Button[0]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - Button[0]->SetPosition(70, -80); + Button[0]->SetPosition(70, -55); Button[1]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - Button[1]->SetPosition(-70, -80); + Button[1]->SetPosition(-70, -55); break; case 3: Button[0]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); @@ -150,13 +151,13 @@ void PromptWindow::PositionButtons() break; case 1: Button[0]->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); - Button[0]->SetPosition(0, -45); + Button[0]->SetPosition(0, -55); break; case 2: Button[0]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - Button[0]->SetPosition(50, -45); + Button[0]->SetPosition(50, -55); Button[1]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - Button[1]->SetPosition(-50, -45); + Button[1]->SetPosition(-50, -55); break; case 3: Button[0]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); @@ -164,7 +165,7 @@ void PromptWindow::PositionButtons() Button[1]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); Button[1]->SetPosition(-50, -120); Button[2]->SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); - Button[2]->SetPosition(0, -65); + Button[2]->SetPosition(0, -55); break; case 4: Button[0]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); @@ -172,9 +173,9 @@ void PromptWindow::PositionButtons() Button[1]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); Button[1]->SetPosition(-50, -120); Button[2]->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - Button[2]->SetPosition(50, -65); + Button[2]->SetPosition(50, -55); Button[3]->SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - Button[3]->SetPosition(-50, -65); + Button[3]->SetPosition(-50, -55); break; } }