ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed most of the checkboxes from the dialogs. 

Replaced wxvbam.xrc with the individual xrc files.
This commit is contained in:
skidau 2015-05-04 13:45:52 +00:00
parent 23c1096934
commit 54a768e6bc
14 changed files with 32 additions and 6842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wx/CMakeLists.txt
View File

@ -74,11 +74,9 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/wxvbam.xpm DESTINATION ${CMAKE_CURRE
# wxrc does not support xrs files in -c output (> 10x compression) # wxrc does not support xrs files in -c output (> 10x compression)
# so do it manually using slow but portable bin2c.cmake script # so do it manually using slow but portable bin2c.cmake script
ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
# doing this in its own dir prevents name prefixes COMMAND wxrc xrc/*.xrc -o wxvbam.xrs
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.xrc wxvbam.xrc
COMMAND wxrc wxvbam.xrc -o wxvbam.xrs
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS wxvbam.xrc) DEPENDS xrc/*.xrc)
ADD_CUSTOM_COMMAND(OUTPUT builtin-xrc.h ADD_CUSTOM_COMMAND(OUTPUT builtin-xrc.h
COMMAND ${CMAKE_COMMAND} -DINFILE=wxvbam.xrs -DOUTFILE=builtin-xrc.h -DVARNAME=builtin_xrs -P ${CMAKE_CURRENT_SOURCE_DIR}/bin2c.cmake COMMAND ${CMAKE_COMMAND} -DINFILE=wxvbam.xrs -DOUTFILE=builtin-xrc.h -DVARNAME=builtin_xrs -P ${CMAKE_CURRENT_SOURCE_DIR}/bin2c.cmake
DEPENDS wxvbam.xrs) DEPENDS wxvbam.xrs)

20
src/wx/cmdevents.cpp
View File

@ -1863,9 +1863,6 @@ EVT_HANDLER(GameBoyConfigure, "Game Boy options...")
break; break;
} }
// this value might have been overwritten by FrameSkip // this value might have been overwritten by FrameSkip
if(XRCCTRL(*dlg, "FrameSkipAuto", wxCheckBox)->GetValue())
gbFrameSkip = -1;
update_opts();
if(panel->game_type() == IMAGE_GB) { if(panel->game_type() == IMAGE_GB) {
if(borderon != gbBorderOn) { if(borderon != gbBorderOn) {
if(gbBorderOn) { if(gbBorderOn) {
@ -1889,6 +1886,7 @@ EVT_HANDLER(GameBoyConfigure, "Game Boy options...")
if(gopts.gbprint) if(gopts.gbprint)
gbSerialFunction = gbPrinterSend; gbSerialFunction = gbPrinterSend;
} }
update_opts();
} }
EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...") EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
@ -1931,21 +1929,11 @@ EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
} }
if(ShowModal(dlg) != wxID_OK) if(ShowModal(dlg) != wxID_OK)
return; return;
// this value might have been overwritten by FrameSkip
if(XRCCTRL(*dlg, "FrameSkipAuto", wxCheckBox)->GetValue())
frameSkip = -1;
update_opts();
if(panel->game_type() == IMAGE_GBA) { if(panel->game_type() == IMAGE_GBA) {
// autoskip will self-adjust // autoskip will self-adjust
if(frameSkip >= 0) if(frameSkip >= 0)
systemFrameSkip = frameSkip; systemFrameSkip = frameSkip;
agbPrintEnable(agbPrint); agbPrintEnable(agbPrint);
#if 0 // disabled in win32 version for undocumented "problems"
if(gopts.skip_intro)
*((u32 *)rom) = 0xea00002e;
else
*((u32 *)rom) = /* original value */;
#endif
wxString s = wxString((const char *)&rom[0xac], wxConvLibc, 4); wxString s = wxString((const char *)&rom[0xac], wxConvLibc, 4);
wxFileConfig *cfg = wxGetApp().overrides; wxFileConfig *cfg = wxGetApp().overrides;
bool chg; bool chg;
@ -2038,6 +2026,7 @@ EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
fos.Commit(); fos.Commit();
} }
} }
update_opts();
} }
EVT_HANDLER_MASK(DisplayConfigure, "Display options...", CMDEN_NREC_ANY) EVT_HANDLER_MASK(DisplayConfigure, "Display options...", CMDEN_NREC_ANY)
@ -2056,8 +2045,6 @@ EVT_HANDLER_MASK(DisplayConfigure, "Display options...", CMDEN_NREC_ANY)
wxDialog *dlg = GetXRCDialog("DisplayConfig"); wxDialog *dlg = GetXRCDialog("DisplayConfig");
if(ShowModal(dlg) != wxID_OK) if(ShowModal(dlg) != wxID_OK)
return; return;
update_opts();
if(fs != fullScreen) if(fs != fullScreen)
{ {
panel->ShowFullScreen(fullScreen); panel->ShowFullScreen(fullScreen);
@ -2073,6 +2060,7 @@ EVT_HANDLER_MASK(DisplayConfigure, "Display options...", CMDEN_NREC_ANY)
panel->panel->Delete(); panel->panel->Delete();
panel->panel = NULL; panel->panel = NULL;
} }
update_opts();
} }
EVT_HANDLER_MASK(ChangeFilter, "Change Pixel Filter", CMDEN_NREC_ANY) EVT_HANDLER_MASK(ChangeFilter, "Change Pixel Filter", CMDEN_NREC_ANY)
@ -2109,7 +2097,6 @@ EVT_HANDLER_MASK(SoundConfigure, "Sound options...", CMDEN_NREC_ANY)
wxDialog *dlg = GetXRCDialog("SoundConfig"); wxDialog *dlg = GetXRCDialog("SoundConfig");
if(ShowModal(dlg) != wxID_OK) if(ShowModal(dlg) != wxID_OK)
return; return;
update_opts();
switch(panel->game_type()) { switch(panel->game_type()) {
case IMAGE_UNKNOWN: case IMAGE_UNKNOWN:
return; return;
@ -2137,6 +2124,7 @@ EVT_HANDLER_MASK(SoundConfigure, "Sound options...", CMDEN_NREC_ANY)
soundInit(); soundInit();
} }
soundSetVolume((float)gopts.sound_vol / 100.0); soundSetVolume((float)gopts.sound_vol / 100.0);
update_opts();
} }
EVT_HANDLER(EmulatorDirectories, "Directories...") EVT_HANDLER(EmulatorDirectories, "Directories...")

