From f2e6d4544fefb0394752795f5ed26dfc22a04c3f Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 23 May 2015 01:01:43 +0000 Subject: [PATCH] Added separate "Open GB" and "Open GBC" menu items. --- po/wxvbam/wxvbam.pot | 1017 ++++++++++++++++++++------------------- src/wx/cmdevents.cpp | 79 ++- src/wx/panel.cpp | 2 +- src/wx/xrc/MainMenu.xrc | 6 + 4 files changed, 593 insertions(+), 511 deletions(-) diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot index 1a2805a0..5a1da47f 100644 --- a/po/wxvbam/wxvbam.pot +++ b/po/wxvbam/wxvbam.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-20 20:43+0200\n" +"POT-Creation-Date: 2015-05-23 11:00+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,133 +17,156 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/wx/cmdevents.cpp:107 +#: ../src/wx/cmdevents.cpp:98 msgid "" -"Archives (*.zip;*.7z;*.rar)|*.zip;*.7z;*.rar|GameBoy Advance Files (*.agb;*." -"gba;*.bin;*.elf;*.mb)|*.agb;*.gba;*.bin;*.elf;*.mb*.agb.gz;*.gba.gz;*.bin.gz;" -"*.elf.gz;*.mb.gz*.agb.z;*.gba.z;*.bin.z;*.elf.z;*.mb.z|GameBoy Files (*.dmg;" -"*.gb;*.gbc;*.cgb;*.sgb)|*.dmg;*.gb;*.gbc;*.cgb;*.sgb*.dmg.gz;*.gb.gz;*.gbc." -"gz;*.cgb.gz;*.sgb.gz*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z|" +"GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|*.agb;" +"*.gba;*.bin;*.elf;*.mb;*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;*.agb.z;*." +"gba.z;*.bin.z;*.elf.z;*.mb.z;*.zip;*.7z;*.rar|GameBoy Files (*.dmg;*.gb;*." +"gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb." +"gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;" +"*.7z;*.rar|" msgstr "" -#: ../src/wx/cmdevents.cpp:120 +#: ../src/wx/cmdevents.cpp:111 msgid "Open ROM file" msgstr "" -#: ../src/wx/cmdevents.cpp:515 ../src/wx/cmdevents.cpp:632 -#: ../src/wx/cmdevents.cpp:672 ../src/wx/cmdevents.cpp:748 +#: ../src/wx/cmdevents.cpp:128 +msgid "" +"GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*." +"gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*." +"gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|" +msgstr "" + +#: ../src/wx/cmdevents.cpp:136 +msgid "Open GB ROM file" +msgstr "" + +#: ../src/wx/cmdevents.cpp:153 +msgid "" +"GameBoy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*." +"gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*." +"gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|" +msgstr "" + +#: ../src/wx/cmdevents.cpp:161 +msgid "Open GBC ROM file" +msgstr "" + +#: ../src/wx/cmdevents.cpp:556 ../src/wx/cmdevents.cpp:673 +#: ../src/wx/cmdevents.cpp:713 ../src/wx/cmdevents.cpp:789 msgid "Unknown" msgstr "" -#: ../src/wx/cmdevents.cpp:524 +#: ../src/wx/cmdevents.cpp:565 msgid "ROM" msgstr "" -#: ../src/wx/cmdevents.cpp:528 +#: ../src/wx/cmdevents.cpp:569 msgid "ROM+MBC1" msgstr "" -#: ../src/wx/cmdevents.cpp:532 +#: ../src/wx/cmdevents.cpp:573 msgid "ROM+MBC1+RAM" msgstr "" -#: ../src/wx/cmdevents.cpp:536 +#: ../src/wx/cmdevents.cpp:577 msgid "ROM+MBC1+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:540 +#: ../src/wx/cmdevents.cpp:581 msgid "ROM+MBC2" msgstr "" -#: ../src/wx/cmdevents.cpp:544 +#: ../src/wx/cmdevents.cpp:585 msgid "ROM+MBC2+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:548 +#: ../src/wx/cmdevents.cpp:589 msgid "ROM+MMM01" msgstr "" -#: ../src/wx/cmdevents.cpp:552 +#: ../src/wx/cmdevents.cpp:593 msgid "ROM+MMM01+RAM" msgstr "" -#: ../src/wx/cmdevents.cpp:556 +#: ../src/wx/cmdevents.cpp:597 msgid "ROM+MMM01+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:560 +#: ../src/wx/cmdevents.cpp:601 msgid "ROM+MBC3+TIMER+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:564 +#: ../src/wx/cmdevents.cpp:605 msgid "ROM+MBC3+TIMER+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:568 +#: ../src/wx/cmdevents.cpp:609 msgid "ROM+MBC3" msgstr "" -#: ../src/wx/cmdevents.cpp:572 +#: ../src/wx/cmdevents.cpp:613 msgid "ROM+MBC3+RAM" msgstr "" -#: ../src/wx/cmdevents.cpp:576 +#: ../src/wx/cmdevents.cpp:617 msgid "ROM+MBC3+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:580 +#: ../src/wx/cmdevents.cpp:621 msgid "ROM+MBC5" msgstr "" -#: ../src/wx/cmdevents.cpp:584 +#: ../src/wx/cmdevents.cpp:625 msgid "ROM+MBC5+RAM" msgstr "" -#: ../src/wx/cmdevents.cpp:588 +#: ../src/wx/cmdevents.cpp:629 msgid "ROM+MBC5+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:592 +#: ../src/wx/cmdevents.cpp:633 msgid "ROM+MBC5+RUMBLE" msgstr "" -#: ../src/wx/cmdevents.cpp:596 +#: ../src/wx/cmdevents.cpp:637 msgid "ROM+MBC5+RUMBLE+RAM" msgstr "" -#: ../src/wx/cmdevents.cpp:600 +#: ../src/wx/cmdevents.cpp:641 msgid "ROM+MBC5+RUMBLE+RAM+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:604 +#: ../src/wx/cmdevents.cpp:645 msgid "ROM+MBC7+BATT" msgstr "" -#: ../src/wx/cmdevents.cpp:608 ../src/wx/guiinit.cpp:807 +#: ../src/wx/cmdevents.cpp:649 ../src/wx/guiinit.cpp:807 msgid "GameGenie" msgstr "" -#: ../src/wx/cmdevents.cpp:612 +#: ../src/wx/cmdevents.cpp:653 msgid "GameShark V3.0" msgstr "" -#: ../src/wx/cmdevents.cpp:616 +#: ../src/wx/cmdevents.cpp:657 msgid "ROM+POCKET CAMERA" msgstr "" -#: ../src/wx/cmdevents.cpp:620 +#: ../src/wx/cmdevents.cpp:661 msgid "ROM+BANDAI TAMA5" msgstr "" -#: ../src/wx/cmdevents.cpp:624 +#: ../src/wx/cmdevents.cpp:665 msgid "ROM+HuC-3" msgstr "" -#: ../src/wx/cmdevents.cpp:628 +#: ../src/wx/cmdevents.cpp:669 msgid "ROM+HuC-1" msgstr "" -#: ../src/wx/cmdevents.cpp:680 ../src/wx/guiinit.cpp:1876 +#: ../src/wx/cmdevents.cpp:721 ../src/wx/guiinit.cpp:1876 #: ../src/wx/xrc/DisplayConfig.xrc:77 ../src/wx/xrc/DisplayConfig.xrc:221 #: ../src/wx/xrc/DisplayConfig.xrc:270 #: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:32 @@ -152,240 +175,240 @@ msgstr "" msgid "None" msgstr "" -#: ../src/wx/cmdevents.cpp:779 ../src/wx/cmdevents.cpp:795 +#: ../src/wx/cmdevents.cpp:820 ../src/wx/cmdevents.cpp:836 msgid "Select Dot Code file" msgstr "" -#: ../src/wx/cmdevents.cpp:781 ../src/wx/cmdevents.cpp:797 +#: ../src/wx/cmdevents.cpp:822 ../src/wx/cmdevents.cpp:838 msgid "e-Reader Dot Code (*.bin;*.raw)|*.bin;*.raw" msgstr "" -#: ../src/wx/cmdevents.cpp:816 ../src/wx/cmdevents.cpp:1030 +#: ../src/wx/cmdevents.cpp:857 ../src/wx/cmdevents.cpp:1071 msgid "Select battery file" msgstr "" -#: ../src/wx/cmdevents.cpp:817 ../src/wx/cmdevents.cpp:1031 +#: ../src/wx/cmdevents.cpp:858 ../src/wx/cmdevents.cpp:1072 msgid "Battery file (*.sav)|*.sav|Flash save (*.dat)|*.dat" msgstr "" -#: ../src/wx/cmdevents.cpp:825 +#: ../src/wx/cmdevents.cpp:866 msgid "" "Importing a battery file will erase any saved games (permanently after the " "next write). Do you want to continue?" msgstr "" -#: ../src/wx/cmdevents.cpp:826 ../src/wx/cmdevents.cpp:857 -#: ../src/wx/cmdevents.cpp:990 +#: ../src/wx/cmdevents.cpp:867 ../src/wx/cmdevents.cpp:898 +#: ../src/wx/cmdevents.cpp:1031 msgid "Confirm import" msgstr "" -#: ../src/wx/cmdevents.cpp:833 ../src/wx/panel.cpp:368 +#: ../src/wx/cmdevents.cpp:874 ../src/wx/panel.cpp:363 #, c-format msgid "Loaded battery %s" msgstr "" -#: ../src/wx/cmdevents.cpp:835 +#: ../src/wx/cmdevents.cpp:876 #, c-format msgid "Error loading battery %s" msgstr "" -#: ../src/wx/cmdevents.cpp:844 +#: ../src/wx/cmdevents.cpp:885 msgid "Select code file" msgstr "" -#: ../src/wx/cmdevents.cpp:846 +#: ../src/wx/cmdevents.cpp:887 msgid "Gameshark Code File (*.spc;*.xpc)|*.spc;*.xpc" msgstr "" -#: ../src/wx/cmdevents.cpp:847 +#: ../src/wx/cmdevents.cpp:888 msgid "Gameshark Code File (*.gcf)|*.gcf" msgstr "" -#: ../src/wx/cmdevents.cpp:856 +#: ../src/wx/cmdevents.cpp:897 msgid "" "Importing a code file will replace any loaded cheats. Do you want to " "continue?" msgstr "" -#: ../src/wx/cmdevents.cpp:876 +#: ../src/wx/cmdevents.cpp:917 #, c-format msgid "Cannot open file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:889 +#: ../src/wx/cmdevents.cpp:930 #, c-format msgid "Unsupported code file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:964 +#: ../src/wx/cmdevents.cpp:1005 #, c-format msgid "Loaded code file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:966 +#: ../src/wx/cmdevents.cpp:1007 #, c-format msgid "Error loading code file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:977 ../src/wx/cmdevents.cpp:1059 +#: ../src/wx/cmdevents.cpp:1018 ../src/wx/cmdevents.cpp:1100 msgid "Select snapshot file" msgstr "" -#: ../src/wx/cmdevents.cpp:979 +#: ../src/wx/cmdevents.cpp:1020 msgid "" "GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|GameShark SP Snapshots (*.gsv)|" "*.gsv" msgstr "" -#: ../src/wx/cmdevents.cpp:980 +#: ../src/wx/cmdevents.cpp:1021 msgid "Gameboy Snapshot (*.gbs)|*.gbs" msgstr "" -#: ../src/wx/cmdevents.cpp:989 +#: ../src/wx/cmdevents.cpp:1030 msgid "" "Importing a snapshot file will erase any saved games (permanently after the " "next write). Do you want to continue?" msgstr "" -#: ../src/wx/cmdevents.cpp:1017 +#: ../src/wx/cmdevents.cpp:1058 #, c-format msgid "Loaded snapshot file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1019 +#: ../src/wx/cmdevents.cpp:1060 #, c-format msgid "Error loading snapshot file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1042 ../src/wx/panel.cpp:666 +#: ../src/wx/cmdevents.cpp:1083 ../src/wx/panel.cpp:690 #, c-format msgid "Wrote battery %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1044 ../src/wx/panel.cpp:668 +#: ../src/wx/cmdevents.cpp:1085 ../src/wx/panel.cpp:692 #, c-format msgid "Error writing battery %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1053 +#: ../src/wx/cmdevents.cpp:1094 msgid "EEPROM saves cannot be exported" msgstr "" -#: ../src/wx/cmdevents.cpp:1060 +#: ../src/wx/cmdevents.cpp:1101 msgid "Gameshark Snapshot (*.sps)|*.sps" msgstr "" -#: ../src/wx/cmdevents.cpp:1074 +#: ../src/wx/cmdevents.cpp:1115 msgid "Exported from VisualBoyAdvance-M" msgstr "" -#: ../src/wx/cmdevents.cpp:1086 +#: ../src/wx/cmdevents.cpp:1127 #, c-format msgid "Saved snapshot file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1088 +#: ../src/wx/cmdevents.cpp:1129 #, c-format msgid "Error saving snapshot file %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1119 ../src/wx/cmdevents.cpp:1220 -#: ../src/wx/cmdevents.cpp:1312 ../src/wx/cmdevents.cpp:1355 +#: ../src/wx/cmdevents.cpp:1160 ../src/wx/cmdevents.cpp:1261 +#: ../src/wx/cmdevents.cpp:1353 ../src/wx/cmdevents.cpp:1396 #: ../src/wx/viewers.cpp:555 ../src/wx/viewers.cpp:750 #: ../src/wx/viewsupt.cpp:1239 msgid "Select output file" msgstr "" -#: ../src/wx/cmdevents.cpp:1120 ../src/wx/viewsupt.cpp:1240 +#: ../src/wx/cmdevents.cpp:1161 ../src/wx/viewsupt.cpp:1240 msgid "PNG images|*.png|BMP images|*.bmp" msgstr "" -#: ../src/wx/cmdevents.cpp:1145 ../src/wx/sys.cpp:493 +#: ../src/wx/cmdevents.cpp:1186 ../src/wx/sys.cpp:493 #, c-format msgid "Wrote snapshot %s" msgstr "" -#: ../src/wx/cmdevents.cpp:1171 ../src/wx/cmdevents.cpp:1263 +#: ../src/wx/cmdevents.cpp:1212 ../src/wx/cmdevents.cpp:1304 msgid " files (" msgstr "" -#: ../src/wx/cmdevents.cpp:1356 ../src/wx/cmdevents.cpp:1394 +#: ../src/wx/cmdevents.cpp:1397 ../src/wx/cmdevents.cpp:1435 msgid "VBA Movie files|*.vmv" msgstr "" -#: ../src/wx/cmdevents.cpp:1393 +#: ../src/wx/cmdevents.cpp:1434 msgid "Select file" msgstr "" -#: ../src/wx/cmdevents.cpp:1544 ../src/wx/cmdevents.cpp:1629 +#: ../src/wx/cmdevents.cpp:1585 ../src/wx/cmdevents.cpp:1670 msgid "Select state file" msgstr "" -#: ../src/wx/cmdevents.cpp:1545 ../src/wx/cmdevents.cpp:1630 +#: ../src/wx/cmdevents.cpp:1586 ../src/wx/cmdevents.cpp:1671 msgid "VisualBoyAdvance saved game files|*.sgm" msgstr "" -#: ../src/wx/cmdevents.cpp:1865 +#: ../src/wx/cmdevents.cpp:1906 msgid "Sound enabled" msgstr "" -#: ../src/wx/cmdevents.cpp:1865 +#: ../src/wx/cmdevents.cpp:1906 msgid "Sound disabled" msgstr "" -#: ../src/wx/cmdevents.cpp:1878 ../src/wx/cmdevents.cpp:1892 +#: ../src/wx/cmdevents.cpp:1919 ../src/wx/cmdevents.cpp:1933 #, c-format msgid "Volume: %d%%" msgstr "" -#: ../src/wx/cmdevents.cpp:1961 +#: ../src/wx/cmdevents.cpp:2002 msgid "Set to 0 for pseudo tty" msgstr "" -#: ../src/wx/cmdevents.cpp:1963 +#: ../src/wx/cmdevents.cpp:2004 msgid "Port to wait for connection:" msgstr "" -#: ../src/wx/cmdevents.cpp:1964 +#: ../src/wx/cmdevents.cpp:2005 msgid "GDB Connection" msgstr "" -#: ../src/wx/cmdevents.cpp:2017 +#: ../src/wx/cmdevents.cpp:2058 #, c-format msgid "Waiting for connection at %s" msgstr "" -#: ../src/wx/cmdevents.cpp:2025 +#: ../src/wx/cmdevents.cpp:2066 #, c-format msgid "Waiting for connection on port %d" msgstr "" -#: ../src/wx/cmdevents.cpp:2028 +#: ../src/wx/cmdevents.cpp:2069 msgid "Waiting for GDB..." msgstr "" -#: ../src/wx/cmdevents.cpp:2525 +#: ../src/wx/cmdevents.cpp:2566 msgid "" "This will download and update three GBA No-Intro DAT files. Do you want to " "continue?" msgstr "" -#: ../src/wx/cmdevents.cpp:2526 +#: ../src/wx/cmdevents.cpp:2567 msgid "Confirm Update" msgstr "" -#: ../src/wx/cmdevents.cpp:2550 +#: ../src/wx/cmdevents.cpp:2591 msgid "Nintendo GameBoy (+Color+Advance) emulator." msgstr "" -#: ../src/wx/cmdevents.cpp:2551 +#: ../src/wx/cmdevents.cpp:2592 msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" "Copyright (C) 2007-2015 VBA-M development team" msgstr "" -#: ../src/wx/cmdevents.cpp:2552 +#: ../src/wx/cmdevents.cpp:2593 msgid "" "This program is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -401,11 +424,11 @@ msgid "" "along with this program. If not, see http://www.gnu.org/licenses ." msgstr "" -#: ../src/wx/cmdevents.cpp:2788 +#: ../src/wx/cmdevents.cpp:2829 msgid "LAN link is already active. Disable link mode to disconnect." msgstr "" -#: ../src/wx/cmdevents.cpp:2795 +#: ../src/wx/cmdevents.cpp:2836 msgid "Network is not supported in local mode." msgstr "" @@ -507,7 +530,7 @@ msgstr "" msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht" msgstr "" -#: ../src/wx/guiinit.cpp:254 ../src/wx/panel.cpp:401 +#: ../src/wx/guiinit.cpp:254 ../src/wx/panel.cpp:425 msgid "Loaded cheats" msgstr "" @@ -714,126 +737,126 @@ msgstr "" msgid "%s is not a valid ROM file" msgstr "" -#: ../src/wx/panel.cpp:77 ../src/wx/panel.cpp:139 ../src/wx/panel.cpp:222 +#: ../src/wx/panel.cpp:77 ../src/wx/panel.cpp:140 ../src/wx/panel.cpp:223 msgid "Problem loading file" msgstr "" -#: ../src/wx/panel.cpp:138 +#: ../src/wx/panel.cpp:139 #, c-format msgid "Unable to load Game Boy ROM %s" msgstr "" -#: ../src/wx/panel.cpp:193 ../src/wx/panel.cpp:301 +#: ../src/wx/panel.cpp:194 ../src/wx/panel.cpp:296 #, c-format msgid "Could not load BIOS %s" msgstr "" -#: ../src/wx/panel.cpp:221 +#: ../src/wx/panel.cpp:222 #, c-format msgid "Unable to load Game Boy Advance ROM %s" msgstr "" -#: ../src/wx/panel.cpp:437 +#: ../src/wx/panel.cpp:461 msgid " player " msgstr "" -#: ../src/wx/panel.cpp:609 +#: ../src/wx/panel.cpp:633 #, c-format msgid "Loaded state %s" msgstr "" -#: ../src/wx/panel.cpp:609 +#: ../src/wx/panel.cpp:633 #, c-format msgid "Error loading state %s" msgstr "" -#: ../src/wx/panel.cpp:633 +#: ../src/wx/panel.cpp:657 #, c-format msgid "Saved state %s" msgstr "" -#: ../src/wx/panel.cpp:633 +#: ../src/wx/panel.cpp:657 #, c-format msgid "Error saving state %s" msgstr "" -#: ../src/wx/panel.cpp:839 +#: ../src/wx/panel.cpp:863 #, c-format msgid "Fullscreen mode %dx%d-%d@%d not supported; looking for another" msgstr "" -#: ../src/wx/panel.cpp:880 +#: ../src/wx/panel.cpp:904 #, c-format msgid "Fullscreen mode %dx%d-%d@%d not supported" msgstr "" -#: ../src/wx/panel.cpp:885 +#: ../src/wx/panel.cpp:909 #, c-format msgid "Valid mode: %dx%d-%d@%d" msgstr "" -#: ../src/wx/panel.cpp:895 +#: ../src/wx/panel.cpp:919 #, c-format msgid "Chose mode %dx%d-%d@%d" msgstr "" -#: ../src/wx/panel.cpp:900 +#: ../src/wx/panel.cpp:924 #, c-format msgid "Failed to change mode to %dx%d-%d@%d" msgstr "" -#: ../src/wx/panel.cpp:969 +#: ../src/wx/panel.cpp:993 msgid "Not a valid GBA cartridge" msgstr "" -#: ../src/wx/panel.cpp:1081 +#: ../src/wx/panel.cpp:1105 msgid "No memory for rewinding" msgstr "" -#: ../src/wx/panel.cpp:1091 +#: ../src/wx/panel.cpp:1115 msgid "Error writing rewind state" msgstr "" -#: ../src/wx/panel.cpp:2302 +#: ../src/wx/panel.cpp:2326 msgid "Cannot create conversion buffer" msgstr "" -#: ../src/wx/panel.cpp:2377 +#: ../src/wx/panel.cpp:2401 msgid "memory allocation error" msgstr "" -#: ../src/wx/panel.cpp:2380 +#: ../src/wx/panel.cpp:2404 msgid "error initializing codec" msgstr "" -#: ../src/wx/panel.cpp:2383 +#: ../src/wx/panel.cpp:2407 msgid "error writing to output file" msgstr "" -#: ../src/wx/panel.cpp:2386 +#: ../src/wx/panel.cpp:2410 msgid "can't guess output format from file name" msgstr "" -#: ../src/wx/panel.cpp:2391 +#: ../src/wx/panel.cpp:2415 msgid "programming error; aborting!" msgstr "" -#: ../src/wx/panel.cpp:2404 ../src/wx/panel.cpp:2436 +#: ../src/wx/panel.cpp:2428 ../src/wx/panel.cpp:2460 #, c-format msgid "Unable to begin recording to %s (%s)" msgstr "" -#: ../src/wx/panel.cpp:2466 +#: ../src/wx/panel.cpp:2490 #, c-format msgid "Error in audio/video recording (%s); aborting" msgstr "" -#: ../src/wx/panel.cpp:2473 +#: ../src/wx/panel.cpp:2497 #, c-format msgid "Error in audio recording (%s); aborting" msgstr "" -#: ../src/wx/panel.cpp:2484 +#: ../src/wx/panel.cpp:2508 #, c-format msgid "Error in video recording (%s); aborting" msgstr "" @@ -903,12 +926,12 @@ msgstr "" msgid "Printed" msgstr "" -#: ../src/wx/sys.cpp:1292 +#: ../src/wx/sys.cpp:1296 #, c-format msgid "Error opening pseudo tty: %s" msgstr "" -#: ../src/wx/sys.cpp:1391 +#: ../src/wx/sys.cpp:1395 #, c-format msgid "Error setting up server socket (%d)" msgstr "" @@ -1001,47 +1024,51 @@ msgstr "" msgid "B:" msgstr "" -#: ../src/wx/wxvbam.cpp:276 +#: ../src/wx/wxvbam.cpp:65 +msgid "vbam" +msgstr "" + +#: ../src/wx/wxvbam.cpp:282 msgid "Could not create main window" msgstr "" -#: ../src/wx/wxvbam.cpp:308 +#: ../src/wx/wxvbam.cpp:314 msgid "Save built-in XRC file and exit" msgstr "" -#: ../src/wx/wxvbam.cpp:312 +#: ../src/wx/wxvbam.cpp:318 msgid "Save built-in vba-over.ini and exit" msgstr "" -#: ../src/wx/wxvbam.cpp:316 +#: ../src/wx/wxvbam.cpp:322 msgid "Print configuration path and exit" msgstr "" -#: ../src/wx/wxvbam.cpp:320 +#: ../src/wx/wxvbam.cpp:326 msgid "Start in full-screen mode" msgstr "" -#: ../src/wx/wxvbam.cpp:325 +#: ../src/wx/wxvbam.cpp:331 msgid "Delete shared link state first, if it exists" msgstr "" -#: ../src/wx/wxvbam.cpp:333 +#: ../src/wx/wxvbam.cpp:339 msgid "List all settable options and exit" msgstr "" -#: ../src/wx/wxvbam.cpp:337 +#: ../src/wx/wxvbam.cpp:343 msgid "ROM file" msgstr "" -#: ../src/wx/wxvbam.cpp:341 +#: ../src/wx/wxvbam.cpp:347 msgid "=" msgstr "" -#: ../src/wx/wxvbam.cpp:375 +#: ../src/wx/wxvbam.cpp:381 msgid "Configuration/build error: can't find built-in xrc" msgstr "" -#: ../src/wx/wxvbam.cpp:383 +#: ../src/wx/wxvbam.cpp:389 #, c-format msgid "" "Wrote built-in configuration to %s.\n" @@ -1050,11 +1077,11 @@ msgid "" "built-in:" msgstr "" -#: ../src/wx/wxvbam.cpp:398 +#: ../src/wx/wxvbam.cpp:404 msgid "Configuration is read from, in order:" msgstr "" -#: ../src/wx/wxvbam.cpp:412 +#: ../src/wx/wxvbam.cpp:418 #, c-format msgid "" "Wrote built-in override file to %s\n" @@ -1062,13 +1089,13 @@ msgid "" "from search path:" msgstr "" -#: ../src/wx/wxvbam.cpp:417 +#: ../src/wx/wxvbam.cpp:423 msgid "" "\n" "\tbuilt-in" msgstr "" -#: ../src/wx/wxvbam.cpp:429 +#: ../src/wx/wxvbam.cpp:435 msgid "" "Options set from the command line are saved if any configuration changes are " "made in the user interface.\n" @@ -1077,13 +1104,13 @@ msgid "" "\n" msgstr "" -#: ../src/wx/wxvbam.cpp:456 +#: ../src/wx/wxvbam.cpp:462 msgid "" "The commands available for the Keyboard/* option are:\n" "\n" msgstr "" -#: ../src/wx/wxvbam.cpp:506 +#: ../src/wx/wxvbam.cpp:512 msgid "Bad configuration option or multiple ROM files given:\n" msgstr "" @@ -1355,7 +1382,7 @@ msgstr "" msgid "Edit Cheat" msgstr "" -#: ../src/wx/xrc/CheatEdit.xrc:31 ../src/wx/xrc/MainMenu.xrc:269 +#: ../src/wx/xrc/CheatEdit.xrc:31 ../src/wx/xrc/MainMenu.xrc:275 msgid "&Type" msgstr "" @@ -1780,196 +1807,6 @@ msgstr "" msgid "Notes:" msgstr "" -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:4 -msgid "Game Boy Advance settings" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:21 -msgid "Save type :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:27 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:178 -#: ../src/wx/xrc/GameBoyConfig.xrc:29 ../src/wx/xrc/GameBoyConfig.xrc:59 -msgid "Automatic" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:28 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:179 -msgid "EEPROM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:29 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:180 -msgid "SRAM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:30 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:181 -msgid "Flash" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:31 -msgid "EEPROM + Sensor" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:43 -msgid "Flash size :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:49 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:200 -msgid "64K" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:50 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:201 -msgid "128K" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:64 -msgid "Detect Now" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:69 -msgid "Cartridge" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:77 -msgid "Save type" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:92 -msgid "Bios file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:115 -#: ../src/wx/xrc/GameBoyConfig.xrc:126 -msgid "Boot ROM" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:125 -msgid "Game Code" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:139 -msgid "Comment" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:151 -msgid "Real Time Clock:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:159 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:177 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:199 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:217 -#: ../src/wx/xrc/GameBoyConfig.xrc:138 -msgid "Default" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:160 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:218 -msgid "Disabled" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:161 -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:219 -msgid "Enabled" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:169 -msgid "Save Type:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:182 -msgid "EEPROM+Sensor" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:191 -msgid "Flash Size:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:209 -msgid "Mirroring:" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:233 -msgid "&Defaults" -msgstr "" - -#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:240 -msgid "Game Overrides" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:4 -msgid "GameBoy settings" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:20 -msgid "Emulated &system :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:30 ../src/wx/xrc/SoundConfig.xrc:328 -msgid "Game Boy Advance" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:31 -msgid "Game Boy Color" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:32 -msgid "Super Game Boy" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:33 -msgid "Super Game Boy 2" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:34 ../src/wx/xrc/SoundConfig.xrc:283 -msgid "Game Boy" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:48 -msgid "Display &borders :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:57 -msgid "Never" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:58 -msgid "Always" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:72 -msgid "System" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:84 -msgid "Boot &ROM file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:91 ../src/wx/xrc/GameBoyConfig.xrc:113 -msgid "Select A File" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:106 -msgid "GBC Boot ROM &file :" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:144 -msgid "User 1" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:150 -msgid "User 2" -msgstr "" - -#: ../src/wx/xrc/GameBoyConfig.xrc:156 -msgid "Custom Colors" -msgstr "" - #: ../src/wx/xrc/GBAROMInfo.xrc:4 msgid "Rom Information" msgstr "" @@ -2306,8 +2143,8 @@ msgstr "" msgid "&0" msgstr "" -#: ../src/wx/xrc/GBTileViewer.xrc:20 ../src/wx/xrc/MainMenu.xrc:42 -#: ../src/wx/xrc/MainMenu.xrc:103 +#: ../src/wx/xrc/GBTileViewer.xrc:20 ../src/wx/xrc/MainMenu.xrc:48 +#: ../src/wx/xrc/MainMenu.xrc:109 msgid "&1" msgstr "" @@ -2323,6 +2160,196 @@ msgstr "" msgid "0x&8800" msgstr "" +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:4 +msgid "Game Boy Advance settings" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:21 +msgid "Save type :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:27 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:178 +#: ../src/wx/xrc/GameBoyConfig.xrc:29 ../src/wx/xrc/GameBoyConfig.xrc:59 +msgid "Automatic" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:28 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:179 +msgid "EEPROM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:29 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:180 +msgid "SRAM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:30 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:181 +msgid "Flash" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:31 +msgid "EEPROM + Sensor" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:43 +msgid "Flash size :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:49 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:200 +msgid "64K" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:50 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:201 +msgid "128K" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:64 +msgid "Detect Now" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:69 +msgid "Cartridge" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:77 +msgid "Save type" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:92 +msgid "Bios file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:115 +#: ../src/wx/xrc/GameBoyConfig.xrc:126 +msgid "Boot ROM" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:125 +msgid "Game Code" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:139 +msgid "Comment" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:151 +msgid "Real Time Clock:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:159 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:177 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:199 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:217 +#: ../src/wx/xrc/GameBoyConfig.xrc:138 +msgid "Default" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:160 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:218 +msgid "Disabled" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:161 +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:219 +msgid "Enabled" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:169 +msgid "Save Type:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:182 +msgid "EEPROM+Sensor" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:191 +msgid "Flash Size:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:209 +msgid "Mirroring:" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:233 +msgid "&Defaults" +msgstr "" + +#: ../src/wx/xrc/GameBoyAdvanceConfig.xrc:240 +msgid "Game Overrides" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:4 +msgid "GameBoy settings" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:20 +msgid "Emulated &system :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:30 ../src/wx/xrc/SoundConfig.xrc:328 +msgid "Game Boy Advance" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:31 +msgid "Game Boy Color" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:32 +msgid "Super Game Boy" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:33 +msgid "Super Game Boy 2" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:34 ../src/wx/xrc/SoundConfig.xrc:283 +msgid "Game Boy" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:48 +msgid "Display &borders :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:57 +msgid "Never" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:58 +msgid "Always" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:72 +msgid "System" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:84 +msgid "Boot &ROM file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:91 ../src/wx/xrc/GameBoyConfig.xrc:113 +msgid "Select A File" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:106 +msgid "GBC Boot ROM &file :" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:144 +msgid "User 1" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:150 +msgid "User 2" +msgstr "" + +#: ../src/wx/xrc/GameBoyConfig.xrc:156 +msgid "Custom Colors" +msgstr "" + #: ../src/wx/xrc/GeneralConfig.xrc:4 msgid "General settings" msgstr "" @@ -2468,26 +2495,6 @@ msgstr "" msgid "0 " msgstr "" -#: ../src/wx/xrc/JoypadConfig.xrc:4 -msgid "Joypad Configuration" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:13 -msgid "Player 1" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:19 -msgid "Player 2" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:25 -msgid "Player 3" -msgstr "" - -#: ../src/wx/xrc/JoypadConfig.xrc:31 -msgid "Player 4" -msgstr "" - #: ../src/wx/xrc/JoyPanel.xrc:8 msgid "" "Click a field and press a key or move joystick to add. Press backspace to " @@ -2591,6 +2598,26 @@ msgstr "" msgid "Clear" msgstr "" +#: ../src/wx/xrc/JoypadConfig.xrc:4 +msgid "Joypad Configuration" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:13 +msgid "Player 1" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:19 +msgid "Player 2" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:25 +msgid "Player 3" +msgstr "" + +#: ../src/wx/xrc/JoypadConfig.xrc:31 +msgid "Player 4" +msgstr "" + #: ../src/wx/xrc/LinkConfig.xrc:4 msgid "Link configuration" msgstr "" @@ -2656,555 +2683,563 @@ msgid "&File" msgstr "" #: ../src/wx/xrc/MainMenu.xrc:8 +msgid "Open &GB..." +msgstr "" + +#: ../src/wx/xrc/MainMenu.xrc:11 +msgid "Open GB&C..." +msgstr "" + +#: ../src/wx/xrc/MainMenu.xrc:14 msgid "Open rece&nt" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:10 +#: ../src/wx/xrc/MainMenu.xrc:16 msgid "&Reset recent list" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:13 +#: ../src/wx/xrc/MainMenu.xrc:19 msgid "&Freeze recent list" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:18 +#: ../src/wx/xrc/MainMenu.xrc:24 msgid "ROM in&formation..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:22 +#: ../src/wx/xrc/MainMenu.xrc:28 msgid "&e-Reader" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:24 +#: ../src/wx/xrc/MainMenu.xrc:30 msgid "&Load Dot Code..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:27 +#: ../src/wx/xrc/MainMenu.xrc:33 msgid "&Save Dot Code..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:33 +#: ../src/wx/xrc/MainMenu.xrc:39 msgid "Most &recent" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:37 +#: ../src/wx/xrc/MainMenu.xrc:43 msgid "&Auto load most recent" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:46 ../src/wx/xrc/MainMenu.xrc:107 +#: ../src/wx/xrc/MainMenu.xrc:52 ../src/wx/xrc/MainMenu.xrc:113 msgid "&2" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:50 ../src/wx/xrc/MainMenu.xrc:111 +#: ../src/wx/xrc/MainMenu.xrc:56 ../src/wx/xrc/MainMenu.xrc:117 msgid "&3" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:54 ../src/wx/xrc/MainMenu.xrc:115 +#: ../src/wx/xrc/MainMenu.xrc:60 ../src/wx/xrc/MainMenu.xrc:121 msgid "&4" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:58 ../src/wx/xrc/MainMenu.xrc:119 +#: ../src/wx/xrc/MainMenu.xrc:64 ../src/wx/xrc/MainMenu.xrc:125 msgid "&5" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:62 ../src/wx/xrc/MainMenu.xrc:123 +#: ../src/wx/xrc/MainMenu.xrc:68 ../src/wx/xrc/MainMenu.xrc:129 msgid "&6" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:66 ../src/wx/xrc/MainMenu.xrc:127 +#: ../src/wx/xrc/MainMenu.xrc:72 ../src/wx/xrc/MainMenu.xrc:133 msgid "&7" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:70 ../src/wx/xrc/MainMenu.xrc:131 +#: ../src/wx/xrc/MainMenu.xrc:76 ../src/wx/xrc/MainMenu.xrc:137 msgid "&8" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:74 ../src/wx/xrc/MainMenu.xrc:135 +#: ../src/wx/xrc/MainMenu.xrc:80 ../src/wx/xrc/MainMenu.xrc:141 msgid "&9" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:78 ../src/wx/xrc/MainMenu.xrc:139 +#: ../src/wx/xrc/MainMenu.xrc:84 ../src/wx/xrc/MainMenu.xrc:145 msgid "1&0" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:83 +#: ../src/wx/xrc/MainMenu.xrc:89 msgid "From &File ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:87 +#: ../src/wx/xrc/MainMenu.xrc:93 msgid "Do not change &battery save" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:91 +#: ../src/wx/xrc/MainMenu.xrc:97 msgid "Do not change &cheat list" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:94 +#: ../src/wx/xrc/MainMenu.xrc:100 msgid "&Load state" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:98 +#: ../src/wx/xrc/MainMenu.xrc:104 msgid "&Oldest slot" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:144 +#: ../src/wx/xrc/MainMenu.xrc:150 msgid "To &File ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:146 +#: ../src/wx/xrc/MainMenu.xrc:152 msgid "&Save state" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:151 ../src/wx/xrc/MainMenu.xrc:163 +#: ../src/wx/xrc/MainMenu.xrc:157 ../src/wx/xrc/MainMenu.xrc:169 msgid "&Battery file..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:154 +#: ../src/wx/xrc/MainMenu.xrc:160 msgid "Gameshark &code file..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:157 ../src/wx/xrc/MainMenu.xrc:166 +#: ../src/wx/xrc/MainMenu.xrc:163 ../src/wx/xrc/MainMenu.xrc:172 msgid "&Gameshark snapshot..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:159 +#: ../src/wx/xrc/MainMenu.xrc:165 msgid "&Import" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:168 +#: ../src/wx/xrc/MainMenu.xrc:174 msgid "&Export" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:172 +#: ../src/wx/xrc/MainMenu.xrc:178 msgid "Screen capt&ure..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:176 +#: ../src/wx/xrc/MainMenu.xrc:182 msgid "Start &sound recording..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:179 +#: ../src/wx/xrc/MainMenu.xrc:185 msgid "Stop s&ound recording" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:182 +#: ../src/wx/xrc/MainMenu.xrc:188 msgid "Start &video recording..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:185 +#: ../src/wx/xrc/MainMenu.xrc:191 msgid "Stop v&ideo recording" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:188 +#: ../src/wx/xrc/MainMenu.xrc:194 msgid "Start &game recording..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:191 +#: ../src/wx/xrc/MainMenu.xrc:197 msgid "Stop g&ame recording" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:193 +#: ../src/wx/xrc/MainMenu.xrc:199 msgid "&Record" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:197 +#: ../src/wx/xrc/MainMenu.xrc:203 msgid "Start playing &movie..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:200 +#: ../src/wx/xrc/MainMenu.xrc:206 msgid "Stop playing m&ovie" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:202 +#: ../src/wx/xrc/MainMenu.xrc:208 msgid "&Play" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:209 +#: ../src/wx/xrc/MainMenu.xrc:215 msgid "&Emulation" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:211 +#: ../src/wx/xrc/MainMenu.xrc:217 msgid "&Pause" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:216 +#: ../src/wx/xrc/MainMenu.xrc:222 msgid "&Next frame" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:220 +#: ../src/wx/xrc/MainMenu.xrc:226 msgid "Re&wind" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:225 +#: ../src/wx/xrc/MainMenu.xrc:231 msgid "&Fullscreen" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:231 +#: ../src/wx/xrc/MainMenu.xrc:237 msgid "&Turbo mode" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:235 +#: ../src/wx/xrc/MainMenu.xrc:241 msgid "&VSync" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:239 +#: ../src/wx/xrc/MainMenu.xrc:245 msgid "&Auto skip frames" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:244 +#: ../src/wx/xrc/MainMenu.xrc:250 msgid "&Skip BIOS" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:248 +#: ../src/wx/xrc/MainMenu.xrc:254 msgid "&Auto IPS/UPS/IPF patch" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:252 +#: ../src/wx/xrc/MainMenu.xrc:258 msgid "&Pause when inactive" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:257 +#: ../src/wx/xrc/MainMenu.xrc:263 msgid "&Reset" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:262 +#: ../src/wx/xrc/MainMenu.xrc:268 msgid "&Options" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:264 +#: ../src/wx/xrc/MainMenu.xrc:270 msgid "&Link" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:266 +#: ../src/wx/xrc/MainMenu.xrc:272 msgid "Start &Network Link ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:271 +#: ../src/wx/xrc/MainMenu.xrc:277 msgid "&Nothing" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:275 +#: ../src/wx/xrc/MainMenu.xrc:281 msgid "&Cable" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:279 +#: ../src/wx/xrc/MainMenu.xrc:285 msgid "&Wireless" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:283 +#: ../src/wx/xrc/MainMenu.xrc:289 msgid "&GameCube" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:287 +#: ../src/wx/xrc/MainMenu.xrc:293 msgid "&Gameboy" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:292 +#: ../src/wx/xrc/MainMenu.xrc:298 msgid "&Local mode" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:296 +#: ../src/wx/xrc/MainMenu.xrc:302 msgid "&Link at boot" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:300 +#: ../src/wx/xrc/MainMenu.xrc:306 msgid "&Speed hack" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:304 ../src/wx/xrc/MainMenu.xrc:310 -#: ../src/wx/xrc/MainMenu.xrc:348 ../src/wx/xrc/MainMenu.xrc:372 +#: ../src/wx/xrc/MainMenu.xrc:310 ../src/wx/xrc/MainMenu.xrc:316 +#: ../src/wx/xrc/MainMenu.xrc:354 ../src/wx/xrc/MainMenu.xrc:378 msgid "&Configure ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:308 +#: ../src/wx/xrc/MainMenu.xrc:314 msgid "&Video" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:314 +#: ../src/wx/xrc/MainMenu.xrc:320 msgid "&Fullscreen mode" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:318 +#: ../src/wx/xrc/MainMenu.xrc:324 msgid "&Retain aspect ratio" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:323 +#: ../src/wx/xrc/MainMenu.xrc:329 msgid "&Bilinear filter" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:327 +#: ../src/wx/xrc/MainMenu.xrc:333 msgid "&Multithread filter" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:332 +#: ../src/wx/xrc/MainMenu.xrc:338 msgid "&Keep window on top" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:337 +#: ../src/wx/xrc/MainMenu.xrc:343 msgid "&Disable on-screen display" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:341 +#: ../src/wx/xrc/MainMenu.xrc:347 msgid "&Transparent on-screen display" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:346 +#: ../src/wx/xrc/MainMenu.xrc:352 msgid "&Audio" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:352 +#: ../src/wx/xrc/MainMenu.xrc:358 msgid "&GBA sound interpolation" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:357 +#: ../src/wx/xrc/MainMenu.xrc:363 msgid "&GB sound enhancement" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:361 +#: ../src/wx/xrc/MainMenu.xrc:367 msgid "&GB surround sound effect" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:365 +#: ../src/wx/xrc/MainMenu.xrc:371 msgid "&GB sound declicking" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:370 +#: ../src/wx/xrc/MainMenu.xrc:376 msgid "&Input" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:376 +#: ../src/wx/xrc/MainMenu.xrc:382 msgid "&Autofire" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:378 +#: ../src/wx/xrc/MainMenu.xrc:384 msgid "&A" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:383 +#: ../src/wx/xrc/MainMenu.xrc:389 msgid "&B" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:388 +#: ../src/wx/xrc/MainMenu.xrc:394 msgid "&L" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:393 +#: ../src/wx/xrc/MainMenu.xrc:399 msgid "&R" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:400 +#: ../src/wx/xrc/MainMenu.xrc:406 msgid "&Game Boy Advance" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:402 ../src/wx/xrc/MainMenu.xrc:421 +#: ../src/wx/xrc/MainMenu.xrc:408 ../src/wx/xrc/MainMenu.xrc:427 msgid "Configure ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:406 +#: ../src/wx/xrc/MainMenu.xrc:412 msgid "&Real-time clock" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:410 +#: ../src/wx/xrc/MainMenu.xrc:416 msgid "&Use BIOS file" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:414 +#: ../src/wx/xrc/MainMenu.xrc:420 msgid "&Debug print" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:419 +#: ../src/wx/xrc/MainMenu.xrc:425 msgid "&Game Boy" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:425 +#: ../src/wx/xrc/MainMenu.xrc:431 msgid "&GB printer" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:429 +#: ../src/wx/xrc/MainMenu.xrc:435 msgid "&Gather a full page before printing" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:433 +#: ../src/wx/xrc/MainMenu.xrc:439 msgid "&Save printouts as screen captures" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:438 +#: ../src/wx/xrc/MainMenu.xrc:444 msgid "&Use GB BIOS file" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:442 +#: ../src/wx/xrc/MainMenu.xrc:448 msgid "&Use GBC BIOS file" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:447 +#: ../src/wx/xrc/MainMenu.xrc:453 msgid "&General ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:450 +#: ../src/wx/xrc/MainMenu.xrc:456 msgid "D&irectories ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:453 +#: ../src/wx/xrc/MainMenu.xrc:459 msgid "&Key Shortcuts ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:457 +#: ../src/wx/xrc/MainMenu.xrc:463 msgid "&Tools" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:459 +#: ../src/wx/xrc/MainMenu.xrc:465 msgid "&Cheats" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:461 +#: ../src/wx/xrc/MainMenu.xrc:467 msgid "List &cheats ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:465 +#: ../src/wx/xrc/MainMenu.xrc:471 msgid "Find c&heat ..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:470 +#: ../src/wx/xrc/MainMenu.xrc:476 msgid "A&utomatically save/load cheats" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:474 +#: ../src/wx/xrc/MainMenu.xrc:480 msgid "&Enable cheats" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:481 +#: ../src/wx/xrc/MainMenu.xrc:487 msgid "&Break into GDB" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:485 +#: ../src/wx/xrc/MainMenu.xrc:491 msgid "&Configure port..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:488 +#: ../src/wx/xrc/MainMenu.xrc:494 msgid "&Break on load" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:493 +#: ../src/wx/xrc/MainMenu.xrc:499 msgid "&Disconnect" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:495 +#: ../src/wx/xrc/MainMenu.xrc:501 msgid "&GDB" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:498 +#: ../src/wx/xrc/MainMenu.xrc:504 msgid "&Disassemble..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:501 +#: ../src/wx/xrc/MainMenu.xrc:507 msgid "&Logging..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:504 +#: ../src/wx/xrc/MainMenu.xrc:510 msgid "&IO Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:507 +#: ../src/wx/xrc/MainMenu.xrc:513 msgid "&Map Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:510 +#: ../src/wx/xrc/MainMenu.xrc:516 msgid "M&emory Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:513 +#: ../src/wx/xrc/MainMenu.xrc:519 msgid "&OAM Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:516 +#: ../src/wx/xrc/MainMenu.xrc:522 msgid "&Palette Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:519 +#: ../src/wx/xrc/MainMenu.xrc:525 msgid "&Tile Viewer..." msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:524 +#: ../src/wx/xrc/MainMenu.xrc:530 msgid "BG &0" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:530 +#: ../src/wx/xrc/MainMenu.xrc:536 msgid "BG &1" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:536 +#: ../src/wx/xrc/MainMenu.xrc:542 msgid "BG &2" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:542 +#: ../src/wx/xrc/MainMenu.xrc:548 msgid "BG &3" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:548 +#: ../src/wx/xrc/MainMenu.xrc:554 msgid "&OBJ" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:554 +#: ../src/wx/xrc/MainMenu.xrc:560 msgid "&WIN 0" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:560 +#: ../src/wx/xrc/MainMenu.xrc:566 msgid "W&IN 1" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:566 +#: ../src/wx/xrc/MainMenu.xrc:572 msgid "O&BJ WIN" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:571 +#: ../src/wx/xrc/MainMenu.xrc:577 msgid "&View Layers" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:575 +#: ../src/wx/xrc/MainMenu.xrc:581 msgid "Channel &1" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:580 +#: ../src/wx/xrc/MainMenu.xrc:586 msgid "Channel &2" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:585 +#: ../src/wx/xrc/MainMenu.xrc:591 msgid "Channel &3" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:590 +#: ../src/wx/xrc/MainMenu.xrc:596 msgid "Channel &4" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:595 +#: ../src/wx/xrc/MainMenu.xrc:601 msgid "Direct Sound &A" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:600 +#: ../src/wx/xrc/MainMenu.xrc:606 msgid "Direct Sound &B" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:604 +#: ../src/wx/xrc/MainMenu.xrc:610 msgid "&Sound Channels" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:608 +#: ../src/wx/xrc/MainMenu.xrc:614 msgid "&Help" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:610 +#: ../src/wx/xrc/MainMenu.xrc:616 msgid "Report &Bugs" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:613 +#: ../src/wx/xrc/MainMenu.xrc:619 msgid "VBA-M Support &Forum" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:616 +#: ../src/wx/xrc/MainMenu.xrc:622 msgid "Translations" msgstr "" -#: ../src/wx/xrc/MainMenu.xrc:619 +#: ../src/wx/xrc/MainMenu.xrc:625 msgid "Update ROM database" msgstr "" diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp index 601d70eb..857b6915 100644 --- a/src/wx/cmdevents.cpp +++ b/src/wx/cmdevents.cpp @@ -87,33 +87,24 @@ void MainFrame::SetMenuOption(const char* menuName, int value) //// File menu -// formerly OpenGBA, OpenGBC, OpenGB -// having just one means separate ROM dirs only make sense on the cmd line - static int open_ft = 0; static wxString open_dir; EVT_HANDLER(wxID_OPEN, "Open ROM...") { - if (gbEmulatorType == 1) - open_dir = gopts.gba_rom_dir; - else if (gbEmulatorType == 5) - open_dir = gopts.gb_rom_dir; - else - open_dir = gopts.gbc_rom_dir; - + open_dir = gopts.gba_rom_dir; // FIXME: ignore if non-existent or not a dir wxString pats = _( - "Archives (*.zip;*.7z;*.rar)|" + "GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|" + "*.agb;*.gba;*.bin;*.elf;*.mb;" + "*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;" + "*.agb.z;*.gba.z;*.bin.z;*.elf.z;*.mb.z;" + "*.zip;*.7z;*.rar" + "|GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|" + "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;" + "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;" + "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;" "*.zip;*.7z;*.rar" - "|GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb)|" - "*.agb;*.gba;*.bin;*.elf;*.mb" - "*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz" - "*.agb.z;*.gba.z;*.bin.z;*.elf.z;*.mb.z" - "|GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb)|" - "*.dmg;*.gb;*.gbc;*.cgb;*.sgb" - "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz" - "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z" "|" ); pats.append(wxALL_FILES); @@ -129,6 +120,56 @@ EVT_HANDLER(wxID_OPEN, "Open ROM...") open_dir = dlg.GetDirectory(); } +EVT_HANDLER(OpenGB, "Open GB...") +{ + open_dir = gopts.gb_rom_dir; + // FIXME: ignore if non-existent or not a dir + wxString pats = _( + "GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|" + "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;" + "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;" + "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;" + "*.zip;*.7z;*.rar" + "|" + ); + pats.append(wxALL_FILES); + wxFileDialog dlg(this, _("Open GB ROM file"), open_dir, wxT(""), + pats, + wxFD_OPEN | wxFD_FILE_MUST_EXIST); + dlg.SetFilterIndex(open_ft); + + if (ShowModal(&dlg) == wxID_OK) + wxGetApp().pending_load = dlg.GetPath(); + + open_ft = dlg.GetFilterIndex(); + open_dir = dlg.GetDirectory(); +} + +EVT_HANDLER(OpenGBC, "Open GBC...") +{ + open_dir = gopts.gbc_rom_dir; + // FIXME: ignore if non-existent or not a dir + wxString pats = _( + "GameBoy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|" + "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;" + "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;" + "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;" + "*.zip;*.7z;*.rar" + "|" + ); + pats.append(wxALL_FILES); + wxFileDialog dlg(this, _("Open GBC ROM file"), open_dir, wxT(""), + pats, + wxFD_OPEN | wxFD_FILE_MUST_EXIST); + dlg.SetFilterIndex(open_ft); + + if (ShowModal(&dlg) == wxID_OK) + wxGetApp().pending_load = dlg.GetPath(); + + open_ft = dlg.GetFilterIndex(); + open_dir = dlg.GetDirectory(); +} + EVT_HANDLER(RecentReset, "Reset recent ROM list") { // only save config if there were items to remove diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp index 3d0a581e..8e1cce6a 100644 --- a/src/wx/panel.cpp +++ b/src/wx/panel.cpp @@ -382,7 +382,7 @@ void GameArea::LoadGame(const wxString &name) case 0x20000: saveType = 3; - flashSetSize(fnb.length()); + flashSetSize(bat.GetSize().GetValue()); break; default: diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc index 64a2b125..f26fefe7 100644 --- a/src/wx/xrc/MainMenu.xrc +++ b/src/wx/xrc/MainMenu.xrc @@ -4,6 +4,12 @@ + + + + + +