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

Add internationalization support. There aren't really any translations yet other than a little French thanks to DavidVag. So now the translators need to go to work. See http://wiki.wxwidgets.org/Internationalization for directions. The binary .mo files are generated at build time on linux. They are provided in Data/Languages for windows. I don't know where they need to go on OSX, but they should be able to be generated there at least. I added a target to generate them on windows, but does not build by default as it requires that msgfmt.exe from the gnu gettext tools be installed and in the path. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6747 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-01-05 04:35:46 +00:00
parent 0b46610d49
commit 4f6d4f5ddd
57 changed files with 8054 additions and 851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -356,6 +356,11 @@ add_subdirectory(Source)
# #
install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE) install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE)
install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE) install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE)
include(FindGettext)
if(GETTEXT_FOUND)
file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/*.po)
GETTEXT_CREATE_TRANSLATIONS(Languages/dolphin-emu.pot ALL ${LINGUAS})
endif()
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
install(FILES Data/license.txt DESTINATION ${datadir}) install(FILES Data/license.txt DESTINATION ${datadir})
endif() endif()

BIN
Data/Languages/fr/dolphin-emu.mo Normal file
View File

Binary file not shown.

226
Languages/Languages.vcproj Normal file
View File

@ -0,0 +1,226 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="Languages"
ProjectGUID="{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
RootNamespace="Languages"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath=".\po.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="msgfmt"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="msgfmt"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="msgfmt"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="10"
CharacterSet="0"
WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="msgfmt"
OutputName="../Binary/$(PlatformName)/Languages/$(InputName)\dolphin-emu.mo"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\fr.po"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

3439
Languages/dolphin-emu.pot Normal file
View File

File diff suppressed because it is too large Load Diff

3442
Languages/fr.po Normal file
View File

File diff suppressed because it is too large Load Diff

33
Languages/po.rules Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile
Name="Message Compiler"
Version="8.00"
>
<Rules>
<CustomBuildRule
Name="msgfmt"
DisplayName="Compile Locale"
CommandLine="msgfmt [AllOptions] [AdditionalOptions] [inputs]"
Outputs="[$OutputName]"
FileExtensions="*.po"
ExecutionDescription="Compiling $(InputName) locale"
>
<Properties>
<StringProperty
Name="OutputName"
DisplayName="Output File"
Description="Specifies a name to override the default file name"
Switch="-o &quot;[value]&quot;"
DefaultValue="$(OutDir)\Languages\$(InputName)\dolphin-emu.mo"
Delimited="true"
/>
<BooleanProperty
Name="Verbose"
DisplayName="Verbose"
Description="Increase verbosity level"
Switch="-v"
/>
</Properties>
</CustomBuildRule>
</Rules>
</VisualStudioToolFile>

8
Source/Core/DebuggerUICommon/Src/CodeView.cpp
View File

@ -362,8 +362,8 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event)
#endif #endif
menu->Append(IDM_RENAMESYMBOL, wxString::FromAscii("Rename &symbol"))->Enable(isSymbol); menu->Append(IDM_RENAMESYMBOL, wxString::FromAscii("Rename &symbol"))->Enable(isSymbol);
menu->AppendSeparator(); menu->AppendSeparator();
menu->Append(IDM_RUNTOHERE, _T("&Run To Here")); menu->Append(IDM_RUNTOHERE, _("&Run To Here"));
menu->Append(IDM_ADDFUNCTION, _T("&Add function")); menu->Append(IDM_ADDFUNCTION, _("&Add function"));
menu->Append(IDM_JITRESULTS, wxString::FromAscii("PPC vs X86")); menu->Append(IDM_JITRESULTS, wxString::FromAscii("PPC vs X86"));
menu->Append(IDM_INSERTBLR, wxString::FromAscii("Insert &blr")); menu->Append(IDM_INSERTBLR, wxString::FromAscii("Insert &blr"));
menu->Append(IDM_INSERTNOP, wxString::FromAscii("Insert &nop")); menu->Append(IDM_INSERTNOP, wxString::FromAscii("Insert &nop"));
@ -411,8 +411,8 @@ void CCodeView::OnPaint(wxPaintEvent& event)
wxPen selPen(_T("#808080")); // gray wxPen selPen(_T("#808080")); // gray
nullPen.SetStyle(wxTRANSPARENT); nullPen.SetStyle(wxTRANSPARENT);
currentPen.SetStyle(wxSOLID); currentPen.SetStyle(wxSOLID);
wxBrush currentBrush(_T("#FFEfE8")); // the ... ? ... is light gray wxBrush currentBrush(_T("#FFEfE8")); // light gray
wxBrush pcBrush(_T("#70FF70")); // the selected code line is green wxBrush pcBrush(_T("#70FF70")); // green
wxBrush bpBrush(_T("#FF3311")); // red wxBrush bpBrush(_T("#FF3311")); // red
wxBrush bgBrush(bgColor); wxBrush bgBrush(bgColor);

2
Source/Core/DebuggerWX/Src/BreakpointDlg.cpp
View File

@ -54,7 +54,7 @@ void BreakPointDlg::CreateGUIControls()
m_pButtonOK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(192,64), wxSize(73,25), 0, wxDefaultValidator, wxT("OK")); m_pButtonOK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(192,64), wxSize(73,25), 0, wxDefaultValidator, wxT("OK"));
m_pButtonCancel = new wxButton(this, ID_CANCEL, wxT("Cancel"), wxPoint(112,64), wxSize(73,25), 0, wxDefaultValidator, wxT("Cancel")); m_pButtonCancel = new wxButton(this, ID_CANCEL, _("Cancel"), wxPoint(112,64), wxSize(73,25), 0, wxDefaultValidator, _("Cancel"));
m_pEditAddress = new wxTextCtrl(this, ID_ADDRESS, wxT("80000000"), wxPoint(56,24), wxSize(197,20), 0, wxDefaultValidator, wxT("WxEdit1")); m_pEditAddress = new wxTextCtrl(this, ID_ADDRESS, wxT("80000000"), wxPoint(56,24), wxSize(197,20), 0, wxDefaultValidator, wxT("WxEdit1"));
} }

2
Source/Core/DebuggerWX/Src/BreakpointDlg.h
View File

@ -32,7 +32,7 @@ class BreakPointDlg : public wxDialog
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
public: public:
BreakPointDlg(CBreakPointWindow *, wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("BreakPoint"), BreakPointDlg(CBreakPointWindow *, wxWindow *parent, wxWindowID id = 1, const wxString &title = _("BreakPoint"),
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX); long style = wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX);
virtual ~BreakPointDlg(); virtual ~BreakPointDlg();

22
Source/Core/DebuggerWX/Src/BreakpointView.cpp
View File

@ -46,11 +46,11 @@ void CBreakPointView::Update()
{ {
ClearAll(); ClearAll();
InsertColumn(0, wxT("Active"), wxLIST_FORMAT_LEFT, 50); InsertColumn(0, _("Active"), wxLIST_FORMAT_LEFT, 50);
InsertColumn(1, wxT("Type"), wxLIST_FORMAT_LEFT, 50); InsertColumn(1, _("Type"), wxLIST_FORMAT_LEFT, 50);
InsertColumn(2, wxT("Function"), wxLIST_FORMAT_CENTER, 200); InsertColumn(2, _("Function"), wxLIST_FORMAT_CENTER, 200);
InsertColumn(3, wxT("Address"), wxLIST_FORMAT_LEFT, 100); InsertColumn(3, _("Address"), wxLIST_FORMAT_LEFT, 100);
InsertColumn(4, wxT("Flags"), wxLIST_FORMAT_CENTER, 100); InsertColumn(4, _("Flags"), wxLIST_FORMAT_CENTER, 100);
char szBuffer[64]; char szBuffer[64];
const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints(); const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();
@ -156,16 +156,16 @@ CBreakPointBar::CBreakPointBar(CBreakPointWindow* parent, const wxWindowID id, c
void CBreakPointBar::PopulateBar() void CBreakPointBar::PopulateBar()
{ {
InsertItem(IDM_DELETE, _T("Delete"), 0); InsertItem(IDM_DELETE, _("Delete"), 0);
InsertItem(IDM_CLEAR, _T("Clear all"), 0); InsertItem(IDM_CLEAR, _("Clear all"), 0);
InsertItem(IDM_ADD_BREAKPOINT, _T("Add BP..."), 1); InsertItem(IDM_ADD_BREAKPOINT, _("Add BP..."), 1);
InsertItem(IDM_ADD_BREAKPOINTMANY, _T("Add BPs..."), 1); InsertItem(IDM_ADD_BREAKPOINTMANY, _("Add BPs..."), 1);
// just add memory breakpoints if you can use them // just add memory breakpoints if you can use them
if (Memory::AreMemoryBreakpointsActivated()) if (Memory::AreMemoryBreakpointsActivated())
{ {
InsertItem(IDM_ADD_MEMORYCHECK, _T("Add MC..."), 2); InsertItem(IDM_ADD_MEMORYCHECK, _("Add MC..."), 2);
InsertItem(IDM_ADD_MEMORYCHECKMANY, _T("Add MCs..."), 2); InsertItem(IDM_ADD_MEMORYCHECKMANY, _("Add MCs..."), 2);
} }
} }

8
Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
View File

@ -143,7 +143,7 @@ void CBreakPointWindow::OnAddBreakPointMany()
std::vector<std::string> lines; std::vector<std::string> lines;
if (!ini.GetLines("BreakPoints", lines)) if (!ini.GetLines("BreakPoints", lines))
{ {
wxMessageBox(_T("You have no [BreakPoints] line in your file")); wxMessageBox(_("You have no [BreakPoints] line in your file"));
return; return;
} }
@ -161,7 +161,7 @@ void CBreakPointWindow::OnAddBreakPointMany()
} }
else else
{ {
wxMessageBox(_T("Couldn't find GameConfig/BreakPoints.ini file")); wxMessageBox(_("Couldn't find GameConfig/BreakPoints.ini file"));
} }
} }
@ -188,7 +188,7 @@ void CBreakPointWindow::OnAddMemoryCheckMany()
std::vector<std::string> lines; std::vector<std::string> lines;
if (!ini.GetLines("MemoryChecks", lines)) if (!ini.GetLines("MemoryChecks", lines))
{ {
wxMessageBox(_T("You have no [MemoryChecks] line in your file")); wxMessageBox(_("You have no [MemoryChecks] line in your file"));
return; return;
} }
@ -259,7 +259,7 @@ void CBreakPointWindow::OnAddMemoryCheckMany()
} }
else else
{ {
wxMessageBox(_T("You have no ") + wxString::FromAscii(File::GetUserPath(D_GAMECONFIG_IDX)) + _T("MemoryChecks.ini file")); wxMessageBox(_("You have no ") + wxString::FromAscii(File::GetUserPath(D_GAMECONFIG_IDX)) + _("MemoryChecks.ini file"));
} }
} }

2
Source/Core/DebuggerWX/Src/BreakpointWindow.h
View File

@ -46,7 +46,7 @@ class CBreakPointWindow
CBreakPointWindow(CCodeWindow* _pCodeWindow, CBreakPointWindow(CCodeWindow* _pCodeWindow,
wxWindow* parent, wxWindow* parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& title = wxT("Breakpoints"), const wxString& title = _("Breakpoints"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE); long style = wxTAB_TRAVERSAL | wxBORDER_NONE);

86
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -115,7 +115,7 @@ BEGIN_EVENT_TABLE(CCodeWindow, wxPanel)
// Toolbar // Toolbar
EVT_MENU(IDM_STEP, CCodeWindow::OnCodeStep) EVT_MENU(IDM_STEP, CCodeWindow::OnCodeStep)
EVT_MENU(IDM_STEPOVER, CCodeWindow::OnCodeStep) EVT_MENU(IDM_STEPOVER, CCodeWindow::OnCodeStep)
EVT_MENU(IDM_TOGGLE_BREAKPOINT, CCodeWindow::OnCodeStep) EVT_MENU(IDM_TOGGLE_BREAKPOINT, CCodeWindow::OnCodeStep)
EVT_MENU(IDM_SKIP, CCodeWindow::OnCodeStep) EVT_MENU(IDM_SKIP, CCodeWindow::OnCodeStep)
EVT_MENU(IDM_SETPC, CCodeWindow::OnCodeStep) EVT_MENU(IDM_SETPC, CCodeWindow::OnCodeStep)
EVT_MENU(IDM_GOTOPC, CCodeWindow::OnCodeStep) EVT_MENU(IDM_GOTOPC, CCodeWindow::OnCodeStep)
@ -428,85 +428,85 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
// CPU Mode // CPU Mode
wxMenu* pCoreMenu = new wxMenu; wxMenu* pCoreMenu = new wxMenu;
wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _T("&Interpreter core") wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _("&Interpreter core"),
, wxString::FromAscii("This is necessary to get break points" wxString::FromAscii("This is necessary to get break points"
" and stepping to work as explained in the Developer Documentation. But it can be very" " and stepping to work as explained in the Developer Documentation. But it can be very"
" slow, perhaps slower than 1 fps.") " slow, perhaps slower than 1 fps."),
, wxITEM_CHECK); wxITEM_CHECK);
interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0); interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0);
pCoreMenu->AppendSeparator(); pCoreMenu->AppendSeparator();
pCoreMenu->Append(IDM_JITBLOCKLINKING, _T("&JIT Block Linking off"), pCoreMenu->Append(IDM_JITBLOCKLINKING, _("&JIT Block Linking off"),
_T("Provide safer execution by not linking the JIT blocks."), _("Provide safer execution by not linking the JIT blocks."),
wxITEM_CHECK); wxITEM_CHECK);
pCoreMenu->Append(IDM_JITNOBLOCKCACHE, _T("&Disable JIT Cache"), pCoreMenu->Append(IDM_JITNOBLOCKCACHE, _("&Disable JIT Cache"),
_T("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.") _("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.\n[This option must be selected before a game is started.]"),
_T(" [This option must be selected before a game is started.]"),
wxITEM_CHECK); wxITEM_CHECK);
pCoreMenu->Append(IDM_CLEARCODECACHE, _T("&Clear JIT cache")); pCoreMenu->Append(IDM_CLEARCODECACHE, _("&Clear JIT cache"));
pCoreMenu->AppendSeparator(); pCoreMenu->AppendSeparator();
pCoreMenu->Append(IDM_LOGINSTRUCTIONS, _T("&Log JIT instruction coverage")); pCoreMenu->Append(IDM_LOGINSTRUCTIONS, _("&Log JIT instruction coverage"));
pCoreMenu->Append(IDM_SEARCHINSTRUCTION, _T("&Search for an op")); pCoreMenu->Append(IDM_SEARCHINSTRUCTION, _("&Search for an op"));
pCoreMenu->AppendSeparator(); pCoreMenu->AppendSeparator();
pCoreMenu->Append(IDM_JITOFF, _T("&JIT off (JIT core)"), pCoreMenu->Append(IDM_JITOFF, _("&JIT off (JIT core)"),
_T("Turn off all JIT functions, but still use the JIT core from Jit.cpp"), _("Turn off all JIT functions, but still use the JIT core from Jit.cpp"),
wxITEM_CHECK); wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSOFF, _T("&JIT LoadStore off"), pCoreMenu->Append(IDM_JITLSOFF, _("&JIT LoadStore off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSLBZXOFF, _T(" &JIT LoadStore lbzx off"), pCoreMenu->Append(IDM_JITLSLBZXOFF, _(" &JIT LoadStore lbzx off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSLXZOFF, _T(" &JIT LoadStore lXz off"), pCoreMenu->Append(IDM_JITLSLXZOFF, _(" &JIT LoadStore lXz off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSLWZOFF, _T(" &JIT LoadStore lwz off"), pCoreMenu->Append(IDM_JITLSLWZOFF, _("&JIT LoadStore lwz off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSFOFF, _T("&JIT LoadStore Floating off"), pCoreMenu->Append(IDM_JITLSFOFF, _("&JIT LoadStore Floating off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITLSPOFF, _T("&JIT LoadStore Paired off"), pCoreMenu->Append(IDM_JITLSPOFF, _("&JIT LoadStore Paired off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITFPOFF, _T("&JIT FloatingPoint off"), pCoreMenu->Append(IDM_JITFPOFF, _("&JIT FloatingPoint off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITIOFF, _T("&JIT Integer off"), pCoreMenu->Append(IDM_JITIOFF, _("&JIT Integer off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITPOFF, _T("&JIT Paired off"), pCoreMenu->Append(IDM_JITPOFF, _("&JIT Paired off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"), pCoreMenu->Append(IDM_JITSROFF, _("&JIT SystemRegisters off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pMenuBar->Append(pCoreMenu, _T("&JIT")); pMenuBar->Append(pCoreMenu, _("&JIT"));
// Debug Menu // Debug Menu
wxMenu* pDebugMenu = new wxMenu; wxMenu* pDebugMenu = new wxMenu;
pDebugMenu->Append(IDM_STEP, _T("Step &Into\tF11")); pDebugMenu->Append(IDM_STEP, _("Step &Into\tF11"));
pDebugMenu->Append(IDM_STEPOVER, _T("Step &Over\tF10")); pDebugMenu->Append(IDM_STEPOVER, _("Step &Over\tF10"));
pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _T("Toggle &Breakpoint\tF9")); pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _("Toggle &Breakpoint\tF9"));
pMenuBar->Append(pDebugMenu, _T("&Debug")); pMenuBar->Append(pDebugMenu, _("&Debug"));
CreateMenuSymbols(pMenuBar); CreateMenuSymbols(pMenuBar);
} }
void CCodeWindow::CreateMenuOptions(wxMenu* pMenu) void CCodeWindow::CreateMenuOptions(wxMenu* pMenu)
{ {
wxMenuItem* boottopause = pMenu->Append(IDM_BOOTTOPAUSE, _T("Boot to pause"), wxMenuItem* boottopause = pMenu->Append(IDM_BOOTTOPAUSE, _("Boot to pause"),
wxT("Start the game directly instead of booting to pause"), wxITEM_CHECK); _("Start the game directly instead of booting to pause"),
wxITEM_CHECK);
boottopause->Check(bBootToPause); boottopause->Check(bBootToPause);
wxMenuItem* automaticstart = pMenu->Append(IDM_AUTOMATICSTART, _T("&Automatic start") wxMenuItem* automaticstart = pMenu->Append(IDM_AUTOMATICSTART, _("&Automatic start"),
, wxString::FromAscii( wxString::FromAscii(
"Automatically load the Default ISO when Dolphin starts, or the last game you loaded," "Automatically load the Default ISO when Dolphin starts, or the last game you loaded,"
" if you have not given it an elf file with the --elf command line. [This can be" " if you have not given it an elf file with the --elf command line. [This can be"
" convenient if you are bug-testing with a certain game and want to rebuild" " convenient if you are bug-testing with a certain game and want to rebuild"
" and retry it several times, either with changes to Dolphin or if you are" " and retry it several times, either with changes to Dolphin or if you are"
" developing a homebrew game.]") " developing a homebrew game.]"),
, wxITEM_CHECK); wxITEM_CHECK);
automaticstart->Check(bAutomaticStart); automaticstart->Check(bAutomaticStart);
pMenu->Append(IDM_FONTPICKER, _T("&Font..."), wxEmptyString, wxITEM_NORMAL); pMenu->Append(IDM_FONTPICKER, _("&Font..."), wxEmptyString, wxITEM_NORMAL);
} }
// CPU Mode and JIT Menu // CPU Mode and JIT Menu
@ -582,7 +582,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event)
case IDM_SEARCHINSTRUCTION: case IDM_SEARCHINSTRUCTION:
{ {
wxString str; wxString str;
str = wxGetTextFromUser(_(""), wxT("Op?"), wxEmptyString, this); str = wxGetTextFromUser(_T(""), wxT("Op?"), wxEmptyString, this);
for (u32 addr = 0x80000000; addr < 0x80100000; addr += 4) for (u32 addr = 0x80000000; addr < 0x80100000; addr += 4)
{ {
const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr)); const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr));
@ -646,12 +646,12 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar)
h = m_Bitmaps[Toolbar_DebugGo].GetHeight(); h = m_Bitmaps[Toolbar_DebugGo].GetHeight();
toolBar->SetToolBitmapSize(wxSize(w, h)); toolBar->SetToolBitmapSize(wxSize(w, h));
toolBar->AddTool(IDM_STEP, _T("Step"), m_Bitmaps[Toolbar_Step]); toolBar->AddTool(IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step]);
toolBar->AddTool(IDM_STEPOVER, _T("Step Over"), m_Bitmaps[Toolbar_StepOver]); toolBar->AddTool(IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver]);
toolBar->AddTool(IDM_SKIP, _T("Skip"), m_Bitmaps[Toolbar_Skip]); toolBar->AddTool(IDM_SKIP, _("Skip"), m_Bitmaps[Toolbar_Skip]);
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(IDM_GOTOPC, _T("Show PC"), m_Bitmaps[Toolbar_GotoPC]); toolBar->AddTool(IDM_GOTOPC, _("Show PC"), m_Bitmaps[Toolbar_GotoPC]);
toolBar->AddTool(IDM_SETPC, _T("Set PC"), m_Bitmaps[Toolbar_SetPC]); toolBar->AddTool(IDM_SETPC, _("Set PC"), m_Bitmaps[Toolbar_SetPC]);
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T(""))); toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));

2
Source/Core/DebuggerWX/Src/CodeWindow.h
View File

@ -49,7 +49,7 @@ class CCodeWindow
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE, long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = wxT("Code") const wxString& name = _("Code")
); );
void Load(); void Load();

30
Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
View File

@ -161,14 +161,14 @@ void CCodeWindow::Save()
void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar) void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar)
{ {
wxMenu *pSymbolsMenu = new wxMenu; wxMenu *pSymbolsMenu = new wxMenu;
pSymbolsMenu->Append(IDM_CLEARSYMBOLS, _T("&Clear symbols")); pSymbolsMenu->Append(IDM_CLEARSYMBOLS, _("&Clear symbols"));
// pSymbolsMenu->Append(IDM_CLEANSYMBOLS, _T("&Clean symbols (zz)")); // pSymbolsMenu->Append(IDM_CLEANSYMBOLS, _("&Clean symbols (zz)"));
pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _T("&Generate symbol map")); pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _("&Generate symbol map"));
pSymbolsMenu->AppendSeparator(); pSymbolsMenu->AppendSeparator();
pSymbolsMenu->Append(IDM_LOADMAPFILE, _T("&Load symbol map")); pSymbolsMenu->Append(IDM_LOADMAPFILE, _("&Load symbol map"));
pSymbolsMenu->Append(IDM_SAVEMAPFILE, _T("&Save symbol map")); pSymbolsMenu->Append(IDM_SAVEMAPFILE, _("&Save symbol map"));
pSymbolsMenu->AppendSeparator(); pSymbolsMenu->AppendSeparator();
pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _T("Save code"), pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _("Save code"),
wxString::FromAscii("Save the entire disassembled code. This may take a several seconds" wxString::FromAscii("Save the entire disassembled code. This may take a several seconds"
" and may require between 50 and 100 MB of hard drive space. It will only save code" " and may require between 50 and 100 MB of hard drive space. It will only save code"
" that are in the first 4 MB of memory, if you are debugging a game that load .rel" " that are in the first 4 MB of memory, if you are debugging a game that load .rel"
@ -177,18 +177,18 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar)
); );
pSymbolsMenu->AppendSeparator(); pSymbolsMenu->AppendSeparator();
pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _T("&Create signature file...")); pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _("&Create signature file..."));
pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _T("&Use signature file...")); pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _("&Use signature file..."));
pSymbolsMenu->AppendSeparator(); pSymbolsMenu->AppendSeparator();
pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _T("&Patch HLE functions")); pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _("&Patch HLE functions"));
pSymbolsMenu->Append(IDM_RENAME_SYMBOLS, _T("&Rename symbols from file...")); pSymbolsMenu->Append(IDM_RENAME_SYMBOLS, _("&Rename symbols from file..."));
pMenuBar->Append(pSymbolsMenu, _T("&Symbols")); pMenuBar->Append(pSymbolsMenu, _("&Symbols"));
wxMenu *pProfilerMenu = new wxMenu; wxMenu *pProfilerMenu = new wxMenu;
pProfilerMenu->Append(IDM_PROFILEBLOCKS, _T("&Profile blocks"), wxEmptyString, wxITEM_CHECK); pProfilerMenu->Append(IDM_PROFILEBLOCKS, _("&Profile blocks"), wxEmptyString, wxITEM_CHECK);
pProfilerMenu->AppendSeparator(); pProfilerMenu->AppendSeparator();
pProfilerMenu->Append(IDM_WRITEPROFILE, _T("&Write to profile.txt, show")); pProfilerMenu->Append(IDM_WRITEPROFILE, _("&Write to profile.txt, show"));
pMenuBar->Append(pProfilerMenu, _T("&Profiler")); pMenuBar->Append(pProfilerMenu, _("&Profiler"));
} }
void CCodeWindow::OnProfilerMenu(wxCommandEvent& event) void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
@ -274,7 +274,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
case IDM_RENAME_SYMBOLS: case IDM_RENAME_SYMBOLS:
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Apply signature file"), wxEmptyString, _("Apply signature file"), wxEmptyString,
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
_T("Dolphin Symbol Rename File (*.sym)|*.sym"), _T("Dolphin Symbol Rename File (*.sym)|*.sym"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);

18
Source/Core/DebuggerWX/Src/JitWindow.cpp
View File

@ -81,9 +81,9 @@ CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos,
sizerBig->Add(sizerSplit, 2, wxEXPAND); sizerBig->Add(sizerSplit, 2, wxEXPAND);
// sizerBig->Add(memview, 5, wxEXPAND); // sizerBig->Add(memview, 5, wxEXPAND);
// sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3); // sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
sizerBig->Add(button_refresh = new wxButton(this, IDM_REFRESH_LIST, _T("&Refresh"))); sizerBig->Add(button_refresh = new wxButton(this, IDM_REFRESH_LIST, _("&Refresh")));
// sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T(""))); // sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T("")));
// sizerRight->Add(new wxButton(this, IDM_SETPC, _T("S&et PC"))); // sizerRight->Add(new wxButton(this, IDM_SETPC, _("S&et PC")));
SetSizer(sizerBig); SetSizer(sizerBig);
@ -252,13 +252,13 @@ JitBlockList::JitBlockList(wxWindow* parent, const wxWindowID id,
void JitBlockList::Init() void JitBlockList::Init()
{ {
InsertColumn(COLUMN_ADDRESS, _T("Address")); InsertColumn(COLUMN_ADDRESS, _("Address"));
InsertColumn(COLUMN_PPCSIZE, _T("PPC Size")); InsertColumn(COLUMN_PPCSIZE, _("PPC Size"));
InsertColumn(COLUMN_X86SIZE, _T("x86 Size")); InsertColumn(COLUMN_X86SIZE, _("x86 Size"));
InsertColumn(COLUMN_NAME, _T("Symbol")); InsertColumn(COLUMN_NAME, _("Symbol"));
InsertColumn(COLUMN_FLAGS, _T("Flags")); InsertColumn(COLUMN_FLAGS, _("Flags"));
InsertColumn(COLUMN_NUMEXEC, _T("NumExec")); InsertColumn(COLUMN_NUMEXEC, _("NumExec"));
InsertColumn(COLUMN_COST, _T("Cost")); InsertColumn(COLUMN_COST, _("Cost"));
} }
void JitBlockList::Update() void JitBlockList::Update()

2
Source/Core/DebuggerWX/Src/JitWindow.h
View File

@ -46,7 +46,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE, long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _T("JIT block viewer")); const wxString& name = _("JIT block viewer"));
static void ViewAddr(u32 em_address); static void ViewAddr(u32 em_address);
void Update(); void Update();

14
Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp
View File

@ -44,25 +44,25 @@ void MemoryCheckDlg::CreateGUIControls()
SetSize(8,8,415,122); SetSize(8,8,415,122);
Center(); Center();
m_pButtonCancel = new wxButton(this, ID_CANCEL, wxT("Cancel"), wxPoint(248,64), wxSize(73,25), 0, wxDefaultValidator, wxT("Cancel")); m_pButtonCancel = new wxButton(this, ID_CANCEL, _("Cancel"), wxPoint(248,64), wxSize(73,25), 0, wxDefaultValidator, _("Cancel"));
m_pButtonOK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(328,64), wxSize(73,25), 0, wxDefaultValidator, wxT("OK")); m_pButtonOK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(328,64), wxSize(73,25), 0, wxDefaultValidator, wxT("OK"));
m_pReadFlag = new wxCheckBox(this, ID_READ_FLAG, wxT("Read"), wxPoint(336,33), wxSize(57,15), 0, wxDefaultValidator, wxT("Read")); m_pReadFlag = new wxCheckBox(this, ID_READ_FLAG, _("Read"), wxPoint(336,33), wxSize(57,15), 0, wxDefaultValidator, _("Read"));
m_pWriteFlag = new wxCheckBox(this, ID_WRITE_FLAG, wxT("Write"), wxPoint(336,16), wxSize(57,17), 0, wxDefaultValidator, wxT("WxCheckBox1")); m_pWriteFlag = new wxCheckBox(this, ID_WRITE_FLAG, _("Write"), wxPoint(336,16), wxSize(57,17), 0, wxDefaultValidator, wxT("WxCheckBox1"));
new wxStaticBox(this, ID_WXSTATICBOX2, wxT("Break On"), wxPoint(328,0), wxSize(73,57)); new wxStaticBox(this, ID_WXSTATICBOX2, _("Break On"), wxPoint(328,0), wxSize(73,57));
new wxStaticText(this, ID_WXSTATICTEXT2, wxT("End"), wxPoint(168,24), wxDefaultSize, 0, wxT("WxStaticText2")); new wxStaticText(this, ID_WXSTATICTEXT2, _("End"), wxPoint(168,24), wxDefaultSize, 0, wxT("WxStaticText2"));
new wxStaticText(this, ID_WXSTATICTEXT1, wxT("Start"), wxPoint(8,24), wxDefaultSize, 0, wxT("WxStaticText1")); new wxStaticText(this, ID_WXSTATICTEXT1, _("Start"), wxPoint(8,24), wxDefaultSize, 0, wxT("WxStaticText1"));
m_pEditStartAddress = new wxTextCtrl(this, ID_EDIT_START_ADDR, wxT("80000000"), wxPoint(40,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit1")); m_pEditStartAddress = new wxTextCtrl(this, ID_EDIT_START_ADDR, wxT("80000000"), wxPoint(40,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit1"));
m_pEditEndAddress = new wxTextCtrl(this, ID_EDIT_END_ADDRESS, wxT("80000000"), wxPoint(200,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit2")); m_pEditEndAddress = new wxTextCtrl(this, ID_EDIT_END_ADDRESS, wxT("80000000"), wxPoint(200,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit2"));
new wxStaticBox(this, ID_WXSTATICBOX1, wxT("Address Range"), wxPoint(0,0), wxSize(321,57)); new wxStaticBox(this, ID_WXSTATICBOX1, _("Address Range"), wxPoint(0,0), wxSize(321,57));
} }
void MemoryCheckDlg::OnClose(wxCloseEvent& /*event*/) void MemoryCheckDlg::OnClose(wxCloseEvent& /*event*/)

