ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/aeinstallerapp.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/aeinstallerapp.cpp (file contents):
Revision 393 by iritscen, Mon Jul 6 15:39:35 2009 UTC vs.
Revision 423 by gumby, Wed Jul 15 21:16:14 2009 UTC

# Line 110 | Line 110 | bool AEInstallerApp::OnInit()
110          ////@end AEInstallerApp initialisation
111          TheWindow = mainWindow;
112          
113 < #ifndef WIN32
113 > #ifdef WIN32
114 >         HKEY hKey;
115 >         if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\.NETFramework\\policy\\v2.0", 0L, KEY_READ , &hKey) == ERROR_SUCCESS) {
116 >                 wxMessageDialog* MonoDialogOfDeath = new wxMessageDialog(TheWindow, "You don't have .NET 2.0 installed! .NET is a framework required by the Edition. You can download it from:\nhttp://gumby.oni2.net/dotnet\nPlease install .NET 2.0, then open this Installer again. \n\nWould you like to open the download webpage?",  "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION        , wxDefaultPosition);
117 >                 if(MonoDialogOfDeath->ShowModal() == wxID_YES) {
118 >                        system("start http://www.microsoft.com/downloads/details.aspx?familyid=0856eacb-4362-4b0d-8edd-aab15c5e04f5");
119 >                 }
120 >                RegCloseKey(hKey);
121 >                TheWindow->Close();
122 >         }
123 > #else
124          // test for the third-party mono framework, because without it, on Mac, we are up a creek
125          char monoCommand[300] = "which mono >> ";
126          strcat(monoCommand, escapePath(system_complete("mono_check.log").string()).c_str());
# Line 146 | Line 156 | bool AEInstallerApp::OnInit()
156                          TheWindow->Close();
157                  else
158                  {
159 <                        TheWindow->InstallButton->Disable();
150 <                        TheWindow->ReglobalizeButton->Disable();
159 >
160  
161   #ifdef WIN32
162 <                        boost::thread thrd3(globalizeData);
162 >                        boost::thread thrd3(globalize2);
163                  //globalizeData();
164                  //boost::thread::create_thread(&globalizeData);
165                  //       boost::thread_group Tg;
166                  // Tg.create_thread( &globalizeData(), this );
167   #else
168 +                                                TheWindow->InstallButton->Disable();
169 +                        TheWindow->ReglobalizeButton->Disable();
170                          globalizeData();
171 +                                                TheWindow->InstallButton->Enable();
172 +                        TheWindow->ReglobalizeButton->Enable();
173   #endif
174                  
175 <                        TheWindow->InstallButton->Enable();
163 <                        TheWindow->ReglobalizeButton->Enable();
175 >
176                  }
177          }
178  

Diff Legend

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