43
src/wx/guiinit.cpp
View File

@ -2766,8 +2766,6 @@ bool MainFrame::BindControls()
sc->SetValidator(wxGenericValidator(&o)); \ sc->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
{ {
getcbi("PauseWhenInactive", pauseWhenInactive);
getcbi("ApplyPatches", autoPatch);
getrbi("PNG", captureFormat, 0); getrbi("PNG", captureFormat, 0);
getrbi("BMP", captureFormat, 1); getrbi("BMP", captureFormat, 1);
getsc("RewindInterval", gopts.rewind_interval); getsc("RewindInterval", gopts.rewind_interval);
@ -2821,32 +2819,25 @@ bool MainFrame::BindControls()
// in command handler. Plus making changes might require resizing // in command handler. Plus making changes might require resizing
// game area. Validation only here. // game area. Validation only here.
SafeXRCCTRL<wxChoice>(d, "Borders"); SafeXRCCTRL<wxChoice>(d, "Borders");
getcbbe("Printer", gopts.gbprint);
getcbb("PrintGather", gopts.print_auto_page);
addbe(cb);
getcbb("PrintSnap", gopts.print_screen_cap);
addbe(cb);
/// Speed /// Speed
// AutoSkip/FrameSkip are 2 controls for 1 value. Needs post-process // AutoSkip/FrameSkip are 2 controls for 1 value. Needs post-process
// to ensure checkbox not ignored // to ensure checkbox not ignored
getcbie("FrameSkipAuto", gbFrameSkip, -1); getcbie("FrameSkipAuto", autoFrameSkip, -1);
getsc("FrameSkip", gbFrameSkip); getsc("FrameSkip", gbFrameSkip);
addbier(sc, true); addbier(sc, true);
getlab("FrameSkipLab"); getlab("FrameSkipLab");
addbier(lab, true); addbier(lab, true);
/// Boot ROM /// Boot ROM
getcbie("BootRomEn", useBiosFileGB, 1);
getfp("BootRom", gopts.gb_bios); getfp("BootRom", gopts.gb_bios);
addbe(fp); addbe(fp);
getlab("BootRomLab"); getlab("BootRomLab");
addbe(lab); addbe(lab);
getcbie("CBootRomEn", useBiosFileGBC, 1);
getfp("CBootRom", gopts.gbc_bios); getfp("CBootRom", gopts.gbc_bios);
addbe(fp); addbe(fp);
getlab("CBootRomLab"); getlab("CBootRomLab");
addbe(lab); addbe(lab);
/// Custom Colors /// Custom Colors
getcbi("Color", gbColorOption); //getcbi("Color", gbColorOption);
wxFarRadio *r = NULL; wxFarRadio *r = NULL;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
wxString pn; wxString pn;
@ -2907,25 +2898,21 @@ bool MainFrame::BindControls()
d->Connect(XRCID("Detect"), wxEVT_COMMAND_BUTTON_CLICKED, d->Connect(XRCID("Detect"), wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler(BatConfig_t::Detect), wxCommandEventHandler(BatConfig_t::Detect),
NULL, &BatConfigHandler); NULL, &BatConfigHandler);
getcbi("RTC", rtcEnabled);
getcbi("AGBPrinter", agbPrint);
/// Speed /// Speed
// AutoSkip/FrameSkip are 2 controls for 1 value. Needs post-process // AutoSkip/FrameSkip are 2 controls for 1 value. Needs post-process
// to ensure checkbox not ignored // to ensure checkbox not ignored
getcbie("FrameSkipAuto", autoFrameSkip, -1); //getcbie("FrameSkipAuto", autoFrameSkip, -1);
getsc("FrameSkip", frameSkip); getsc("FrameSkip", frameSkip);
addbier(sc, true); addbier(sc, true);
getlab("FrameSkipLab"); getlab("FrameSkipLab");
addbier(lab, true); addbier(lab, true);
/// Boot ROM /// Boot ROM
getcbie("BootRomEn", useBiosFileGBA, 1);
getfp("BootRom", gopts.gba_bios); getfp("BootRom", gopts.gba_bios);
addbe(fp); addbe(fp);
getlab("BootRomLab"); getlab("BootRomLab");
addbe(lab); addbe(lab);
getcbi("SkipIntro", skipBios);
/// Game Overrides /// Game Overrides
getgbaw("GameSettings"); getgbaw("GameSettings");
@ -2942,19 +2929,14 @@ bool MainFrame::BindControls()
{ {
/// On-Screen Display /// On-Screen Display
ch = GetValidatedChild<wxChoice, wxGenericValidator>(d, "SpeedIndicator", wxGenericValidator(&showSpeed)); ch = GetValidatedChild<wxChoice, wxGenericValidator>(d, "SpeedIndicator", wxGenericValidator(&showSpeed));
getcbi("NoStatusMsg", disableStatusMessages);
getcbi("Transparent", showSpeedTransparent);
/// Zoom /// Zoom
// this was a choice, but I'd rather not have to make an off-by-one // this was a choice, but I'd rather not have to make an off-by-one
// validator just for this, and spinctrl is good enough. // validator just for this, and spinctrl is good enough.
getsc("DefaultScale", gopts.video_scale); getsc("DefaultScale", gopts.video_scale);
getcbb("RetainAspect", gopts.retain_aspect);
getsc("MaxScale", maxScale); getsc("MaxScale", maxScale);
// fs modes should be filled in at popup time // fs modes should be filled in at popup time
// since they may change based on what screen is current // since they may change based on what screen is current
SafeXRCCTRL<wxChoice>(d, "FullscreenMode"); SafeXRCCTRL<wxChoice>(d, "FullscreenMode");
getcbi("Fullscreen", fullScreen);
/// Advanced /// Advanced
getrbi("OutputSimple", gopts.render_method, RND_SIMPLE); getrbi("OutputSimple", gopts.render_method, RND_SIMPLE);
@ -2970,20 +2952,6 @@ bool MainFrame::BindControls()
#if !defined(__WXMSW__) || defined(NO_D3D) || 1 // not implemented #if !defined(__WXMSW__) || defined(NO_D3D) || 1 // not implemented
rb->Hide(); rb->Hide();
#endif #endif
getcbb("Bilinear", gopts.bilinear);
getcbi("VSync", vsync);
// FIXME: make cb disabled when not GL or d3d
int mthr = wxThread::GetCPUCount();
if (mthr > 8)
mthr = 8;
if (mthr < 0)
mthr = 2;
cb = SafeXRCCTRL<wxCheckBox>(d, "Multithread");
cb->SetValidator(wxBoolIntValidator(&gopts.max_threads, mthr));
if (mthr <= 1)
cb->Hide();
getcbi("MMX", disableMMX);
//cb->Hide();
ch = GetValidatedChild<wxChoice, wxGenericValidator>(d, "Filter", wxGenericValidator(&gopts.filter)); ch = GetValidatedChild<wxChoice, wxGenericValidator>(d, "Filter", wxGenericValidator(&gopts.filter));
// these two are filled and/or hidden at dialog load time // these two are filled and/or hidden at dialog load time
wxControl *pll; wxControl *pll;
@ -3048,7 +3016,6 @@ bool MainFrame::BindControls()
#ifndef __WXMSW__ #ifndef __WXMSW__
cb->Hide(); cb->Hide();
#endif #endif
getcbi("SyncGameAudio", synchronize);
getsl("Buffers", gopts.audio_buffers); getsl("Buffers", gopts.audio_buffers);
sound_config_handler.bufs = sl; sound_config_handler.bufs = sl;
getlab("BuffersInfo"); getlab("BuffersInfo");
@ -3062,17 +3029,13 @@ bool MainFrame::BindControls()
sound_config_handler.AdjustFrames(10); sound_config_handler.AdjustFrames(10);
/// Game Boy /// Game Boy
getcbb("GBDeclicking", gopts.gb_declick);
getcbbe("GBEnhanceSound", gb_effects_config.enabled);
wxPanel *p; wxPanel *p;
p = SafeXRCCTRL<wxPanel>(d, "GBEnhanceSoundDep"); p = SafeXRCCTRL<wxPanel>(d, "GBEnhanceSoundDep");
addbe(p); addbe(p);
getcbb("GBSurround", gb_effects_config.surround);
getsl("GBEcho", gopts.gb_echo); getsl("GBEcho", gopts.gb_echo);
getsl("GBStereo", gopts.gb_stereo); getsl("GBStereo", gopts.gb_stereo);
/// Game Boy Advance /// Game Boy Advance
getcbb("GBASoundInterpolation", soundInterpolation);
getsl("GBASoundFiltering", gopts.gba_sound_filter); getsl("GBASoundFiltering", gopts.gba_sound_filter);
d->Fit(); d->Fit();
} }

2
src/wx/opts.cpp
View File

@ -136,7 +136,7 @@ opt_desc opts[] = {
L"simple2x|simple3x|hq3x|simple4x|hq4x|xbrz2x|xbrz3x|xbrz4x|xbrz5x|plugin")), L"simple2x|simple3x|hq3x|simple4x|hq4x|xbrz2x|xbrz3x|xbrz4x|xbrz5x|plugin")),
STROPT ("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin), STROPT ("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin),
ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")), ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")),
INTOPT ("Display/MaxThreads", "", wxTRANSLATE("Maximum number of threads to run filters in"), gopts.max_threads, 1, 8), INTOPT ("Display/MaxThreads", "Multithread", wxTRANSLATE("Maximum number of threads to run filters in"), gopts.max_threads, 1, 8),
#ifdef __WXMSW__ #ifdef __WXMSW__
ENUMOPT("Display/RenderMethod", "", wxTRANSLATE("Render method; if unsupported, simple method will be used"), gopts.render_method, wxTRANSLATE("simple|opengl|cairo|direct3d")), ENUMOPT("Display/RenderMethod", "", wxTRANSLATE("Render method; if unsupported, simple method will be used"), gopts.render_method, wxTRANSLATE("simple|opengl|cairo|direct3d")),
#else #else