2
Source/Core/DebuggerWX/Src/MemoryCheckDlg.h
View File

@ -35,7 +35,7 @@ class MemoryCheckDlg : public wxDialog
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
public: public:
MemoryCheckDlg(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("Memory Check"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MemoryCheckDlg_STYLE); MemoryCheckDlg(wxWindow *parent, wxWindowID id = 1, const wxString &title = _("Memory Check"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MemoryCheckDlg_STYLE);
virtual ~MemoryCheckDlg(); virtual ~MemoryCheckDlg();
private: private:

18
Source/Core/DebuggerWX/Src/MemoryWindow.cpp
View File

@ -90,19 +90,19 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3); sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, _T(""))); sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, _T("")));
sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, _T(""))); sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, _T("")));
sizerRight->Add(new wxButton(this, IDM_SETVALBUTTON, _T("Set &Value"))); sizerRight->Add(new wxButton(this, IDM_SETVALBUTTON, _("Set &Value")));
sizerRight->AddSpacer(5); sizerRight->AddSpacer(5);
sizerRight->Add(new wxButton(this, IDM_DUMP_MEMORY, _T("&Dump MRAM"))); sizerRight->Add(new wxButton(this, IDM_DUMP_MEMORY, _("&Dump MRAM")));
sizerRight->Add(new wxButton(this, IDM_DUMP_MEM2, _T("&Dump EXRAM"))); sizerRight->Add(new wxButton(this, IDM_DUMP_MEM2, _("&Dump EXRAM")));
wxStaticBoxSizer* sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Search")); wxStaticBoxSizer* sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search"));
sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _T("Search"))); sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _("Search")));
sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, _T("&Ascii "))); sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, _T("&Ascii ")));
sizerSearchType->Add(chkHex = new wxCheckBox(this, IDM_HEX, _T("&Hex"))); sizerSearchType->Add(chkHex = new wxCheckBox(this, IDM_HEX, _("&Hex")));
sizerRight->Add(sizerSearchType); sizerRight->Add(sizerSearchType);
wxStaticBoxSizer* sizerDataTypes = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Data Type")); wxStaticBoxSizer* sizerDataTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Data Type"));
sizerDataTypes->SetMinSize(74, 40); sizerDataTypes->SetMinSize(74, 40);
sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, _T("&U8"))); sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, _T("&U8")));
@ -411,7 +411,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
if(k == size) if(k == size)
{ {
//Match was found //Match was found
wxMessageBox(_T("A match was found. Placing viewer at the offset.")); wxMessageBox(_("A match was found. Placing viewer at the offset."));
wxChar tmpwxstr[128] = {0}; wxChar tmpwxstr[128] = {0};
wxSprintf(tmpwxstr, _T("%08x"), i); wxSprintf(tmpwxstr, _T("%08x"), i);
wxString tmpwx(tmpwxstr); wxString tmpwx(tmpwxstr);
@ -422,7 +422,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
return; return;
} }
} }
wxMessageBox(_T("No match was found.")); wxMessageBox(_("No match was found."));
} }
} }

2
Source/Core/DebuggerWX/Src/MemoryWindow.h
View File

@ -40,7 +40,7 @@ class CMemoryWindow
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE, long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _T("Memory")); const wxString& name = _("Memory"));
wxCheckBox* chk8; wxCheckBox* chk8;
wxCheckBox* chk16; wxCheckBox* chk16;

2
Source/Core/DebuggerWX/Src/RegisterView.cpp
View File

