From 6e7eb52211844727bdf9f665630273ea109a1589 Mon Sep 17 00:00:00 2001 From: CarlKenner Date: Wed, 17 Dec 2014 00:11:05 +1030 Subject: [PATCH] Rename menu items, stop using PanicAlertT, remove -d when running from visual studio. I accidentally committed my addition of the -d option that I used for testing, now it's fixed. --- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 2 +- Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp | 6 +++--- Source/Core/DolphinWX/DolphinWX.vcxproj.user | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index ef4863812b..55d9cb1e59 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -356,7 +356,7 @@ bool PPCSymbolDB::LoadMap(const std::string& filename, bool bad) Index(); if (bad) - PanicAlertT("Loaded %d good functions, ignored %d bad functions", good_count, bad_count); + SuccessAlertT("Loaded %d good functions, ignored %d bad functions.", good_count, bad_count); return true; } diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index e5f91692ee..1bf48b523e 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -156,7 +156,7 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar) pSymbolsMenu->Append(IDM_SAVEMAPFILE, _("&Save symbol map"), _("Save the function names for each address to a .map file in your user settings map folder, named after the title id.")); pSymbolsMenu->AppendSeparator(); - pSymbolsMenu->Append(IDM_LOADMAPFILEAS, _("Choose symbol map file to load..."), + pSymbolsMenu->Append(IDM_LOADMAPFILEAS, _("Load &other map file..."), _("Load any .map file containing the function names and addresses for this game.")); pSymbolsMenu->Append(IDM_LOADBADMAPFILE, _("Load &bad map file..."), _("Try to load a .map file that might be from a slightly different version.")); @@ -176,9 +176,9 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar) _("Create a .dsy file that can be used to recognise these same functions in other games.")); pSymbolsMenu->Append(IDM_APPENDSIGNATUREFILE, _("Append to &existing signature file..."), _("Add any named functions missing from a .dsy file, so it can also recognise these additional functions in other games.")); - pSymbolsMenu->Append(IDM_COMBINESIGNATUREFILES, _("Combine &2 signature files..."), + pSymbolsMenu->Append(IDM_COMBINESIGNATUREFILES, _("Combine two signature files..."), _("Make a new .dsy file which can recognise more functions, by combining two existing files. The first input file has priority.")); - pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _("&Use signature file..."), + pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _("Apply signat&ure file..."), _("Must use Generate symbol map first! Recognise names of any standard library functions used in multiple games, by loading them from a .dsy file.")); pSymbolsMenu->AppendSeparator(); pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _("&Patch HLE functions")); diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.user b/Source/Core/DolphinWX/DolphinWX.vcxproj.user index 4f062ae3a8..aa15c4df30 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj.user +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.user @@ -6,10 +6,4 @@ $(BinaryOutputDir) WindowsLocalDebugger - - -d - - - -d - \ No newline at end of file