Merge pull request #4412 from JosJuice/more-debug-text
More debug text fixes
This commit is contained in:
commit
25070d149e
|
@ -52,7 +52,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CWII_IPC_HLE_Device_usb_oh1_57e_305_emu
|
||||||
SetUsbPointer(this);
|
SetUsbPointer(this);
|
||||||
if (!sysconf.GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)))
|
if (!sysconf.GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)))
|
||||||
{
|
{
|
||||||
PanicAlertT("Trying to read from invalid SYSCONF\nWii Remote bt ids are not available");
|
PanicAlertT("Trying to read from invalid SYSCONF\nWii Remote Bluetooth IDs are not available");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,7 +65,9 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) : wxPanel(parent)
|
||||||
wxLC_REPORT | wxLC_SINGLE_SEL);
|
wxLC_REPORT | wxLC_SINGLE_SEL);
|
||||||
m_lview_search_results->AppendColumn(_("Address"));
|
m_lview_search_results->AppendColumn(_("Address"));
|
||||||
m_lview_search_results->AppendColumn(_("Value"));
|
m_lview_search_results->AppendColumn(_("Value"));
|
||||||
|
// i18n: Float means floating point number
|
||||||
m_lview_search_results->AppendColumn(_("Value (float)"));
|
m_lview_search_results->AppendColumn(_("Value (float)"));
|
||||||
|
// i18n: Double means double-precision floating point number
|
||||||
m_lview_search_results->AppendColumn(_("Value (double)"));
|
m_lview_search_results->AppendColumn(_("Value (double)"));
|
||||||
m_lview_search_results->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CheatSearchTab::OnListViewItemActivated,
|
m_lview_search_results->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CheatSearchTab::OnListViewItemActivated,
|
||||||
this);
|
this);
|
||||||
|
|
|
@ -369,7 +369,7 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event)
|
||||||
menu.AppendSeparator();
|
menu.AppendSeparator();
|
||||||
menu.Append(IDM_RUNTOHERE, _("&Run To Here"))->Enable(Core::IsRunning());
|
menu.Append(IDM_RUNTOHERE, _("&Run To Here"))->Enable(Core::IsRunning());
|
||||||
menu.Append(IDM_ADDFUNCTION, _("&Add function"))->Enable(Core::IsRunning());
|
menu.Append(IDM_ADDFUNCTION, _("&Add function"))->Enable(Core::IsRunning());
|
||||||
menu.Append(IDM_JITRESULTS, _("PPC vs X86"))->Enable(Core::IsRunning());
|
menu.Append(IDM_JITRESULTS, _("PPC vs x86"))->Enable(Core::IsRunning());
|
||||||
menu.Append(IDM_INSERTBLR, _("Insert &blr"))->Enable(Core::IsRunning());
|
menu.Append(IDM_INSERTBLR, _("Insert &blr"))->Enable(Core::IsRunning());
|
||||||
menu.Append(IDM_INSERTNOP, _("Insert &nop"))->Enable(Core::IsRunning());
|
menu.Append(IDM_INSERTNOP, _("Insert &nop"))->Enable(Core::IsRunning());
|
||||||
// menu.Append(IDM_PATCHALERT, _("Patch alert"))->Enable(Core::IsRunning());
|
// menu.Append(IDM_PATCHALERT, _("Patch alert"))->Enable(Core::IsRunning());
|
||||||
|
|
|
@ -46,9 +46,12 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
|
||||||
new DolphinAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT);
|
new DolphinAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT);
|
||||||
m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"),
|
m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"),
|
||||||
wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, m_toolbar_item_size));
|
wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, m_toolbar_item_size));
|
||||||
|
// i18n: Here, "Step" is a verb. This function is used for
|
||||||
|
// going through code step by step.
|
||||||
m_Toolbar->AddTool(ID_STEPTOOL, _("Step"),
|
m_Toolbar->AddTool(ID_STEPTOOL, _("Step"),
|
||||||
wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, m_toolbar_item_size));
|
wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, m_toolbar_item_size));
|
||||||
m_Toolbar->AddTool(
|
m_Toolbar->AddTool(
|
||||||
|
// i18n: Here, PC is an acronym for program counter, not personal computer.
|
||||||
ID_SHOWPCTOOL, _("Show PC"),
|
ID_SHOWPCTOOL, _("Show PC"),
|
||||||
wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, m_toolbar_item_size));
|
wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, m_toolbar_item_size));
|
||||||
m_Toolbar->AddSeparator();
|
m_Toolbar->AddSeparator();
|
||||||
|
|
|
@ -116,15 +116,17 @@ void GFXDebuggerPanel::CreateGUIControls()
|
||||||
m_pButtonClearTextureCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearTextureCacheButton,
|
m_pButtonClearTextureCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearTextureCacheButton,
|
||||||
this);
|
this);
|
||||||
|
|
||||||
|
const wxString clear_vertex_shaders = _("Clear Vertex Shaders");
|
||||||
m_pButtonClearVertexShaderCache =
|
m_pButtonClearVertexShaderCache =
|
||||||
new wxButton(this, wxID_ANY, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0,
|
new wxButton(this, wxID_ANY, clear_vertex_shaders, wxDefaultPosition, wxDefaultSize, 0,
|
||||||
wxDefaultValidator, _("Clear V Shaders"));
|
wxDefaultValidator, clear_vertex_shaders);
|
||||||
m_pButtonClearVertexShaderCache->Bind(wxEVT_BUTTON,
|
m_pButtonClearVertexShaderCache->Bind(wxEVT_BUTTON,
|
||||||
&GFXDebuggerPanel::OnClearVertexShaderCacheButton, this);
|
&GFXDebuggerPanel::OnClearVertexShaderCacheButton, this);
|
||||||
|
|
||||||
|
const wxString clear_pixel_shaders = _("Clear Pixel Shaders");
|
||||||
m_pButtonClearPixelShaderCache =
|
m_pButtonClearPixelShaderCache =
|
||||||
new wxButton(this, wxID_ANY, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0,
|
new wxButton(this, wxID_ANY, clear_pixel_shaders, wxDefaultPosition, wxDefaultSize, 0,
|
||||||
wxDefaultValidator, _("Clear P Shaders"));
|
wxDefaultValidator, clear_pixel_shaders);
|
||||||
m_pButtonClearPixelShaderCache->Bind(wxEVT_BUTTON,
|
m_pButtonClearPixelShaderCache->Bind(wxEVT_BUTTON,
|
||||||
&GFXDebuggerPanel::OnClearPixelShaderCacheButton, this);
|
&GFXDebuggerPanel::OnClearPixelShaderCacheButton, this);
|
||||||
|
|
||||||
|
|
|
@ -173,9 +173,14 @@ void JitBlockList::Init()
|
||||||
InsertColumn(COLUMN_ADDRESS, _("Address"));
|
InsertColumn(COLUMN_ADDRESS, _("Address"));
|
||||||
InsertColumn(COLUMN_PPCSIZE, _("PPC Size"));
|
InsertColumn(COLUMN_PPCSIZE, _("PPC Size"));
|
||||||
InsertColumn(COLUMN_X86SIZE, _("x86 Size"));
|
InsertColumn(COLUMN_X86SIZE, _("x86 Size"));
|
||||||
|
// i18n: The symbolic name of a code block
|
||||||
InsertColumn(COLUMN_NAME, _("Symbol"));
|
InsertColumn(COLUMN_NAME, _("Symbol"));
|
||||||
|
// i18n: These are the kinds of flags that a CPU uses (e.g. carry),
|
||||||
|
// not the kinds of flags that represent e.g. countries
|
||||||
InsertColumn(COLUMN_FLAGS, _("Flags"));
|
InsertColumn(COLUMN_FLAGS, _("Flags"));
|
||||||
|
// i18n: The number of times a code block has been executed
|
||||||
InsertColumn(COLUMN_NUMEXEC, _("NumExec"));
|
InsertColumn(COLUMN_NUMEXEC, _("NumExec"));
|
||||||
|
// i18n: Performance cost, not monetary cost
|
||||||
InsertColumn(COLUMN_COST, _("Cost"));
|
InsertColumn(COLUMN_COST, _("Cost"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -250,6 +250,8 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event)
|
||||||
menu.Append(IDM_COPYADDRESS, _("Copy &address"));
|
menu.Append(IDM_COPYADDRESS, _("Copy &address"));
|
||||||
menu.Append(IDM_COPYHEX, _("Copy &hex"));
|
menu.Append(IDM_COPYHEX, _("Copy &hex"));
|
||||||
#endif
|
#endif
|
||||||
|
// i18n: This kind of "watch" is used for watching emulated memory.
|
||||||
|
// It's not related to timekeeping devices.
|
||||||
menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
|
menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
|
||||||
menu.AppendCheckItem(IDM_TOGGLEMEMORY, _("Toggle &memory"))->Check(memory != 0);
|
menu.AppendCheckItem(IDM_TOGGLEMEMORY, _("Toggle &memory"))->Check(memory != 0);
|
||||||
|
|
||||||
|
|
|
@ -483,6 +483,8 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event)
|
||||||
TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress);
|
TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress);
|
||||||
|
|
||||||
wxMenu menu;
|
wxMenu menu;
|
||||||
|
// i18n: This kind of "watch" is used for watching emulated memory.
|
||||||
|
// It's not related to timekeeping devices.
|
||||||
menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
|
menu.Append(IDM_WATCHADDRESS, _("Add to &watch"));
|
||||||
menu.Append(IDM_VIEWMEMORY, _("View &memory"));
|
menu.Append(IDM_VIEWMEMORY, _("View &memory"));
|
||||||
menu.Append(IDM_VIEWCODE, _("View &code"));
|
menu.Append(IDM_VIEWCODE, _("View &code"));
|
||||||
|
@ -495,11 +497,13 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event)
|
||||||
menu.Append(IDM_VIEW_HEX8, _("View as hexadecimal"));
|
menu.Append(IDM_VIEW_HEX8, _("View as hexadecimal"));
|
||||||
menu.Append(IDM_VIEW_INT, _("View as signed integer"));
|
menu.Append(IDM_VIEW_INT, _("View as signed integer"));
|
||||||
menu.Append(IDM_VIEW_UINT, _("View as unsigned integer"));
|
menu.Append(IDM_VIEW_UINT, _("View as unsigned integer"));
|
||||||
|
// i18n: Float means floating point number
|
||||||
menu.Append(IDM_VIEW_FLOAT, _("View as float"));
|
menu.Append(IDM_VIEW_FLOAT, _("View as float"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
menu.Append(IDM_VIEW_HEX16, _("View as hexadecimal"));
|
menu.Append(IDM_VIEW_HEX16, _("View as hexadecimal"));
|
||||||
|
// i18n: Double means double-precision floating point number
|
||||||
menu.Append(IDM_VIEW_DOUBLE, _("View as double"));
|
menu.Append(IDM_VIEW_DOUBLE, _("View as double"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,7 @@ static wxString GetValueByRowCol(int row, int col)
|
||||||
case 3:
|
case 3:
|
||||||
return _("Decimal");
|
return _("Decimal");
|
||||||
case 4:
|
case 4:
|
||||||
|
// i18n: Data type used in computing
|
||||||
return _("String");
|
return _("String");
|
||||||
default:
|
default:
|
||||||
return wxEmptyString;
|
return wxEmptyString;
|
||||||
|
@ -258,7 +259,11 @@ void CWatchView::OnMouseDownR(wxGridEvent& event)
|
||||||
|
|
||||||
wxMenu menu;
|
wxMenu menu;
|
||||||
if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1))
|
if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1))
|
||||||
|
{
|
||||||
|
// i18n: This kind of "watch" is used for watching emulated memory.
|
||||||
|
// It's not related to timekeeping devices.
|
||||||
menu.Append(IDM_DELETEWATCH, _("&Delete watch"));
|
menu.Append(IDM_DELETEWATCH, _("&Delete watch"));
|
||||||
|
}
|
||||||
|
|
||||||
if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1) && (col == 1 || col == 2))
|
if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1) && (col == 1 || col == 2))
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,6 +14,8 @@ class CWatchWindow : public wxPanel
|
||||||
public:
|
public:
|
||||||
CWatchWindow(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
|
CWatchWindow(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
||||||
|
// i18n: This kind of "watch" is used for watching emulated memory.
|
||||||
|
// It's not related to timekeeping devices.
|
||||||
const wxString& name = _("Watch"));
|
const wxString& name = _("Watch"));
|
||||||
~CWatchWindow();
|
~CWatchWindow();
|
||||||
|
|
||||||
|
|
|
@ -302,6 +302,8 @@ wxMenu* MainMenuBar::CreateViewMenu() const
|
||||||
if (m_type == MenuType::Debug)
|
if (m_type == MenuType::Debug)
|
||||||
{
|
{
|
||||||
view_menu->AppendCheckItem(IDM_REGISTER_WINDOW, _("&Registers"));
|
view_menu->AppendCheckItem(IDM_REGISTER_WINDOW, _("&Registers"));
|
||||||
|
// i18n: This kind of "watch" is used for watching emulated memory.
|
||||||
|
// It's not related to timekeeping devices.
|
||||||
view_menu->AppendCheckItem(IDM_WATCH_WINDOW, _("&Watch"));
|
view_menu->AppendCheckItem(IDM_WATCH_WINDOW, _("&Watch"));
|
||||||
view_menu->AppendCheckItem(IDM_BREAKPOINT_WINDOW, _("&Breakpoints"));
|
view_menu->AppendCheckItem(IDM_BREAKPOINT_WINDOW, _("&Breakpoints"));
|
||||||
view_menu->AppendCheckItem(IDM_MEMORY_WINDOW, _("&Memory"));
|
view_menu->AppendCheckItem(IDM_MEMORY_WINDOW, _("&Memory"));
|
||||||
|
|
|
@ -214,9 +214,15 @@ void MainToolBar::AddMainToolBarButtons()
|
||||||
|
|
||||||
void MainToolBar::AddDebuggerToolBarButtons()
|
void MainToolBar::AddDebuggerToolBarButtons()
|
||||||
{
|
{
|
||||||
|
// i18n: Here, "Step" is a verb. This function is used for
|
||||||
|
// going through code step by step.
|
||||||
AddToolBarButton(IDM_STEP, TOOLBAR_DEBUG_STEP, _("Step"), _("Step into the next instruction"));
|
AddToolBarButton(IDM_STEP, TOOLBAR_DEBUG_STEP, _("Step"), _("Step into the next instruction"));
|
||||||
|
// i18n: Here, "Step" is a verb. This function is used for
|
||||||
|
// going through code step by step.
|
||||||
AddToolBarButton(IDM_STEPOVER, TOOLBAR_DEBUG_STEPOVER, _("Step Over"),
|
AddToolBarButton(IDM_STEPOVER, TOOLBAR_DEBUG_STEPOVER, _("Step Over"),
|
||||||
_("Step over the next instruction"));
|
_("Step over the next instruction"));
|
||||||
|
// i18n: Here, "Step" is a verb. This function is used for
|
||||||
|
// going through code step by step.
|
||||||
AddToolBarButton(IDM_STEPOUT, TOOLBAR_DEBUG_STEPOUT, _("Step Out"),
|
AddToolBarButton(IDM_STEPOUT, TOOLBAR_DEBUG_STEPOUT, _("Step Out"),
|
||||||
_("Step out of the current function"));
|
_("Step out of the current function"));
|
||||||
AddToolBarButton(IDM_SKIP, TOOLBAR_DEBUG_SKIP, _("Skip"),
|
AddToolBarButton(IDM_SKIP, TOOLBAR_DEBUG_SKIP, _("Skip"),
|
||||||
|
|
|
@ -59,7 +59,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien
|
||||||
// This looks a little weird but it's fine because we're using a grid bag sizer;
|
// This looks a little weird but it's fine because we're using a grid bag sizer;
|
||||||
// we can add columns in any order.
|
// we can add columns in any order.
|
||||||
build_choice(0, i, m_pad_mapping, _("GC Port"));
|
build_choice(0, i, m_pad_mapping, _("GC Port"));
|
||||||
build_choice(4, i, m_wii_mapping, _("Wiimote"));
|
build_choice(4, i, m_wii_mapping, _("Wii Remote"));
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
|
@ -225,10 +225,13 @@ const wxString WXKeyToString(int keycode)
|
||||||
case WXK_NUMPAD_DIVIDE:
|
case WXK_NUMPAD_DIVIDE:
|
||||||
return _("NP Divide");
|
return _("NP Divide");
|
||||||
case WXK_WINDOWS_LEFT:
|
case WXK_WINDOWS_LEFT:
|
||||||
|
// i18n: The left Windows key on PC keyboards
|
||||||
return _("Windows Left");
|
return _("Windows Left");
|
||||||
case WXK_WINDOWS_RIGHT:
|
case WXK_WINDOWS_RIGHT:
|
||||||
|
// i18n: The right Windows key on PC keyboards
|
||||||
return _("Windows Right");
|
return _("Windows Right");
|
||||||
case WXK_WINDOWS_MENU:
|
case WXK_WINDOWS_MENU:
|
||||||
|
// i18n: The context menu key on the right of PC keyboards
|
||||||
return _("Windows Menu");
|
return _("Windows Menu");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue