ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 357 by gumby, Fri Jun 19 21:32:17 2009 UTC vs.
Revision 362 by gumby, Fri Jun 19 22:58:07 2009 UTC

#	Line 288 | Line 288 | int globalizeData(void)
288		//printf(Step_x_x,"Step %d/%d: reimporting level", parts_done + 1, 7 + 2 * num_levels); setStatusArea((string)Step_x_x + levels[i] + (string)"_Final.dat");
289		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
290		system( (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
291	<	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni > Globalize.oni").c_str());
291	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni > Globalize.log").c_str());
292		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
293		parts_done++;
294		}
#	Line 300 | Line 300 | int globalizeData(void)
300
301		for(int j = 0; j < GDFPaths.size(); j++) {
302		logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
303	<	setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
303	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
304		system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
305		parts_done++;
306		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
#	Line 323 | Line 323 | int globalizeData(void)
323		if (exists("../GameDataFolder/IGMD")) remove_all("../GameDataFolder/IGMD");
324		*/
325		create_directory((path)"../GameDataFolder/IGMD");
326	<	copy((path)"packages/VanillaBSL/", (path)"../GameDataFolder");
326	>	copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
327		setProgressBar( 1000 );
328		setStatusArea((string)"Done! Now select your mod packages and click install.");
329		//      while(1) Sleep(-1);
#	Line 1279 | Line 1279 | void MainWindow::OnOptionsClick( wxComma
1279
1280		if (!event.GetInt() ) {
1281		OptionsPanel->Hide();
1282	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1282	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1283		else {
1284	<	//Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1285	<	//wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                      "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
1286	<	//YesNoDialog->ShowModal();
1284	>	//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1285	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
1286	>	YesNoDialog->ShowModal();
1287		OptionsPanel->Show();
1288	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
1288	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
1289		}
1290	+
1291		}
1292
1293
#	Line 1566 | Line 1567 | void MainWindow::OnReGlobalizeButtonClic
1567		// Tg.create_thread( &globalizeData(), this );
1568		#else
1569		globalizeData();
1569	–	setProgressBar(1000);
1570	–	setStatusArea("Done!");
1570		#endif
1571
1572		this->InstallButton->Enable();

Diff Legend

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