6578
src/wx/wxvbam.xrc
View File

File diff suppressed because it is too large Load Diff

1
src/wx/xrc/AccelConfig.xrc
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="AccelConfig"> <object class="wxDialog" name="AccelConfig">
<title>Key Shortcuts</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

1
src/wx/xrc/DirectoriesConfig.xrc
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="DirectoriesConfig"> <object class="wxDialog" name="DirectoriesConfig">
<title>Directories</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

64
src/wx/xrc/DisplayConfig.xrc
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="DisplayConfig"> <object class="wxDialog" name="DisplayConfig">
<title>Display settings</title> <title>Display settings</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
@ -40,20 +40,6 @@
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
</object> </object>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="NoStatusMsg">
<label>Disable status messages</label>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="Transparent">
<label>Transparent status and speed</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
</object> </object>
</object> </object>
<label>On-Screen Display</label> <label>On-Screen Display</label>
@ -83,13 +69,6 @@
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>
</object> </object>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="RetainAspect">
<label>Retain aspect ratio</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<object class="sizeritem"> <object class="sizeritem">
@ -142,13 +121,6 @@
</object> </object>
<flag>wxEXPAND</flag> <flag>wxEXPAND</flag>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="Fullscreen">
<label>Full screen at startup</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
</object> </object>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
@ -210,26 +182,6 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem">
<object class="wxGridSizer">
<object class="sizeritem">
<object class="wxCheckBox" name="Bilinear">
<label>Bilinear scaling filter</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<cols>2</cols>
<object class="sizeritem">
<object class="wxCheckBox" name="VSync">
<label>Wait for VSync</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
</object>
<flag>wxEXPAND</flag>
</object>
</object> </object>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
@ -244,20 +196,6 @@
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxFlexGridSizer"> <object class="wxFlexGridSizer">
<object class="sizeritem">
<object class="wxCheckBox" name="MMX">
<label>Enable MMX</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="Multithread">
<label>Enable multithreading</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>

