Resized some of the dialogs. Fixed the Cancel button on the GDB configuration dialog.

This commit is contained in:
skidau 2015-05-20 14:11:53 +00:00
parent 8e7f8ad74a
commit 90249184a3
16 changed files with 275 additions and 215 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1972,8 +1972,13 @@ int GetGDBPort(MainFrame* mf)
EVT_HANDLER(DebugGDBPort, "Configure port...") EVT_HANDLER(DebugGDBPort, "Configure port...")
{ {
gdbPort = GetGDBPort(this); int port_selected = GetGDBPort(this);
update_opts();
if (port_selected != -1)
{
gdbPort = port_selected;
update_opts();
}
} }
EVT_HANDLER(DebugGDBBreakOnLoad, "Break on load") EVT_HANDLER(DebugGDBBreakOnLoad, "Break on load")
@ -1988,11 +1993,16 @@ void MainFrame::GDBBreak()
if (gdbPort == 0) if (gdbPort == 0)
{ {
gdbPort = GetGDBPort(this); int port_selected = GetGDBPort(this);
update_opts();
if (port_selected != -1)
{
gdbPort = port_selected;
update_opts();
}
} }
if (gdbPort != 0) if (gdbPort > 0)
{ {
if (!remotePort) if (!remotePort)
{ {

View File

@ -18,6 +18,7 @@
<object class="sizeritem"> <object class="sizeritem">
<object class="wxTreeCtrl" name="Commands"> <object class="wxTreeCtrl" name="Commands">
<style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_FULL_ROW_HIGHLIGHT|wxTR_HIDE_ROOT</style> <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_FULL_ROW_HIGHLIGHT|wxTR_HIDE_ROOT</style>
<size>300,300</size>
</object> </object>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>

View File

@ -17,6 +17,7 @@
<object class="wxDirPickerCtrl" name="GBARoms"> <object class="wxDirPickerCtrl" name="GBARoms">
<message>Game Boy Advance ROMs</message> <message>Game Boy Advance ROMs</message>
<style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style> <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
<size>439,30</size>
</object> </object>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>

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="Disassemble"> <object class="wxDialog" name="Disassemble">
<title>Disassemble</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

View File

@ -97,6 +97,7 @@
<object class="sizeritem"> <object class="sizeritem">
<object class="wxFilePickerCtrl" name="BootRom"> <object class="wxFilePickerCtrl" name="BootRom">
<wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard> <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
<size>527,30</size>
</object> </object>
<option>1</option> <option>1</option>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>

View File

@ -90,6 +90,7 @@
<object class="wxFilePickerCtrl" name="BootRom"> <object class="wxFilePickerCtrl" name="BootRom">
<message>Select A File</message> <message>Select A File</message>
<wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard> <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
<size>472,30</size>
</object> </object>
<option>1</option> <option>1</option>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
@ -111,6 +112,7 @@
<object class="wxFilePickerCtrl" name="CBootRom"> <object class="wxFilePickerCtrl" name="CBootRom">
<message>Select A File</message> <message>Select A File</message>
<wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard> <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
<size>472,30</size>
</object> </object>
<option>1</option> <option>1</option>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>

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="IOViewer"> <object class="wxDialog" name="IOViewer">
<title>IO Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="Logging"> <object class="wxDialog" name="Logging">
<title>Logging</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

View File

@ -507,7 +507,7 @@
<label>&amp;Map Viewer...</label> <label>&amp;Map Viewer...</label>
</object> </object>
<object class="wxMenuItem" name="MemoryViewer"> <object class="wxMenuItem" name="MemoryViewer">
<label>M_emory viewer...</label> <label>M_emory Viewer...</label>
</object> </object>
<object class="wxMenuItem" name="OAMViewer"> <object class="wxMenuItem" name="OAMViewer">
<label>_OAM Viewer...</label> <label>_OAM Viewer...</label>

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="MapViewer"> <object class="wxDialog" name="MapViewer">
<title>Map Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="MemViewer"> <object class="wxDialog" name="MemViewer">
<title>Memory Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="NetLink"> <object class="wxDialog" name="NetLink">
<title>Start Network Link</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="OAMViewer"> <object class="wxDialog" name="OAMViewer">
<title>OAM Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="PaletteViewer"> <object class="wxDialog" name="PaletteViewer">
<title>Palette Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">

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="TileViewer"> <object class="wxDialog" name="TileViewer">
<title>Tile Viewer</title>
<object class="wxBoxSizer"> <object class="wxBoxSizer">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">