@ -131,7 +131,7 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
{ {
wxGridCellAttr *attr = new wxGridCellAttr(); wxGridCellAttr *attr = new wxGridCellAttr();
attr->SetBackgroundColour(wxColour(wxT("#FFFFFF"))); attr->SetBackgroundColour(wxColour(wxT("#FFFFFF"))); //wxWHITE
attr->SetFont(DebuggerFont); attr->SetFont(DebuggerFont);
switch (col) { switch (col) {

2
Source/Core/DebuggerWX/Src/RegisterWindow.h
View File

@ -30,7 +30,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER, long style = wxTAB_TRAVERSAL | wxNO_BORDER,
const wxString& name = wxT("Registers")); const wxString& name = _("Registers"));
void NotifyUpdate(); void NotifyUpdate();

4
Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
View File

@ -40,7 +40,7 @@ CARCodeAddEdit::~CARCodeAddEdit()
void CARCodeAddEdit::CreateGUIControls(int _selection) void CARCodeAddEdit::CreateGUIControls(int _selection)
{ {
ActionReplay::ARCode tempEntries; ActionReplay::ARCode tempEntries;
wxString currentName = wxT("Insert name here.."); wxString currentName = _("Insert name here..");
if (_selection == -1) if (_selection == -1)
{ {
@ -65,7 +65,7 @@ void CARCodeAddEdit::CreateGUIControls(int _selection)
EntrySelection->SetValue((int)(arCodes.size() - _selection)); EntrySelection->SetValue((int)(arCodes.size() - _selection));
EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE);
UpdateTextCtrl(tempEntries); UpdateTextCtrl(tempEntries);
wxButton* bOK = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxButton* bOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5); sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5);

2
Source/Core/DolphinWX/Src/ARCodeAddEdit.h
View File

@ -27,7 +27,7 @@ class CARCodeAddEdit : public wxDialog
public: public:
CARCodeAddEdit(int _selection, wxWindow* parent, CARCodeAddEdit(int _selection, wxWindow* parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString& title = wxT("Edit ActionReplay Code"), const wxString& title = _("Edit ActionReplay Code"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE); long style = wxDEFAULT_DIALOG_STYLE);

2
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -39,7 +39,7 @@ AboutDolphin::~AboutDolphin()
void AboutDolphin::CreateGUIControls() void AboutDolphin::CreateGUIControls()
{ {
m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), m_Close = new wxButton(this, wxID_CLOSE, _("Close"),
wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png); wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png);

2
Source/Core/DolphinWX/Src/AboutDolphin.h
View File

@ -30,7 +30,7 @@ class AboutDolphin : public wxDialog
public: public:
AboutDolphin(wxWindow *parent, AboutDolphin(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString &title = wxT("About Dolphin"), const wxString &title = _("About Dolphin"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE); long style = wxDEFAULT_DIALOG_STYLE);

70
Source/Core/DolphinWX/Src/CheatsWindow.cpp
View File

@ -34,7 +34,7 @@ extern std::vector<ActionReplay::ARCode> arCodes;
static wxCheatsWindow *g_cheat_window; static wxCheatsWindow *g_cheat_window;
wxCheatsWindow::wxCheatsWindow(wxWindow* const parent) wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
: wxFrame(parent, wxID_ANY, wxT("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) : wxFrame(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
{ {
::g_cheat_window = this; ::g_cheat_window = this;
@ -74,10 +74,10 @@ void wxCheatsWindow::Init_ChildControls()
_connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemSelected, wxEVT_COMMAND_LISTBOX_SELECTED, this); _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemSelected, wxEVT_COMMAND_LISTBOX_SELECTED, this);
_connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemToggled, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this); _connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemToggled, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this);
m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _T("Name: "), wxDefaultPosition, wxDefaultSize); m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize);
m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _T("Code Info"), wxDefaultPosition, wxDefaultSize); m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize);
m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _T("Number Of Codes: "), wxDefaultPosition, wxDefaultSize); m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: "), wxDefaultPosition, wxDefaultSize);
m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL); m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL);
wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL); wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL);
@ -97,10 +97,10 @@ void wxCheatsWindow::Init_ChildControls()
// $ Log Tab // $ Log Tab
m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize);
wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, wxT("Update")); wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update"));
_connect_macro_(button_updatelog, wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(button_updatelog, wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, wxT("Enable AR Logging")); m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging"));
_connect_macro_(m_CheckBox_LogAR, wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, wxEVT_COMMAND_CHECKBOX_CLICKED, this); _connect_macro_(m_CheckBox_LogAR, wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging()); m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging());
@ -117,16 +117,16 @@ void wxCheatsWindow::Init_ChildControls()
m_Tab_Log->SetSizerAndFit(sTabLog); m_Tab_Log->SetSizerAndFit(sTabLog);
// Add Tabs to Notebook // Add Tabs to Notebook
m_Notebook_Main->AddPage(m_Tab_Cheats, _T("AR Codes")); m_Notebook_Main->AddPage(m_Tab_Cheats, _("AR Codes"));
m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook_Main); m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook_Main);
m_Notebook_Main->AddPage(m_geckocode_panel, wxT("Gecko Codes")); m_Notebook_Main->AddPage(m_geckocode_panel, _("Gecko Codes"));
m_Notebook_Main->AddPage(tab_cheat_search, _T("Cheat Search")); m_Notebook_Main->AddPage(tab_cheat_search, _("Cheat Search"));
m_Notebook_Main->AddPage(m_Tab_Log, _T("Logging")); m_Notebook_Main->AddPage(m_Tab_Log, _("Logging"));
// Button Strip // Button Strip
wxButton* const button_apply = new wxButton(panel, wxID_ANY, _T("Apply"), wxDefaultPosition, wxDefaultSize); wxButton* const button_apply = new wxButton(panel, wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize);
_connect_macro_(button_apply, wxCheatsWindow::OnEvent_ApplyChanges_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(button_apply, wxCheatsWindow::OnEvent_ApplyChanges_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxButton* const button_close = new wxButton(panel, wxID_ANY, _T("Close"), wxDefaultPosition, wxDefaultSize); wxButton* const button_close = new wxButton(panel, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize);
_connect_macro_(button_close, wxCheatsWindow::OnEvent_ButtonClose_Press, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(button_close, wxCheatsWindow::OnEvent_ButtonClose_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
sButtons->Add(button_apply, 1, wxRIGHT, 5); sButtons->Add(button_apply, 1, wxRIGHT, 5);
@ -146,11 +146,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
{ {
// first scan button // first scan button
btnInitScan = new wxButton(this, -1, wxT("New Scan")); btnInitScan = new wxButton(this, -1, _("New Scan"));
_connect_macro_(btnInitScan, CheatSearchTab::StartNewSearch, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btnInitScan, CheatSearchTab::StartNewSearch, wxEVT_COMMAND_BUTTON_CLICKED, this);
// next scan button // next scan button
btnNextScan = new wxButton(this, -1, wxT("Next Scan")); btnNextScan = new wxButton(this, -1, _("Next Scan"));
_connect_macro_(btnNextScan, CheatSearchTab::FilterCheatSearchResults, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btnNextScan, CheatSearchTab::FilterCheatSearchResults, wxEVT_COMMAND_BUTTON_CLICKED, this);
btnNextScan->Disable(); btnNextScan->Disable();
@ -161,27 +161,27 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
size_radiobtn.rad_8->SetValue(true); size_radiobtn.rad_8->SetValue(true);
// data sizes groupbox // data sizes groupbox
wxStaticBoxSizer* const sizer_cheat_new_search = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Data Size")); wxStaticBoxSizer* const sizer_cheat_new_search = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Data Size"));
sizer_cheat_new_search->Add(size_radiobtn.rad_8, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5); sizer_cheat_new_search->Add(size_radiobtn.rad_8, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
sizer_cheat_new_search->Add(size_radiobtn.rad_16, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5); sizer_cheat_new_search->Add(size_radiobtn.rad_16, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
sizer_cheat_new_search->Add(size_radiobtn.rad_32, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5); sizer_cheat_new_search->Add(size_radiobtn.rad_32, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
// result controls // result controls
lbox_search_results = new wxListBox(this, -1, wxDefaultPosition, wxDefaultSize); lbox_search_results = new wxListBox(this, -1, wxDefaultPosition, wxDefaultSize);
label_results_count = new wxStaticText(this, -1, wxT("Count:")); label_results_count = new wxStaticText(this, -1, _("Count:"));
// create AR code button // create AR code button
wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, wxT("Create AR Code")); wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code"));
_connect_macro_(button_cheat_search_copy_address, CheatSearchTab::CreateARCode, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(button_cheat_search_copy_address, CheatSearchTab::CreateARCode, wxEVT_COMMAND_BUTTON_CLICKED, this);
// results groupbox // results groupbox
wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Results")); wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results"));
sizer_cheat_search_results->Add(label_results_count, 0, wxALIGN_LEFT | wxALL, 5); sizer_cheat_search_results->Add(label_results_count, 0, wxALIGN_LEFT | wxALL, 5);
sizer_cheat_search_results->Add(lbox_search_results, 1, wxEXPAND | wxALL, 5); sizer_cheat_search_results->Add(lbox_search_results, 1, wxEXPAND | wxALL, 5);
sizer_cheat_search_results->Add(button_cheat_search_copy_address, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5); sizer_cheat_search_results->Add(button_cheat_search_copy_address, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
// Search value radio buttons // Search value radio buttons
value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, wxT("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, _("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, wxT("")); value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, wxT(""));
value_x_radiobtn.rad_oldvalue->SetValue(true); value_x_radiobtn.rad_oldvalue->SetValue(true);
@ -194,25 +194,25 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
sizer_cheat_filter_text->Add(textctrl_value_x, 1, wxALIGN_CENTER_VERTICAL, 5); sizer_cheat_filter_text->Add(textctrl_value_x, 1, wxALIGN_CENTER_VERTICAL, 5);
// value groupbox // value groupbox
wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Value")); wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, _("Value"));
sizer_cheat_search_filter_x->Add(value_x_radiobtn.rad_oldvalue, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5); sizer_cheat_search_filter_x->Add(value_x_radiobtn.rad_oldvalue, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
sizer_cheat_search_filter_x->Add(sizer_cheat_filter_text, 0, wxALL | wxEXPAND, 5); sizer_cheat_search_filter_x->Add(sizer_cheat_filter_text, 0, wxALL | wxEXPAND, 5);
// filter types in the compare dropdown // filter types in the compare dropdown
static const wxString searches[] = { static const wxString searches[] = {
wxT("Unknown"), _("Unknown"),
wxT("Not Equal"), _("Not Equal"),
wxT("Equal"), _("Equal"),
wxT("Greater Than"), _("Greater Than"),
wxT("Less Than"), _("Less Than"),
// TODO: Implement between search. // TODO: Implement between search.
//wxT("Between"), //_("Between"),
}; };
search_type = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, sizeof(searches)/sizeof(*searches), searches); search_type = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, sizeof(searches)/sizeof(*searches), searches);
search_type->Select(0); search_type->Select(0);
wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Search Filter")); wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, _("Search Filter"));
sizer_cheat_search_filter->Add(sizer_cheat_search_filter_x, 0, wxALL | wxEXPAND, 5); sizer_cheat_search_filter->Add(sizer_cheat_search_filter_x, 0, wxALL | wxEXPAND, 5);
sizer_cheat_search_filter->Add(search_type, 0, wxALL, 5); sizer_cheat_search_filter->Add(search_type, 0, wxALL, 5);
@ -275,7 +275,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e
if ((int)indexList[i].uiIndex == index) if ((int)indexList[i].uiIndex == index)
{ {
ARCode code = GetARCode(i); ARCode code = GetARCode(i);
m_Label_Codename->SetLabel(wxT("Name: ") + wxString(code.name.c_str(), *wxConvCurrent)); m_Label_Codename->SetLabel(_("Name: ") + wxString(code.name.c_str(), *wxConvCurrent));
char text[CHAR_MAX]; char text[CHAR_MAX];
char* numcodes = text; char* numcodes = text;
sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size()); sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size());
@ -491,7 +491,7 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
wxString count_label = wxString::Format(wxT("Count: %i"), search_results.size()); wxString count_label = wxString::Format(wxT("Count: %i"), search_results.size());
if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY) if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
{ {
count_label += wxT(" (too many to display)"); count_label += _(" (too many to display)");
} }
else else
{ {
@ -542,22 +542,22 @@ void CheatSearchTab::CreateARCode(wxCommandEvent&)
} }
CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address) CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
: wxDialog(parent, -1, wxT("Create AR Code"), wxDefaultPosition) : wxDialog(parent, -1, _("Create AR Code"), wxDefaultPosition)
, code_address(address) , code_address(address)
{ {
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);
wxStaticText* const label_name = new wxStaticText(panel, -1, wxT("Name: ")); wxStaticText* const label_name = new wxStaticText(panel, -1, _("Name: "));
textctrl_name = new wxTextCtrl(panel, -1, wxEmptyString, wxDefaultPosition, wxSize(256,-1)); textctrl_name = new wxTextCtrl(panel, -1, wxEmptyString, wxDefaultPosition, wxSize(256,-1));
wxStaticText* const label_code = new wxStaticText(panel, -1, wxT("Code: ")); wxStaticText* const label_code = new wxStaticText(panel, -1, _("Code: "));
textctrl_code = new wxTextCtrl(panel, -1, wxString::Format(wxT("0x%08x"), address)); textctrl_code = new wxTextCtrl(panel, -1, wxString::Format(wxT("0x%08x"), address));
textctrl_code->Disable(); textctrl_code->Disable();
wxStaticText* const label_value = new wxStaticText(panel, -1, wxT("Value: ")); wxStaticText* const label_value = new wxStaticText(panel, -1, _("Value: "));
textctrl_value = new wxTextCtrl(panel, -1, wxT("0")); textctrl_value = new wxTextCtrl(panel, -1, wxT("0"));
checkbox_use_hex = new wxCheckBox(panel, -1, wxT("Use Hex")); checkbox_use_hex = new wxCheckBox(panel, -1, _("Use Hex"));
checkbox_use_hex->SetValue(true); checkbox_use_hex->SetValue(true);
wxBoxSizer* const sizer_value_label = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sizer_value_label = new wxBoxSizer(wxHORIZONTAL);
@ -566,7 +566,7 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
wxButton* const btn_ok = new wxButton(panel, -1, wxT("OK")); wxButton* const btn_ok = new wxButton(panel, -1, wxT("OK"));
_connect_macro_(btn_ok, CreateCodeDialog::PressOK, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btn_ok, CreateCodeDialog::PressOK, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxButton* const btn_cancel = new wxButton(panel, -1, wxT("Cancel")); wxButton* const btn_cancel = new wxButton(panel, -1, _("Cancel"));
_connect_macro_(btn_cancel, CreateCodeDialog::PressCancel, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btn_cancel, CreateCodeDialog::PressCancel, wxEVT_COMMAND_BUTTON_CLICKED, this);
// button sizer // button sizer

209
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -32,6 +32,7 @@
#include "SysConf.h" #include "SysConf.h"
#include "Frame.h" #include "Frame.h"
#include "HotkeyDlg.h" #include "HotkeyDlg.h"
#include "Main.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
@ -207,15 +208,15 @@ void CConfigMain::InitializeGUILists()
arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i)); arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i));
// Emulator Engine // Emulator Engine
arrayStringFor_CPUEngine.Add(wxT("Interpreter (VERY slow)")); arrayStringFor_CPUEngine.Add(_("Interpreter (VERY slow)"));
arrayStringFor_CPUEngine.Add(wxT("JIT Recompiler (recommended)")); arrayStringFor_CPUEngine.Add(_("JIT Recompiler (recommended)"));
arrayStringFor_CPUEngine.Add(wxT("JITIL experimental recompiler")); arrayStringFor_CPUEngine.Add(_("JITIL experimental recompiler"));
// Display page // Display page
// Resolutions // Resolutions
if (arrayStringFor_FullscreenResolution.empty()) if (arrayStringFor_FullscreenResolution.empty())
arrayStringFor_FullscreenResolution.Add(wxT("<No resolutions found>")); arrayStringFor_FullscreenResolution.Add(_("<No resolutions found>"));
// Themes // Themes
arrayStringFor_Themes.Add(wxT("Boomy")); arrayStringFor_Themes.Add(wxT("Boomy"));
@ -224,12 +225,12 @@ void CConfigMain::InitializeGUILists()
arrayStringFor_Themes.Add(wxT("KDE")); arrayStringFor_Themes.Add(wxT("KDE"));
// GUI language arrayStrings // GUI language arrayStrings
arrayStringFor_InterfaceLang.Add(wxT("English")); arrayStringFor_InterfaceLang.Add(_("English"));
arrayStringFor_InterfaceLang.Add(wxT("German")); arrayStringFor_InterfaceLang.Add(_("German"));
arrayStringFor_InterfaceLang.Add(wxT("French")); arrayStringFor_InterfaceLang.Add(_("French"));
arrayStringFor_InterfaceLang.Add(wxT("Spanish")); arrayStringFor_InterfaceLang.Add(_("Spanish"));
arrayStringFor_InterfaceLang.Add(wxT("Italian")); arrayStringFor_InterfaceLang.Add(_("Italian"));
arrayStringFor_InterfaceLang.Add(wxT("Dutch")); arrayStringFor_InterfaceLang.Add(_("Dutch"));
// Gamecube page // Gamecube page
@ -239,8 +240,8 @@ void CConfigMain::InitializeGUILists()
// Wii page // Wii page
// Sensorbar Position // Sensorbar Position
arrayStringFor_WiiSensBarPos.Add(wxT("Bottom")); arrayStringFor_WiiSensBarPos.Add(_("Bottom"));
arrayStringFor_WiiSensBarPos.Add(wxT("Top")); arrayStringFor_WiiSensBarPos.Add(_("Top"));
// Aspect ratio // Aspect ratio
arrayStringFor_WiiAspectRatio.Add(wxT("4:3")); arrayStringFor_WiiAspectRatio.Add(wxT("4:3"));
@ -248,10 +249,10 @@ void CConfigMain::InitializeGUILists()
// Wii Language arrayStrings // Wii Language arrayStrings
arrayStringFor_WiiSystemLang = arrayStringFor_InterfaceLang; arrayStringFor_WiiSystemLang = arrayStringFor_InterfaceLang;
arrayStringFor_WiiSystemLang.Insert(wxT("Japanese"), 0); arrayStringFor_WiiSystemLang.Insert(_("Japanese"), 0);
arrayStringFor_WiiSystemLang.Add(wxT("Simplified Chinese")); arrayStringFor_WiiSystemLang.Add(_("Simplified Chinese"));
arrayStringFor_WiiSystemLang.Add(wxT("Traditional Chinese")); arrayStringFor_WiiSystemLang.Add(_("Traditional Chinese"));
arrayStringFor_WiiSystemLang.Add(wxT("Korean")); arrayStringFor_WiiSystemLang.Add(_("Korean"));
} }
@ -333,47 +334,41 @@ void CConfigMain::InitializeGUIValues()
void CConfigMain::InitializeGUITooltips() void CConfigMain::InitializeGUITooltips()
{ {
// General - Basic // General - Basic
CPUThread->SetToolTip(wxT("This splits the Video and CPU threads, so they can be run on separate cores.") CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core,\nbut can also cause occasional crashes/glitches."));
wxT("\nCauses major speed improvements on PCs with more than one core,") Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50),\nyou also have to disable Audio Throttle in DSP to make it effective."));
wxT("\nbut can also cause occasional crashes/glitches."));
Framelimit->SetToolTip(wxT("If you set Framelimit higher than game full speed (NTSC:60, PAL:50),\nyou also have to disable Audio Throttle in DSP to make it effective."));
// General - Advanced // General - Advanced
DSPThread->SetToolTip(wxT("Run DSPLLE on a dedicated thread (not recommended).")); DSPThread->SetToolTip(_("Run DSPLLE on a dedicated thread (not recommended)."));
// Display - Display // Display - Display
FullscreenResolution->SetToolTip(wxT("Select resolution for fullscreen mode")); FullscreenResolution->SetToolTip(_("Select resolution for fullscreen mode"));
WindowWidth->SetToolTip(wxT("Window width for windowed mode")); WindowWidth->SetToolTip(_("Window width for windowed mode"));
WindowHeight->SetToolTip(wxT("Window height for windowed mode")); WindowHeight->SetToolTip(_("Window height for windowed mode"));
Fullscreen->SetToolTip(wxT("Start the rendering window in fullscreen mode.")); Fullscreen->SetToolTip(_("Start the rendering window in fullscreen mode."));
HideCursor->SetToolTip(wxT("Hide the cursor when it is over the rendering window") HideCursor->SetToolTip(_("Hide the cursor when it is over the rendering window\n and the rendering window has focus."));
wxT("\n and the rendering window has focus.")); RenderToMain->SetToolTip(_("Render to main window."));
RenderToMain->SetToolTip(wxT("Render to main window.")); ProgressiveScan->SetToolTip(_("Will enable progressive scan option if supported by software."));
ProgressiveScan->SetToolTip(wxT("Will enable progressive scan option if supported by software.")); NTSCJ->SetToolTip(_("Required for using the Japanese ROM font."));
NTSCJ->SetToolTip(wxT("Required for using the Japanese ROM font."));
// Display - Interface // Display - Interface
ConfirmStop->SetToolTip(wxT("Show a confirmation box before stopping a game.")); ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game."));
UsePanicHandlers->SetToolTip(wxT("Show a message box when a potentially serious error has occured.") UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin\nsuddenly crashes without any explanation at all."));
wxT(" Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin")
wxT(" suddenly crashes without any explanation at all."));
// Display - Themes: Copyright notice // Display - Themes: Copyright notice
Theme->SetItemToolTip(0, wxT("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]")); Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"));
Theme->SetItemToolTip(1, wxT("Created by VistaIcons.com")); Theme->SetItemToolTip(1, _("Created by VistaIcons.com"));
Theme->SetItemToolTip(2, wxT("Created by black_rider and published on ForumW.org > Web Developments")); Theme->SetItemToolTip(2, _("Created by black_rider and published on ForumW.org > Web Developments"));
Theme->SetItemToolTip(3, wxT("Created by KDE-Look.org")); Theme->SetItemToolTip(3, _("Created by KDE-Look.org"));
InterfaceLang->SetToolTip(wxT("For the time being this will only change the text shown in") InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart."));
wxT("\nthe game list of PAL GC games."));
// Gamecube - Devices // Gamecube - Devices
GCEXIDevice[2]->SetToolTip(wxT("Serial Port 1 - This is the port which devices such as the net adapter use")); GCEXIDevice[2]->SetToolTip(_("Serial Port 1 - This is the port which devices such as the net adapter use"));
// Wii - Devices // Wii - Devices
WiiKeyboard->SetToolTip(wxT("This could cause slow down in Wii Menu and some games.")); WiiKeyboard->SetToolTip(_("This could cause slow down in Wii Menu and some games."));
} }
void CConfigMain::CreateGUIControls() void CConfigMain::CreateGUIControls()
@ -389,30 +384,30 @@ void CConfigMain::CreateGUIControls()
PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize); PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize);
PluginsPage = new wxPanel(Notebook, ID_PLUGINPAGE, wxDefaultPosition, wxDefaultSize); PluginsPage = new wxPanel(Notebook, ID_PLUGINPAGE, wxDefaultPosition, wxDefaultSize);
Notebook->AddPage(GeneralPage, wxT("General")); Notebook->AddPage(GeneralPage, _("General"));
Notebook->AddPage(DisplayPage, wxT("Display")); Notebook->AddPage(DisplayPage, _("Display"));
Notebook->AddPage(GamecubePage, wxT("Gamecube")); Notebook->AddPage(GamecubePage, _("Gamecube"));
Notebook->AddPage(WiiPage, wxT("Wii")); Notebook->AddPage(WiiPage, _("Wii"));
Notebook->AddPage(PathsPage, wxT("Paths")); Notebook->AddPage(PathsPage, _("Paths"));
Notebook->AddPage(PluginsPage, wxT("Plugins")); Notebook->AddPage(PluginsPage, _("Plugins"));
// General page // General page
// Core Settings - Basic // Core Settings - Basic
sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Basic Settings")); sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings"));
CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, wxT("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, _("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, wxT("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, _("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, wxT("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Framelimit // Framelimit
wxStaticText* FramelimitText = new wxStaticText(GeneralPage, ID_FRAMELIMIT_TEXT, wxT("Framelimit :"), wxDefaultPosition, wxDefaultSize); wxStaticText* FramelimitText = new wxStaticText(GeneralPage, ID_FRAMELIMIT_TEXT, _("Framelimit :"), wxDefaultPosition, wxDefaultSize);
Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator); Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator);
UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, wxT("Use FPS For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Use FPS For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Core Settings - Advanced // Core Settings - Advanced
sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Advanced Settings")); sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, wxT("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, _("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, wxT("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, wxT("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, _("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Populate the settings // Populate the settings
sbBasic->Add(CPUThread, 0, wxALL, 5); sbBasic->Add(CPUThread, 0, wxALL, 5);
@ -439,37 +434,38 @@ void CConfigMain::CreateGUIControls()
// Display page // Display page
// General display settings // General display settings
sbDisplay = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, wxT("Emulator Display Settings")); sbDisplay = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Emulator Display Settings"));
wxStaticText* FullscreenResolutionText = new wxStaticText(DisplayPage, wxID_ANY, wxT("Fullscreen Display Resolution:"), wxDefaultPosition, wxDefaultSize, 0); wxStaticText* FullscreenResolutionText = new wxStaticText(DisplayPage, wxID_ANY, _("Fullscreen Display Resolution:"), wxDefaultPosition, wxDefaultSize, 0);
FullscreenResolution = new wxChoice(DisplayPage, ID_DISPLAY_FULLSCREENRES, wxDefaultPosition, wxDefaultSize, arrayStringFor_FullscreenResolution, 0, wxDefaultValidator, arrayStringFor_FullscreenResolution[0]); FullscreenResolution = new wxChoice(DisplayPage, ID_DISPLAY_FULLSCREENRES, wxDefaultPosition, wxDefaultSize, arrayStringFor_FullscreenResolution, 0, wxDefaultValidator, arrayStringFor_FullscreenResolution[0]);
wxStaticText *WindowSizeText = new wxStaticText(DisplayPage, wxID_ANY, wxT("Window Size:"), wxDefaultPosition, wxDefaultSize, 0); wxStaticText *WindowSizeText = new wxStaticText(DisplayPage, wxID_ANY, _("Window Size:"), wxDefaultPosition, wxDefaultSize, 0);
WindowWidth = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWWIDTH, wxEmptyString, wxDefaultPosition, wxSize(70, -1)); WindowWidth = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWWIDTH, wxEmptyString, wxDefaultPosition, wxSize(70, -1));
WindowWidth->SetRange(0,3280); WindowWidth->SetRange(0,3280);
wxStaticText *WindowXText = new wxStaticText(DisplayPage, wxID_ANY, wxT("x"), wxDefaultPosition, wxDefaultSize, 0); wxStaticText *WindowXText = new wxStaticText(DisplayPage, wxID_ANY, wxT("x"), wxDefaultPosition, wxDefaultSize, 0);
WindowHeight = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWHEIGHT, wxEmptyString, wxDefaultPosition, wxSize(70, -1)); WindowHeight = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWHEIGHT, wxEmptyString, wxDefaultPosition, wxSize(70, -1));
WindowHeight->SetRange(0,2048); WindowHeight->SetRange(0,2048);
Fullscreen = new wxCheckBox(DisplayPage, ID_DISPLAY_FULLSCREEN, wxT("Start Renderer in Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); Fullscreen = new wxCheckBox(DisplayPage, ID_DISPLAY_FULLSCREEN, _("Start Renderer in Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
HideCursor = new wxCheckBox(DisplayPage, ID_DISPLAY_HIDECURSOR, wxT("Hide Mouse Cursor")); HideCursor = new wxCheckBox(DisplayPage, ID_DISPLAY_HIDECURSOR, _("Hide Mouse Cursor"));
RenderToMain = new wxCheckBox(DisplayPage, ID_DISPLAY_RENDERTOMAIN, wxT("Render to Main Window"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); RenderToMain = new wxCheckBox(DisplayPage, ID_DISPLAY_RENDERTOMAIN, _("Render to Main Window"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
ProgressiveScan = new wxCheckBox(DisplayPage, ID_DISPLAY_PROGSCAN, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); ProgressiveScan = new wxCheckBox(DisplayPage, ID_DISPLAY_PROGSCAN, _("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
NTSCJ = new wxCheckBox(DisplayPage, ID_DISPLAY_NTSCJ, wxT("Set Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); NTSCJ = new wxCheckBox(DisplayPage, ID_DISPLAY_NTSCJ, _("Set Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Interface settings // Interface settings
sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, wxT("Interface Settings")); sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings"));
ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, wxT("Confirm On Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm On Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, wxT("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, _("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Themes - this should really be a wxChoice... // Themes - this should really be a wxChoice...
Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, wxT("Theme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS); Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, _("Theme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS);
// Interface Language // Interface Language
// At the moment this only changes the language displayed in m_gamelistctrl // At the moment this only changes the language displayed in m_gamelistctrl
// If someone wants to control the whole GUI's language, it should be set here too // If someone wants to control the whole GUI's language, it should be set here too
wxStaticText* InterfaceLangText = new wxStaticText(DisplayPage, ID_INTERFACE_LANG_TEXT, wxT("Game List Language:"), wxDefaultPosition, wxDefaultSize); wxStaticText* InterfaceLangText = new wxStaticText(DisplayPage, ID_INTERFACE_LANG_TEXT,
_("Language:"), wxDefaultPosition, wxDefaultSize);
InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_InterfaceLang, 0, wxDefaultValidator); InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_InterfaceLang, 0, wxDefaultValidator);
// Hotkey configuration // Hotkey configuration
HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, wxT("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator); HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
// Populate the settings // Populate the settings
wxBoxSizer* sDisplayRes = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sDisplayRes = new wxBoxSizer(wxHORIZONTAL);
@ -508,12 +504,12 @@ void CConfigMain::CreateGUIControls()
// Gamecube page // Gamecube page
// IPL settings // IPL settings
sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, wxT("IPL Settings")); sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("IPL Settings"));
wxStaticText* GCSystemLangText = new wxStaticText(GamecubePage, ID_GC_SRAM_LNG_TEXT, wxT("System Language:"), wxDefaultPosition, wxDefaultSize); wxStaticText* GCSystemLangText = new wxStaticText(GamecubePage, ID_GC_SRAM_LNG_TEXT, _("System Language:"), wxDefaultPosition, wxDefaultSize);
GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_GCSystemLang, 0, wxDefaultValidator); GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_GCSystemLang, 0, wxDefaultValidator);
// Device settings // Device settings
// EXI Devices // EXI Devices
wxStaticBoxSizer *sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, wxT("Device Settings")); wxStaticBoxSizer *sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("Device Settings"));
wxStaticText* GCEXIDeviceText[3]; wxStaticText* GCEXIDeviceText[3];
GCEXIDeviceText[0] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTA_TEXT, wxT("Slot A"), wxDefaultPosition, wxDefaultSize); GCEXIDeviceText[0] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTA_TEXT, wxT("Slot A"), wxDefaultPosition, wxDefaultSize);
GCEXIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTB_TEXT, wxT("Slot B"), wxDefaultPosition, wxDefaultSize); GCEXIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTB_TEXT, wxT("Slot B"), wxDefaultPosition, wxDefaultSize);
@ -627,26 +623,26 @@ void CConfigMain::CreateGUIControls()
// Wii page // Wii page
// Wiimote Settings // Wiimote Settings
sbWiimoteSettings = new wxStaticBoxSizer(wxHORIZONTAL, WiiPage, wxT("Wiimote Settings")); sbWiimoteSettings = new wxStaticBoxSizer(wxHORIZONTAL, WiiPage, _("Wiimote Settings"));
wxStaticText* WiiSensBarPosText = new wxStaticText(WiiPage, ID_WII_BT_BAR_TEXT, wxT("Sensor Bar Position:"), wxDefaultPosition, wxDefaultSize); wxStaticText* WiiSensBarPosText = new wxStaticText(WiiPage, ID_WII_BT_BAR_TEXT, _("Sensor Bar Position:"), wxDefaultPosition, wxDefaultSize);
WiiSensBarPos = new wxChoice(WiiPage, ID_WII_BT_BAR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSensBarPos, 0, wxDefaultValidator); WiiSensBarPos = new wxChoice(WiiPage, ID_WII_BT_BAR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSensBarPos, 0, wxDefaultValidator);
wxStaticText* WiiSensBarSensText = new wxStaticText(WiiPage, ID_WII_BT_SENS_TEXT, wxT("IR Sensitivity:"), wxDefaultPosition, wxDefaultSize); wxStaticText* WiiSensBarSensText = new wxStaticText(WiiPage, ID_WII_BT_SENS_TEXT, _("IR Sensitivity:"), wxDefaultPosition, wxDefaultSize);
WiiSensBarSens = new wxSlider(WiiPage, ID_WII_BT_SENS, 0, 0, 4); WiiSensBarSens = new wxSlider(WiiPage, ID_WII_BT_SENS, 0, 0, 4);
WiimoteMotor = new wxCheckBox(WiiPage, ID_WII_BT_MOT, wxT("Wiimote Motor"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiimoteMotor = new wxCheckBox(WiiPage, ID_WII_BT_MOT, _("Wiimote Motor"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Misc Settings // Misc Settings
sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("Misc Settings")); sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Misc Settings"));
WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, wxT("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxStaticText* WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, wxT("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize); wxStaticText* WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, _("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize);
WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator); WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator);
wxStaticText* WiiSystemLangText = new wxStaticText(WiiPage, ID_WII_IPL_LNG_TEXT, wxT("System Language:"), wxDefaultPosition, wxDefaultSize); wxStaticText* WiiSystemLangText = new wxStaticText(WiiPage, ID_WII_IPL_LNG_TEXT, _("System Language:"), wxDefaultPosition, wxDefaultSize);
WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator); WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator);
// Device Settings // Device Settings
sbWiiDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("Device Settings")); sbWiiDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Device Settings"));
WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, wxT("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, _("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, wxT("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, _("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Populate the settings // Populate the settings
sWiimoteSettings = new wxGridBagSizer(); sWiimoteSettings = new wxGridBagSizer();
@ -679,21 +675,21 @@ void CConfigMain::CreateGUIControls()
// Paths page // Paths page
sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, wxT("ISO Directories")); sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, _("ISO Directories"));
ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator); ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator);
RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, wxT("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, wxT("Add..."), wxDefaultPosition, wxDefaultSize, 0); AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add..."), wxDefaultPosition, wxDefaultSize, 0);
RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0); RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0);
RemoveISOPath->Enable(false); RemoveISOPath->Enable(false);
wxStaticText* DefaultISOText = new wxStaticText(PathsPage, ID_DEFAULTISO_TEXT, wxT("Default ISO:"), wxDefaultPosition, wxDefaultSize); wxStaticText* DefaultISOText = new wxStaticText(PathsPage, ID_DEFAULTISO_TEXT, _("Default ISO:"), wxDefaultPosition, wxDefaultSize);
DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, wxT("Choose a default ISO:"), DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"),
wxString::Format(wxT("All GC/Wii images (gcm, iso, ciso, gcz)|*.gcm;*.iso;*.ciso;*.gcz|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr), wxString::Format(wxT("All GC/Wii images (gcm, iso, ciso, gcz)|*.gcm;*.iso;*.ciso;*.gcz|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr),
wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN); wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
wxStaticText* DVDRootText = new wxStaticText(PathsPage, ID_DVDROOT_TEXT, wxT("DVD Root:"), wxDefaultPosition, wxDefaultSize); wxStaticText* DVDRootText = new wxStaticText(PathsPage, ID_DVDROOT_TEXT, _("DVD Root:"), wxDefaultPosition, wxDefaultSize);
DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, wxT("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL); DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
wxStaticText* ApploaderPathText = new wxStaticText(PathsPage, ID_APPLOADERPATH_TEXT, wxT("Apploader:"), wxDefaultPosition, wxDefaultSize); wxStaticText* ApploaderPathText = new wxStaticText(PathsPage, ID_APPLOADERPATH_TEXT, _("Apploader:"), wxDefaultPosition, wxDefaultSize);
ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, wxT("Choose file to use as apploader: (applies to discs constructed from directories only)"), ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"),
wxString::Format(wxT("apploader (.img)|*.img|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr), wxString::Format(wxT("apploader (.img)|*.img|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr),
wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN); wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
@ -724,13 +720,13 @@ void CConfigMain::CreateGUIControls()
// Plugins page // Plugins page
sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, wxT("Graphics")); sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("Graphics"));
GraphicSelection = new wxChoice(PluginsPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator); GraphicSelection = new wxChoice(PluginsPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
GraphicConfig = new wxButton(PluginsPage, ID_GRAPHIC_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); GraphicConfig = new wxButton(PluginsPage, ID_GRAPHIC_CONFIG, _("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, wxT("DSP")); sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("DSP"));
DSPSelection = new wxChoice(PluginsPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator); DSPSelection = new wxChoice(PluginsPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
DSPConfig = new wxButton(PluginsPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DSPConfig = new wxButton(PluginsPage, ID_DSP_CONFIG, _("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Populate the settings // Populate the settings
sbGraphicsPlugin->Add(GraphicSelection, 1, wxEXPAND|wxALL, 5); sbGraphicsPlugin->Add(GraphicSelection, 1, wxEXPAND|wxALL, 5);
@ -870,6 +866,9 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event)
main_frame->InitBitmaps(); main_frame->InitBitmaps();
break; break;
case ID_INTERFACE_LANG: case ID_INTERFACE_LANG:
if (SConfig::GetInstance().m_InterfaceLanguage !=
(INTERFACE_LANGUAGE)InterfaceLang->GetSelection())
SuccessAlert("You must restart Dolphin in order for the change to take effect.");
SConfig::GetInstance().m_InterfaceLanguage = (INTERFACE_LANGUAGE)InterfaceLang->GetSelection(); SConfig::GetInstance().m_InterfaceLanguage = (INTERFACE_LANGUAGE)InterfaceLang->GetSelection();
bRefreshList = true; bRefreshList = true;
break; break;
@ -927,11 +926,11 @@ void CConfigMain::GCSettingsChanged(wxCommandEvent& event)
void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA) void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
{ {
std::string filename = std::string(wxFileSelector( std::string filename = std::string(wxFileSelector(
wxT("Choose a file to open"), _("Choose a file to open"),
wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)), wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)),
isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB), isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB),
wxEmptyString, wxEmptyString,
wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str()); _("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str());
if (!filename.empty()) if (!filename.empty())
{ {
@ -1078,7 +1077,7 @@ void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event)
{ {
if (event.GetId() == ID_ADDISOPATH) if (event.GetId() == ID_ADDISOPATH)
{ {
wxDirDialog dialog(this, _T("Choose a directory to add"), wxGetHomeDir(), wxDirDialog dialog(this, _("Choose a directory to add"), wxGetHomeDir(),
wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)

2
Source/Core/DolphinWX/Src/ConfigMain.h
View File

@ -33,7 +33,7 @@ public:
CConfigMain(wxWindow* parent, CConfigMain(wxWindow* parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString& title = wxT("Dolphin Configuration"), const wxString& title = _("Dolphin Configuration"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE); long style = wxDEFAULT_DIALOG_STYLE);

17
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -171,11 +171,8 @@ CPanel::CPanel(
// The Wiimote has been disconnected, we offer reconnect here. // The Wiimote has been disconnected, we offer reconnect here.
wxMessageDialog *dlg = new wxMessageDialog( wxMessageDialog *dlg = new wxMessageDialog(
this, this,
wxString::Format(wxT("Wiimote %i has been disconnected by system.\n") wxString::Format(_("Wiimote %i has been disconnected by system.\nMaybe this game doesn't support multi-wiimote,\nor maybe it is due to idle time out or other reason.\nDo you want to reconnect immediately?"), wiimote_num),
wxT("Maybe this game doesn't support multi-wiimote,\n") _("Reconnect Wiimote Confirm"),
wxT("or maybe it is due to idle time out or other reason.\n\n")
wxT("Do you want to reconnect immediately?"), wiimote_num),
wxT("Reconnect Wiimote Confirm"),
wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION,
wxDefaultPosition); wxDefaultPosition);
@ -409,17 +406,17 @@ CFrame::CFrame(wxFrame* parent,
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
.Name(wxT("Pane 0")).Caption(wxT("Pane 0")) .Name(_("Pane 0")).Caption(_("Pane 0"))
.CenterPane().PaneBorder(false).Show()); .CenterPane().PaneBorder(false).Show());
AuiFullscreen = m_Mgr->SavePerspective(); AuiFullscreen = m_Mgr->SavePerspective();
} }
else else
{ {
m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
.Name(wxT("Pane 0")).Caption(wxT("Pane 0")).PaneBorder(false) .Name(_("Pane 0")).Caption(_("Pane 0")).PaneBorder(false)
.CaptionVisible(false).Layer(0).Center().Show()); .CaptionVisible(false).Layer(0).Center().Show());
m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo() m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
.Name(wxT("Pane 1")).Caption(wxT("Logging")).CaptionVisible(true) .Name(_("Pane 1")).Caption(_("Logging")).CaptionVisible(true)
.Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide()); .Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide());
AuiFullscreen = m_Mgr->SavePerspective(); AuiFullscreen = m_Mgr->SavePerspective();
} }
@ -659,7 +656,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
#ifdef __WXGTK__ #ifdef __WXGTK__
case IDM_PANIC: case IDM_PANIC:
bPanicResult = (wxYES == wxMessageBox(event.GetString(), bPanicResult = (wxYES == wxMessageBox(event.GetString(),
wxT("Warning"), event.GetInt() ? wxYES_NO : wxOK, this)); _("Warning"), event.GetInt() ? wxYES_NO : wxOK, this));
panic_event.Set(); panic_event.Set();
break; break;
#endif #endif
@ -825,7 +822,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
GetMenuBar()->Check(IDM_CONNECT_WIIMOTE1 + WiimoteId, !bNoWiimoteMsg); GetMenuBar()->Check(IDM_CONNECT_WIIMOTE1 + WiimoteId, !bNoWiimoteMsg);
GetUsbPointer()->AccessWiiMote(WiimoteId | 0x100)->Activate(!bNoWiimoteMsg); GetUsbPointer()->AccessWiiMote(WiimoteId | 0x100)->Activate(!bNoWiimoteMsg);
wxString msg(wxString::Format(wxT("Wiimote %i %s"), WiimoteId + 1, wxString msg(wxString::Format(wxT("Wiimote %i %s"), WiimoteId + 1,
bNoWiimoteMsg ? wxT("Disconnected") : wxT("Connected"))); bNoWiimoteMsg ? _("Disconnected") : _("Connected")));
Core::DisplayMessage(msg.ToAscii(), 3000); Core::DisplayMessage(msg.ToAscii(), 3000);
} }

46
Source/Core/DolphinWX/Src/FrameAui.cpp
View File

@ -78,11 +78,11 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event)
else else
{ {
if (GetNotebookCount() == 1) if (GetNotebookCount() == 1)
wxMessageBox(wxT("At least one pane must remain open."), wxMessageBox(_("At least one pane must remain open."),
wxT("Notice"), wxOK, this); _("Notice"), wxOK, this);
else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs(wxT("<>"))) else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs(wxT("<>")))
wxMessageBox(wxT("You can't close panes that have pages in them."), wxMessageBox(_("You can't close panes that have pages in them."),
wxT("Notice"), wxOK, this); _("Notice"), wxOK, this);
else else
{ {
// Detach and delete the empty notebook // Detach and delete the empty notebook
@ -335,7 +335,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
wxMenu* MenuPopup = new wxMenu; wxMenu* MenuPopup = new wxMenu;
wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY, wxMenuItem* Item = new wxMenuItem(MenuPopup, wxID_ANY,
wxT("Select floating windows")); _("Select floating windows"));
MenuPopup->Append(Item); MenuPopup->Append(Item);
Item->Enable(false); Item->Enable(false);
MenuPopup->Append(new wxMenuItem(MenuPopup)); MenuPopup->Append(new wxMenuItem(MenuPopup));
@ -378,20 +378,20 @@ void CFrame::TogglePane()
{ {
if (NB->GetPageCount() == 0) if (NB->GetPageCount() == 0)
{ {
m_LogWindow->x = m_Mgr->GetPane(wxT("Pane 1")).rect.GetWidth(); m_LogWindow->x = m_Mgr->GetPane(_("Pane 1")).rect.GetWidth();
m_LogWindow->y = m_Mgr->GetPane(wxT("Pane 1")).rect.GetHeight(); m_LogWindow->y = m_Mgr->GetPane(_("Pane 1")).rect.GetHeight();
m_LogWindow->winpos = m_Mgr->GetPane(wxT("Pane 1")).dock_direction; m_LogWindow->winpos = m_Mgr->GetPane(_("Pane 1")).dock_direction;
m_Mgr->GetPane(wxT("Pane 1")).Hide(); m_Mgr->GetPane(_("Pane 1")).Hide();
} }
else else
{ {
m_Mgr->GetPane(wxT("Pane 1")).BestSize(m_LogWindow->x, m_LogWindow->y) m_Mgr->GetPane(_("Pane 1")).BestSize(m_LogWindow->x, m_LogWindow->y)
.MinSize(m_LogWindow->x, m_LogWindow->y) .MinSize(m_LogWindow->x, m_LogWindow->y)
.Direction(m_LogWindow->winpos).Show(); .Direction(m_LogWindow->winpos).Show();
m_Mgr->Update(); m_Mgr->Update();
// Reset the minimum size of the pane // Reset the minimum size of the pane
m_Mgr->GetPane(wxT("Pane 1")).MinSize(-1, -1); m_Mgr->GetPane(_("Pane 1")).MinSize(-1, -1);
} }
m_Mgr->Update(); m_Mgr->Update();
} }
@ -464,14 +464,14 @@ void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event)
wxMenu* menuPopup = new wxMenu; wxMenu* menuPopup = new wxMenu;
wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_ADD_PANE, wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_PERSPECTIVES_ADD_PANE,
wxT("Add new pane")); _("Add new pane"));
menuPopup->Append(Item); menuPopup->Append(Item);
menuPopup->Append(new wxMenuItem(menuPopup)); menuPopup->Append(new wxMenuItem(menuPopup));
Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, wxT("Tab split"), Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, _("Tab split"),
wxT(""), wxITEM_CHECK); wxT(""), wxITEM_CHECK);
menuPopup->Append(Item); menuPopup->Append(Item);
Item->Check(m_bTabSplit); Item->Check(m_bTabSplit);
Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, wxT("No docking"), Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, _("No docking"),
wxT(""), wxITEM_CHECK); wxT(""), wxITEM_CHECK);
menuPopup->Append(Item); menuPopup->Append(Item);
Item->Check(m_bNoDocking); Item->Check(m_bNoDocking);
@ -500,7 +500,7 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
// create the popup menu // create the popup menu
wxMenu* menuPopup = new wxMenu; wxMenu* menuPopup = new wxMenu;
wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_ADD_PERSPECTIVE, wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_ADD_PERSPECTIVE,
wxT("Create new perspective")); _("Create new perspective"));
menuPopup->Append(Item); menuPopup->Append(Item);
if (Perspectives.size() > 0) if (Perspectives.size() > 0)
@ -536,8 +536,8 @@ void CFrame::OnToolBar(wxCommandEvent& event)
case IDM_SAVE_PERSPECTIVE: case IDM_SAVE_PERSPECTIVE:
if (Perspectives.size() == 0) if (Perspectives.size() == 0)
{ {
wxMessageBox(wxT("Please create a perspective before saving"), wxMessageBox(_("Please create a perspective before saving"),
wxT("Notice"), wxOK, this); _("Notice"), wxOK, this);
return; return;
} }
SaveIniPerspectives(); SaveIniPerspectives();
@ -564,8 +564,8 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
case IDM_ADD_PERSPECTIVE: case IDM_ADD_PERSPECTIVE:
{ {
wxTextEntryDialog dlg(this, wxTextEntryDialog dlg(this,
wxT("Enter a name for the new perspective:"), _("Enter a name for the new perspective:"),
wxT("Create new perspective")); _("Create new perspective"));
wxString DefaultValue = wxString::Format(wxT("Perspective %d"), wxString DefaultValue = wxString::Format(wxT("Perspective %d"),
Perspectives.size() + 1); Perspectives.size() + 1);
dlg.SetValue(DefaultValue); dlg.SetValue(DefaultValue);
@ -577,16 +577,16 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
return; return;
else if (dlg.GetValue().Find(wxT(",")) != -1) else if (dlg.GetValue().Find(wxT(",")) != -1)
{ {
wxMessageBox(wxT("The name can not contain the character ','"), wxMessageBox(_("The name can not contain the character ','"),
wxT("Notice"), wxOK, this); _("Notice"), wxOK, this);
wxString Str = dlg.GetValue(); wxString Str = dlg.GetValue();
Str.Replace(wxT(","), wxT(""), true); Str.Replace(wxT(","), wxT(""), true);
dlg.SetValue(Str); dlg.SetValue(Str);
} }
else if (dlg.GetValue().IsSameAs(wxT(""))) else if (dlg.GetValue().IsSameAs(wxT("")))
{ {
wxMessageBox(wxT("The name can not be empty"), wxMessageBox(_("The name can not be empty"),
wxT("Notice"), wxOK, this); _("Notice"), wxOK, this);
dlg.SetValue(DefaultValue); dlg.SetValue(DefaultValue);
} }
else else

202
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -106,11 +106,11 @@ void CFrame::CreateMenu()
// file menu // file menu
wxMenu* fileMenu = new wxMenu; wxMenu* fileMenu = new wxMenu;
fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O")); fileMenu->Append(wxID_OPEN, _("&Open...\tCtrl+O"));
fileMenu->Append(IDM_CHANGEDISC, _T("Change &Disc...")); fileMenu->Append(IDM_CHANGEDISC, _("Change &Disc..."));
wxMenu *externalDrive = new wxMenu; wxMenu *externalDrive = new wxMenu;
fileMenu->Append(IDM_DRIVES, _T("&Boot from DVD Drive..."), externalDrive); fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Drive..."), externalDrive);
drives = cdio_get_devices(); drives = cdio_get_devices();
// Windows Limitation of 24 character drives // Windows Limitation of 24 character drives
@ -119,32 +119,32 @@ void CFrame::CreateMenu()
} }
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(wxID_REFRESH, _T("&Refresh List")); fileMenu->Append(wxID_REFRESH, _("&Refresh List"));
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(IDM_BROWSE, _T("&Browse for ISOs...")); fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt+F4")); fileMenu->Append(wxID_EXIT, _("E&xit\tAlt+F4"));
m_MenuBar->Append(fileMenu, _T("&File")); m_MenuBar->Append(fileMenu, _("&File"));
// Emulation menu // Emulation menu
wxMenu* emulationMenu = new wxMenu; wxMenu* emulationMenu = new wxMenu;
emulationMenu->Append(IDM_PLAY, GetMenuLabel(HK_PLAY_PAUSE)); emulationMenu->Append(IDM_PLAY, GetMenuLabel(HK_PLAY_PAUSE));
emulationMenu->Append(IDM_STOP, GetMenuLabel(HK_STOP)); emulationMenu->Append(IDM_STOP, GetMenuLabel(HK_STOP));
emulationMenu->Append(IDM_RESET, _T("&Reset")); emulationMenu->Append(IDM_RESET, _("&Reset"));
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN)); emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN));
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_RECORD, _T("Start Re&cording")); emulationMenu->Append(IDM_RECORD, _("Start Re&cording"));
emulationMenu->Append(IDM_PLAYRECORD, _T("P&lay Recording...")); emulationMenu->Append(IDM_PLAYRECORD, _("P&lay Recording..."));
emulationMenu->Append(IDM_RECORDEXPORT, _T("Export Recording...")); emulationMenu->Append(IDM_RECORDEXPORT, _("Export Recording..."));
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_FRAMESTEP, _T("&Frame Stepping"), wxEmptyString, wxITEM_CHECK); emulationMenu->Append(IDM_FRAMESTEP, _("&Frame Stepping"), wxEmptyString, wxITEM_CHECK);
wxMenu *skippingMenu = new wxMenu; wxMenu *skippingMenu = new wxMenu;
emulationMenu->AppendSubMenu(skippingMenu, _T("Frame S&kipping")); emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
for(int i = 0; i < 10; i++) for(int i = 0; i < 10; i++)
skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(_T("%i"), i), wxEmptyString, wxITEM_RADIO); skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(wxT("%i"), i), wxEmptyString, wxITEM_RADIO);
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT)); emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
@ -152,64 +152,64 @@ void CFrame::CreateMenu()
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
wxMenu *saveMenu = new wxMenu; wxMenu *saveMenu = new wxMenu;
wxMenu *loadMenu = new wxMenu; wxMenu *loadMenu = new wxMenu;
emulationMenu->Append(IDM_LOADSTATE, _T("&Load State"), loadMenu); emulationMenu->Append(IDM_LOADSTATE, _("&Load State"), loadMenu);
emulationMenu->Append(IDM_SAVESTATE, _T("Sa&ve State"), saveMenu); emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu);
saveMenu->Append(IDM_SAVESTATEFILE, _T("Save State...")); saveMenu->Append(IDM_SAVESTATEFILE, _("Save State..."));
loadMenu->Append(IDM_UNDOSAVESTATE, _T("Last Overwritten State\tShift+F12")); loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State\tShift+F12"));
saveMenu->AppendSeparator(); saveMenu->AppendSeparator();
loadMenu->Append(IDM_LOADSTATEFILE, _T("Load State...")); loadMenu->Append(IDM_LOADSTATEFILE, _("Load State..."));
// Reserve F11 for the "step into" function in the debugger // Reserve F11 for the "step into" function in the debugger
if (g_pCodeWindow) if (g_pCodeWindow)
loadMenu->Append(IDM_LOADLASTSTATE, _T("Last Saved State")); loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State"));
else else
loadMenu->Append(IDM_LOADLASTSTATE, _T("Last Saved State\tF11")); loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State\tF11"));
loadMenu->Append(IDM_UNDOLOADSTATE, _T("Undo Load State\tF12")); loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State\tF12"));
loadMenu->AppendSeparator(); loadMenu->AppendSeparator();
for (int i = 1; i <= 8; i++) { for (int i = 1; i <= 8; i++) {
loadMenu->Append(IDM_LOADSLOT1 + i - 1, wxString::Format(_T("Slot %i\tF%i"), i, i)); loadMenu->Append(IDM_LOADSLOT1 + i - 1, wxString::Format(wxT("Slot %i\tF%i"), i, i));
saveMenu->Append(IDM_SAVESLOT1 + i - 1, wxString::Format(_T("Slot %i\tShift+F%i"), i, i)); saveMenu->Append(IDM_SAVESLOT1 + i - 1, wxString::Format(wxT("Slot %i\tShift+F%i"), i, i));
} }
m_MenuBar->Append(emulationMenu, _T("&Emulation")); m_MenuBar->Append(emulationMenu, _("&Emulation"));
// Options menu // Options menu
wxMenu* pOptionsMenu = new wxMenu; wxMenu* pOptionsMenu = new wxMenu;
pOptionsMenu->Append(wxID_PREFERENCES, _T("Co&nfigure...")); pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure..."));
pOptionsMenu->AppendSeparator(); pOptionsMenu->AppendSeparator();
pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _T("&Graphics Settings")); pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _("&Graphics Settings"));
pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP Settings")); pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _("&DSP Settings"));
pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&Gamecube Pad Settings")); pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _("&Gamecube Pad Settings"));
pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _T("&Wiimote Settings")); pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _("&Wiimote Settings"));
if (g_pCodeWindow) if (g_pCodeWindow)
{ {
pOptionsMenu->AppendSeparator(); pOptionsMenu->AppendSeparator();
g_pCodeWindow->CreateMenuOptions(pOptionsMenu); g_pCodeWindow->CreateMenuOptions(pOptionsMenu);
} }
m_MenuBar->Append(pOptionsMenu, _T("&Options")); m_MenuBar->Append(pOptionsMenu, _("&Options"));
// Tools menu // Tools menu
wxMenu* toolsMenu = new wxMenu; wxMenu* toolsMenu = new wxMenu;
toolsMenu->Append(IDM_LUA, _T("New &Lua Console")); toolsMenu->Append(IDM_LUA, _("New &Lua Console"));
toolsMenu->Append(IDM_MEMCARD, _T("&Memcard Manager (GC)")); toolsMenu->Append(IDM_MEMCARD, _("&Memcard Manager (GC)"));
toolsMenu->Append(IDM_IMPORTSAVE, _T("Wii Save Import")); toolsMenu->Append(IDM_IMPORTSAVE, _("Wii Save Import"));
toolsMenu->Append(IDM_CHEATS, _T("&Cheats Manager")); toolsMenu->Append(IDM_CHEATS, _("&Cheats Manager"));
toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay")); toolsMenu->Append(IDM_NETPLAY, _("Start &NetPlay"));
if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid()) if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
{ {
int sysmenuVersion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetTitleVersion(); int sysmenuVersion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetTitleVersion();
char sysmenuRegion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetCountryChar(); char sysmenuRegion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetCountryChar();
toolsMenu->Append(IDM_LOAD_WII_MENU, wxString::Format(_T("Load Wii System Menu (%d %c)"), sysmenuVersion, sysmenuRegion)); toolsMenu->Append(IDM_LOAD_WII_MENU, wxString::Format(wxT("Load Wii System Menu (%d %c)"), sysmenuVersion, sysmenuRegion));
} }
else else
{ {
toolsMenu->Append(IDM_INSTALL_WII_MENU, _T("Install Wii Menu")); toolsMenu->Append(IDM_INSTALL_WII_MENU, _("Install Wii Menu"));
} }
toolsMenu->AppendSeparator(); toolsMenu->AppendSeparator();
toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT)); toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
@ -217,16 +217,16 @@ void CFrame::CreateMenu()
toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT)); toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT)); toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
m_MenuBar->Append(toolsMenu, _T("&Tools")); m_MenuBar->Append(toolsMenu, _("&Tools"));
wxMenu* viewMenu = new wxMenu; wxMenu* viewMenu = new wxMenu;
viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("Show &Toolbar")); viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _("Show &Toolbar"));
viewMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar); viewMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _T("Show &Statusbar")); viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _("Show &Statusbar"));
viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar); viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
viewMenu->AppendCheckItem(IDM_LOGWINDOW, _T("Show &Logwindow")); viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Logwindow"));
viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _T("Show &Console")); viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
if (g_pCodeWindow) if (g_pCodeWindow)
@ -235,12 +235,12 @@ void CFrame::CreateMenu()
viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]); viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]);
const wxString MenuText[] = { const wxString MenuText[] = {
wxT("&Registers"), _("&Registers"),
wxT("&Breakpoints"), _("&Breakpoints"),
wxT("&Memory"), _("&Memory"),
wxT("&JIT"), _("&JIT"),
wxT("&Sound"), _("&Sound"),
wxT("&Video") _("&Video")
}; };
for (int i = IDM_REGISTERWINDOW; i <= IDM_VIDEOWINDOW; i++) for (int i = IDM_REGISTERWINDOW; i <= IDM_VIDEOWINDOW; i++)
@ -258,49 +258,49 @@ void CFrame::CreateMenu()
} }
wxMenu *platformMenu = new wxMenu; wxMenu *platformMenu = new wxMenu;
viewMenu->AppendSubMenu(platformMenu, _T("Show Platforms")); viewMenu->AppendSubMenu(platformMenu, _("Show Platforms"));
platformMenu->AppendCheckItem(IDM_LISTWII, _T("Show Wii")); platformMenu->AppendCheckItem(IDM_LISTWII, _("Show Wii"));
platformMenu->Check(IDM_LISTWII, SConfig::GetInstance().m_ListWii); platformMenu->Check(IDM_LISTWII, SConfig::GetInstance().m_ListWii);
platformMenu->AppendCheckItem(IDM_LISTGC, _T("Show GameCube")); platformMenu->AppendCheckItem(IDM_LISTGC, _("Show GameCube"));
platformMenu->Check(IDM_LISTGC, SConfig::GetInstance().m_ListGC); platformMenu->Check(IDM_LISTGC, SConfig::GetInstance().m_ListGC);
platformMenu->AppendCheckItem(IDM_LISTWAD, _T("Show Wad")); platformMenu->AppendCheckItem(IDM_LISTWAD, _("Show Wad"));
platformMenu->Check(IDM_LISTWAD, SConfig::GetInstance().m_ListWad); platformMenu->Check(IDM_LISTWAD, SConfig::GetInstance().m_ListWad);
wxMenu *regionMenu = new wxMenu; wxMenu *regionMenu = new wxMenu;
viewMenu->AppendSubMenu(regionMenu, _T("Show Regions")); viewMenu->AppendSubMenu(regionMenu, _("Show Regions"));
regionMenu->AppendCheckItem(IDM_LISTJAP, _T("Show JAP")); regionMenu->AppendCheckItem(IDM_LISTJAP, _("Show JAP"));
regionMenu->Check(IDM_LISTJAP, SConfig::GetInstance().m_ListJap); regionMenu->Check(IDM_LISTJAP, SConfig::GetInstance().m_ListJap);
regionMenu->AppendCheckItem(IDM_LISTPAL, _T("Show PAL")); regionMenu->AppendCheckItem(IDM_LISTPAL, _("Show PAL"));
regionMenu->Check(IDM_LISTPAL, SConfig::GetInstance().m_ListPal); regionMenu->Check(IDM_LISTPAL, SConfig::GetInstance().m_ListPal);
regionMenu->AppendCheckItem(IDM_LISTUSA, _T("Show USA")); regionMenu->AppendCheckItem(IDM_LISTUSA, _("Show USA"));
regionMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa); regionMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa);
regionMenu->AppendSeparator(); regionMenu->AppendSeparator();
regionMenu->AppendCheckItem(IDM_LISTFRANCE, _T("Show France")); regionMenu->AppendCheckItem(IDM_LISTFRANCE, _("Show France"));
regionMenu->Check(IDM_LISTFRANCE, SConfig::GetInstance().m_ListFrance); regionMenu->Check(IDM_LISTFRANCE, SConfig::GetInstance().m_ListFrance);
regionMenu->AppendCheckItem(IDM_LISTITALY, _T("Show Italy")); regionMenu->AppendCheckItem(IDM_LISTITALY, _("Show Italy"));
regionMenu->Check(IDM_LISTITALY, SConfig::GetInstance().m_ListItaly); regionMenu->Check(IDM_LISTITALY, SConfig::GetInstance().m_ListItaly);
regionMenu->AppendCheckItem(IDM_LISTKOREA, _T("Show Korea")); regionMenu->AppendCheckItem(IDM_LISTKOREA, _("Show Korea"));
regionMenu->Check(IDM_LISTKOREA, SConfig::GetInstance().m_ListKorea); regionMenu->Check(IDM_LISTKOREA, SConfig::GetInstance().m_ListKorea);
regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _T("Show Taiwan")); regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _("Show Taiwan"));
regionMenu->Check(IDM_LISTTAIWAN, SConfig::GetInstance().m_ListTaiwan); regionMenu->Check(IDM_LISTTAIWAN, SConfig::GetInstance().m_ListTaiwan);
regionMenu->AppendCheckItem(IDM_LIST_UNK, _T("Show unknown")); regionMenu->AppendCheckItem(IDM_LIST_UNK, _("Show unknown"));
regionMenu->Check(IDM_LIST_UNK, SConfig::GetInstance().m_ListUnknown); regionMenu->Check(IDM_LIST_UNK, SConfig::GetInstance().m_ListUnknown);
viewMenu->AppendCheckItem(IDM_LISTDRIVES, _T("Show Drives")); viewMenu->AppendCheckItem(IDM_LISTDRIVES, _("Show Drives"));
viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives); viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives);
viewMenu->Append(IDM_PURGECACHE, _T("Purge Cache")); viewMenu->Append(IDM_PURGECACHE, _("Purge Cache"));
m_MenuBar->Append(viewMenu, _T("&View")); m_MenuBar->Append(viewMenu, _("&View"));
if (g_pCodeWindow) g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar); if (g_pCodeWindow) g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar);
// Help menu // Help menu
wxMenu* helpMenu = new wxMenu; wxMenu* helpMenu = new wxMenu;
// Re-enable when there's something useful to display */ // Re-enable when there's something useful to display */
// helpMenu->Append(wxID_HELP, _T("&Help")); // helpMenu->Append(wxID_HELP, _("&Help"));
helpMenu->Append(IDM_HELPWEBSITE, _T("Dolphin &Web Site")); helpMenu->Append(IDM_HELPWEBSITE, _("Dolphin &Web Site"));
helpMenu->Append(IDM_HELPGOOGLECODE, _T("Dolphin at &Google Code")); helpMenu->Append(IDM_HELPGOOGLECODE, _("Dolphin at &Google Code"));
helpMenu->AppendSeparator(); helpMenu->AppendSeparator();
helpMenu->Append(wxID_ABOUT, _T("&About...")); helpMenu->Append(wxID_ABOUT, _("&About..."));
m_MenuBar->Append(helpMenu, _T("&Help")); m_MenuBar->Append(helpMenu, _("&Help"));
// Associate the menu bar with the frame // Associate the menu bar with the frame
SetMenuBar(m_MenuBar); SetMenuBar(m_MenuBar);
@ -312,25 +312,25 @@ wxString CFrame::GetMenuLabel(int Id)
switch (Id) switch (Id)
{ {
case HK_FULLSCREEN: case HK_FULLSCREEN:
Label = _T("&Fullscreen\t"); Label = _("&Fullscreen\t");
break; break;
case HK_PLAY_PAUSE: case HK_PLAY_PAUSE:
if (Core::GetState() == Core::CORE_RUN) if (Core::GetState() == Core::CORE_RUN)
Label = _T("&Pause\t"); Label = _("&Pause\t");
else else
Label = _T("&Play\t"); Label = _("&Play\t");
break; break;
case HK_STOP: case HK_STOP:
Label = _T("&Stop\t"); Label = _("&Stop\t");
break; break;
case HK_SCREENSHOT: case HK_SCREENSHOT:
Label = _T("Take Screenshot\t"); Label = _("Take Screenshot\t");
break; break;
case HK_WIIMOTE1_CONNECT: case HK_WIIMOTE1_CONNECT:
case HK_WIIMOTE2_CONNECT: case HK_WIIMOTE2_CONNECT:
case HK_WIIMOTE3_CONNECT: case HK_WIIMOTE3_CONNECT:
case HK_WIIMOTE4_CONNECT: case HK_WIIMOTE4_CONNECT:
Label = wxString::Format(_T("Connect Wiimote %i\t"), Label = wxString::Format(wxT("Connect Wiimote %i\t"),
Id - HK_WIIMOTE1_CONNECT + 1); Id - HK_WIIMOTE1_CONNECT + 1);
break; break;
} }
@ -353,20 +353,20 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
ToolBar->SetToolBitmapSize(wxSize(w, h)); ToolBar->SetToolBitmapSize(wxSize(w, h));
ToolBar->AddTool(wxID_OPEN, _T("Open"), m_Bitmaps[Toolbar_FileOpen], _T("Open file...")); ToolBar->AddTool(wxID_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file..."));
ToolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh game list")); ToolBar->AddTool(wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list"));
ToolBar->AddTool(IDM_BROWSE, _T("Browse"), m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory...")); ToolBar->AddTool(IDM_BROWSE, _("Browse"), m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory..."));
ToolBar->AddSeparator(); ToolBar->AddSeparator();
ToolBar->AddTool(IDM_PLAY, wxT("Play"), m_Bitmaps[Toolbar_Play], _T("Play")); ToolBar->AddTool(IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play"));
ToolBar->AddTool(IDM_STOP, _T("Stop"), m_Bitmaps[Toolbar_Stop], _T("Stop")); ToolBar->AddTool(IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop"));
ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _T("FullScr"), m_Bitmaps[Toolbar_FullScreen], _T("Toggle Fullscreen")); ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _("FullScr"), m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen"));
ToolBar->AddTool(IDM_SCREENSHOT, _T("ScrShot"), m_Bitmaps[Toolbar_FullScreen], _T("Take Screenshot")); ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"), m_Bitmaps[Toolbar_FullScreen], _("Take Screenshot"));
ToolBar->AddSeparator(); ToolBar->AddSeparator();
ToolBar->AddTool(wxID_PREFERENCES, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure...")); ToolBar->AddTool(wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_PluginOptions], _("Configure..."));
ToolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("Graphics"), m_Bitmaps[Toolbar_PluginGFX], _T("Graphics settings")); ToolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _("Graphics"), m_Bitmaps[Toolbar_PluginGFX], _("Graphics settings"));
ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"), m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings")); ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _("DSP"), m_Bitmaps[Toolbar_PluginDSP], _("DSP settings"));
ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("GCPad"), m_Bitmaps[Toolbar_PluginPAD], _T("Gamecube Pad settings")); ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _("GCPad"), m_Bitmaps[Toolbar_PluginPAD], _("Gamecube Pad settings"));
ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _T("Wiimote"), m_Bitmaps[Toolbar_Wiimote], _T("Wiimote settings")); ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _("Wiimote"), m_Bitmaps[Toolbar_Wiimote], _("Wiimote settings"));
// after adding the buttons to the toolbar, must call Realize() to reflect // after adding the buttons to the toolbar, must call Realize() to reflect
// the changes // the changes
@ -379,8 +379,8 @@ void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar)
h = m_Bitmaps[Toolbar_FileOpen].GetHeight(); h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
ToolBar->SetToolBitmapSize(wxSize(w, h)); ToolBar->SetToolBitmapSize(wxSize(w, h));
ToolBar->AddTool(IDM_SAVE_PERSPECTIVE, wxT("Save"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Save current perspective")); ToolBar->AddTool(IDM_SAVE_PERSPECTIVE, _("Save"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Save current perspective"));
ToolBar->AddTool(IDM_EDIT_PERSPECTIVES, wxT("Edit"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Edit current perspective")); ToolBar->AddTool(IDM_EDIT_PERSPECTIVES, _("Edit"), g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Edit current perspective"));
ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true); ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true);
ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true); ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true);
@ -584,7 +584,7 @@ void CFrame::DoOpen(bool Boot)
std::string currentDir = File::GetCurrentDir(); std::string currentDir = File::GetCurrentDir();
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select the file to load"), _("Select the file to load"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -648,7 +648,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event)) void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event))
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select The Recording File"), _("Select The Recording File"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -912,8 +912,8 @@ void CFrame::DoStop()
{ {
wxMessageDialog *m_StopDlg = new wxMessageDialog( wxMessageDialog *m_StopDlg = new wxMessageDialog(
this, this,
wxT("Do you want to stop the current emulation?"), _("Do you want to stop the current emulation?"),
wxT("Please confirm..."), _("Please confirm..."),
wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
wxDefaultPosition); wxDefaultPosition);
@ -998,7 +998,7 @@ void CFrame::DoRecordingSave()
DoPause(); DoPause();
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select The Recording File"), _("Select The Recording File"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -1170,9 +1170,9 @@ void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event)) void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event))
{ {
wxString path = wxFileSelector(_T("Select the save file"), wxString path = wxFileSelector(_("Select the save file"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
_T("Wii save files (*.bin)|*.bin"), _("Wii save files (*.bin)|*.bin"),
wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
this); this);
@ -1203,7 +1203,7 @@ void CFrame::OnLoadWiiMenu(wxCommandEvent& event)
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select the System Menu wad extracted from the update partition of a disc"), _("Select the System Menu wad extracted from the update partition of a disc"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
_T("System Menu (*.wad)|*.wad"), _T("System Menu (*.wad)|*.wad"),
wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
@ -1223,7 +1223,7 @@ void CFrame::OnConnectWiimote(wxCommandEvent& event)
int Id = event.GetId() - IDM_CONNECT_WIIMOTE1; int Id = event.GetId() - IDM_CONNECT_WIIMOTE1;
bNoWiimoteMsg = !event.IsChecked(); bNoWiimoteMsg = !event.IsChecked();
GetUsbPointer()->AccessWiiMote(Id | 0x100)->Activate(event.IsChecked()); GetUsbPointer()->AccessWiiMote(Id | 0x100)->Activate(event.IsChecked());
wxString msg(wxString::Format(wxT("Wiimote %i %s"), Id + 1, (event.IsChecked()) ? wxT("Connected") : wxT("Disconnected"))); wxString msg(wxString::Format(wxT("Wiimote %i %s"), Id + 1, (event.IsChecked()) ? _("Connected") : _("Disconnected")));
Core::DisplayMessage(msg.ToAscii(), 3000); Core::DisplayMessage(msg.ToAscii(), 3000);
} }
} }
@ -1250,7 +1250,7 @@ void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED (event))
void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event)) void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select the state to load"), _("Select the state to load"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -1268,7 +1268,7 @@ void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event)) void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event))
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select the state to save"), _("Select the state to save"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (

34
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -250,7 +250,7 @@ void CGameListCtrl::Update()
InitBitmaps(); InitBitmaps();
// add columns // add columns
InsertColumn(COLUMN_PLATFORM, _("")); InsertColumn(COLUMN_PLATFORM, _T(""));
InsertColumn(COLUMN_BANNER, _("Banner")); InsertColumn(COLUMN_BANNER, _("Banner"));
InsertColumn(COLUMN_TITLE, _("Title")); InsertColumn(COLUMN_TITLE, _("Title"));
@ -258,7 +258,7 @@ void CGameListCtrl::Update()
// wii titles We show in the same column : company for GC games and // wii titles We show in the same column : company for GC games and
// description for wii/wad games // description for wii/wad games
InsertColumn(COLUMN_NOTES, _("Notes")); InsertColumn(COLUMN_NOTES, _("Notes"));
InsertColumn(COLUMN_COUNTRY, _("")); InsertColumn(COLUMN_COUNTRY, _T(""));
InsertColumn(COLUMN_SIZE, _("Size")); InsertColumn(COLUMN_SIZE, _("Size"));
InsertColumn(COLUMN_EMULATION_STATE, _("State")); InsertColumn(COLUMN_EMULATION_STATE, _("State"));
@ -300,12 +300,12 @@ void CGameListCtrl::Update()
SConfig::GetInstance().m_ListPal)) SConfig::GetInstance().m_ListPal))
{ {
errorString = wxT("Dolphin could not find any GC/Wii ISOs. ") errorString = wxT("Dolphin could not find any GC/Wii ISOs. ")
wxT("Doubleclick here to browse for files..."); wxT("Doubleclick here to browse for files...");
} }
else else
{ {
errorString = wxT("Dolphin is currently set to hide all games. ") errorString = wxT("Dolphin is currently set to hide all games. ")
wxT("Doubleclick here to show all games..."); wxT("Doubleclick here to show all games...");
} }
InsertColumn(0, _("No ISOs or WADS found")); InsertColumn(0, _("No ISOs or WADS found"));
long index = InsertItem(0, errorString); long index = InsertItem(0, errorString);
@ -577,8 +577,8 @@ void CGameListCtrl::ScanForISOs()
if (rFilenames.size() > 0) if (rFilenames.size() > 0)
{ {
wxProgressDialog dialog(_T("Scanning for ISOs"), wxProgressDialog dialog(_("Scanning for ISOs"),
_T("Scanning..."), _("Scanning..."),
(int)rFilenames.size(), // range (int)rFilenames.size(), // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_APP_MODAL |
@ -914,7 +914,7 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
toolTip = new wxEmuStateTip(this, wxString(temp, *wxConvCurrent), &toolTip); toolTip = new wxEmuStateTip(this, wxString(temp, *wxConvCurrent), &toolTip);
} }
else else
toolTip = new wxEmuStateTip(this, wxT("Not Set"), &toolTip); toolTip = new wxEmuStateTip(this, _("Not Set"), &toolTip);
toolTip->SetBoundingRect(wxRect(mx - GetColumnWidth(subitem), toolTip->SetBoundingRect(wxRect(mx - GetColumnWidth(subitem),
my, GetColumnWidth(subitem), Rect.GetHeight())); my, GetColumnWidth(subitem), Rect.GetHeight()));
@ -1099,7 +1099,7 @@ void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event))
if (!iso) if (!iso)
return; return;
if (wxMessageBox(wxT("Are you sure you want to delete this file?\n") if (wxMessageBox(wxT("Are you sure you want to delete this file?\n")
wxT("It will be gone forever!"), wxT("It will be gone forever!"),
wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES) wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
{ {
File::Delete(iso->GetFileName().c_str()); File::Delete(iso->GetFileName().c_str());
@ -1109,7 +1109,7 @@ void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event))
else else
{ {
if (wxMessageBox(wxT("Are you sure you want to delete these files?\n") if (wxMessageBox(wxT("Are you sure you want to delete these files?\n")
wxT("They will be gone forever!"), wxT("They will be gone forever!"),
wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES) wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
{ {
int selected = GetSelectedItemCount(); int selected = GetSelectedItemCount();
@ -1141,8 +1141,8 @@ void CGameListCtrl::OnInstallWAD(wxCommandEvent& WXUNUSED (event))
if (!iso) if (!iso)
return; return;
wxProgressDialog dialog(_T("Installing WAD to Wii Menu..."), wxProgressDialog dialog(_("Installing WAD to Wii Menu..."),
_T("Working..."), _("Working..."),
1000, // range 1000, // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_APP_MODAL |
@ -1287,12 +1287,12 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
{ {
wxString FileType; wxString FileType;
if (iso->GetPlatform() == GameListItem::WII_DISC) if (iso->GetPlatform() == GameListItem::WII_DISC)
FileType = wxT("All Wii ISO files (iso)|*.iso"); FileType = _("All Wii ISO files (iso)|*.iso");
else else
FileType = wxT("All Gamecube GCM files (gcm)|*.gcm"); FileType = _("All Gamecube GCM files (gcm)|*.gcm");
path = wxFileSelector( path = wxFileSelector(
_T("Save decompressed GCM/ISO"), _("Save decompressed GCM/ISO"),
wxString(FilePath.c_str(), *wxConvCurrent), wxString(FilePath.c_str(), *wxConvCurrent),
wxString(FileName.c_str(), *wxConvCurrent) + FileType.After('*'), wxString(FileName.c_str(), *wxConvCurrent) + FileType.After('*'),
wxEmptyString, wxEmptyString,
@ -1309,7 +1309,7 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
else else
{ {
path = wxFileSelector( path = wxFileSelector(
_T("Save compressed GCM/ISO"), _("Save compressed GCM/ISO"),
wxString(FilePath.c_str(), *wxConvCurrent), wxString(FilePath.c_str(), *wxConvCurrent),
wxString(FileName.c_str(), *wxConvCurrent) + _T(".gcz"), wxString(FileName.c_str(), *wxConvCurrent) + _T(".gcz"),
wxEmptyString, wxEmptyString,
@ -1331,8 +1331,8 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
wxYES_NO) == wxNO); wxYES_NO) == wxNO);
wxProgressDialog dialog(iso->IsCompressed() ? wxProgressDialog dialog(iso->IsCompressed() ?
_T("Decompressing ISO") : _T("Compressing ISO"), _("Decompressing ISO") : _("Compressing ISO"),
_T("Working..."), _("Working..."),
1000, // range 1000, // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_APP_MODAL |

8
Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
View File

@ -13,9 +13,9 @@
namespace Gecko namespace Gecko
{ {
static const wxString wxstr_name(wxT("Name: ")), static const wxString wxstr_name(_("Name: ")),
wxstr_notes(wxT("Notes: ")), wxstr_notes(_("Notes: ")),
wxstr_creator(wxT("Creator: ")); wxstr_creator(_("Creator: "));
CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
@ -42,7 +42,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
// button sizer // button sizer
wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL);
wxButton* const btn_download = new wxButton(this, -1, wxT("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1)); wxButton* const btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
_connect_macro_(btn_download, CodeConfigPanel::DownloadCodes, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btn_download, CodeConfigPanel::DownloadCodes, wxEVT_COMMAND_BUTTON_CLICKED, this);
sizer_buttons->AddStretchSpacer(1); sizer_buttons->AddStretchSpacer(1);
sizer_buttons->Add(btn_download, 1, wxEXPAND); sizer_buttons->Add(btn_download, 1, wxEXPAND);

24
Source/Core/DolphinWX/Src/HotkeyDlg.cpp
View File

@ -188,14 +188,14 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
{ {
static const wxChar* hkText[] = static const wxChar* hkText[] =
{ {
wxT("Toggle Fullscreen"), _("Toggle Fullscreen"),
wxT("Play/Pause"), _("Play/Pause"),
wxT("Stop"), _("Stop"),
wxT("Take Screenshot"), _("Take Screenshot"),
wxT("Connect Wiimote 1"), _("Connect Wiimote 1"),
wxT("Connect Wiimote 2"), _("Connect Wiimote 2"),
wxT("Connect Wiimote 3"), _("Connect Wiimote 3"),
wxT("Connect Wiimote 4") _("Connect Wiimote 4")
}; };
// Configuration controls sizes // Configuration controls sizes
@ -203,14 +203,14 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
// A small type font // A small type font
wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
wxStaticBoxSizer *sHotkeys = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Hotkeys")); wxStaticBoxSizer *sHotkeys = new wxStaticBoxSizer(wxVERTICAL, this, _("Hotkeys"));
// Header line // Header line
wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, wxT("Action")); wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Action"));
HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2); HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2);
HeaderSizer->AddStretchSpacer(); HeaderSizer->AddStretchSpacer();
StaticTextHeader = new wxStaticText(this, wxID_ANY, wxT("Key"), wxDefaultPosition, size); StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Key"), wxDefaultPosition, size);
HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2); HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2);
sHotkeys->Add(HeaderSizer, 0, wxEXPAND | wxALL, 1); sHotkeys->Add(HeaderSizer, 0, wxEXPAND | wxALL, 1);
@ -234,7 +234,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
sHotkeys->Add(sHotkey, 0, wxEXPAND | wxALL, 1); sHotkeys->Add(sHotkey, 0, wxEXPAND | wxALL, 1);
} }
m_Close = new wxButton(this, ID_CLOSE, wxT("Close")); m_Close = new wxButton(this, ID_CLOSE, _("Close"));
wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
sButtons->AddStretchSpacer(); sButtons->AddStretchSpacer();
sButtons->Add(m_Close, 0, (wxLEFT), 5); sButtons->Add(m_Close, 0, (wxLEFT), 5);

2
Source/Core/DolphinWX/Src/HotkeyDlg.h
View File

@ -41,7 +41,7 @@ class HotkeyConfigDialog : public wxDialog
public: public:
HotkeyConfigDialog(wxWindow *parent, HotkeyConfigDialog(wxWindow *parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString &title = wxT("Hotkey Configuration"), const wxString &title = _("Hotkey Configuration"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE | wxWANTS_CHARS); long style = wxDEFAULT_DIALOG_STYLE | wxWANTS_CHARS);

56
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -140,7 +140,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
if (GameIni.Load(GameIniFile.c_str())) if (GameIni.Load(GameIniFile.c_str()))
LoadGameConfig(); LoadGameConfig();
else else
wxMessageBox(wxString::Format(_("Could not create %s"), wxString::From8BitData(GameIniFile.c_str()).c_str()), _("Error"), wxOK|wxICON_ERROR, this); wxMessageBox(wxString::Format(wxT("Could not create %s"), wxString::From8BitData(GameIniFile.c_str()).c_str()), _("Error"), wxOK|wxICON_ERROR, this);
} }
// Disk header and apploader // Disk header and apploader
@ -149,46 +149,46 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
switch (OpenISO->GetCountry()) switch (OpenISO->GetCountry())
{ {
case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_EUROPE:
m_Country->SetValue(wxT("EUROPE")); m_Country->SetValue(_("EUROPE"));
break; break;
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
m_Country->SetValue(wxT("FRANCE")); m_Country->SetValue(_("FRANCE"));
break; break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
m_Country->SetValue(wxT("ITALY")); m_Country->SetValue(_("ITALY"));
break; break;
case DiscIO::IVolume::COUNTRY_RUSSIA: case DiscIO::IVolume::COUNTRY_RUSSIA:
m_Country->SetValue(wxT("RUSSIA")); m_Country->SetValue(_("RUSSIA"));
break; break;
case DiscIO::IVolume::COUNTRY_USA: case DiscIO::IVolume::COUNTRY_USA:
m_Country->SetValue(wxT("USA")); m_Country->SetValue(_("USA"));
m_Lang->SetSelection(0); m_Lang->SetSelection(0);
m_Lang->Disable(); // For NTSC Games, there's no multi lang m_Lang->Disable(); // For NTSC Games, there's no multi lang
break; break;
case DiscIO::IVolume::COUNTRY_JAPAN: case DiscIO::IVolume::COUNTRY_JAPAN:
m_Country->SetValue(wxT("JAPAN")); m_Country->SetValue(_("JAPAN"));
m_Lang->SetSelection(-1); m_Lang->SetSelection(-1);
m_Lang->Disable(); // For NTSC Games, there's no multi lang m_Lang->Disable(); // For NTSC Games, there's no multi lang
break; break;
case DiscIO::IVolume::COUNTRY_KOREA: case DiscIO::IVolume::COUNTRY_KOREA:
m_Country->SetValue(wxT("KOREA")); m_Country->SetValue(_("KOREA"));
break; break;
case DiscIO::IVolume::COUNTRY_TAIWAN: case DiscIO::IVolume::COUNTRY_TAIWAN:
m_Country->SetValue(wxT("TAIWAN")); m_Country->SetValue(_("TAIWAN"));
m_Lang->SetSelection(-1); m_Lang->SetSelection(-1);
m_Lang->Disable(); // For NTSC Games, there's no multi lang m_Lang->Disable(); // For NTSC Games, there's no multi lang
break; break;
case DiscIO::IVolume::COUNTRY_SDK: case DiscIO::IVolume::COUNTRY_SDK:
m_Country->SetValue(wxT("No Country (SDK)")); m_Country->SetValue(_("No Country (SDK)"));
break; break;
default: default:
m_Country->SetValue(wxT("UNKNOWN")); m_Country->SetValue(_("UNKNOWN"));
break; break;
} }
wxString temp = _T("0x") + wxString::From8BitData(OpenISO->GetMakerID().c_str()); wxString temp = _T("0x") + wxString::From8BitData(OpenISO->GetMakerID().c_str());
m_MakerID->SetValue(temp); m_MakerID->SetValue(temp);
m_Date->SetValue(wxString::From8BitData(OpenISO->GetApploaderDate().c_str())); m_Date->SetValue(wxString::From8BitData(OpenISO->GetApploaderDate().c_str()));
m_FST->SetValue(wxString::Format(_T("%u"), OpenISO->GetFSTSize())); m_FST->SetValue(wxString::Format(wxT("%u"), OpenISO->GetFSTSize()));
// Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title // Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title
ChangeBannerDetails((int)SConfig::GetInstance().m_InterfaceLanguage); ChangeBannerDetails((int)SConfig::GetInstance().m_InterfaceLanguage);
@ -284,7 +284,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize); m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize);
m_Notebook->AddPage(m_CheatPage, _("AR Codes")); m_Notebook->AddPage(m_CheatPage, _("AR Codes"));
m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook); m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook);
m_Notebook->AddPage(m_geckocode_panel, wxT("Gecko Codes")); m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes"));
m_Information = new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize); m_Information = new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize);
m_Notebook->AddPage(m_Information, _("Info")); m_Notebook->AddPage(m_Information, _("Info"));
m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize); m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize);
@ -305,15 +305,15 @@ void CISOProperties::CreateGUIControls(bool IsWad)
CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
MMU->SetToolTip(wxT("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
MMUBAT = new wxCheckBox(m_GameConfig, ID_MMUBAT, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); MMUBAT = new wxCheckBox(m_GameConfig, ID_MMUBAT, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
MMUBAT->SetToolTip(wxT("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)")); MMUBAT->SetToolTip(_("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)"));
TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
TLBHack->SetToolTip(wxT("Fast version of the MMU. Does not work for every game.")); TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game."));
AlternateRFI = new wxCheckBox(m_GameConfig, ID_RFI, _("Alternate RFI"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); AlternateRFI = new wxCheckBox(m_GameConfig, ID_RFI, _("Alternate RFI"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
AlternateRFI->SetToolTip(wxT("If a game hangs, works only in the Interpreter or Dolphin crashes, this option may fix the game.")); AlternateRFI->SetToolTip(_("If a game hangs, works only in the Interpreter or Dolphin crashes, this option may fix the game."));
FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
FastDiscSpeed->SetToolTip(wxT("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)")); FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)"));
BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
// Wii Console // Wii Console
@ -343,7 +343,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
UseZTPSpeedupHack->SetToolTip(wxT("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game.")); UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game."));
DListCache = new wxCheckBox(m_GameConfig, ID_DLISTCACHE, _("DList Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); DListCache = new wxCheckBox(m_GameConfig, ID_DLISTCACHE, _("DList Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
// Hack // Hack
Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize); Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize);
@ -527,7 +527,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
// Filesystem tree // Filesystem tree
m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE, wxDefaultValidator); m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE, wxDefaultValidator);
m_Treectrl->AssignImageList(m_iconList); m_Treectrl->AssignImageList(m_iconList);
RootId = m_Treectrl->AddRoot(wxT("Disc"), 0, 0, 0); RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0);
wxBoxSizer* sTreePage; wxBoxSizer* sTreePage;
sTreePage = new wxBoxSizer(wxVERTICAL); sTreePage = new wxBoxSizer(wxVERTICAL);
@ -576,7 +576,7 @@ void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event))
{ {
wxString dirHome; wxString dirHome;
wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(_("%s.png"), m_GameID->GetLabel().c_str()), wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(wxT("%s.png"), m_GameID->GetLabel().c_str()),
_("*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize); _("*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize);
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
{ {
@ -616,7 +616,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
File = m_Treectrl->GetItemText(m_Treectrl->GetSelection()); File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
Path = wxFileSelector( Path = wxFileSelector(
wxT("Export File"), _("Export File"),
wxEmptyString, File, wxEmptyString, wxEmptyString, File, wxEmptyString,
wxString::Format wxString::Format
( (
@ -690,9 +690,9 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
DEBUG_LOG(DISCIO,"Dir found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder); DEBUG_LOG(DISCIO,"Dir found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
} }
wxString dialogTitle = index[0] ? _T("Extracting Directory") : _T("Extracting All Files"); wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files");
wxProgressDialog dialog(dialogTitle, wxProgressDialog dialog(dialogTitle,
_T("Extracting..."), _("Extracting..."),
index[1], // range index[1], // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT |
@ -704,9 +704,9 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
// Extraction // Extraction
for (u32 i = index[0]; i < index[1]; i++) for (u32 i = index[0]; i < index[1]; i++)
{ {
dialog.SetTitle(wxString::Format(_T("%s : %d%%"), dialogTitle.c_str(), dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100))); (u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
if (!dialog.Update(i, wxString::Format(_T("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str()))) if (!dialog.Update(i, wxString::Format(wxT("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
break; break;
if (fst[i]->IsDirectory()) if (fst[i]->IsDirectory())
@ -746,7 +746,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
void CISOProperties::OnExtractDir(wxCommandEvent& event) void CISOProperties::OnExtractDir(wxCommandEvent& event)
{ {
wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection()); wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
wxString Path = wxDirSelector(wxT("Choose the folder where to extract to")); wxString Path = wxDirSelector(_("Choose the folder where to extract to"));
if (!Path || !Directory) if (!Path || !Directory)
return; return;
@ -785,7 +785,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
{ {
std::vector<const DiscIO::SFileInfo *> fst; std::vector<const DiscIO::SFileInfo *> fst;
DiscIO::IFileSystem *FS = 0; DiscIO::IFileSystem *FS = 0;
wxString Path = wxDirSelector(wxT("Choose the folder to extract to")); wxString Path = wxDirSelector(_("Choose the folder to extract to"));
if (Path.empty()) if (Path.empty())
return; return;

2
Source/Core/DolphinWX/Src/ISOProperties.h
View File

@ -44,7 +44,7 @@ class CISOProperties : public wxDialog
CISOProperties(const std::string fileName, CISOProperties(const std::string fileName,
wxWindow* parent, wxWindow* parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString& title = wxT("Properties"), const wxString& title = _("Properties"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);

46
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -114,7 +114,7 @@ void PadSettingSpin::UpdateValue()
} }
ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref) ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref)
: wxDialog(parent, -1, wxT("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) : wxDialog(parent, -1, _("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
, control_reference(ref) , control_reference(ref)
, m_plugin(plugin) , m_plugin(plugin)
, m_parent(parent) , m_parent(parent)
@ -130,7 +130,7 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, Con
wxStaticBoxSizer* const control_chooser = CreateControlChooser( this, parent ); wxStaticBoxSizer* const control_chooser = CreateControlChooser( this, parent );
wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer( wxVERTICAL, this, wxT("Device") ); wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer( wxVERTICAL, this, _("Device") );
d_szr->Add( device_cbox, 0, wxEXPAND|wxALL, 5 ); d_szr->Add( device_cbox, 0, wxEXPAND|wxALL, 5 );
wxBoxSizer* const szr = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* const szr = new wxBoxSizer( wxVERTICAL );
@ -451,7 +451,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
ControllerInterface::Device* const dev = g_controller_interface.FindDevice(m_devq); ControllerInterface::Device* const dev = g_controller_interface.FindDevice(m_devq);
if (dev) if (dev)
{ {
btn->SetLabel(wxT("[ waiting ]")); btn->SetLabel(_("[ waiting ]"));
// apparently, this makes the "waiting" text work on Linux // apparently, this makes the "waiting" text work on Linux
wxTheApp->Yield(); wxTheApp->Yield();
@ -476,7 +476,7 @@ void GamepadPage::DetectControl( wxCommandEvent& event )
ControllerInterface::Device* const dev = g_controller_interface.FindDevice(controller->default_device); ControllerInterface::Device* const dev = g_controller_interface.FindDevice(controller->default_device);
if (dev) if (dev)
{ {
btn->SetLabel(wxT("[ waiting ]")); btn->SetLabel(_("[ waiting ]"));
// apparently, this makes the "waiting" text work on Linux // apparently, this makes the "waiting" text work on Linux
wxTheApp->Yield(); wxTheApp->Yield();
@ -499,16 +499,16 @@ void GamepadPage::DetectControl( wxCommandEvent& event )
wxStaticBoxSizer* ControlDialog::CreateControlChooser( wxWindow* const parent, wxWindow* const eventsink ) wxStaticBoxSizer* ControlDialog::CreateControlChooser( wxWindow* const parent, wxWindow* const eventsink )
{ {
wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? wxT("Input") : wxT("Output")); wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? _("Input") : _("Output"));
textctrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE); textctrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE);
wxButton* const detect_button = new wxButton( parent, -1, control_reference->is_input ? wxT("Detect") : wxT("Test") ); wxButton* const detect_button = new wxButton( parent, -1, control_reference->is_input ? _("Detect") : _("Test") );
wxButton* const clear_button = new wxButton( parent, -1, wxT("Clear")); wxButton* const clear_button = new wxButton( parent, -1, _("Clear"));
wxButton* const set_button = new wxButton( parent, -1, wxT("Set")); wxButton* const set_button = new wxButton( parent, -1, _("Set"));
wxButton* const select_button = new wxButton( parent, -1, wxT("Select")); wxButton* const select_button = new wxButton( parent, -1, _("Select"));
_connect_macro_(select_button, ControlDialog::SetSelectedControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); _connect_macro_(select_button, ControlDialog::SetSelectedControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
wxButton* const or_button = new wxButton( parent, -1, wxT("| OR"), wxDefaultPosition ); wxButton* const or_button = new wxButton( parent, -1, wxT("| OR"), wxDefaultPosition );
@ -546,7 +546,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser( wxWindow* const parent, w
_connect_macro_( set_button, ControlDialog::SetControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); _connect_macro_( set_button, ControlDialog::SetControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
_connect_macro_( range_slider, GamepadPage::AdjustControlOption, wxEVT_SCROLL_CHANGED, eventsink); _connect_macro_( range_slider, GamepadPage::AdjustControlOption, wxEVT_SCROLL_CHANGED, eventsink);
wxStaticText* const range_label = new wxStaticText( parent, -1, wxT("Range")); wxStaticText* const range_label = new wxStaticText( parent, -1, _("Range"));
m_bound_label = new wxStaticText( parent, -1, wxT("") ); m_bound_label = new wxStaticText( parent, -1, wxT("") );
wxBoxSizer* const range_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* const range_sizer = new wxBoxSizer( wxHORIZONTAL );
@ -711,12 +711,12 @@ ControlGroupBox::ControlGroupBox( ControllerEmu::ControlGroup* const group, wxWi
if ((*ci)->control_ref->is_input) if ((*ci)->control_ref->is_input)
{ {
control_button->SetToolTip(wxT("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
_connect_macro_( control_button, GamepadPage::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink ); _connect_macro_( control_button, GamepadPage::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink );
} }
else else
{ {
control_button->SetToolTip(wxT("Left/Right-click for more options.\nMiddle-click to clear.")); control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear."));
_connect_macro_( control_button, GamepadPage::ConfigControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink ); _connect_macro_( control_button, GamepadPage::ConfigControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink );
} }
@ -777,7 +777,7 @@ ControlGroupBox::ControlGroupBox( ControllerEmu::ControlGroup* const group, wxWi
PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]); PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]);
_connect_macro_(threshold_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink); _connect_macro_(threshold_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink);
threshold_cbox->wxcontrol->SetToolTip(wxT("Adjust the analog control pressure required to activate buttons.")); threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons."));
options.push_back(threshold_cbox); options.push_back(threshold_cbox);
@ -912,11 +912,11 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
wxBoxSizer* control_group_sizer = new ControlGroupsSizer( m_plugin.controllers[pad_num], this, this, &control_groups ); wxBoxSizer* control_group_sizer = new ControlGroupsSizer( m_plugin.controllers[pad_num], this, this, &control_groups );
wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Profile") ); wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Profile") );
// device chooser // device chooser
wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Device") ); wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Device") );
device_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1)); device_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1));
#ifndef __APPLE__ #ifndef __APPLE__
@ -924,7 +924,7 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER); device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER);
#endif #endif
wxButton* refresh_button = new wxButton( this, -1, wxT("Refresh"), wxDefaultPosition, wxSize(60,-1) ); wxButton* refresh_button = new wxButton( this, -1, _("Refresh"), wxDefaultPosition, wxSize(60,-1) );
_connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this ); _connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this );
_connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this ); _connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this );
@ -933,10 +933,10 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
device_sbox->Add( device_cbox, 1, wxLEFT|wxRIGHT, 3 ); device_sbox->Add( device_cbox, 1, wxLEFT|wxRIGHT, 3 );
device_sbox->Add( refresh_button, 0, wxRIGHT|wxBOTTOM, 3 ); device_sbox->Add( refresh_button, 0, wxRIGHT|wxBOTTOM, 3 );
wxButton* const default_button = new wxButton(this, -1, wxT("Default"), wxDefaultPosition, wxSize(48,-1)); wxButton* const default_button = new wxButton(this, -1, _("Default"), wxDefaultPosition, wxSize(48,-1));
wxButton* const clearall_button = new wxButton(this, -1, wxT("Clear"), wxDefaultPosition, wxSize(58,-1)); wxButton* const clearall_button = new wxButton(this, -1, _("Clear"), wxDefaultPosition, wxSize(58,-1));
wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Reset") ); wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Reset") );
clear_sbox->Add(default_button, 1, wxLEFT, 3); clear_sbox->Add(default_button, 1, wxLEFT, 3);
clear_sbox->Add(clearall_button, 1, wxRIGHT, 3); clear_sbox->Add(clearall_button, 1, wxRIGHT, 3);
@ -945,9 +945,9 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
profile_cbox = new wxComboBox( this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1) ); profile_cbox = new wxComboBox( this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1) );
wxButton* const pload_btn = new wxButton( this, -1, wxT("Load"), wxDefaultPosition, wxSize(48,-1) ); wxButton* const pload_btn = new wxButton( this, -1, _("Load"), wxDefaultPosition, wxSize(48,-1) );
wxButton* const psave_btn = new wxButton( this, -1, wxT("Save"), wxDefaultPosition, wxSize(48,-1) ); wxButton* const psave_btn = new wxButton( this, -1, _("Save"), wxDefaultPosition, wxSize(48,-1) );
wxButton* const pdelete_btn = new wxButton( this, -1, wxT("Delete"), wxDefaultPosition, wxSize(60,-1) ); wxButton* const pdelete_btn = new wxButton( this, -1, _("Delete"), wxDefaultPosition, wxSize(60,-1) );
_connect_macro_(pload_btn, GamepadPage::LoadProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(pload_btn, GamepadPage::LoadProfile, wxEVT_COMMAND_BUTTON_CLICKED, this);
_connect_macro_(psave_btn, GamepadPage::SaveProfile, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(psave_btn, GamepadPage::SaveProfile, wxEVT_COMMAND_BUTTON_CLICKED, this);
@ -992,7 +992,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin
UpdateDeviceComboBox(); UpdateDeviceComboBox();
UpdateProfileComboBox(); UpdateProfileComboBox();
wxButton* const close_button = new wxButton( this, -1, wxT("Save")); wxButton* const close_button = new wxButton( this, -1, _("Save"));
_connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this);
_connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this);

4
Source/Core/DolphinWX/Src/InputConfigDiag.h
View File

@ -132,7 +132,7 @@ class ExtensionButton : public wxButton
{ {
public: public:
ExtensionButton( wxWindow* const parent, ControllerEmu::Extension* const ext ) ExtensionButton( wxWindow* const parent, ControllerEmu::Extension* const ext )
: wxButton( parent, -1, wxT("Configure"), wxDefaultPosition ) : wxButton( parent, -1, _("Configure"), wxDefaultPosition )
, extension(ext) {} , extension(ext) {}
ControllerEmu::Extension* const extension; ControllerEmu::Extension* const extension;
@ -151,7 +151,7 @@ class UDPConfigButton : public wxButton
public: public:
UDPWrapper* const wrapper; UDPWrapper* const wrapper;
UDPConfigButton( wxWindow* const parent, UDPWrapper * udp) UDPConfigButton( wxWindow* const parent, UDPWrapper * udp)
: wxButton( parent, -1, wxT("Configure"), wxDefaultPosition ) : wxButton( parent, -1, _("Configure"), wxDefaultPosition )
, wrapper(udp) , wrapper(udp)
{} {}
}; };

58
Source/Core/DolphinWX/Src/LogWindow.cpp
View File

@ -72,14 +72,14 @@ void CLogWindow::CreateGUIControls()
{ {
// Verbosity // Verbosity
wxArrayString wxLevels, wxLevelsUse; wxArrayString wxLevels, wxLevelsUse;
wxLevels.Add(wxT("Notice")); wxLevels.Add(_("Notice"));
wxLevels.Add(wxT("Error")); wxLevels.Add(_("Error"));
wxLevels.Add(wxT("Warning")); wxLevels.Add(_("Warning"));
wxLevels.Add(wxT("Info")); wxLevels.Add(_("Info"));
wxLevels.Add(wxT("Debug")); wxLevels.Add(_("Debug"));
for (int i = 0; i < MAX_LOGLEVEL; ++i) for (int i = 0; i < MAX_LOGLEVEL; ++i)
wxLevelsUse.Add(wxString::Format(wxT("%s"), wxLevels.Item(i).c_str())); wxLevelsUse.Add(wxString::Format(wxT("%s"), wxLevels.Item(i).c_str()));
m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, wxT("Verbosity"), m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, _("Verbosity"),
wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0, wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0,
wxRA_SPECIFY_ROWS, wxDefaultValidator); wxRA_SPECIFY_ROWS, wxDefaultValidator);
// Don't take up so much space // Don't take up so much space
@ -89,24 +89,24 @@ void CLogWindow::CreateGUIControls()
m_FontChoice = new wxChoice(this, IDM_FONT, m_FontChoice = new wxChoice(this, IDM_FONT,
wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator); wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
m_FontChoice->Append(wxT("Default font")); m_FontChoice->Append(_("Default font"));
m_FontChoice->Append(wxT("Monospaced font")); m_FontChoice->Append(_("Monospaced font"));
m_FontChoice->Append(wxT("Selected font")); m_FontChoice->Append(_("Selected font"));
m_FontChoice->SetSelection(0); m_FontChoice->SetSelection(0);
DefaultFont = GetFont(); DefaultFont = GetFont();
MonoSpaceFont.SetNativeFontInfoUserDesc(wxT("lucida console windows-1252")); MonoSpaceFont.SetNativeFontInfoUserDesc(_("lucida console windows-1252"));
LogFont.push_back(DefaultFont); LogFont.push_back(DefaultFont);
LogFont.push_back(MonoSpaceFont); LogFont.push_back(MonoSpaceFont);
LogFont.push_back(DebuggerFont); LogFont.push_back(DebuggerFont);
// Options // Options
wxCheckBox * m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, wxT("Word Wrap")); wxCheckBox * m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, _("Word Wrap"));
m_writeFileCB = new wxCheckBox(this, IDM_WRITEFILE, m_writeFileCB = new wxCheckBox(this, IDM_WRITEFILE,
wxT("Write to File"), wxDefaultPosition, wxDefaultSize, 0); _("Write to File"), wxDefaultPosition, wxDefaultSize, 0);
m_writeConsoleCB = new wxCheckBox(this, IDM_WRITECONSOLE, m_writeConsoleCB = new wxCheckBox(this, IDM_WRITECONSOLE,
wxT("Write to Console"), wxDefaultPosition, wxDefaultSize, 0); _("Write to Console"), wxDefaultPosition, wxDefaultSize, 0);
m_writeWindowCB = new wxCheckBox(this, IDM_WRITEWINDOW, m_writeWindowCB = new wxCheckBox(this, IDM_WRITEWINDOW,
wxT("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0); _("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0);
m_checks = new wxCheckListBox(this, IDM_LOGCHECKS, wxDefaultPosition, wxDefaultSize); m_checks = new wxCheckListBox(this, IDM_LOGCHECKS, wxDefaultPosition, wxDefaultSize);
@ -121,12 +121,12 @@ void CLogWindow::CreateGUIControls()
sRight = new wxBoxSizer(wxVERTICAL); // right sizer sRight = new wxBoxSizer(wxVERTICAL); // right sizer
sRightBottom = new wxBoxSizer(wxHORIZONTAL); // submit row sRightBottom = new wxBoxSizer(wxHORIZONTAL); // submit row
// Left side: buttons (-submit), options, and log type selection // Left side: buttons (-submit), options, and log type selection
wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Options")); wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, _("Options"));
wxBoxSizer* sLogCtrl = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sLogCtrl = new wxBoxSizer(wxHORIZONTAL);
sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, wxT("Toggle all"), sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, _("Toggle all"),
wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1); wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, wxT("Clear"), sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, _("Clear"),
wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1); wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
sbLeftOptions->Add(m_FontChoice, 0, (wxDOWN), 1); sbLeftOptions->Add(m_FontChoice, 0, (wxDOWN), 1);
@ -168,11 +168,11 @@ void CLogWindow::OnClose(wxCloseEvent& event)
void CLogWindow::OnSize(wxSizeEvent& event) void CLogWindow::OnSize(wxSizeEvent& event)
{ {
if (!Parent->g_pCodeWindow && if (!Parent->g_pCodeWindow &&
Parent->m_Mgr->GetPane(wxT("Pane 1")).IsShown()) Parent->m_Mgr->GetPane(_("Pane 1")).IsShown())
{ {
x = Parent->m_Mgr->GetPane(wxT("Pane 1")).rect.GetWidth(); x = Parent->m_Mgr->GetPane(_("Pane 1")).rect.GetWidth();
y = Parent->m_Mgr->GetPane(wxT("Pane 1")).rect.GetHeight(); y = Parent->m_Mgr->GetPane(_("Pane 1")).rect.GetHeight();
winpos = Parent->m_Mgr->GetPane(wxT("Pane 1")).dock_direction; winpos = Parent->m_Mgr->GetPane(_("Pane 1")).dock_direction;
} }
event.Skip(); event.Skip();
} }
@ -493,27 +493,27 @@ void CLogWindow::UpdateLog()
{ {
switch (msgQueue.front().first) switch (msgQueue.front().first)
{ {
// red
case ERROR_LEVEL: case ERROR_LEVEL:
m_Log->SetDefaultStyle(wxTextAttr(*wxRED)); m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
break; break;
// yellow
case WARNING_LEVEL: case WARNING_LEVEL:
m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); // YELLOW
break; break;
// green
case NOTICE_LEVEL: case NOTICE_LEVEL:
m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN)); m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN));
break; break;
// cyan
case INFO_LEVEL: case INFO_LEVEL:
m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN)); m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN));
break; break;
// light gray
case DEBUG_LEVEL: case DEBUG_LEVEL:
m_Log->SetDefaultStyle(wxTextAttr(wxColour(211, 211, 211))); m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY));
break; break;
// white
default: default:
m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE)); m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
break; break;

2
Source/Core/DolphinWX/Src/LogWindow.h
View File

@ -54,7 +54,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL, long style = wxTAB_TRAVERSAL,
const wxString& name = wxT("Log") const wxString& name = _("Log")
); );
~CLogWindow(); ~CLogWindow();