37
src/wx/xrc/GameBoyAdvanceConfig.xrc
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="GameBoyAdvanceConfig"> <object class="wxDialog" name="GameBoyAdvanceConfig">
<title>Game Boy Advance settings</title> <title>Game Boy Advance settings</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
@ -72,20 +72,6 @@
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="RTC">
<label>Enable real-time clock</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="AGBPrinter">
<label>Enable AGB Printer</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
</object> </object>
</object> </object>
<label>System and peripherals</label> <label>System and peripherals</label>
@ -107,13 +93,6 @@
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="FrameSkipAuto">
<label>Enable _automatic frame skipping</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
@ -151,13 +130,6 @@
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxCheckBox" name="BootRomEn">
<label>Use a bios file</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
@ -181,13 +153,6 @@
</object> </object>
</object> </object>
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="SkipIntro">
<label>Skip BIOS intro</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
</object> </object>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>

46
src/wx/xrc/GameBoyConfig.xrc
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="GameBoyConfig"> <object class="wxDialog" name="GameBoyConfig">
<title>GameBoy settings</title> <title>GameBoy settings</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
@ -67,34 +67,6 @@
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="Printer">
<label>Emulate a Game Boy _Printer</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="PrintGather">
<label>Automatically _gather entire printed page</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="PrintSnap">
<label>Automatically _save printouts as snapshots</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="Color">
<label>Emulate gameboy washed colors</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
</object> </object>
</object> </object>
<label>System and Peripherals</label> <label>System and Peripherals</label>
@ -158,13 +130,6 @@
<object class="wxPanel"> <object class="wxPanel">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="BootRomEn">
<label>Use a _Game Boy boot ROM file</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxEXPAND</flag> <flag>wxEXPAND</flag>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
@ -187,19 +152,12 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="CBootRomEn">
<label>Use a _Color Game Boy boot ROM file</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStaticText" name="CBootRomLab"> <object class="wxStaticText" name="CBootRomLab">
<label>Boot ROM _file :</label> <label>GBC Boot ROM _file :</label>
</object> </object>
<flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border> <border>5</border>

