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 506 by iritscen, Mon Apr 5 02:11:45 2010 UTC vs.
Revision 554 by iritscen, Sat May 29 02:49:13 2010 UTC

#	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 140 | Line 140 | bool AEInstallerApp::OnInit()
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 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" +
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)

Diff Legend

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