/[pcsx2_0.9.7]/trunk/pcsx2/gui/Dialogs/FirstTimeWizard.cpp
ViewVC logotype

Diff of /trunk/pcsx2/gui/Dialogs/FirstTimeWizard.cpp

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

--- trunk/pcsx2/gui/Dialogs/FirstTimeWizard.cpp	2010/12/23 11:48:33	279
+++ trunk/pcsx2/gui/Dialogs/FirstTimeWizard.cpp	2010/12/23 12:02:12	280
@@ -45,12 +45,12 @@
 Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent )
 	: DirPickerPanel( parent, FolderId_Settings, _("Settings"), AddAppName(_("Select a folder for %s settings")) )
 {
-	pxSetToolTip( this, pxE( ".Tooltip:Folders:Settings",
+	pxSetToolTip( this, pxEt( "!ContextTip:Folders:Settings",
 		L"This is the folder where PCSX2 saves your settings, including settings generated "
 		L"by most plugins (some older plugins may not respect this value)."
 	) );
 
-	SetStaticDesc( pxE( ".Panel:Folders:Settings",
+	SetStaticDesc( pxE( "!Panel:Folders:Settings",
 		L"You may optionally specify a location for your PCSX2 settings here.  If the location "
 		L"contains existing PCSX2 settings, you will be given the option to import or overwrite them."
 	) );
@@ -106,7 +106,7 @@
 		// FIXME: There's already a file by the same name.. not sure what we should do here.
 		throw Exception::BadStream( path.ToString() )
 			.SetDiagMsg(L"Targeted documents folder is already occupied by a file.")
-			.SetUserMsg(pxE( ".Error:DocsFolderFileConflict",
+			.SetUserMsg(pxE( "!Notice:DocsFolderFileConflict",
 				L"PCSX2 cannot create a documents folder in the requested location.  "
 				L"The path name matches an existing file.  Delete the file or change the documents location, "
 				L"and then try again."
@@ -120,7 +120,7 @@
 		dialog += 12;
 		dialog += dialog.Heading( path.ToString() );
 
-		if( wxID_CANCEL == pxIssueConfirmation( dialog, MsgButtons().Custom(_("Create")).Cancel(), L"CreateNewFolder" ) )
+		if( wxID_CANCEL == pxIssueConfirmation( dialog, MsgButtons().Custom(_("Create"), "create").Cancel(), L"CreateNewFolder" ) )
 			return false;
 	}
 	path.Mkdir();
@@ -149,7 +149,7 @@
 	// Temporary tutorial message for the BIOS, needs proof-reading!!
 	m_page_bios		+= 12;
 	m_page_bios		+= new pxStaticHeading( &m_page_bios,
-		pxE( ".Wizard:Bios:Tutorial",
+		pxE( "!Wizard:Bios:Tutorial",
 			L"PCSX2 requires a *legal* copy of the PS2 BIOS in order to run games.\n"
 			L"You cannot use a copy obtained from a friend or the Internet.\n"
 			L"You must dump the BIOS from your *own* Playstation 2 console."
@@ -175,6 +175,8 @@
 	Connect( wxEVT_WIZARD_PAGE_CHANGED,				wxWizardEventHandler	(FirstTimeWizard::OnPageChanged) );
 	Connect( wxEVT_WIZARD_PAGE_CHANGING,			wxWizardEventHandler	(FirstTimeWizard::OnPageChanging) );
 	Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,	wxCommandEventHandler	(FirstTimeWizard::OnDoubleClicked) );
+
+	Connect( pxID_RestartWizard,	wxEVT_COMMAND_BUTTON_CLICKED,	wxCommandEventHandler( FirstTimeWizard::OnRestartWizard ) );
 }
 
 FirstTimeWizard::~FirstTimeWizard() throw()
@@ -182,6 +184,12 @@
 
 }
 
+void FirstTimeWizard::OnRestartWizard( wxCommandEvent& evt )
+{
+	EndModal( pxID_RestartWizard );
+	evt.Skip();
+}
+
 static void _OpenConsole()
 {
 	g_Conf->ProgLogBox.Visible = true;

 

  ViewVC Help
Powered by ViewVC 1.1.22