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 the GBA washed colors option as it did not do anything. 

Removed the broken full screen resolution selection.
Added some separators in the menu.
Fixed a path problem in the wx CMakeLists.txt

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1407 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
skidau 2015-05-08 14:39:54 +00:00
parent 84695b301c
commit 421f911371
7 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wx/CMakeLists.txt
View File

@ -74,8 +74,8 @@ 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
COMMAND wxrc ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc -o wxvbam.xrs
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND wxrc ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc -o wxvbam.xrs
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/xrc/*.xrc) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/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

6
src/wx/cmdevents.cpp
View File

@ -2228,12 +2228,6 @@ EVT_HANDLER(Printer, "Enable printer emulation")
update_opts(); update_opts();
} }
EVT_HANDLER(Color, "Emulate washed colors of LCD")
{
GetMenuOptionBool("Color", gopts.gbcColorOption);
update_opts();
}
EVT_HANDLER(PrintGather, "Automatically gather a full page before printing") EVT_HANDLER(PrintGather, "Automatically gather a full page before printing")
{ {
GetMenuOptionBool("PrintGather", gopts.print_auto_page); GetMenuOptionBool("PrintGather", gopts.print_auto_page);

3
src/wx/guiinit.cpp
View File

@ -2937,9 +2937,6 @@ bool MainFrame::BindControls()
// 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);
getsc("MaxScale", maxScale); getsc("MaxScale", maxScale);
// fs modes should be filled in at popup time
// since they may change based on what screen is current
SafeXRCCTRL<wxChoice>(d, "FullscreenMode");
/// Advanced /// Advanced
getrbi("OutputSimple", gopts.render_method, RND_SIMPLE); getrbi("OutputSimple", gopts.render_method, RND_SIMPLE);

1
src/wx/opts.cpp
View File

@ -149,7 +149,6 @@ opt_desc opts[] = {
/// GB /// GB
STROPT ("GB/BiosFile", "", wxTRANSLATE("BIOS file to use for GB, if enabled"), gopts.gb_bios), STROPT ("GB/BiosFile", "", wxTRANSLATE("BIOS file to use for GB, if enabled"), gopts.gb_bios),
STROPT ("GB/GBCBiosFile", "", wxTRANSLATE("BIOS file to use for GBC, if enabled"), gopts.gbc_bios), STROPT ("GB/GBCBiosFile", "", wxTRANSLATE("BIOS file to use for GBC, if enabled"), gopts.gbc_bios),
BOOLOPT("GB/LCDColor", "Color", wxTRANSLATE("Emulate washed colors of LCD"), gopts.gbcColorOption),
{ wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).") }, { wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
{ wxT("GB/Palette1"), "", wxTRANSLATE("The first user palette, as 8 comma-separated 4-digit hex integers (rgb555).") }, { wxT("GB/Palette1"), "", wxTRANSLATE("The first user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
{ wxT("GB/Palette2"), "", wxTRANSLATE("The second user palette, as 8 comma-separated 4-digit hex integers (rgb555).") }, { wxT("GB/Palette2"), "", wxTRANSLATE("The second user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },

1
src/wx/opts.h
View File

@ -24,7 +24,6 @@ extern struct opts_t {
/// GB /// GB
wxString gb_bios; wxString gb_bios;
wxString gbc_bios; wxString gbc_bios;
bool gbcColorOption;
// u16 systemGbPalette[8*3]; // u16 systemGbPalette[8*3];
bool print_auto_page, print_screen_cap; bool print_auto_page, print_screen_cap;
wxString gb_rom_dir; wxString gb_rom_dir;

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

@ -90,42 +90,6 @@
</object> </object>
<flag>wxEXPAND</flag> <flag>wxEXPAND</flag>
</object> </object>
<object class="sizeritem">
<object class="wxStaticText">
<label>Full screen</label>
<font>
<weight>bold</weight>
</font>
</object>
<flag>wxALL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxStaticText">
<label>Video Mode :</label>
</object>
<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxChoice" name="FullscreenMode"/>
<option>1</option>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<orient>wxHORIZONTAL</orient>
</object>
<flag>wxEXPAND</flag>
</object>
<orient>wxVERTICAL</orient>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
</object> </object>
</object> </object>
<label>Zoom</label> <label>Zoom</label>

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

@ -313,14 +313,16 @@
<object class="wxMenuItem" name="DisplayConfigure"> <object class="wxMenuItem" name="DisplayConfigure">
<label>_Configure ...</label> <label>_Configure ...</label>
</object> </object>
<object class="wxMenuItem" name="Color"> <object class="separator"/>
<label>_GB washed colors</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="Fullscreen"> <object class="wxMenuItem" name="Fullscreen">
<label>_Fullscreen mode</label> <label>_Fullscreen mode</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="RetainAspect">
<label>_Retain aspect ratio</label>
<checkable>1</checkable>
</object>
<object class="separator"/>
<object class="wxMenuItem" name="Bilinear"> <object class="wxMenuItem" name="Bilinear">
<label>_Bilinear filter</label> <label>_Bilinear filter</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -329,16 +331,13 @@
<label>_Multithread filter</label> <label>_Multithread filter</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="RetainAspect"> <object class="separator"/>
<label>_Retain aspect ratio</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="NoStatusMsg"> <object class="wxMenuItem" name="NoStatusMsg">
<label>_Disable on-screen status messages</label> <label>_Disable on-screen display</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="wxMenuItem" name="Transparent"> <object class="wxMenuItem" name="Transparent">
<label>_Transparent on-screen messages</label> <label>_Transparent on-screen display</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
</object> </object>
@ -347,10 +346,12 @@
<object class="wxMenuItem" name="SoundConfigure"> <object class="wxMenuItem" name="SoundConfigure">
<label>_Configure ...</label> <label>_Configure ...</label>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="GBASoundInterpolation"> <object class="wxMenuItem" name="GBASoundInterpolation">
<label>_GBA sound interpolation</label> <label>_GBA sound interpolation</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="GBEnhanceSound"> <object class="wxMenuItem" name="GBEnhanceSound">
<label>_GB sound enhancement</label> <label>_GB sound enhancement</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -369,6 +370,7 @@
<object class="wxMenuItem" name="JoypadConfigure"> <object class="wxMenuItem" name="JoypadConfigure">
<label>_Configure ...</label> <label>_Configure ...</label>
</object> </object>
<object class="separator"/>
<object class="wxMenu"> <object class="wxMenu">
<label>_Autofire</label> <label>_Autofire</label>
<object class="wxMenuItem" name="JoypadAutofireA"> <object class="wxMenuItem" name="JoypadAutofireA">
@ -398,6 +400,7 @@
<object class="wxMenuItem" name="GameBoyAdvanceConfigure"> <object class="wxMenuItem" name="GameBoyAdvanceConfigure">
<label>Configure ...</label> <label>Configure ...</label>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="RTC"> <object class="wxMenuItem" name="RTC">
<label>_Real-time clock</label> <label>_Real-time clock</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -416,6 +419,7 @@
<object class="wxMenuItem" name="GameBoyConfigure"> <object class="wxMenuItem" name="GameBoyConfigure">
<label>Configure ...</label> <label>Configure ...</label>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="Printer"> <object class="wxMenuItem" name="Printer">
<label>_GB printer</label> <label>_GB printer</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -428,6 +432,7 @@
<label>_Save printouts as screen captures</label> <label>_Save printouts as screen captures</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="BootRomGB"> <object class="wxMenuItem" name="BootRomGB">
<label>_Use GB BIOS file</label> <label>_Use GB BIOS file</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -459,6 +464,7 @@
<label>Find c_heat ...</label> <label>Find c_heat ...</label>
<accel>Ctrl+F</accel> <accel>Ctrl+F</accel>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="CheatsAutoSaveLoad"> <object class="wxMenuItem" name="CheatsAutoSaveLoad">
<label>A_utomatically save/load cheats</label> <label>A_utomatically save/load cheats</label>
<checkable>1</checkable> <checkable>1</checkable>
@ -473,6 +479,7 @@
<object class="wxMenuItem" name="DebugGDBBreak"> <object class="wxMenuItem" name="DebugGDBBreak">
<label>_Break into GDB</label> <label>_Break into GDB</label>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="DebugGDBPort"> <object class="wxMenuItem" name="DebugGDBPort">
<label>_Configure port...</label> <label>_Configure port...</label>
</object> </object>
@ -480,6 +487,7 @@
<label>_Break on load</label> <label>_Break on load</label>
<checkable>1</checkable> <checkable>1</checkable>
</object> </object>
<object class="separator"/>
<object class="wxMenuItem" name="DebugGDBDisconnect"> <object class="wxMenuItem" name="DebugGDBDisconnect">
<label>_Disconnect</label> <label>_Disconnect</label>
</object> </object>