/[pcsx2_0.9.7]/branch/r3113_0.9.7_beta_reference/pcsx2/gui/AppInit.cpp
ViewVC logotype

Diff of /branch/r3113_0.9.7_beta_reference/pcsx2/gui/AppInit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- branch/r3113_0.9.7_beta_reference/pcsx2/gui/AppInit.cpp	2010/09/13 17:18:05	173
+++ branch/r3113_0.9.7_beta_reference/pcsx2/gui/AppInit.cpp	2010/09/13 17:24:24	174
@@ -124,23 +124,41 @@
 
 	if( forceWiz )
 	{
-		// Beta Warning!
+		//// Beta Warning!
 
-		if( !hasGroup )
-		{
-			wxDialogWithHelpers beta( NULL, _("PCSX2 0.9.7 Beta"), wxVERTICAL );
+		//if( !hasGroup )
+		//{
+		//	wxDialogWithHelpers beta( NULL, _("PCSX2 0.9.7 Beta"), wxVERTICAL );
 
-			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
-			);
-			
-			beta += new wxButton( &beta, wxID_OK ) | pxSizerFlags::StdCenter();
-			beta.ShowModal();
-		}
+		//	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
+		//	);
+		//	
+		//	beta += new wxButton( &beta, wxID_OK ) | pxSizerFlags::StdCenter();
+		//	beta.ShowModal();
+		//}
 	
+	// Beta Warning!
+		#if 0
+		if( !hasGroup )
+		{
+			//wxDialogWithHelpers beta( NULL, _fmt("Welcome to %s %u.%u.%u (r%u)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo, SVN_REV ));
+			wxDialogWithHelpers beta( NULL, _fmt("Welcome to %s (%s)", pxGetAppName().c_str(), wxPCSX2_FULL_VERSION() ));
+			beta.SetMinWidth(480);
+
+			beta += beta.Heading(
+				L"PCSX2 0.9.7 is a work-in-progress.  We are in the middle of major rewrites of the user interface, and some parts "
+				L"of the program have *NOT* been re-implemented yet.  Options will be missing or disabled.  Horrible crashes might be present.  Enjoy!"
+			);
+			beta += StdPadding*2;
+			beta += new wxButton( &beta, wxID_OK ) | StdCenter();
+			beta.ShowModal();
+		}
+		#endif
+
 		// first time startup, so give the user the choice of user mode:
 		FirstTimeWizard wiz( NULL );
 		if( !wiz.RunWizard( wiz.GetUsermodePage() ) )

 

  ViewVC Help
Powered by ViewVC 1.1.22