15
src/wx/xrc/GeneralConfig.xrc
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="GeneralConfig"> <object class="wxDialog" name="GeneralConfig">
<title>General settings</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
@ -18,20 +19,6 @@
<border>5</border> <border>5</border>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="PauseWhenInactive">
<label>Pause when _inactive</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="ApplyPatches">
<label>_Auto-apply IPS/UPS/PPF patches</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<object class="sizeritem"> <object class="sizeritem">

1
src/wx/xrc/LinkConfig.xrc
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="LinkConfig"> <object class="wxDialog" name="LinkConfig">
<title>Link configuration</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

22
src/wx/xrc/MainMenu.xrc
View File

@ -309,10 +309,18 @@
<object class="wxMenuItem" name="DisplayConfigure"> <object class="wxMenuItem" name="DisplayConfigure">
<label>_Configure ...</label> <label>_Configure ...</label>
</object> </object>
<object class="wxMenuItem" name="Fullscreen">
<label>_Fullscreen mode</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="Bilinear"> <object class="wxMenuItem" name="Bilinear">
<label>_Bilinear filter</label> <label>_Bilinear filter</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="Multithread">
<label>_Multithread filter</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="RetainAspect"> <object class="wxMenuItem" name="RetainAspect">
<label>_Retain aspect ratio</label> <label>_Retain aspect ratio</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -325,10 +333,6 @@
<label>_Transparent on-screen messages</label> <label>_Transparent on-screen messages</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="Fullscreen">
<label>_Fullscreen mode</label>
<checkable>1</checkable>
</object>
</object> </object>
<object class="wxMenu"> <object class="wxMenu">
<label>_Audio</label> <label>_Audio</label>
@ -340,13 +344,17 @@
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="GBEnhanceSound"> <object class="wxMenuItem" name="GBEnhanceSound">
<label>_GB sound effects</label> <label>_GB sound enhancement</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="GBSurround"> <object class="wxMenuItem" name="GBSurround">
<label>_GB surround sound effect</label> <label>_GB surround sound effect</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="GBDeclicking">
<label>_GB sound declicking</label>
<checkable>1</checkable>
</object>
</object> </object>
<object class="wxMenu"> <object class="wxMenu">
<label>_Input</label> <label>_Input</label>
@ -420,10 +428,6 @@
<label>_Save printouts as screen captures</label> <label>_Save printouts as screen captures</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="GBDeclicking">
<label>_GB sound declicking</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="CBootRomEn"> <object class="wxMenuItem" name="CBootRomEn">
<label>_Use GBC BIOS file</label> <label>_Use GBC BIOS file</label>
<checkable>1</checkable> <checkable>1</checkable>