16
Source/Core/DolphinWX/Src/LuaWindow.cpp
View File

@ -58,7 +58,7 @@ void LuaStop(int uid, bool ok)
} }
wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size) : wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size) :
wxFrame(parent, wxID_ANY, _T("Lua Script Console"), pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) wxFrame(parent, wxID_ANY, _("Lua Script Console"), pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
{ {
LuaWindow_InitFirstTime(); LuaWindow_InitFirstTime();
@ -107,11 +107,11 @@ void wxLuaWindow::InitGUIControls()
m_Tab_Log->Layout(); m_Tab_Log->Layout();
// Button Strip // Button Strip
m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _T("Close"), wxDefaultPosition, wxDefaultSize); m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _("Close"), wxDefaultPosition, wxDefaultSize);
m_Button_LoadScript = new wxButton(this, ID_BUTTON_LOAD, _T("Load Script..."), wxDefaultPosition, wxDefaultSize); m_Button_LoadScript = new wxButton(this, ID_BUTTON_LOAD, _("Load Script..."), wxDefaultPosition, wxDefaultSize);
m_Button_Run = new wxButton(this, ID_BUTTON_RUN, _T("Run"), wxDefaultPosition, wxDefaultSize); m_Button_Run = new wxButton(this, ID_BUTTON_RUN, _("Run"), wxDefaultPosition, wxDefaultSize);
m_Button_Stop = new wxButton(this, ID_BUTTON_STOP, _T("Stop"), wxDefaultPosition, wxDefaultSize); m_Button_Stop = new wxButton(this, ID_BUTTON_STOP, _("Stop"), wxDefaultPosition, wxDefaultSize);
m_Button_Clear = new wxButton(this, ID_BUTTON_CLEAR, _T("Clear"), wxDefaultPosition, wxDefaultSize); m_Button_Clear = new wxButton(this, ID_BUTTON_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize);
wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
m_Button_Run->Disable(); m_Button_Run->Disable();
@ -135,7 +135,7 @@ void wxLuaWindow::InitGUIControls()
void wxLuaWindow::OnEvent_ScriptLoad_Press(wxCommandEvent& WXUNUSED(event)) void wxLuaWindow::OnEvent_ScriptLoad_Press(wxCommandEvent& WXUNUSED(event))
{ {
wxString path = wxFileSelector( wxString path = wxFileSelector(
_T("Select the script to load"), _("Select the script to load"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -160,7 +160,7 @@ void wxLuaWindow::OnEvent_ScriptLoad_Press(wxCommandEvent& WXUNUSED(event))
void wxLuaWindow::OnEvent_ScriptRun_Press(wxCommandEvent& WXUNUSED(event)) void wxLuaWindow::OnEvent_ScriptRun_Press(wxCommandEvent& WXUNUSED(event))
{ {
m_TextCtrl_Log->AppendText(wxT("Running script...\n")); m_TextCtrl_Log->AppendText(_("Running script...\n"));
bScriptRunning = true; bScriptRunning = true;
m_Button_LoadScript->Disable(); m_Button_LoadScript->Disable();
m_Button_Run->Disable(); m_Button_Run->Disable();

75
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -43,6 +43,8 @@
#include "BootManager.h" #include "BootManager.h"
#include "Frame.h" #include "Frame.h"
#include <wx/intl.h>
// ------------ // ------------
// Main window // Main window
@ -89,6 +91,8 @@ LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) {
bool DolphinApp::OnInit() bool DolphinApp::OnInit()
{ {
InitLanguageSupport();
// Declarations and definitions // Declarations and definitions
bool UseDebugger = false; bool UseDebugger = false;
bool BatchMode = false; bool BatchMode = false;
@ -137,28 +141,28 @@ bool DolphinApp::OnInit()
{ {
{ {
wxCMD_LINE_SWITCH, _("h"), _("help"), wxCMD_LINE_SWITCH, _("h"), _("help"),
wxT("Show this help message"), _("Show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
}, },
{ {
wxCMD_LINE_SWITCH, _("d"), _("debugger"), wxT("Opens the debugger") wxCMD_LINE_SWITCH, _("d"), _("debugger"), _("Opens the debugger")
}, },
{ {
wxCMD_LINE_SWITCH, _("l"), _("logger"), wxT("Opens the logger") wxCMD_LINE_SWITCH, _("l"), _("logger"), _("Opens the logger")
}, },
{ {
wxCMD_LINE_OPTION, _("e"), _("exec"), wxT("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"), wxCMD_LINE_OPTION, _("e"), _("exec"), _("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
}, },
{ {
wxCMD_LINE_SWITCH, _("b"), _("batch"), wxT("Exit Dolphin with emulator") wxCMD_LINE_SWITCH, _("b"), _("batch"), _("Exit Dolphin with emulator")
}, },
{ {
wxCMD_LINE_OPTION, _("V"), _("video_plugin"), wxT("Specify a video plugin"), wxCMD_LINE_OPTION, _("V"), _("video_plugin"), _("Specify a video plugin"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
}, },
{ {
wxCMD_LINE_OPTION, _("A"), _("audio_plugin"), wxT("Specify an audio plugin"), wxCMD_LINE_OPTION, _("A"), _("audio_plugin"), _("Specify an audio plugin"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
}, },
{ {
@ -179,18 +183,18 @@ bool DolphinApp::OnInit()
LoadFile = parser.Found("exec", &FileToLoad); LoadFile = parser.Found("exec", &FileToLoad);
BatchMode = parser.Found("batch"); BatchMode = parser.Found("batch");
#else #else
UseDebugger = parser.Found(wxT("debugger")); UseDebugger = parser.Found(_("debugger"));
UseLogger = parser.Found(wxT("logger")); UseLogger = parser.Found(_("logger"));
LoadFile = parser.Found(wxT("exec"), &FileToLoad); LoadFile = parser.Found(_("exec"), &FileToLoad);
BatchMode = parser.Found(wxT("batch")); BatchMode = parser.Found(_("batch"));
#endif #endif
#if wxCHECK_VERSION(2, 9, 0) #if wxCHECK_VERSION(2, 9, 0)
selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename); selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename);
selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename); selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename);
#else #else
selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename); selectVideoPlugin = parser.Found(_("video_plugin"), &videoPluginFilename);
selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename); selectAudioPlugin = parser.Found(_("audio_plugin"), &audioPluginFilename);
#endif #endif
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
@ -403,6 +407,49 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
} }
} }
void DolphinApp::InitLanguageSupport()
{
int language = 0;
const wxLanguage langIds[] =
{
wxLANGUAGE_DEFAULT,
wxLANGUAGE_GERMAN,
wxLANGUAGE_FRENCH,
wxLANGUAGE_SPANISH,
wxLANGUAGE_ITALIAN,
wxLANGUAGE_DUTCH,
};
IniFile ini;
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
ini.Get("Interface", "Language", &language, 0);
// Load language if possible, fall back to system default otherwise
if(wxLocale::IsAvailable(langIds[language]))
{
m_locale = new wxLocale(langIds[language]);
#ifdef _WIN32
m_locale->AddCatalogLookupPathPrefix(wxT("Languages"));
#endif
m_locale->AddCatalog(wxT("dolphin-emu"));
if(!m_locale->IsOk())
{
PanicAlert("Error loading selected language. Falling back to system default.\n");
delete m_locale;
m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
}
}
else
{
PanicAlert("The selected language is not supported by your system. Falling back to system default.\n");
m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
}
}
void DolphinApp::OnEndSession() void DolphinApp::OnEndSession()
{ {
SConfig::GetInstance().SaveSettings(); SConfig::GetInstance().SaveSettings();
@ -419,6 +466,8 @@ int DolphinApp::OnExit()
SConfig::Shutdown(); SConfig::Shutdown();
LogManager::Shutdown(); LogManager::Shutdown();
delete m_locale;
return wxApp::OnExit(); return wxApp::OnExit();
} }

2
Source/Core/DolphinWX/Src/Main.h
View File

@ -29,6 +29,7 @@ public:
void OnEndSession(); void OnEndSession();
int OnExit(); int OnExit();
CFrame* GetCFrame(); CFrame* GetCFrame();
void InitLanguageSupport();
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@ -36,6 +37,7 @@ private:
wxTimer *m_afterinit; wxTimer *m_afterinit;
bool LoadFile; bool LoadFile;
wxString FileToLoad; wxString FileToLoad;
wxLocale *m_locale;
void AfterInit(wxTimerEvent& WXUNUSED(event)); void AfterInit(wxTimerEvent& WXUNUSED(event));
}; };

60
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -189,7 +189,7 @@ void CMemcardManager::CreateGUIControls()
const wxChar* ARROW[2] = {_T("<-"), _T("->")}; const wxChar* ARROW[2] = {_T("<-"), _T("->")};
m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, wxT("Convert to GCI")); m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
for (int slot = SLOT_A; slot < SLOT_B + 1; slot++) for (int slot = SLOT_A; slot < SLOT_B + 1; slot++)
{ {
@ -203,8 +203,8 @@ void CMemcardManager::CreateGUIControls()
wxString::Format(wxT("%sDelete%s"), ARROWS)); wxString::Format(wxT("%sDelete%s"), ARROWS));
m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, wxT("Prev Page")); m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, _("Prev Page"));
m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, wxT("Next Page")); m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, _("Next Page"));
t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition,wxDefaultSize, 0, wxEmptyString); t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition,wxDefaultSize, 0, wxEmptyString);
@ -215,8 +215,8 @@ void CMemcardManager::CreateGUIControls()
sPages[slot]->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1); sPages[slot]->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1);
m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot, m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)), wxT("Choose a memory card:"), wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)), _("Choose a memory card:"),
wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN); _("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400), m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400),
wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings); wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings);
@ -526,18 +526,18 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
case ID_SAVEIMPORT_B: case ID_SAVEIMPORT_B:
{ {
wxString fileName = wxFileSelector( wxString fileName = wxFileSelector(
wxT("Select a save file to import"), _("Select a save file to import"),
(strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0) (strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0)
? wxString::FromAscii("") ? wxString::FromAscii("")
: wxString::From8BitData(DefaultIOPath.c_str()), : wxString::From8BitData(DefaultIOPath.c_str()),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxT("Native GCI files(*.gci)|*.gci|") _T("Native GCI files(*.gci)|*.gci|")
wxT("MadCatz Gameshark files(*.gcs)|*.gcs|") _T("MadCatz Gameshark files(*.gcs)|*.gcs|")
wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"), _T("Datel MaxDrive/Pro files(*.sav)|*.sav"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!fileName.empty() && !fileName2.empty()) if (!fileName.empty() && !fileName2.empty())
{ {
wxString temp2 = wxFileSelector(wxT("Save GCI as.."), wxString temp2 = wxFileSelector(_("Save GCI as.."),
wxEmptyString, wxEmptyString, wxT(".gci"), wxEmptyString, wxEmptyString, wxT(".gci"),
wxT("GCI File(*.gci)|*.gci"), wxT("GCI File(*.gci)|*.gci"),
wxFD_OVERWRITE_PROMPT|wxFD_SAVE); wxFD_OVERWRITE_PROMPT|wxFD_SAVE);
@ -562,7 +562,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
memoryCard[slot]->DEntry_FileName(index,tempC2); memoryCard[slot]->DEntry_FileName(index,tempC2);
sprintf(tempC, "%s_%s.gci", tempC, tempC2); sprintf(tempC, "%s_%s.gci", tempC, tempC2);
wxString fileName = wxFileSelector( wxString fileName = wxFileSelector(
wxT("Export save as.."), _("Export save as.."),
wxString::From8BitData(DefaultIOPath.c_str()), wxString::From8BitData(DefaultIOPath.c_str()),
wxString::From8BitData(tempC), wxT(".gci"), wxString::From8BitData(tempC), wxT(".gci"),
wxT("Native GCI files(*.gci)|*.gci|") wxT("Native GCI files(*.gci)|*.gci|")
@ -631,12 +631,12 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
m_MemcardList[card]->Hide(); m_MemcardList[card]->Hide();
m_MemcardList[card]->ClearAll(); m_MemcardList[card]->ClearAll();
m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _T("Banner")); m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _("Banner"));
m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _T("Title")); m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _("Title"));
m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _T("Comment")); m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _("Comment"));
m_MemcardList[card]->InsertColumn(COLUMN_ICON, _T("Icon")); m_MemcardList[card]->InsertColumn(COLUMN_ICON, _("Icon"));
m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _T("Blocks")); m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _("Blocks"));
m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _T("First Block")); m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _("First Block"));
wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL); wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL);
list->RemoveAll(); list->RemoveAll();
@ -793,20 +793,20 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
int slot = GetId() - ID_MEMCARDLIST_A; int slot = GetId() - ID_MEMCARDLIST_A;
popupMenu->Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot)); popupMenu->Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot));
popupMenu->Append(ID_DELETE_A + slot, wxT("Delete Save")); popupMenu->Append(ID_DELETE_A + slot, _("Delete Save"));
popupMenu->Append(ID_SAVEIMPORT_A + slot, wxT("Import Save")); popupMenu->Append(ID_SAVEIMPORT_A + slot, _("Import Save"));
popupMenu->Append(ID_SAVEEXPORT_A + slot, wxT("Export Save")); popupMenu->Append(ID_SAVEEXPORT_A + slot, _("Export Save"));
popupMenu->Append(ID_EXPORTALL_A + slot, wxT("Export all saves")); popupMenu->Append(ID_EXPORTALL_A + slot, _("Export all saves"));
popupMenu->FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded); popupMenu->FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded);
popupMenu->AppendSeparator(); popupMenu->AppendSeparator();
popupMenu->Append(ID_FIXCHECKSUM_A + slot, wxT("Fix Checksums")); popupMenu->Append(ID_FIXCHECKSUM_A + slot, _("Fix Checksums"));
popupMenu->Append(ID_PREVPAGE_A + slot, wxT("Previous Page")); popupMenu->Append(ID_PREVPAGE_A + slot, _("Previous Page"));
popupMenu->Append(ID_NEXTPAGE_A + slot, wxT("Next Page")); popupMenu->Append(ID_NEXTPAGE_A + slot, _("Next Page"));
popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot)); popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot));
popupMenu->AppendCheckItem(ID_USEPAGES, wxT("Enable pages")); popupMenu->AppendCheckItem(ID_USEPAGES, _("Enable pages"));
popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages); popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages); popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
@ -814,11 +814,11 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
popupMenu->AppendSeparator(); popupMenu->AppendSeparator();
popupMenu->AppendCheckItem(COLUMN_BANNER, wxT("Show save banner")); popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
popupMenu->AppendCheckItem(COLUMN_TITLE, wxT("Show save title")); popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title"));
popupMenu->AppendCheckItem(COLUMN_COMMENT, wxT("Show save comment")); popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
popupMenu->AppendCheckItem(COLUMN_ICON, wxT("Show save icon")); popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon"));
popupMenu->AppendCheckItem(COLUMN_BLOCKS, wxT("Show save blocks")); popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++) for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++)
{ {

44
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -44,7 +44,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);
// top row // top row
wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, wxT("Nickname :"), wxDefaultPosition, wxDefaultSize); wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"), wxDefaultPosition, wxDefaultSize);
std::string nickname; std::string nickname;
netplay_section.Get("Nickname", &nickname, "Player"); netplay_section.Get("Nickname", &nickname, "Player");
@ -58,14 +58,14 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
// tabs // tabs
wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize); wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
notebook->AddPage(connect_tab, wxT("Connect")); notebook->AddPage(connect_tab, _("Connect"));
wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize); wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
notebook->AddPage(host_tab, wxT("Host")); notebook->AddPage(host_tab, _("Host"));
// connect tab // connect tab
{ {
wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, wxT("Address :"), wxDefaultPosition, wxDefaultSize); wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Address :"), wxDefaultPosition, wxDefaultSize);
std::string address; std::string address;
netplay_section.Get("Address", &address, "localhost"); netplay_section.Get("Address", &address, "localhost");
@ -78,7 +78,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
netplay_section.Get("ConnectPort", &port, "2626"); netplay_section.Get("ConnectPort", &port, "2626");
m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, wxString::FromAscii(port.c_str())); m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, wxString::FromAscii(port.c_str()));
wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, wxT("Connect")); wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect"));
_connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY
@ -142,7 +142,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
} }
// bottom row // bottom row
wxButton* const quit_btn = new wxButton(panel, wxID_ANY, wxT("Quit")); wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
_connect_macro_(quit_btn, NetPlaySetupDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(quit_btn, NetPlaySetupDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this);
// main sizer // main sizer
@ -257,7 +257,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
// top crap // top crap
m_game_btn = new wxButton(panel, wxID_ANY m_game_btn = new wxButton(panel, wxID_ANY
, wxString(m_selected_game.c_str(), *wxConvCurrent).Prepend(wxT(" Game : ")), wxDefaultPosition, wxDefaultSize, wxBU_LEFT); , wxString(m_selected_game.c_str(), *wxConvCurrent).Prepend(_(" Game : ")), wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
if (is_hosting) if (is_hosting)
_connect_macro_(m_game_btn, NetPlayDiag::OnChangeGame, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(m_game_btn, NetPlayDiag::OnChangeGame, wxEVT_COMMAND_BUTTON_CLICKED, this);
@ -274,7 +274,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); , wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
_connect_macro_(m_chat_msg_text, NetPlayDiag::OnChat, wxEVT_COMMAND_TEXT_ENTER, this); _connect_macro_(m_chat_msg_text, NetPlayDiag::OnChat, wxEVT_COMMAND_TEXT_ENTER, this);
wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, wxT("Send")); wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send"));
_connect_macro_(chat_msg_btn, NetPlayDiag::OnChat, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(chat_msg_btn, NetPlayDiag::OnChat, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL);
@ -287,12 +287,12 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(192,-1)); m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(192,-1));
wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, wxT("Players")); wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Players"));
player_szr->Add(m_player_lbox, 1, wxEXPAND); player_szr->Add(m_player_lbox, 1, wxEXPAND);
// player list // player list
if (is_hosting) if (is_hosting)
{ {
wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, wxT("Configure Pads")); wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads"));
_connect_macro_(player_config_btn, NetPlayDiag::OnConfigPads, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(player_config_btn, NetPlayDiag::OnConfigPads, wxEVT_COMMAND_BUTTON_CLICKED, this);
player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5); player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5);
} }
@ -302,19 +302,19 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
mid_szr->Add(player_szr, 0, wxEXPAND); mid_szr->Add(player_szr, 0, wxEXPAND);
// bottom crap // bottom crap
wxButton* const quit_btn = new wxButton(panel, wxID_ANY, wxT("Quit")); wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
_connect_macro_(quit_btn, NetPlayDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(quit_btn, NetPlayDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL);
if (is_hosting) if (is_hosting)
{ {
wxButton* const start_btn = new wxButton(panel, wxID_ANY, wxT("Start")); wxButton* const start_btn = new wxButton(panel, wxID_ANY, _("Start"));
_connect_macro_(start_btn, NetPlayDiag::OnStart, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(start_btn, NetPlayDiag::OnStart, wxEVT_COMMAND_BUTTON_CLICKED, this);
bottom_szr->Add(start_btn); bottom_szr->Add(start_btn);
wxButton* const stop_btn = new wxButton(panel, wxID_ANY, wxT("Stop")); wxButton* const stop_btn = new wxButton(panel, wxID_ANY, _("Stop"));
_connect_macro_(stop_btn, NetPlayDiag::OnStop, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(stop_btn, NetPlayDiag::OnStop, wxEVT_COMMAND_BUTTON_CLICKED, this);
bottom_szr->Add(stop_btn); bottom_szr->Add(stop_btn);
bottom_szr->Add(new wxStaticText(panel, wxID_ANY, wxT("Buffer:")), 0, wxLEFT | wxCENTER, 5 ); bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 );
wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20") wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20")
, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20); , wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20);
_connect_macro_(padbuf_spin, NetPlayDiag::OnAdjustBuffer, wxEVT_COMMAND_SPINCTRL_UPDATED, this); _connect_macro_(padbuf_spin, NetPlayDiag::OnAdjustBuffer, wxEVT_COMMAND_SPINCTRL_UPDATED, this);
@ -439,7 +439,7 @@ void NetPlayDiag::OnThread(wxCommandEvent& event)
// update selected game :/ // update selected game :/
{ {
m_selected_game.assign(event.GetString().mb_str()); m_selected_game.assign(event.GetString().mb_str());
m_game_btn->SetLabel(event.GetString().Prepend(wxT(" Game : "))); m_game_btn->SetLabel(event.GetString().Prepend(_(" Game : ")));
} }
break; break;
case NP_GUI_EVT_START_GAME : case NP_GUI_EVT_START_GAME :
@ -504,7 +504,7 @@ void NetPlayDiag::OnConfigPads(wxCommandEvent&)
} }
ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name) ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name)
: wxDialog(parent, wxID_ANY, wxT("Change Game"), wxDefaultPosition, wxDefaultSize) : wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize)
, m_game_name(game_name) , m_game_name(game_name)
{ {
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);
@ -518,7 +518,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons
while (std::getline(ss,game)) while (std::getline(ss,game))
m_game_lbox->Append(wxString(game.c_str(), *wxConvCurrent)); m_game_lbox->Append(wxString(game.c_str(), *wxConvCurrent));
wxButton* const ok_btn = new wxButton(panel, wxID_ANY, wxT("Change")); wxButton* const ok_btn = new wxButton(panel, wxID_ANY, _("Change"));
_connect_macro_(ok_btn, ChangeGameDiag::OnPick, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(ok_btn, ChangeGameDiag::OnPick, wxEVT_COMMAND_BUTTON_CLICKED, this);
wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
@ -540,7 +540,7 @@ void ChangeGameDiag::OnPick(wxCommandEvent&)
} }
PadMapDiag::PadMapDiag(wxWindow* const parent, int map[]) PadMapDiag::PadMapDiag(wxWindow* const parent, int map[])
: wxDialog(parent, wxID_ANY, wxT("Configure Pads"), wxDefaultPosition, wxDefaultSize) : wxDialog(parent, wxID_ANY, _("Configure Pads"), wxDefaultPosition, wxDefaultSize)
, m_mapping(map) , m_mapping(map)
{ {
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);
@ -551,17 +551,17 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[])
// labels // labels
wxBoxSizer* const label_szr = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const label_szr = new wxBoxSizer(wxVERTICAL);
label_szr->Add(new wxStaticText(panel,wxID_ANY, wxT("Local")), 0, wxALIGN_TOP); label_szr->Add(new wxStaticText(panel,wxID_ANY, _("Local")), 0, wxALIGN_TOP);
label_szr->AddStretchSpacer(1); label_szr->AddStretchSpacer(1);
label_szr->Add(new wxStaticText(panel,wxID_ANY, wxT("In-Game")), 0, wxALIGN_BOTTOM); label_szr->Add(new wxStaticText(panel,wxID_ANY, _("In-Game")), 0, wxALIGN_BOTTOM);
h_szr->Add(label_szr, 1, wxTOP | wxBOTTOM | wxEXPAND, 20); h_szr->Add(label_szr, 1, wxTOP | wxBOTTOM | wxEXPAND, 20);
// set up choices // set up choices
wxString pad_names[5]; wxString pad_names[5];
pad_names[0] = wxT("None"); pad_names[0] = _("None");
for (unsigned int i=1; i<5; ++i) for (unsigned int i=1; i<5; ++i)
pad_names[i] = wxString(wxT("Pad ")) + (wxChar)(wxT('0')+i); pad_names[i] = wxString(_("Pad ")) + (wxChar)(wxT('0')+i);
for (unsigned int i=0; i<4; ++i) for (unsigned int i=0; i<4; ++i)
{ {

2
Source/Core/DolphinWX/Src/PatchAddEdit.cpp
View File

@ -99,7 +99,7 @@ void CPatchAddEdit::CreateGUIControls(int _selection)
sbEntry->Add(sEntryAddRemove, 0, wxEXPAND); sbEntry->Add(sEntryAddRemove, 0, wxEXPAND);
sEditPatch->Add(sbEntry, 0, wxEXPAND|wxALL, 5); sEditPatch->Add(sbEntry, 0, wxEXPAND|wxALL, 5);
wxBoxSizer* sEditPatchButtons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sEditPatchButtons = new wxBoxSizer(wxHORIZONTAL);
wxButton* bOK = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxButton* bOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
sEditPatchButtons->Add(0, 0, 1, wxEXPAND, 5); sEditPatchButtons->Add(0, 0, 1, wxEXPAND, 5);
sEditPatchButtons->Add(bOK, 0, wxALL, 5); sEditPatchButtons->Add(bOK, 0, wxALL, 5);

2
Source/Core/DolphinWX/Src/PatchAddEdit.h
View File

@ -27,7 +27,7 @@ class CPatchAddEdit : public wxDialog
public: public:
CPatchAddEdit(int _selection, wxWindow* parent, CPatchAddEdit(int _selection, wxWindow* parent,
wxWindowID id = 1, wxWindowID id = 1,
const wxString& title = wxT("Edit Patch"), const wxString& title = _("Edit Patch"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE); long style = wxDEFAULT_DIALOG_STYLE);

18
Source/Core/DolphinWX/Src/UDPConfigDiag.cpp
View File

@ -9,27 +9,27 @@
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) #define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) :
wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
wrp(_wrp) wrp(_wrp)
{ {
wxBoxSizer *const outer_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *const outer_sizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *const sizer1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer *const sizer1 = new wxBoxSizer(wxVERTICAL);
wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Update")); wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, _("Update"));
outer_sizer->Add(sizer1, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 5); outer_sizer->Add(sizer1, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 5);
outer_sizer->Add(sizer2, 1, wxLEFT | wxRIGHT | wxEXPAND, 10); outer_sizer->Add(sizer2, 1, wxLEFT | wxRIGHT | wxEXPAND, 10);
enable = new wxCheckBox(this,wxID_ANY,wxT("Enable")); enable = new wxCheckBox(this,wxID_ANY,_("Enable"));
butt = new wxCheckBox(this,wxID_ANY,wxT("Buttons")); butt = new wxCheckBox(this,wxID_ANY,_("Buttons"));
accel = new wxCheckBox(this,wxID_ANY,wxT("Acceleration")); accel = new wxCheckBox(this,wxID_ANY,_("Acceleration"));
point = new wxCheckBox(this,wxID_ANY,wxT("IR Pointer")); point = new wxCheckBox(this,wxID_ANY,_("IR Pointer"));
nun = new wxCheckBox(this,wxID_ANY,wxT("Nunchuk")); nun = new wxCheckBox(this,wxID_ANY,_("Nunchuk"));
nunaccel = new wxCheckBox(this,wxID_ANY,wxT("Nunchuk Acceleration")); nunaccel = new wxCheckBox(this,wxID_ANY,_("Nunchuk Acceleration"));
wxButton *const ok_butt = new wxButton(this,wxID_ANY,wxT("OK")); wxButton *const ok_butt = new wxButton(this,wxID_ANY,wxT("OK"));
wxBoxSizer *const port_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *const port_sizer = new wxBoxSizer(wxHORIZONTAL);
port_sizer->Add(new wxStaticText(this, wxID_ANY, wxT("UDP Port:")), 0, wxALIGN_CENTER); port_sizer->Add(new wxStaticText(this, wxID_ANY, _("UDP Port:")), 0, wxALIGN_CENTER);
port_tbox = new wxTextCtrl(this, wxID_ANY, wxString::FromUTF8(wrp->port.c_str())); port_tbox = new wxTextCtrl(this, wxID_ANY, wxString::FromUTF8(wrp->port.c_str()));
port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND , 5); port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND , 5);

20
Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
View File

@ -6,7 +6,7 @@
const wxString& ConnectedWiimotesString() const wxString& ConnectedWiimotesString()
{ {
static wxString str = wxT("Connected to . Wiimotes"); static wxString str = _("Connected to . Wiimotes");
str[13] = wxChar(wxT('0') + WiimoteReal::Initialize()); str[13] = wxChar(wxT('0') + WiimoteReal::Initialize());
return str; return str;
} }
@ -16,34 +16,34 @@ WiimoteConfigPage::WiimoteConfigPage(wxWindow* const parent, const int index)
, m_index(index) , m_index(index)
{ {
// input source // input source
const wxString src_choices[] = { wxT("None"), const wxString src_choices[] = { _("None"),
wxT("Emulated Wiimote"), wxT("Real Wiimote"), wxT("Hybrid Wiimote") }; _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") };
wxChoice* const input_src_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, wxChoice* const input_src_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize,
sizeof(src_choices)/sizeof(*src_choices), src_choices); sizeof(src_choices)/sizeof(*src_choices), src_choices);
input_src_choice->Select(g_wiimote_sources[m_index]); input_src_choice->Select(g_wiimote_sources[m_index]);
_connect_macro_(input_src_choice, WiimoteConfigPage::SelectSource, wxEVT_COMMAND_CHOICE_SELECTED, this); _connect_macro_(input_src_choice, WiimoteConfigPage::SelectSource, wxEVT_COMMAND_CHOICE_SELECTED, this);
wxStaticBoxSizer* const input_src_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Input Source")); wxStaticBoxSizer* const input_src_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Input Source"));
input_src_sizer->Add(input_src_choice, 1, wxEXPAND | wxALL, 5); input_src_sizer->Add(input_src_choice, 1, wxEXPAND | wxALL, 5);
// emulated wiimote // emulated wiimote
wxButton* const configure_wiimote_emu_btn = new wxButton(this, -1, wxT("Configure")); wxButton* const configure_wiimote_emu_btn = new wxButton(this, -1, _("Configure"));
wxStaticBoxSizer* const wiimote_emu_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Emulated Wiimote")); wxStaticBoxSizer* const wiimote_emu_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Emulated Wiimote"));
wiimote_emu_sizer->Add(configure_wiimote_emu_btn, 1, wxEXPAND | wxALL, 5); wiimote_emu_sizer->Add(configure_wiimote_emu_btn, 1, wxEXPAND | wxALL, 5);
_connect_macro_(configure_wiimote_emu_btn, WiimoteConfigDiag::ConfigEmulatedWiimote, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent()); _connect_macro_(configure_wiimote_emu_btn, WiimoteConfigDiag::ConfigEmulatedWiimote, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
// real wiimote // real wiimote
connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString()); connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString());
wxButton* const refresh_btn = new wxButton(this, -1, wxT("Refresh"), wxDefaultPosition); wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition);
_connect_macro_(refresh_btn, WiimoteConfigDiag::RefreshRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent()); _connect_macro_(refresh_btn, WiimoteConfigDiag::RefreshRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
wxStaticBoxSizer* const wiimote_real_sizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Real Wiimote")); wxStaticBoxSizer* const wiimote_real_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimote"));
wiimote_real_sizer->AddStretchSpacer(1); wiimote_real_sizer->AddStretchSpacer(1);
wiimote_real_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER | wxBOTTOM | wxLEFT | wxRIGHT, 5); wiimote_real_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER | wxBOTTOM | wxLEFT | wxRIGHT, 5);
#ifdef _WIN32 #ifdef _WIN32
wxButton* const pairup_btn = new wxButton(this, -1, wxT("Pair Up"), wxDefaultPosition); wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition);
_connect_macro_(pairup_btn, WiimoteConfigDiag::PairUpRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent()); _connect_macro_(pairup_btn, WiimoteConfigDiag::PairUpRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
wiimote_real_sizer->Add(pairup_btn, 0, wxALIGN_CENTER | wxBOTTOM, 5); wiimote_real_sizer->Add(pairup_btn, 0, wxALIGN_CENTER | wxBOTTOM, 5);
#endif #endif
@ -64,7 +64,7 @@ WiimoteConfigPage::WiimoteConfigPage(wxWindow* const parent, const int index)
} }
WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin)
: wxDialog(parent, -1, wxT("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)
, m_plugin(plugin) , m_plugin(plugin)
{ {
m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);

224
Source/Core/InputUICommon/Src/WXInputBase.cpp
View File

@ -24,135 +24,135 @@ const wxString WXKeyToString(int keycode)
{ {
switch (keycode) switch (keycode)
{ {
case WXK_BACK: return wxT("Back"); case WXK_BACK: return _("Back");
case WXK_TAB: return wxT("Tab"); case WXK_TAB: return _("Tab");
case WXK_RETURN: return wxT("Return"); case WXK_RETURN: return _("Return");
case WXK_ESCAPE: return wxT("Escape"); case WXK_ESCAPE: return _("Escape");
case WXK_SPACE: return wxT("Space"); case WXK_SPACE: return _("Space");
case WXK_DELETE: return wxT("Delete"); case WXK_DELETE: return _("Delete");
// Undocumented wx keycodes // Undocumented wx keycodes
case 167: return wxT("Paragraph"); case 167: return _("Paragraph");
case 177: return wxT("Plus-Minus"); case 177: return _("Plus-Minus");
case WXK_START: return wxT("Start"); case WXK_START: return _("Start");
case WXK_LBUTTON: return wxT("L Button"); case WXK_LBUTTON: return _("L Button");
case WXK_RBUTTON: return wxT("R Button"); case WXK_RBUTTON: return _("R Button");
case WXK_CANCEL: return wxT("Cancel"); case WXK_CANCEL: return _("Cancel");
case WXK_MBUTTON: return wxT("M Button"); case WXK_MBUTTON: return _("M Button");
case WXK_CLEAR: return wxT("Clear"); case WXK_CLEAR: return _("Clear");
case WXK_SHIFT: return wxT("Shift"); case WXK_SHIFT: return wxT("Shift");
case WXK_ALT: return wxT("Alt"); case WXK_ALT: return wxT("Alt");
case WXK_CONTROL: return wxT("Control"); case WXK_CONTROL: return _("Control");
case WXK_MENU: return wxT("Menu"); case WXK_MENU: return _("Menu");
case WXK_PAUSE: return wxT("Pause"); case WXK_PAUSE: return _("Pause");
case WXK_CAPITAL: return wxT("Caps Lock"); case WXK_CAPITAL: return _("Caps Lock");
case WXK_END: return wxT("End"); case WXK_END: return _("End");
case WXK_HOME: return wxT("Home"); case WXK_HOME: return _("Home");
case WXK_LEFT: return wxT("Left"); case WXK_LEFT: return _("Left");
case WXK_UP: return wxT("Up"); case WXK_UP: return _("Up");
case WXK_RIGHT: return wxT("Right"); case WXK_RIGHT: return _("Right");
case WXK_DOWN: return wxT("Down"); case WXK_DOWN: return _("Down");
case WXK_SELECT: return wxT("Select"); case WXK_SELECT: return _("Select");
case WXK_PRINT: return wxT("Print"); case WXK_PRINT: return _("Print");
case WXK_EXECUTE: return wxT("Execute"); case WXK_EXECUTE: return _("Execute");
case WXK_SNAPSHOT: return wxT("Snapshot"); case WXK_SNAPSHOT: return _("Snapshot");
case WXK_INSERT: return wxT("Insert"); case WXK_INSERT: return _("Insert");
case WXK_HELP: return wxT("Help"); case WXK_HELP: return _("Help");
case WXK_NUMPAD0: return wxT("NP 0"); case WXK_NUMPAD0: return wxT("NP 0");
case WXK_NUMPAD1: return wxT("NP 1"); case WXK_NUMPAD1: return wxT("NP 1");
case WXK_NUMPAD2: return wxT("NP 2"); case WXK_NUMPAD2: return wxT("NP 2");
case WXK_NUMPAD3: return wxT("NP 3"); case WXK_NUMPAD3: return wxT("NP 3");
case WXK_NUMPAD4: return wxT("NP 4"); case WXK_NUMPAD4: return wxT("NP 4");
case WXK_NUMPAD5: return wxT("NP 5"); case WXK_NUMPAD5: return wxT("NP 5");
case WXK_NUMPAD6: return wxT("NP 6"); case WXK_NUMPAD6: return wxT("NP 6");
case WXK_NUMPAD7: return wxT("NP 7"); case WXK_NUMPAD7: return wxT("NP 7");
case WXK_NUMPAD8: return wxT("NP 8"); case WXK_NUMPAD8: return wxT("NP 8");
case WXK_NUMPAD9: return wxT("NP 9"); case WXK_NUMPAD9: return wxT("NP 9");
case WXK_MULTIPLY: return wxT("Multiply"); case WXK_MULTIPLY: return _("Multiply");
case WXK_ADD: return wxT("Add"); case WXK_ADD: return _("Add");
case WXK_SEPARATOR: return wxT("Separator"); case WXK_SEPARATOR: return _("Separator");
case WXK_SUBTRACT: return wxT("Subtract"); case WXK_SUBTRACT: return _("Subtract");
case WXK_DECIMAL: return wxT("Decimal"); case WXK_DECIMAL: return _("Decimal");
case WXK_DIVIDE: return wxT("Divide"); case WXK_DIVIDE: return _("Divide");
case WXK_F1: return wxT("F1"); case WXK_F1: return wxT("F1");
case WXK_F2: return wxT("F2"); case WXK_F2: return wxT("F2");
case WXK_F3: return wxT("F3"); case WXK_F3: return wxT("F3");
case WXK_F4: return wxT("F4"); case WXK_F4: return wxT("F4");
case WXK_F5: return wxT("F5"); case WXK_F5: return wxT("F5");
case WXK_F6: return wxT("F6"); case WXK_F6: return wxT("F6");
case WXK_F7: return wxT("F7"); case WXK_F7: return wxT("F7");
case WXK_F8: return wxT("F8"); case WXK_F8: return wxT("F8");
case WXK_F9: return wxT("F9"); case WXK_F9: return wxT("F9");
case WXK_F10: return wxT("F10"); case WXK_F10: return wxT("F10");
case WXK_F11: return wxT("F11"); case WXK_F11: return wxT("F11");
case WXK_F12: return wxT("F12"); case WXK_F12: return wxT("F12");
case WXK_F13: return wxT("F13"); case WXK_F13: return wxT("F13");
case WXK_F14: return wxT("F14"); case WXK_F14: return wxT("F14");
case WXK_F15: return wxT("F15"); case WXK_F15: return wxT("F15");
case WXK_F16: return wxT("F16"); case WXK_F16: return wxT("F16");
case WXK_F17: return wxT("F17"); case WXK_F17: return wxT("F17");
case WXK_F18: return wxT("F19"); case WXK_F18: return wxT("F19");
case WXK_F19: return wxT("F20"); case WXK_F19: return wxT("F20");
case WXK_F20: return wxT("F21"); case WXK_F20: return wxT("F21");
case WXK_F21: return wxT("F22"); case WXK_F21: return wxT("F22");
case WXK_F22: return wxT("F23"); case WXK_F22: return wxT("F23");
case WXK_F23: return wxT("F24"); case WXK_F23: return wxT("F24");
case WXK_F24: return wxT("F25"); case WXK_F24: return wxT("F25");
case WXK_NUMLOCK: return wxT("Num Lock"); case WXK_NUMLOCK: return _("Num Lock");
case WXK_SCROLL: return wxT("Scroll Lock"); case WXK_SCROLL: return _("Scroll Lock");
case WXK_PAGEUP: return wxT("Page Up"); case WXK_PAGEUP: return _("Page Up");
case WXK_PAGEDOWN: return wxT("Page Down"); case WXK_PAGEDOWN: return _("Page Down");
case WXK_NUMPAD_SPACE: return wxT("NP Space"); case WXK_NUMPAD_SPACE: return _("NP Space");
case WXK_NUMPAD_TAB: return wxT("NP Tab"); case WXK_NUMPAD_TAB: return _("NP Tab");
case WXK_NUMPAD_ENTER: return wxT("NP Enter"); case WXK_NUMPAD_ENTER: return _("NP Enter");
case WXK_NUMPAD_F1: return wxT("NP F1"); case WXK_NUMPAD_F1: return wxT("NP F1");
case WXK_NUMPAD_F2: return wxT("NP F2"); case WXK_NUMPAD_F2: return wxT("NP F2");
case WXK_NUMPAD_F3: return wxT("NP F3"); case WXK_NUMPAD_F3: return wxT("NP F3");
case WXK_NUMPAD_F4: return wxT("NP F4"); case WXK_NUMPAD_F4: return wxT("NP F4");
case WXK_NUMPAD_HOME: return wxT("NP Home"); case WXK_NUMPAD_HOME: return _("NP Home");
case WXK_NUMPAD_LEFT: return wxT("NP Left"); case WXK_NUMPAD_LEFT: return _("NP Left");
case WXK_NUMPAD_UP: return wxT("NP Up"); case WXK_NUMPAD_UP: return _("NP Up");
case WXK_NUMPAD_RIGHT: return wxT("NP Right"); case WXK_NUMPAD_RIGHT: return _("NP Right");
case WXK_NUMPAD_DOWN: return wxT("NP Down"); case WXK_NUMPAD_DOWN: return _("NP Down");
case WXK_NUMPAD_PAGEUP: return wxT("NP Page Up"); case WXK_NUMPAD_PAGEUP: return _("NP Page Up");
case WXK_NUMPAD_PAGEDOWN: return wxT("NP Page Down"); case WXK_NUMPAD_PAGEDOWN: return _("NP Page Down");
case WXK_NUMPAD_END: return wxT("NP End"); case WXK_NUMPAD_END: return _("NP End");
case WXK_NUMPAD_BEGIN: return wxT("NP Begin"); case WXK_NUMPAD_BEGIN: return _("NP Begin");
case WXK_NUMPAD_INSERT: return wxT("NP Insert"); case WXK_NUMPAD_INSERT: return _("NP Insert");
case WXK_NUMPAD_DELETE: return wxT("NP Delete"); case WXK_NUMPAD_DELETE: return _("NP Delete");
case WXK_NUMPAD_EQUAL: return wxT("NP Equal"); case WXK_NUMPAD_EQUAL: return _("NP Equal");
case WXK_NUMPAD_MULTIPLY: return wxT("NP Multiply"); case WXK_NUMPAD_MULTIPLY: return _("NP Multiply");
case WXK_NUMPAD_ADD: return wxT("NP Add"); case WXK_NUMPAD_ADD: return _("NP Add");
case WXK_NUMPAD_SEPARATOR: return wxT("NP Separator"); case WXK_NUMPAD_SEPARATOR: return _("NP Separator");
case WXK_NUMPAD_SUBTRACT: return wxT("NP Subtract"); case WXK_NUMPAD_SUBTRACT: return _("NP Subtract");
case WXK_NUMPAD_DECIMAL: return wxT("NP Decimal"); case WXK_NUMPAD_DECIMAL: return _("NP Decimal");
case WXK_NUMPAD_DIVIDE: return wxT("NP Divide"); case WXK_NUMPAD_DIVIDE: return _("NP Divide");
case WXK_WINDOWS_LEFT: return wxT("Windows Left"); case WXK_WINDOWS_LEFT: return _("Windows Left");
case WXK_WINDOWS_RIGHT: return wxT("Windows Right"); case WXK_WINDOWS_RIGHT: return _("Windows Right");
case WXK_WINDOWS_MENU: return wxT("Windows Menu"); case WXK_WINDOWS_MENU: return _("Windows Menu");
case WXK_COMMAND: return wxT("Command"); case WXK_COMMAND: return _("Command");
} }
if (keycode > WXK_SPACE && keycode < WXK_DELETE) { if (keycode > WXK_SPACE && keycode < WXK_DELETE) {
return wxString((wxChar)keycode, 1); return wxString((wxChar)keycode, 1);
} }
return wxT(""); return _T("");
} }
const wxString WXKeymodToString(int modifier) const wxString WXKeymodToString(int modifier)
{ {
switch (modifier) switch (modifier)
{ {
case wxMOD_ALT: return wxT("Alt"); case wxMOD_ALT: return wxT("Alt");
case wxMOD_CONTROL: return wxT("Ctrl"); case wxMOD_CONTROL: return wxT("Ctrl");
case wxMOD_ALTGR: return wxT("Ctrl+Alt"); case wxMOD_ALTGR: return wxT("Ctrl+Alt");
case wxMOD_SHIFT: return wxT("Shift"); case wxMOD_SHIFT: return wxT("Shift");
// wxWidgets can only use Alt/Ctrl/Shift as menu accelerators, // wxWidgets can only use Alt/Ctrl/Shift as menu accelerators,
// so Meta (Command on OS X) is simply made equivalent to Ctrl. // so Meta (Command on OS X) is simply made equivalent to Ctrl.
case wxMOD_META: return wxT("Ctrl"); case wxMOD_META: return wxT("Ctrl");
default: return wxT(""); default: return wxT("");
} }
} }

74
Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
View File

@ -106,24 +106,24 @@ struct PauseEventMap
}; };
static PauseEventMap pauseEventMap[] = { static PauseEventMap pauseEventMap[] = {
{NEXT_FRAME, wxT("Frame")}, {NEXT_FRAME, _("Frame")},
{NEXT_FLUSH, wxT("Flush")}, {NEXT_FLUSH, _("Flush")},
{NEXT_PIXEL_SHADER_CHANGE, wxT("Pixel Shader")}, {NEXT_PIXEL_SHADER_CHANGE, _("Pixel Shader")},
{NEXT_VERTEX_SHADER_CHANGE, wxT("Vertex Shader")}, {NEXT_VERTEX_SHADER_CHANGE, _("Vertex Shader")},
{NEXT_TEXTURE_CHANGE, wxT("Texture")}, {NEXT_TEXTURE_CHANGE, _("Texture")},
{NEXT_NEW_TEXTURE, wxT("New Texture")}, {NEXT_NEW_TEXTURE, _("New Texture")},
{NEXT_XFB_CMD, wxT("XFB Cmd")}, {NEXT_XFB_CMD, _("XFB Cmd")},
{NEXT_EFB_CMD, wxT("EFB Cmd")}, {NEXT_EFB_CMD, _("EFB Cmd")},
{NEXT_MATRIX_CMD, wxT("Matrix Cmd")}, {NEXT_MATRIX_CMD, _("Matrix Cmd")},
{NEXT_VERTEX_CMD, wxT("Vertex Cmd")}, {NEXT_VERTEX_CMD, _("Vertex Cmd")},
{NEXT_TEXTURE_CMD, wxT("Texture Cmd")}, {NEXT_TEXTURE_CMD, _("Texture Cmd")},
{NEXT_LIGHT_CMD, wxT("Light Cmd")}, {NEXT_LIGHT_CMD, _("Light Cmd")},
{NEXT_FOG_CMD, wxT("Fog Cmd")}, {NEXT_FOG_CMD, _("Fog Cmd")},
{NEXT_SET_TLUT, wxT("TLUT Cmd")}, {NEXT_SET_TLUT, _("TLUT Cmd")},
{NEXT_ERROR, wxT("Error")} {NEXT_ERROR, wxT("Error")}
}; };
@ -139,12 +139,12 @@ void GFXDebuggerPanel::CreateGUIControls()
// MainPanel // MainPanel
m_MainPanel = new wxPanel(this, ID_MAINPANEL, wxDefaultPosition, wxDefaultSize); m_MainPanel = new wxPanel(this, ID_MAINPANEL, wxDefaultPosition, wxDefaultSize);
m_pButtonPause = new wxButton(m_MainPanel, ID_PAUSE, wxT("Pause"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Pause")); m_pButtonPause = new wxButton(m_MainPanel, ID_PAUSE, _("Pause"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause"));
m_pButtonPauseAtNext = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT, wxT("Pause At Next"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Pause At Next")); m_pButtonPauseAtNext = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT, _("Pause At Next"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Pause At Next"));
m_pButtonPauseAtNextFrame = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT_FRAME, wxT("Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Next Frame")); m_pButtonPauseAtNextFrame = new wxButton(m_MainPanel, ID_PAUSE_AT_NEXT_FRAME, _("Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Next Frame"));
m_pButtonCont = new wxButton(m_MainPanel, ID_CONT, wxT("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Continue")); m_pButtonCont = new wxButton(m_MainPanel, ID_CONT, _("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Continue"));
m_pPauseAtList = new wxChoice(m_MainPanel, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, NULL,0,wxDefaultValidator, wxT("PauseAtList")); m_pPauseAtList = new wxChoice(m_MainPanel, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, NULL,0,wxDefaultValidator, _("PauseAtList"));
for (int i=0; i<numPauseEventMap; i++) for (int i=0; i<numPauseEventMap; i++)
{ {
m_pPauseAtList->Append(pauseEventMap[i].ListStr); m_pPauseAtList->Append(pauseEventMap[i].ListStr);
@ -152,25 +152,25 @@ void GFXDebuggerPanel::CreateGUIControls()
m_pPauseAtList->SetSelection(0); m_pPauseAtList->SetSelection(0);
m_pButtonDump = new wxButton(m_MainPanel, ID_DUMP, wxT("Dump"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Dump")); m_pButtonDump = new wxButton(m_MainPanel, ID_DUMP, _("Dump"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Dump"));
m_pButtonUpdateScreen = new wxButton(m_MainPanel, ID_UPDATE_SCREEN, wxT("Update Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Update Screen")); m_pButtonUpdateScreen = new wxButton(m_MainPanel, ID_UPDATE_SCREEN, _("Update Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Update Screen"));
m_pButtonClearScreen = new wxButton(m_MainPanel, ID_CLEAR_SCREEN, wxT("Clear Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear Screen")); m_pButtonClearScreen = new wxButton(m_MainPanel, ID_CLEAR_SCREEN, _("Clear Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Screen"));
m_pButtonClearTextureCache = new wxButton(m_MainPanel, ID_CLEAR_TEXTURE_CACHE, wxT("Clear Textures"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear Textures")); m_pButtonClearTextureCache = new wxButton(m_MainPanel, ID_CLEAR_TEXTURE_CACHE, _("Clear Textures"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear Textures"));
m_pButtonClearVertexShaderCache = new wxButton(m_MainPanel, ID_CLEAR_VERTEX_SHADER_CACHE, wxT("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear V Shaders")); m_pButtonClearVertexShaderCache = new wxButton(m_MainPanel, ID_CLEAR_VERTEX_SHADER_CACHE, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear V Shaders"));
m_pButtonClearPixelShaderCache = new wxButton(m_MainPanel, ID_CLEAR_PIXEL_SHADER_CACHE, wxT("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("Clear P Shaders")); m_pButtonClearPixelShaderCache = new wxButton(m_MainPanel, ID_CLEAR_PIXEL_SHADER_CACHE, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear P Shaders"));
m_pCount = new wxTextCtrl(m_MainPanel, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), 0, wxDefaultValidator, wxT("Count")); m_pCount = new wxTextCtrl(m_MainPanel, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), 0, wxDefaultValidator, _("Count"));
m_pDumpList = new wxChoice(m_MainPanel, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, NULL,0,wxDefaultValidator, wxT("DumpList")); m_pDumpList = new wxChoice(m_MainPanel, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, NULL,0,wxDefaultValidator, _("DumpList"));
m_pDumpList->Insert(wxT("Pixel Shader"),0); m_pDumpList->Insert(_("Pixel Shader"),0);
m_pDumpList->Append(wxT("Vertex Shader")); m_pDumpList->Append(_("Vertex Shader"));
m_pDumpList->Append(wxT("Pixel Shader Constants")); m_pDumpList->Append(_("Pixel Shader Constants"));
m_pDumpList->Append(wxT("Vertex Shader Constants")); m_pDumpList->Append(_("Vertex Shader Constants"));
m_pDumpList->Append(wxT("Textures")); m_pDumpList->Append(_("Textures"));
m_pDumpList->Append(wxT("Frame Buffer")); m_pDumpList->Append(_("Frame Buffer"));
m_pDumpList->Append(wxT("Geometry data")); m_pDumpList->Append(_("Geometry data"));
m_pDumpList->Append(wxT("Vertex Description")); m_pDumpList->Append(_("Vertex Description"));
m_pDumpList->Append(wxT("Vertex Matrices")); m_pDumpList->Append(_("Vertex Matrices"));
m_pDumpList->Append(wxT("Statistics")); m_pDumpList->Append(_("Statistics"));
m_pDumpList->SetSelection(0); m_pDumpList->SetSelection(0);
// Layout everything on m_MainPanel // Layout everything on m_MainPanel

2
Source/Core/VideoUICommon/Src/DebuggerPanel.h
View File

@ -30,7 +30,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL, long style = wxTAB_TRAVERSAL,
const wxString &title = wxT("GFX Debugger")); const wxString &title = _("GFX Debugger"));
virtual ~GFXDebuggerPanel(); virtual ~GFXDebuggerPanel();

