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 504 by gumby, Sat Mar 27 03:48:25 2010 UTC vs.
Revision 506 by iritscen, Mon Apr 5 02:11:45 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 139 | Line 139 | bool AEInstallerApp::OnInit()
139		if (updateNotification->ShowModal() == wxID_YES)
140		ProcessAEUpdate(&currentAE, &updateAE, &installerJustUpdated);
141		break;
142	<	case UPDATE_THIRD_PARTY: // there's an update with no globalization or Installer strings attached
142	>	case UPDATE_PKG_AVAIL: // there's an update with no globalization or Installer strings attached
143		updateMsg = (string)"One or more third party update(s) for Anniversary Edition package(s) are available.\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" +
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	<	ProcessThirdPartyUpdates();
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" +

Diff Legend

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