From 4c3e22e83134359b4c32a373359d9e182421529f Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Tue, 28 Dec 2010 04:14:47 +0000 Subject: [PATCH] * Solution file updates for zzogl (adds needed dependencies) * A couple i18n fixes listed in Issue 915, relating to dialog message formatting for a couple specific messages. DevNote: * Added some missing operator+() stuff for the pxsFmt string formatter. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4160 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/Utilities/StringHelpers.h | 2 ++ common/src/Utilities/FastFormatString.cpp | 14 +++++++++++++- pcsx2/gui/AppInit.cpp | 4 ++-- pcsx2/gui/AppMain.cpp | 9 ++++----- pcsx2/gui/MainMenuClicks.cpp | 2 +- pcsx2/gui/Panels/PluginSelectorPanel.cpp | 6 +++--- pcsx2/gui/i18n.cpp | 5 ++++- pcsx2_suite_2008.sln | 4 ++++ 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/common/include/Utilities/StringHelpers.h b/common/include/Utilities/StringHelpers.h index 53dc226c6..d2c3344b3 100644 --- a/common/include/Utilities/StringHelpers.h +++ b/common/include/Utilities/StringHelpers.h @@ -227,6 +227,8 @@ extern bool pxParseAssignmentString( const wxString& src, wxString& ldest, wxStr extern wxString& operator+=(wxString& str1, const FastFormatUnicode& str2); extern wxString operator+(const wxString& str1, const FastFormatUnicode& str2); extern wxString operator+(const wxChar* str1, const FastFormatUnicode& str2); +extern wxString operator+(const FastFormatUnicode& str1, const wxString& str2); +extern wxString operator+(const FastFormatUnicode& str1, const wxChar* str2); ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/common/src/Utilities/FastFormatString.cpp b/common/src/Utilities/FastFormatString.cpp index 2aef1d00e..a87d075af 100644 --- a/common/src/Utilities/FastFormatString.cpp +++ b/common/src/Utilities/FastFormatString.cpp @@ -334,7 +334,6 @@ wxString operator+(const wxString& str1, const FastFormatUnicode& str2) { wxString s = str1; s += str2; - return s; } @@ -342,7 +341,20 @@ wxString operator+(const wxChar* str1, const FastFormatUnicode& str2) { wxString s = str1; s += str2; + return s; +} +wxString operator+(const FastFormatUnicode& str1, const wxString& str2) +{ + wxString s = str2; + s += str1; + return s; +} + +wxString operator+(const FastFormatUnicode& str1, const wxChar* str2) +{ + wxString s = str2; + s += str1; return s; } diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 1def159e2..e9dcc8446 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -623,7 +623,7 @@ bool Pcsx2App::OnInit() } catch( Exception::HardwareDeficiency& ex ) { - Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(_("\n\nPress OK to close %s.")), _("PCSX2 Error: Hardware Deficiency") ); + Msgbox::Alert( ex.FormatDisplayMessage() + L"\n\n" + AddAppName(_("Press OK to close %s.")), _("PCSX2 Error: Hardware Deficiency") ); CleanupOnExit(); return false; } @@ -635,7 +635,7 @@ bool Pcsx2App::OnInit() catch( Exception::RuntimeError& ex ) { Console.Error( ex.FormatDiagnosticMessage() ); - Msgbox::Alert( ex.FormatDisplayMessage() + AddAppName(_("\n\nPress OK to close %s.")), + Msgbox::Alert( ex.FormatDisplayMessage() + L"\n\n" + AddAppName(_("Press OK to close %s.")), AddAppName(_("%s Critical Error")), wxICON_ERROR ); CleanupOnExit(); return false; diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 2f6890bfa..2e93d50ef 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -481,10 +481,9 @@ void Pcsx2App::OnEmuKeyDown( wxKeyEvent& evt ) wxString BIOS_GetMsg_Required() { return pxE( "!Notice:BiosDumpRequired", - L"\n\n" - L"PCSX2 requires a PS2 BIOS in order to run. For legal reasons, you *must* obtain \n" - L"a BIOS from an actual PS2 unit that you own (borrowing doesn't count).\n" - L"Please consult the FAQs and Guides for further instructions.\n" + L"PCSX2 requires a PS2 BIOS in order to run. For legal reasons, you *must* obtain " + L"a BIOS from an actual PS2 unit that you own (borrowing doesn't count). " + L"Please consult the FAQs and Guides for further instructions." ); } @@ -509,7 +508,7 @@ void Pcsx2App::HandleEvent(wxEvtHandler* handler, wxEventFunction func, wxEvent& catch( Exception::BiosLoadFailed& ex ) { wxDialogWithHelpers dialog( NULL, _("PS2 BIOS Error") ); - dialog += dialog.Heading( ex.FormatDisplayMessage() + BIOS_GetMsg_Required() + _("\nPress Ok to go to the BIOS Configuration Panel.") ); + dialog += dialog.Heading( ex.FormatDisplayMessage() + L"\n\n" + BIOS_GetMsg_Required() + L"\n\n" + _("Press Ok to go to the BIOS Configuration Panel.") ); dialog += new ModalButtonPanel( &dialog, MsgButtons().OKCancel() ); if( dialog.ShowModal() == wxID_CANCEL ) diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index fde9628bb..dc7fb0c5d 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -316,7 +316,7 @@ void MainEmuFrame::_DoBootCdvd() wxDialogWithHelpers dialog( this, _("ISO file not found!") ); dialog += dialog.Heading( - _("An error occurred while trying to open the file:\n\n") + g_Conf->CurrentIso + L"\n\n" + + _("An error occurred while trying to open the file:") + wxString(L"\n\n") + g_Conf->CurrentIso + L"\n\n" + _("Error: The configured ISO file does not exist. Click OK to select a new ISO source for CDVD.") ); diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp index 0f81c66da..f2156c438 100644 --- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp +++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp @@ -478,8 +478,8 @@ void Panels::PluginSelectorPanel::Apply() wxString plugname( pi->GetShortname() ); throw Exception::CannotApplySettings( this ) - .SetDiagMsg(wxsFormat( L"PluginSelectorPanel: Invalid or missing selection for the %s plugin.", plugname.c_str()) ) - .SetUserMsg(wxsFormat( L"Please select a valid plugin for the %s.", plugname.c_str() ) + L"\n\n" + GetApplyFailedMsg() ); + .SetDiagMsg(pxsFmt( L"PluginSelectorPanel: Invalid or missing selection for the %s plugin.", plugname.c_str()) ) + .SetUserMsg(pxsFmt( L"Please select a valid plugin for the %s.", plugname.c_str() ) + L"\n\n" + GetApplyFailedMsg() ); } g_Conf->BaseFilenames.Plugins[pid] = GetFilename((int)m_ComponentBoxes->Get(pid).GetClientData(sel)); @@ -516,7 +516,7 @@ void Panels::PluginSelectorPanel::Apply() throw Exception::CannotApplySettings( this ) .SetDiagMsg(ex.FormatDiagnosticMessage()) - .SetUserMsg(wxsFormat( + .SetUserMsg(pxsFmt( _("The selected %s plugin failed to load.\n\nReason: %s\n\n"), plugname.c_str(), ex.FormatDisplayMessage().c_str() ) + GetApplyFailedMsg()); diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index f52c4b983..9261befb5 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -219,7 +219,10 @@ bool i18n_SetLanguage( wxLanguage wxLangId, const wxString& langCode ) { L"pcsx2_Main", L"pcsx2_Iconized", - L"pcsx2_Tertiary" + L"pcsx2_Tertiary", +#ifdef PCSX2_DEVBUILD + L"pcsx2_devel" +#endif }; bool foundone = false; diff --git a/pcsx2_suite_2008.sln b/pcsx2_suite_2008.sln index 2dd6ffd2e..0ee8efae1 100644 --- a/pcsx2_suite_2008.sln +++ b/pcsx2_suite_2008.sln @@ -156,9 +156,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "3rdparty\porta EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZZOgl", "plugins\zzogl-pg\opengl\Win32\zerogsogl_2008.vcproj", "{2D4E85B2-F47F-4D65-B091-701E5C031DAC}" ProjectSection(ProjectDependencies) = postProject + {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {4639972E-424E-4E13-8B07-CA403C481346} = {4639972E-424E-4E13-8B07-CA403C481346} {BC236261-77E8-4567-8D09-45CD02965EB6} = {BC236261-77E8-4567-8D09-45CD02965EB6} + {26511268-2902-4997-8421-ECD7055F9E28} = {26511268-2902-4997-8421-ECD7055F9E28} {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} + {C34487AF-228A-4D11-8E50-27803DF76873} = {C34487AF-228A-4D11-8E50-27803DF76873} + {7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86} = {7E9B2BE7-CEC3-4F14-847B-0AB8D562FB86} EndProjectSection EndProject Global