38
src/wx/xrc/SoundConfig.xrc
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxDialog" name="SoundConfig"> <object class="wxDialog" name="SoundConfig">
<title>Sound Settings</title> <title>Sound Settings</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
@ -156,13 +156,6 @@
<flag>wxALL</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem">
<object class="wxCheckBox" name="SyncGameAudio">
<label>_Sync game to audio</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStaticBoxSizer"> <object class="wxStaticBoxSizer">
<object class="sizeritem"> <object class="sizeritem">
@ -201,32 +194,10 @@
<object class="wxPanel"> <object class="wxPanel">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="GBDeclicking">
<label>Declicking</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="GBEnhanceSound">
<label>Enhance sound</label>
<label>Enhance sound</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxPanel" name="GBEnhanceSoundDep"> <object class="wxPanel" name="GBEnhanceSoundDep">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="GBSurround">
<label>Surround</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStaticBoxSizer"> <object class="wxStaticBoxSizer">
<object class="sizeritem"> <object class="sizeritem">
@ -315,13 +286,6 @@
<object class="wxPanel"> <object class="wxPanel">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<object class="wxCheckBox" name="GBASoundInterpolation">
<label>Sound interpolation</label>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxStaticBoxSizer"> <object class="wxStaticBoxSizer">
<label>Sound filtering</label> <label>Sound filtering</label>