194
Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp
View File

@ -61,39 +61,39 @@ void VideoConfigDiag::Event_Close(wxCloseEvent& ev)
// TODO: implement some hack to increase the tooltip display duration, because some of these are way too long for anyone to read in 5 seconds. // TODO: implement some hack to increase the tooltip display duration, because some of these are way too long for anyone to read in 5 seconds.
wxString adapter_tooltip = wxT("Select a hardware adapter to use.\nWhen in doubt, use the first one"); wxString adapter_tooltip = _("Select a hardware adapter to use.\nWhen in doubt, use the first one");
wxString ar_tooltip = wxT("Select what aspect ratio to use when rendering:\nAuto: Use the native aspect ratio (4:3)\nForce 16:9: Stretch the picture to an aspect ratio of 16:9.\nForce 4:3: Stretch the picture to an aspect ratio of 4:3.\nStretch to window: Stretch the picture to the window size."); wxString ar_tooltip = _("Select what aspect ratio to use when rendering:\nAuto: Use the native aspect ratio (4:3)\nForce 16:9: Stretch the picture to an aspect ratio of 16:9.\nForce 4:3: Stretch the picture to an aspect ratio of 4:3.\nStretch to window: Stretch the picture to the window size.");
wxString ws_hack_tooltip = wxT("Force the game to output graphics for widescreen resolutions.\nNote that this might cause graphical glitches"); wxString ws_hack_tooltip = _("Force the game to output graphics for widescreen resolutions.\nNote that this might cause graphical glitches");
wxString vsync_tooltip = wxT("Wait for vertical blanks.\nReduces tearing but might also decrease performance"); wxString vsync_tooltip = _("Wait for vertical blanks.\nReduces tearing but might also decrease performance");
wxString af_tooltip = wxT("Enables anisotropic filtering.\nEnhances visual quality of textures that are at oblique viewing angles."); wxString af_tooltip = _("Enables anisotropic filtering.\nEnhances visual quality of textures that are at oblique viewing angles.");
wxString aa_tooltip = wxT("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky but also heavily decreases performance."); wxString aa_tooltip = _("Reduces the amount of aliasing caused by rasterizing 3D graphics.\nThis makes the rendered picture look less blocky but also heavily decreases performance.");
wxString native_mips_tooltip = wxT("Loads native mipmaps instead of generating them.\nLoading native mipmaps is the more accurate behavior, but might also decrease performance (your mileage might vary though)."); wxString native_mips_tooltip = _("Loads native mipmaps instead of generating them.\nLoading native mipmaps is the more accurate behavior, but might also decrease performance (your mileage might vary though).");
wxString scaled_efb_copy_tooltip = wxT("Uses the high-resolution render buffer for EFB copies instead of scaling them down to native resolution.\nVastly improves visual quality in games which use EFB copies but might cause glitches in some games."); wxString scaled_efb_copy_tooltip = _("Uses the high-resolution render buffer for EFB copies instead of scaling them down to native resolution.\nVastly improves visual quality in games which use EFB copies but might cause glitches in some games.");
wxString pixel_lighting_tooltip = wxT("Calculates lighting of 3D graphics on a per-pixel basis rather than per vertex.\nThis is the more accurate behavior but reduces performance."); wxString pixel_lighting_tooltip = _("Calculates lighting of 3D graphics on a per-pixel basis rather than per vertex.\nThis is the more accurate behavior but reduces performance.");
wxString pixel_depth_tooltip = wxT(""); wxString pixel_depth_tooltip = wxT("");
wxString force_filtering_tooltip = wxT("Forces bilinear texture filtering even if the game explicitly disabled it.\nImproves texture quality (especially when using a high internal resolution) but causes glitches in some games."); wxString force_filtering_tooltip = _("Forces bilinear texture filtering even if the game explicitly disabled it.\nImproves texture quality (especially when using a high internal resolution) but causes glitches in some games.");
wxString _3d_vision_tooltip = wxT(""); wxString _3d_vision_tooltip = wxT("");
wxString internal_res_tooltip = wxT("Specifies the resolution used to render at. A high resolution will improve visual quality but is also quite heavy on performance and might cause glitches in certain games.\nFractional: Uses your display resolution directly instead of the native resolution. The quality scales with your display/window size, as does the performance impact.\nIntegral: This is like Fractional, but rounds up to an integer multiple of the native resolution. Should give a more accurate look but is usually slower.\nThe other options are fixed resolutions for choosing a visual quality independent of your display size."); wxString internal_res_tooltip = _("Specifies the resolution used to render at. A high resolution will improve visual quality but is also quite heavy on performance and might cause glitches in certain games.\nFractional: Uses your display resolution directly instead of the native resolution. The quality scales with your display/window size, as does the performance impact.\nIntegral: This is like Fractional, but rounds up to an integer multiple of the native resolution. Should give a more accurate look but is usually slower.\nThe other options are fixed resolutions for choosing a visual quality independent of your display size.");
wxString efb_access_tooltip = wxT("Allows the CPU to read or write to the EFB (render buffer).\nThis is needed for certain gameplay functionality (e.g. star pointer in Super Mario Galaxy) as well as for certain visual effects (e.g. Monster Hunter Tri),\nbut enabling this option can also have a huge negative impact on performance if the game uses this functionality heavily."); wxString efb_access_tooltip = _("Allows the CPU to read or write to the EFB (render buffer).\nThis is needed for certain gameplay functionality (e.g. star pointer in Super Mario Galaxy) as well as for certain visual effects (e.g. Monster Hunter Tri),\nbut enabling this option can also have a huge negative impact on performance if the game uses this functionality heavily.");
wxString efb_emulate_format_changes_tooltip = wxT("Enables reinterpreting the data inside the EFB when the pixel format changes.\nSome games depend on this function for certain effects, so enable it if you're having glitches.\nDepending on how the game uses this function, the speed hits caused by this option range from none to critical."); wxString efb_emulate_format_changes_tooltip = _("Enables reinterpreting the data inside the EFB when the pixel format changes.\nSome games depend on this function for certain effects, so enable it if you're having glitches.\nDepending on how the game uses this function, the speed hits caused by this option range from none to critical.");
wxString efb_copy_tooltip = wxT("Enables emulation of Embedded Frame Buffer copies, if the game uses them.\nGames often need this for post-processing or other things, but if you can live without it, you can sometimes get a big speedup."); wxString efb_copy_tooltip = _("Enables emulation of Embedded Frame Buffer copies, if the game uses them.\nGames often need this for post-processing or other things, but if you can live without it, you can sometimes get a big speedup.");
wxString efb_copy_texture_tooltip = wxT("Emulate frame buffer copies directly to textures.\nThis is not so accurate, but it's good enough for the way many games use framebuffer copies."); wxString efb_copy_texture_tooltip = _("Emulate frame buffer copies directly to textures.\nThis is not so accurate, but it's good enough for the way many games use framebuffer copies.");
wxString efb_copy_ram_tooltip = wxT("Fully emulate embedded frame buffer copies.\nThis is more accurate than EFB Copy to Texture, and some games need this to work properly, but it can also be very slow."); wxString efb_copy_ram_tooltip = _("Fully emulate embedded frame buffer copies.\nThis is more accurate than EFB Copy to Texture, and some games need this to work properly, but it can also be very slow.");
wxString stc_tooltip = wxT("Keeps track of textures based on looking at the actual pixels in the texture.\nCan cause slowdown, but some games need this option enabled to work properly."); wxString stc_tooltip = _("Keeps track of textures based on looking at the actual pixels in the texture.\nCan cause slowdown, but some games need this option enabled to work properly.");
wxString stc_speed_tooltip = wxT("Faster variants look at fewer pixels and thus have more potential for errors.\nSlower variants look at more pixels and thus are safer."); wxString stc_speed_tooltip = _("Faster variants look at fewer pixels and thus have more potential for errors.\nSlower variants look at more pixels and thus are safer.");
wxString wireframe_tooltip = wxT("Render the scene as a wireframe.\nThis is only useful for debugging purposes."); wxString wireframe_tooltip = _("Render the scene as a wireframe.\nThis is only useful for debugging purposes.");
wxString disable_lighting_tooltip = wxT("Disable lighting. Improves performance but causes lighting to disappear in games which use it."); wxString disable_lighting_tooltip = _("Disable lighting. Improves performance but causes lighting to disappear in games which use it.");
wxString disable_textures_tooltip = wxT("Disable texturing.\nThis is only useful for debugging purposes."); wxString disable_textures_tooltip = _("Disable texturing.\nThis is only useful for debugging purposes.");
wxString disable_fog_tooltip = wxT("Disable fog. Improves performance but causes glitches in games which rely on proper fog emulation."); wxString disable_fog_tooltip = _("Disable fog. Improves performance but causes glitches in games which rely on proper fog emulation.");
wxString disable_alphapass_tooltip = wxT("Disables an alpha-setting pass.\nBreaks certain effects but might help performance."); wxString disable_alphapass_tooltip = _("Disables an alpha-setting pass.\nBreaks certain effects but might help performance.");
wxString show_fps_tooltip = wxT("Show the number of frames rendered per second."); wxString show_fps_tooltip = _("Show the number of frames rendered per second.");
wxString show_stats_tooltip = wxT("Show various statistics.\nThis is only useful for debugging purposes."); wxString show_stats_tooltip = _("Show various statistics.\nThis is only useful for debugging purposes.");
wxString proj_stats_tooltip = wxT("Show projection statistics.\nThis is only useful for debugging purposes."); wxString proj_stats_tooltip = _("Show projection statistics.\nThis is only useful for debugging purposes.");
wxString texfmt_tooltip = wxT("Modify textures to show the format they're using.\nThis is only useful for debugging purposes."); wxString texfmt_tooltip = _("Modify textures to show the format they're using.\nThis is only useful for debugging purposes.");
wxString efb_copy_regions_tooltip = wxT(""); wxString efb_copy_regions_tooltip = wxT("");
wxString xfb_tooltip = wxT(""); wxString xfb_tooltip = wxT("");
wxString dump_textures_tooltip = wxT("Dump game textures to User/Dump/Textures/<game id>/"); wxString dump_textures_tooltip = _("Dump game textures to User/Dump/Textures/<game id>/");
wxString load_hires_textures_tooltip = wxT("Load high-resolution textures from User/Load/Textures/<game id>/"); wxString load_hires_textures_tooltip = _("Load high-resolution textures from User/Load/Textures/<game id>/");
wxString dump_efb_tooltip = wxT(""); wxString dump_efb_tooltip = wxT("");
wxString dump_frames_tooltip = wxT(""); wxString dump_frames_tooltip = wxT("");
wxString free_look_tooltip = wxT(""); wxString free_look_tooltip = wxT("");
@ -102,11 +102,11 @@ wxString opencl_tooltip = wxT("");
wxString dlc_tooltip = wxT(""); wxString dlc_tooltip = wxT("");
wxString hotkeys_tooltip = wxT(""); wxString hotkeys_tooltip = wxT("");
wxString ppshader_tooltip = wxT(""); wxString ppshader_tooltip = wxT("");
wxString cache_efb_copies_tooltip = wxT("When using EFB to RAM we very often need to decode RAM data to a VRAM texture, which is a very time-consuming task.\nWith this option enabled, we'll skip decoding a texture if it didn't change.\nThis results in a nice speedup, but possibly causes glitches.\nIf you have any problems with this option enabled you should either try increasing the safety of the texture cache or disable this option.\n(NOTE: The safier the texture cache is adjusted the lower the speedup will be; accurate texture cache set to \"safe\" might actually be slower!)"); wxString cache_efb_copies_tooltip = _("When using EFB to RAM we very often need to decode RAM data to a VRAM texture, which is a very time-consuming task.\nWith this option enabled, we'll skip decoding a texture if it didn't change.\nThis results in a nice speedup, but possibly causes glitches.\nIf you have any problems with this option enabled you should either try increasing the safety of the texture cache or disable this option.\n(NOTE: The safier the texture cache is adjusted the lower the speedup will be; accurate texture cache set to \"safe\" might actually be slower!)");
VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame) VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, const std::string& _ininame)
: wxDialog(parent, -1, : wxDialog(parent, -1,
wxString(wxT("Dolphin ")).append(wxString::FromAscii(title.c_str())).append(wxT(" Graphics Configuration")), wxString(wxT("Dolphin ")).append(wxString::FromAscii(title.c_str())).append(_(" Graphics Configuration")),
wxDefaultPosition, wxDefaultSize) wxDefaultPosition, wxDefaultSize)
, vconfig(g_Config) , vconfig(g_Config)
, ininame(_ininame) , ininame(_ininame)
@ -118,22 +118,22 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// -- GENERAL -- // -- GENERAL --
{ {
wxPanel* const page_general = new wxPanel(notebook, -1, wxDefaultPosition); wxPanel* const page_general = new wxPanel(notebook, -1, wxDefaultPosition);
notebook->AddPage(page_general, wxT("General")); notebook->AddPage(page_general, _("General"));
wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const szr_general = new wxBoxSizer(wxVERTICAL);
// - basic // - basic
{ {
wxStaticBoxSizer* const group_basic = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Basic")); wxStaticBoxSizer* const group_basic = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Basic"));
szr_general->Add(group_basic, 0, wxEXPAND | wxALL, 5); szr_general->Add(group_basic, 0, wxEXPAND | wxALL, 5);
wxFlexGridSizer* const szr_basic = new wxFlexGridSizer(2, 5, 5); wxFlexGridSizer* const szr_basic = new wxFlexGridSizer(2, 5, 5);
group_basic->Add(szr_basic, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_basic->Add(szr_basic, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
// graphics api // graphics api
//{ //{
//const wxString gfxapi_choices[] = { wxT("Software [not present]"), //const wxString gfxapi_choices[] = { _("Software [not present]"),
// wxT("OpenGL [broken]"), wxT("Direct3D 9 [broken]"), wxT("Direct3D 11") }; // _("OpenGL [broken]"), _("Direct3D 9 [broken]"), _("Direct3D 11") };
//szr_basic->Add(new wxStaticText(page_general, -1, wxT("Graphics API:")), 1, wxALIGN_CENTER_VERTICAL, 0); //szr_basic->Add(new wxStaticText(page_general, -1, _("Graphics API:")), 1, wxALIGN_CENTER_VERTICAL, 0);
//wxChoice* const choice_gfxapi = new SettingChoice(page_general, //wxChoice* const choice_gfxapi = new SettingChoice(page_general,
// g_gfxapi, sizeof(gfxapi_choices)/sizeof(*gfxapi_choices), gfxapi_choices); // g_gfxapi, sizeof(gfxapi_choices)/sizeof(*gfxapi_choices), gfxapi_choices);
//szr_basic->Add(choice_gfxapi, 1, 0, 0); //szr_basic->Add(choice_gfxapi, 1, 0, 0);
@ -143,7 +143,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// adapter // for D3D only // adapter // for D3D only
if (vconfig.backend_info.Adapters.size()) if (vconfig.backend_info.Adapters.size())
{ {
szr_basic->Add(new wxStaticText(page_general, -1, wxT("Adapter:")), 1, wxALIGN_CENTER_VERTICAL, 5); szr_basic->Add(new wxStaticText(page_general, -1, _("Adapter:")), 1, wxALIGN_CENTER_VERTICAL, 5);
wxChoice* const choice_adapter = new SettingChoice(page_general, vconfig.iAdapter, adapter_tooltip); wxChoice* const choice_adapter = new SettingChoice(page_general, vconfig.iAdapter, adapter_tooltip);
std::vector<std::string>::const_iterator std::vector<std::string>::const_iterator
@ -159,10 +159,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// aspect-ratio // aspect-ratio
{ {
const wxString ar_choices[] = { wxT("Auto [recommended]"), const wxString ar_choices[] = { _("Auto [recommended]"),
wxT("Force 16:9"), wxT("Force 4:3"), wxT("Strech to Window") }; _("Force 16:9"), _("Force 4:3"), _("Strech to Window") };
szr_basic->Add(new wxStaticText(page_general, -1, wxT("Aspect ratio:")), 1, wxALIGN_CENTER_VERTICAL, 0); szr_basic->Add(new wxStaticText(page_general, -1, _("Aspect ratio:")), 1, wxALIGN_CENTER_VERTICAL, 0);
wxChoice* const choice_aspect = new SettingChoice(page_general, wxChoice* const choice_aspect = new SettingChoice(page_general,
vconfig.iAspectRatio, ar_tooltip, sizeof(ar_choices)/sizeof(*ar_choices), ar_choices); vconfig.iAspectRatio, ar_tooltip, sizeof(ar_choices)/sizeof(*ar_choices), ar_choices);
szr_basic->Add(choice_aspect, 1, 0, 0); szr_basic->Add(choice_aspect, 1, 0, 0);
@ -171,24 +171,24 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// widescreen hack // widescreen hack
{ {
szr_basic->AddStretchSpacer(1); szr_basic->AddStretchSpacer(1);
szr_basic->Add(new SettingCheckBox(page_general, wxT("Widescreen Hack"), ws_hack_tooltip, vconfig.bWidescreenHack), 1, 0, 0); szr_basic->Add(new SettingCheckBox(page_general, _("Widescreen Hack"), ws_hack_tooltip, vconfig.bWidescreenHack), 1, 0, 0);
szr_basic->AddStretchSpacer(1); szr_basic->AddStretchSpacer(1);
szr_basic->Add(new SettingCheckBox(page_general, wxT("V-Sync"), vsync_tooltip, vconfig.bVSync), 1, 0, 0); szr_basic->Add(new SettingCheckBox(page_general, _("V-Sync"), vsync_tooltip, vconfig.bVSync), 1, 0, 0);
} }
// enhancements // enhancements
{ {
wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("Enhancements")); wxStaticBoxSizer* const group_enh = new wxStaticBoxSizer(wxVERTICAL, page_general, _("Enhancements"));
szr_general->Add(group_enh, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_general->Add(group_enh, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
wxFlexGridSizer* const szr_enh = new wxFlexGridSizer(2, 5, 5); wxFlexGridSizer* const szr_enh = new wxFlexGridSizer(2, 5, 5);
group_enh->Add(szr_enh, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_enh->Add(szr_enh, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
szr_enh->Add(new wxStaticText(page_general, -1, wxT("Anisotropic Filtering:")), 1, wxALIGN_CENTER_VERTICAL, 0); szr_enh->Add(new wxStaticText(page_general, -1, _("Anisotropic Filtering:")), 1, wxALIGN_CENTER_VERTICAL, 0);
const wxString af_choices[] = {wxT("1x"), wxT("2x"), wxT("4x"), wxT("8x"), wxT("16x")}; const wxString af_choices[] = {wxT("1x"), wxT("2x"), wxT("4x"), wxT("8x"), wxT("16x")};
szr_enh->Add(new SettingChoice(page_general, vconfig.iMaxAnisotropy, af_tooltip, 5, af_choices)); szr_enh->Add(new SettingChoice(page_general, vconfig.iMaxAnisotropy, af_tooltip, 5, af_choices));
wxStaticText* const text_aamode = new wxStaticText(page_general, -1, wxT("Anti-Aliasing:")); wxStaticText* const text_aamode = new wxStaticText(page_general, -1, _("Anti-Aliasing:"));
szr_enh->Add(text_aamode, 1, wxALIGN_CENTER_VERTICAL, 0); szr_enh->Add(text_aamode, 1, wxALIGN_CENTER_VERTICAL, 0);
SettingChoice* const choice_aamode = new SettingChoice(page_general, vconfig.iMultisampleMode, aa_tooltip); SettingChoice* const choice_aamode = new SettingChoice(page_general, vconfig.iMultisampleMode, aa_tooltip);
@ -208,43 +208,43 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
szr_enh->Add(choice_aamode); szr_enh->Add(choice_aamode);
szr_enh->Add(new SettingCheckBox(page_general, wxT("Load Native Mipmaps"), native_mips_tooltip, vconfig.bUseNativeMips)); szr_enh->Add(new SettingCheckBox(page_general, _("Load Native Mipmaps"), native_mips_tooltip, vconfig.bUseNativeMips));
szr_enh->Add(new SettingCheckBox(page_general, wxT("EFB Scaled Copy"), scaled_efb_copy_tooltip, vconfig.bCopyEFBScaled)); szr_enh->Add(new SettingCheckBox(page_general, _("EFB Scaled Copy"), scaled_efb_copy_tooltip, vconfig.bCopyEFBScaled));
szr_enh->Add(new SettingCheckBox(page_general, wxT("Pixel Lighting"), pixel_lighting_tooltip, vconfig.bEnablePixelLigting)); szr_enh->Add(new SettingCheckBox(page_general, _("Pixel Lighting"), pixel_lighting_tooltip, vconfig.bEnablePixelLigting));
szr_enh->Add(new SettingCheckBox(page_general, wxT("Pixel Depth"), pixel_depth_tooltip, vconfig.bEnablePerPixelDepth)); szr_enh->Add(new SettingCheckBox(page_general, _("Pixel Depth"), pixel_depth_tooltip, vconfig.bEnablePerPixelDepth));
szr_enh->Add(new SettingCheckBox(page_general, wxT("Force Bi/Trilinear Filtering"), force_filtering_tooltip, vconfig.bForceFiltering)); szr_enh->Add(new SettingCheckBox(page_general, _("Force Bi/Trilinear Filtering"), force_filtering_tooltip, vconfig.bForceFiltering));
if (vconfig.backend_info.bSupports3DVision) if (vconfig.backend_info.bSupports3DVision)
{ {
szr_enh->Add(new SettingCheckBox(page_general, wxT("3D Vision (Requires Fullscreen)"), _3d_vision_tooltip, vconfig.b3DVision)); szr_enh->Add(new SettingCheckBox(page_general, _("3D Vision (Requires Fullscreen)"), _3d_vision_tooltip, vconfig.b3DVision));
} }
} }
// - EFB // - EFB
{ {
wxStaticBoxSizer* const group_efb = new wxStaticBoxSizer(wxVERTICAL, page_general, wxT("EFB")); wxStaticBoxSizer* const group_efb = new wxStaticBoxSizer(wxVERTICAL, page_general, _("EFB"));
szr_general->Add(group_efb, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_general->Add(group_efb, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
// EFB scale // EFB scale
{ {
wxBoxSizer* const efb_scale_szr = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const efb_scale_szr = new wxBoxSizer(wxHORIZONTAL);
// TODO: give this a label (?) // TODO: give this a label (?)
const wxString efbscale_choices[] = { wxT("Fractional"), wxT("Integral [recommended]"), const wxString efbscale_choices[] = { _("Fractional"), _("Integral [recommended]"),
wxT("1x"), wxT("2x"), wxT("3x"), wxT("0.75x"), wxT("0.5x"), wxT("0.375x") }; wxT("1x"), wxT("2x"), wxT("3x"), wxT("0.75x"), wxT("0.5x"), wxT("0.375x") };
wxChoice *const choice_efbscale = new SettingChoice(page_general, wxChoice *const choice_efbscale = new SettingChoice(page_general,
vconfig.iEFBScale, internal_res_tooltip, sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices); vconfig.iEFBScale, internal_res_tooltip, sizeof(efbscale_choices)/sizeof(*efbscale_choices), efbscale_choices);
efb_scale_szr->Add(new wxStaticText(page_general, -1, wxT("Scale:")), 0, wxALIGN_CENTER_VERTICAL, 5); efb_scale_szr->Add(new wxStaticText(page_general, -1, _("Scale:")), 0, wxALIGN_CENTER_VERTICAL, 5);
//efb_scale_szr->AddStretchSpacer(1); //efb_scale_szr->AddStretchSpacer(1);
efb_scale_szr->Add(choice_efbscale, 0, wxBOTTOM | wxLEFT, 5); efb_scale_szr->Add(choice_efbscale, 0, wxBOTTOM | wxLEFT, 5);
group_efb->Add(efb_scale_szr, 0, wxBOTTOM | wxLEFT, 5); group_efb->Add(efb_scale_szr, 0, wxBOTTOM | wxLEFT, 5);
} }
group_efb->Add(new SettingCheckBox(page_general, wxT("Enable CPU Access"), efb_access_tooltip, vconfig.bEFBAccessEnable), 0, wxBOTTOM | wxLEFT, 5); group_efb->Add(new SettingCheckBox(page_general, _("Enable CPU Access"), efb_access_tooltip, vconfig.bEFBAccessEnable), 0, wxBOTTOM | wxLEFT, 5);
SettingCheckBox *emulate_efb_format_changes = new SettingCheckBox(page_general, wxT("Emulate format changes"), efb_emulate_format_changes_tooltip, vconfig.bEFBEmulateFormatChanges); SettingCheckBox *emulate_efb_format_changes = new SettingCheckBox(page_general, _("Emulate format changes"), efb_emulate_format_changes_tooltip, vconfig.bEFBEmulateFormatChanges);
group_efb->Add(emulate_efb_format_changes, 0, wxBOTTOM | wxLEFT, 5); group_efb->Add(emulate_efb_format_changes, 0, wxBOTTOM | wxLEFT, 5);
if (!vconfig.backend_info.bSupportsFormatReinterpretation) if (!vconfig.backend_info.bSupportsFormatReinterpretation)
@ -254,16 +254,16 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
} }
// EFB copy // EFB copy
wxStaticBoxSizer* const group_efbcopy = new wxStaticBoxSizer(wxHORIZONTAL, page_general, wxT("Copy")); wxStaticBoxSizer* const group_efbcopy = new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Copy"));
group_efb->Add(group_efbcopy, 0, wxEXPAND | wxBOTTOM, 5); group_efb->Add(group_efbcopy, 0, wxEXPAND | wxBOTTOM, 5);
SettingCheckBox* efbcopy_enable = new SettingCheckBox(page_general, wxT("Enable"), efb_copy_tooltip, vconfig.bEFBCopyEnable); SettingCheckBox* efbcopy_enable = new SettingCheckBox(page_general, _("Enable"), efb_copy_tooltip, vconfig.bEFBCopyEnable);
_connect_macro_(efbcopy_enable, VideoConfigDiag::Event_EfbCopy, wxEVT_COMMAND_CHECKBOX_CLICKED, this); _connect_macro_(efbcopy_enable, VideoConfigDiag::Event_EfbCopy, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
efbcopy_texture = new SettingRadioButton(page_general, wxT("Texture"), efb_copy_texture_tooltip, vconfig.bCopyEFBToTexture, false, wxRB_GROUP); efbcopy_texture = new SettingRadioButton(page_general, _("Texture"), efb_copy_texture_tooltip, vconfig.bCopyEFBToTexture, false, wxRB_GROUP);
_connect_macro_(efbcopy_texture, VideoConfigDiag::Event_EfbCopyToTexture, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); _connect_macro_(efbcopy_texture, VideoConfigDiag::Event_EfbCopyToTexture, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
efbcopy_ram = new SettingRadioButton(page_general, wxT("RAM"), efb_copy_ram_tooltip, vconfig.bCopyEFBToTexture, true); efbcopy_ram = new SettingRadioButton(page_general, _("RAM"), efb_copy_ram_tooltip, vconfig.bCopyEFBToTexture, true);
_connect_macro_(efbcopy_ram, VideoConfigDiag::Event_EfbCopyToRam, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); _connect_macro_(efbcopy_ram, VideoConfigDiag::Event_EfbCopyToRam, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
cache_efb_copies = new SettingCheckBox(page_general, wxT("Enable cache"), cache_efb_copies_tooltip, vconfig.bEFBCopyCacheEnable); cache_efb_copies = new SettingCheckBox(page_general, _("Enable cache"), cache_efb_copies_tooltip, vconfig.bEFBCopyCacheEnable);
group_efbcopy->Add(efbcopy_enable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5); group_efbcopy->Add(efbcopy_enable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
group_efbcopy->AddStretchSpacer(1); group_efbcopy->AddStretchSpacer(1);
group_efbcopy->Add(efbcopy_texture, 0, wxRIGHT, 5); group_efbcopy->Add(efbcopy_texture, 0, wxRIGHT, 5);
@ -289,26 +289,26 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// - safe texture cache // - safe texture cache
{ {
wxStaticBoxSizer* const group_safetex = new wxStaticBoxSizer(wxHORIZONTAL, page_general, wxT("Accurate texture cache")); wxStaticBoxSizer* const group_safetex = new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Accurate texture cache"));
szr_general->Add(group_safetex, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_general->Add(group_safetex, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
SettingCheckBox* stc_enable = new SettingCheckBox(page_general, wxT("Enable"), stc_tooltip, vconfig.bSafeTextureCache); SettingCheckBox* stc_enable = new SettingCheckBox(page_general, _("Enable"), stc_tooltip, vconfig.bSafeTextureCache);
_connect_macro_(stc_enable, VideoConfigDiag::Event_Stc, wxEVT_COMMAND_CHECKBOX_CLICKED, this); _connect_macro_(stc_enable, VideoConfigDiag::Event_Stc, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
group_safetex->Add(stc_enable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5); group_safetex->Add(stc_enable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
group_safetex->AddStretchSpacer(1); group_safetex->AddStretchSpacer(1);
stc_safe = new wxRadioButton(page_general, -1, wxT("Safe"), stc_safe = new wxRadioButton(page_general, -1, _("Safe"),
wxDefaultPosition, wxDefaultSize, wxRB_GROUP); wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
stc_safe->SetToolTip(stc_speed_tooltip); stc_safe->SetToolTip(stc_speed_tooltip);
_connect_macro_(stc_safe, VideoConfigDiag::Event_StcSafe, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); _connect_macro_(stc_safe, VideoConfigDiag::Event_StcSafe, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
group_safetex->Add(stc_safe, 0, wxRIGHT, 5); group_safetex->Add(stc_safe, 0, wxRIGHT, 5);
stc_normal = new wxRadioButton(page_general, -1, wxT("Normal")); stc_normal = new wxRadioButton(page_general, -1, _("Normal"));
stc_normal->SetToolTip(stc_speed_tooltip); stc_normal->SetToolTip(stc_speed_tooltip);
_connect_macro_(stc_normal, VideoConfigDiag::Event_StcNormal, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); _connect_macro_(stc_normal, VideoConfigDiag::Event_StcNormal, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
group_safetex->Add(stc_normal, 0, wxRIGHT, 5); group_safetex->Add(stc_normal, 0, wxRIGHT, 5);
stc_fast = new wxRadioButton(page_general, -1, wxT("Fast")); stc_fast = new wxRadioButton(page_general, -1, _("Fast"));
stc_fast->SetToolTip(stc_speed_tooltip); stc_fast->SetToolTip(stc_speed_tooltip);
_connect_macro_(stc_fast, VideoConfigDiag::Event_StcFast, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this); _connect_macro_(stc_fast, VideoConfigDiag::Event_StcFast, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
group_safetex->Add(stc_fast, 0, wxRIGHT, 5); group_safetex->Add(stc_fast, 0, wxRIGHT, 5);
@ -339,47 +339,47 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// -- ADVANCED -- // -- ADVANCED --
{ {
wxPanel* const page_advanced = new wxPanel(notebook, -1, wxDefaultPosition); wxPanel* const page_advanced = new wxPanel(notebook, -1, wxDefaultPosition);
notebook->AddPage(page_advanced, wxT("Advanced")); notebook->AddPage(page_advanced, _("Advanced"));
wxBoxSizer* const szr_advanced = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const szr_advanced = new wxBoxSizer(wxVERTICAL);
// - rendering // - rendering
{ {
wxStaticBoxSizer* const group_rendering = new wxStaticBoxSizer(wxVERTICAL, page_advanced, wxT("Rendering")); wxStaticBoxSizer* const group_rendering = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Rendering"));
szr_advanced->Add(group_rendering, 0, wxEXPAND | wxALL, 5); szr_advanced->Add(group_rendering, 0, wxEXPAND | wxALL, 5);
wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5); wxGridSizer* const szr_rendering = new wxGridSizer(2, 5, 5);
group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_rendering->Add(szr_rendering, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
szr_rendering->Add(new SettingCheckBox(page_advanced, wxT("Enable Wireframe"), wireframe_tooltip, vconfig.bWireFrame)); szr_rendering->Add(new SettingCheckBox(page_advanced, _("Enable Wireframe"), wireframe_tooltip, vconfig.bWireFrame));
szr_rendering->Add(new SettingCheckBox(page_advanced, wxT("Disable Lighting"), disable_lighting_tooltip, vconfig.bDisableLighting)); szr_rendering->Add(new SettingCheckBox(page_advanced, _("Disable Lighting"), disable_lighting_tooltip, vconfig.bDisableLighting));
szr_rendering->Add(new SettingCheckBox(page_advanced, wxT("Disable Textures"), disable_textures_tooltip, vconfig.bDisableTexturing)); szr_rendering->Add(new SettingCheckBox(page_advanced, _("Disable Textures"), disable_textures_tooltip, vconfig.bDisableTexturing));
szr_rendering->Add(new SettingCheckBox(page_advanced, wxT("Disable Fog"), disable_fog_tooltip, vconfig.bDisableFog)); szr_rendering->Add(new SettingCheckBox(page_advanced, _("Disable Fog"), disable_fog_tooltip, vconfig.bDisableFog));
szr_rendering->Add(new SettingCheckBox(page_advanced, wxT("Disable Dest. Alpha Pass"), disable_alphapass_tooltip, vconfig.bDstAlphaPass)); szr_rendering->Add(new SettingCheckBox(page_advanced, _("Disable Dest. Alpha Pass"), disable_alphapass_tooltip, vconfig.bDstAlphaPass));
} }
// - info // - info
{ {
wxStaticBoxSizer* const group_info = new wxStaticBoxSizer(wxVERTICAL, page_advanced, wxT("Information")); wxStaticBoxSizer* const group_info = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Information"));
szr_advanced->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_advanced->Add(group_info, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5); wxGridSizer* const szr_info = new wxGridSizer(2, 5, 5);
group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_info->Add(szr_info, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
szr_info->Add(new SettingCheckBox(page_advanced, wxT("Show FPS"), show_fps_tooltip, vconfig.bShowFPS)); szr_info->Add(new SettingCheckBox(page_advanced, _("Show FPS"), show_fps_tooltip, vconfig.bShowFPS));
szr_info->Add(new SettingCheckBox(page_advanced, wxT("Various Statistics"), show_stats_tooltip, vconfig.bOverlayStats)); szr_info->Add(new SettingCheckBox(page_advanced, _("Various Statistics"), show_stats_tooltip, vconfig.bOverlayStats));
szr_info->Add(new SettingCheckBox(page_advanced, wxT("Projection Stats"), proj_stats_tooltip, vconfig.bOverlayProjStats)); szr_info->Add(new SettingCheckBox(page_advanced, _("Projection Stats"), proj_stats_tooltip, vconfig.bOverlayProjStats));
szr_info->Add(new SettingCheckBox(page_advanced, wxT("Texture Format"), texfmt_tooltip, vconfig.bTexFmtOverlayEnable)); szr_info->Add(new SettingCheckBox(page_advanced, _("Texture Format"), texfmt_tooltip, vconfig.bTexFmtOverlayEnable));
szr_info->Add(new SettingCheckBox(page_advanced, wxT("EFB Copy Regions"), efb_copy_regions_tooltip, vconfig.bShowEFBCopyRegions)); szr_info->Add(new SettingCheckBox(page_advanced, _("EFB Copy Regions"), efb_copy_regions_tooltip, vconfig.bShowEFBCopyRegions));
szr_info->Add(new SettingCheckBox(page_advanced, wxT("Show Shader Errors"), wxT(""), vconfig.bShowShaderErrors)); szr_info->Add(new SettingCheckBox(page_advanced, _("Show Shader Errors"), wxT(""), vconfig.bShowShaderErrors));
} }
// - XFB // - XFB
{ {
wxStaticBoxSizer* const group_xfb = new wxStaticBoxSizer(wxHORIZONTAL, page_advanced, wxT("XFB")); wxStaticBoxSizer* const group_xfb = new wxStaticBoxSizer(wxHORIZONTAL, page_advanced, _("XFB"));
szr_advanced->Add(group_xfb, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_advanced->Add(group_xfb, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
SettingCheckBox* enable_xfb = new SettingCheckBox(page_advanced, wxT("Enable"), xfb_tooltip, vconfig.bUseXFB); SettingCheckBox* enable_xfb = new SettingCheckBox(page_advanced, _("Enable"), xfb_tooltip, vconfig.bUseXFB);
_connect_macro_(enable_xfb, VideoConfigDiag::Event_Xfb, wxEVT_COMMAND_CHECKBOX_CLICKED, this); _connect_macro_(enable_xfb, VideoConfigDiag::Event_Xfb, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
virtual_xfb = new SettingRadioButton(page_advanced, wxT("Virtual"), xfb_tooltip, vconfig.bUseRealXFB, true, wxRB_GROUP); virtual_xfb = new SettingRadioButton(page_advanced, _("Virtual"), xfb_tooltip, vconfig.bUseRealXFB, true, wxRB_GROUP);
real_xfb = new SettingRadioButton(page_advanced, wxT("Real"), xfb_tooltip, vconfig.bUseRealXFB); real_xfb = new SettingRadioButton(page_advanced, _("Real"), xfb_tooltip, vconfig.bUseRealXFB);
group_xfb->Add(enable_xfb, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5); group_xfb->Add(enable_xfb, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
group_xfb->AddStretchSpacer(1); group_xfb->AddStretchSpacer(1);
group_xfb->Add(virtual_xfb, 0, wxRIGHT, 5); group_xfb->Add(virtual_xfb, 0, wxRIGHT, 5);
@ -402,34 +402,34 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// - utility // - utility
{ {
wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_advanced, wxT("Utility")); wxStaticBoxSizer* const group_utility = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Utility"));
szr_advanced->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_advanced->Add(group_utility, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5); wxGridSizer* const szr_utility = new wxGridSizer(2, 5, 5);
group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_utility->Add(szr_utility, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
szr_utility->Add(new SettingCheckBox(page_advanced, wxT("Dump Textures"), dump_textures_tooltip, vconfig.bDumpTextures)); szr_utility->Add(new SettingCheckBox(page_advanced, _("Dump Textures"), dump_textures_tooltip, vconfig.bDumpTextures));
szr_utility->Add(new SettingCheckBox(page_advanced, wxT("Load Hi-Res Textures"), load_hires_textures_tooltip, vconfig.bHiresTextures)); szr_utility->Add(new SettingCheckBox(page_advanced, _("Load Hi-Res Textures"), load_hires_textures_tooltip, vconfig.bHiresTextures));
szr_utility->Add(new SettingCheckBox(page_advanced, wxT("Dump EFB Target"), dump_efb_tooltip, vconfig.bDumpEFBTarget)); szr_utility->Add(new SettingCheckBox(page_advanced, _("Dump EFB Target"), dump_efb_tooltip, vconfig.bDumpEFBTarget));
szr_utility->Add(new SettingCheckBox(page_advanced, wxT("Dump Frames"), dump_frames_tooltip, vconfig.bDumpFrames)); szr_utility->Add(new SettingCheckBox(page_advanced, _("Dump Frames"), dump_frames_tooltip, vconfig.bDumpFrames));
szr_utility->Add(new SettingCheckBox(page_advanced, wxT("Free Look"), free_look_tooltip, vconfig.bFreeLook)); szr_utility->Add(new SettingCheckBox(page_advanced, _("Free Look"), free_look_tooltip, vconfig.bFreeLook));
} }
// - misc // - misc
{ {
wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_advanced, wxT("Misc")); wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Misc"));
szr_advanced->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); szr_advanced->Add(group_misc, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5); wxFlexGridSizer* const szr_misc = new wxFlexGridSizer(2, 5, 5);
group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); group_misc->Add(szr_misc, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
szr_misc->Add(new SettingCheckBox(page_advanced, wxT("Crop"), crop_tooltip, vconfig.bCrop)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Crop"), crop_tooltip, vconfig.bCrop));
szr_misc->Add(new SettingCheckBox(page_advanced, wxT("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL));
szr_misc->Add(new SettingCheckBox(page_advanced, wxT("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable));
szr_misc->Add(new SettingCheckBox(page_advanced, wxT("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey)); szr_misc->Add(new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey));
// postproc shader // postproc shader
if (vconfig.backend_info.PPShaders.size()) if (vconfig.backend_info.PPShaders.size())
{ {
szr_misc->Add(new wxStaticText(page_advanced, -1, wxT("Post-Processing Shader:")), 1, wxALIGN_CENTER_VERTICAL, 0); szr_misc->Add(new wxStaticText(page_advanced, -1, _("Post-Processing Shader:")), 1, wxALIGN_CENTER_VERTICAL, 0);
wxChoice *const choice_ppshader = new wxChoice(page_advanced, -1, wxDefaultPosition); wxChoice *const choice_ppshader = new wxChoice(page_advanced, -1, wxDefaultPosition);
choice_ppshader->SetToolTip(ppshader_tooltip); choice_ppshader->SetToolTip(ppshader_tooltip);
@ -456,7 +456,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
page_advanced->SetSizerAndFit(szr_advanced); page_advanced->SetSizerAndFit(szr_advanced);
} }
wxButton* const btn_close = new wxButton(this, -1, wxT("Close"), wxDefaultPosition); wxButton* const btn_close = new wxButton(this, -1, _("Close"), wxDefaultPosition);
_connect_macro_(btn_close, VideoConfigDiag::Event_ClickClose, wxEVT_COMMAND_BUTTON_CLICKED, this); _connect_macro_(btn_close, VideoConfigDiag::Event_ClickClose, wxEVT_COMMAND_BUTTON_CLICKED, this);
Connect(-1, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VideoConfigDiag::Event_Close), (wxObject*)0, this); Connect(-1, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VideoConfigDiag::Event_Close), (wxObject*)0, this);

13
Source/Dolphin.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
@ -259,6 +259,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoUICommon", "Core\Video
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcproj", "{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -653,6 +655,15 @@ Global
{56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|Win32.Build.0 = Release|Win32 {56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|Win32.Build.0 = Release|Win32
{56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|x64.ActiveCfg = Release|x64 {56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|x64.ActiveCfg = Release|x64
{56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|x64.Build.0 = Release|x64 {56C4B06E-F2C9-4729-A15A-DD327A9AA465}.Release|x64.Build.0 = Release|x64
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.ActiveCfg = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.Build.0 = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.ActiveCfg = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.ActiveCfg = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.Build.0 = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.ActiveCfg = Debug|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.ActiveCfg = Release|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.Build.0 = Release|Win32
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE