From 6a24e30e7806553a3ceecbf73bea27247445078f Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Mon, 24 May 2010 12:41:56 +0000 Subject: [PATCH] Changed some descriptions. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3069 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppInit.cpp | 19 +++++++++---------- pcsx2/gui/ConsoleLogger.cpp | 2 +- pcsx2/gui/MainFrame.cpp | 2 +- pcsx2/gui/Panels/MiscPanelStuff.cpp | 2 +- pcsx2/gui/Panels/SpeedhacksPanel.cpp | 12 ++++++------ 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 0acd78b42a..2d9dffd643 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -124,22 +124,21 @@ void Pcsx2App::ReadUserModeSettings() if( forceWiz ) { - // Pre-Alpha Warning! Why didn't I think to add this sooner?! + // Beta Warning! if( !hasGroup ) { - wxDialogWithHelpers preAlpha( NULL, _("It might devour your kittens! - PCSX2 0.9.7 Pre-Alpha"), wxVERTICAL ); + wxDialogWithHelpers beta( NULL, _("PCSX2 0.9.7 Beta"), wxVERTICAL ); - preAlpha.SetSizer( new wxBoxSizer( wxVERTICAL ) ); - preAlpha += new pxStaticText( &preAlpha, - L"NOTICE!! This is a *PRE-ALPHA* developer build of PCSX2 0.9.7. We are in the middle of major rewrites of the " - L"user interface, and many parts of the program have *NOT* been implemented yet. Options will be missing. " - L"Some things may crash or hang without warning. Other things will seem plainly stupid and the product of incompetent " - L"programmers. This is normal. We're working on it.\n\nYou have been warned!", wxALIGN_CENTER + beta.SetSizer( new wxBoxSizer( wxVERTICAL ) ); + beta += new pxStaticText( &beta, + L"This is a *Beta* build of PCSX2 0.9.7. We are in the middle of major rewrites of the " + L"user interface, and some parts of the program have *NOT* been implemented yet. Options will be missing. " + L"Some things may crash or hang without warning.", wxALIGN_CENTER ); - preAlpha += new wxButton( &preAlpha, wxID_OK ) | pxSizerFlags::StdCenter(); - preAlpha.ShowModal(); + beta += new wxButton( &beta, wxID_OK ) | pxSizerFlags::StdCenter(); + beta.ShowModal(); } // first time startup, so give the user the choice of user mode: diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index fa74046e61..218559c27a 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -280,7 +280,7 @@ ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, A menuLog.Append(wxID_CLEAR, _("C&lear"), _("Clear the log window contents")); menuLog.AppendSeparator(); menuLog.AppendSubMenu( &menuAppear, _("Appearance") ); - menuLog.Append(wxID_ANY, _("Show Legend"), _("Displays the console color legend.") ); + menuLog.Append(wxID_ANY, _("Show Legend (unimplemented)"), _("Displays the console color legend.") ); menuLog.AppendSeparator(); menuLog.Append(wxID_CLOSE, _("&Close"), _("Close this log window; contents are preserved")); diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index d0d9f15717..db5c699527 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -424,7 +424,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) m_menuConfig.Append(MenuId_Config_FireWire, _("Firewire"), m_PluginMenuPacks[PluginId_FW]); m_menuConfig.AppendSeparator(); - m_menuConfig.Append(MenuId_Config_Patches, _("Patches"), wxEmptyString); + m_menuConfig.Append(MenuId_Config_Patches, _("Patches (unimplemented)"), wxEmptyString); m_menuConfig.Append(MenuId_Config_BIOS, _("BIOS") ); m_menuConfig.AppendSeparator(); diff --git a/pcsx2/gui/Panels/MiscPanelStuff.cpp b/pcsx2/gui/Panels/MiscPanelStuff.cpp index 1a8d520d23..2808b53037 100644 --- a/pcsx2/gui/Panels/MiscPanelStuff.cpp +++ b/pcsx2/gui/Panels/MiscPanelStuff.cpp @@ -129,7 +129,7 @@ Panels::LanguageSelectionPanel::LanguageSelectionPanel( wxWindow* parent ) m_picker = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, size, compiled.GetPtr(), wxCB_READONLY | wxCB_SORT ); - *this += Text(_("Select a language: ")) | pxMiddle; + *this += Text(_("Select a language: (unimplemented)")) | pxMiddle; *this += 5; *this += m_picker | pxSizerFlags::StdSpace(); diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index e253492e96..9b4ad912e5 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -125,7 +125,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) // Cycle stealing works by 'fast-forwarding' the EE by an arbitrary number of cycles whenever VU1 micro-programs // are run, which works as a rough-guess skipping of what would normally be idle time spent running on the EE. - wxPanelWithHelpers* eeSliderPanel = new wxPanelWithHelpers( left, wxVERTICAL, _("EE Cyclerate") ); + wxPanelWithHelpers* eeSliderPanel = new wxPanelWithHelpers( left, wxVERTICAL, _("EE Cyclerate [Not Recommended]") ); m_slider_eecycle = new wxSlider( eeSliderPanel, wxID_ANY, 1, 1, 3, wxDefaultPosition, wxDefaultSize, wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS ); @@ -146,7 +146,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) // ------------------------------------------------------------------------ // VU Cycle Stealing Hack Section: - wxPanelWithHelpers* vuSliderPanel = new wxPanelWithHelpers( right, wxVERTICAL, _("VU Cycle Stealing") ); + wxPanelWithHelpers* vuSliderPanel = new wxPanelWithHelpers( right, wxVERTICAL, _("VU Cycle Stealing [Not Recommended]") ); m_slider_vustealer = new wxSlider( vuSliderPanel, wxID_ANY, 0, 0, 3, wxDefaultPosition, wxDefaultSize, wxHORIZONTAL | wxSL_AUTOTICKS | wxSL_LABELS ); @@ -169,10 +169,10 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) wxPanelWithHelpers* vuHacksPanel = new wxPanelWithHelpers( right, wxVERTICAL, _("microVU Hacks") ); m_check_vuFlagHack = new pxCheckBox( vuHacksPanel, _("mVU Flag Hack"), - _("Large Speedup and High Compatibility; may cause garbage graphics, SPS, etc...") ); + _("Good Speedup and High Compatibility; may cause garbage graphics, SPS, etc... [Recommended]") ); m_check_vuMinMax = new pxCheckBox( vuHacksPanel, _("mVU Min/Max Hack"), - _("Small Speedup; may cause black screens, garbage graphics, SPS, etc...") ); + _("Small Speedup; may cause black screens, garbage graphics, SPS, etc... [Not Recommended]") ); m_check_vuFlagHack->SetToolTip( pxE( ".Tooltips:Speedhacks:vuFlagHack", L"Updates Status Flags only on blocks which will read them, instead of all the time. " @@ -193,10 +193,10 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) _("Huge speedup for some games, with almost no compatibility side effects. [Recommended]") ); m_check_waitloop = new pxCheckBox( miscHacksPanel, _("Enable Wait Loop Detection"), - _("Moderate speedup for some games, with no known side effects. [Recommended???]" ) ); + _("Moderate speedup for some games, with no known side effects. [Recommended]" ) ); m_check_IOPx2 = new pxCheckBox( miscHacksPanel, _("IOP x2 cycle rate hack"), - _("Small Speedup and works well with most games; may cause some games to hang during startup.") ); + _("Small Speedup. Works well with some games but may cause issues in others. [Not Recommended]") ); m_check_intc->SetToolTip( pxE( ".Tooltips:Speedhacks:INTC",