ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/aeinstallerapp.cpp

Comparing AE/Installer/trunk/source/aeinstallerapp.cpp (file contents):
Revision 500 by iritscen, Sun Mar 14 23:31:14 2010 UTC vs.
Revision 554 by iritscen, Sat May 29 02:49:13 2010 UTC

#	Line 114 | Line 114 | bool AEInstallerApp::OnInit()
114
115		if (updateStatus) // updateStatus was set when MainWindow::CreateControls() was called during initialization of the window
116		{
117	<	string updateMsg = "An update for the Anniversary Edition is available.\n"; // for some reason we can't set the initial value while using the '+' operator...
118	<	updateMsg = updateMsg + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" +
119	<	"(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
117	>	string updateMsg = "An update for the Anniversary Edition is available.\n"
118	>	"Do you wish to update to Edition version " + updateAE.AEVersion + "?\n"
119	>	"(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command
120		wxMessageDialog* updateNotification;
121
122		switch (updateStatus) // for the meanings of these return values, see the comments preceding installer.cpp's GetUpdateStatus()
#	Line 130 | Line 130 | bool AEInstallerApp::OnInit()
130		break;
131		case UPDATE_MNTH_REQD_ERR:
132		updateMsg = "There is a patch in the updates/ folder, but it patches the\n";
133	<	updateMsg = updateMsg + updateAE.AEVersion.substr(0, updateAE.AEVersion.length() - 1) + " release; it cannot update this version of the Edition.";
133	>	updateMsg = updateMsg + updateAE.AEVersion + " release; it cannot update this version of the Edition.";
134		updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxOK | wxICON_EXCLAMATION, wxDefaultPosition);
135		updateNotification->ShowModal();
136		break;
#	Line 139 | Line 139 | bool AEInstallerApp::OnInit()
139		if (updateNotification->ShowModal() == wxID_YES)
140		ProcessAEUpdate(&currentAE, &updateAE, &installerJustUpdated);
141		break;
142	+	case UPDATE_PKG_AVAIL: // there's an update with no globalization or Installer strings attached
143	+	updateMsg = (string)"One or individual package updates for the Anniversary Edition is available.\n\n" +
144	+	(string)"Please note that the AE team assumes no responsibility for the content of third party mods " +
145	+	(string)"nor effects that a third party mod may have on your install.\n\n" +
146	+	(string)"Do you wish to install these update(s)?";
147	+	updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition);
148	+	if (updateNotification->ShowModal() == wxID_YES)
149	+	ProcessPackageUpdates("../updates", "./packages");
150	+	break;
151		case UPDATE_GLOB_AVAIL: // there's an update with globalization strings attached
152		updateMsg = updateMsg + "**Note that the update requires you to reglobalize, which will take 5-20 minutes.**\n" +
153		"Before clicking Yes, MAKE SURE you have backed up any mods not installed through\n " +

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)