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 355 by gumby, Thu Jun 18 22:30:30 2009 UTC vs.
Revision 399 by gumby, Mon Jul 6 22:56:35 2009 UTC

#	Line 1 | Line 1
1	+	#ifndef NTDDI_VERSION
2	+	#define NTDDI_VERSION NTDDI_WIN7
3	+	#endif
4	+	#ifdef WIN32
5	+	#include <windows.h>
6	+	#include <shobjidl.h>
7	+	HWND Handle;
8	+
9	+	ITaskbarList *pTaskbarList;
10	+	ITaskbarList3 *pTaskbarList3;
11	+	#endif
12	+
13		/*
14	<	AE/Mod Installer
15	<	by Gumby and Iritscen
14	>	AE/Mod Installer
15	>	by Gumby and Iritscen
16		*/
17
18	<	// To-do: -
18	>	// To-do: - Load credits from text resource file
19		//                - Institute lots of checks into file-handling
20	<	//                - Clear mod info fields when mod is de-selected ???
20	>	//                - Clear mod info fields when mod is de-selected
21
22		#define DEBUG
23		#include <stdio.h>
#	Line 30 | Line 42 | by Gumby and Iritscen
42		#include <dirent.h>
43		#endif
44
45	<	const string strInstallerVersion = "1.0";
45	>	//const string strInstallerVersion = "1.0";
46		const bool SPLIT = 1;
47		const bool NOT_SPLIT = 0;
48		bool splitInstances = SPLIT;
49	<
49	>	bool busy = 0;
50		#ifdef WIN32
51		const string strOniSplit = "Onisplit.exe";
52		string strImportOption = "-import:nosep";
#	Line 58 | Line 70 | using namespace std;
70		#include "boost/date_time/date_parsing.hpp"
71		#include "boost/date_time/posix_time/posix_time.hpp"
72
73	+	string escapePath(string input) {
74	+
75	+	string output;
76	+	string escape_me = "& ;()|<>\"'\\#*?$";
77	+	for(int i = 0; i < input.size(); i++)  {
78	+	for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
79	+	output += input[i];
80	+	}
81	+	return output;
82	+	}
83	+
84		int globalizeData(void)
85		{
86	<	using boost::lexical_cast;
87	<	using boost::bad_lexical_cast;
88	<	// using namespace boost::posix_time;
86	>	busy = 1;
87	>	using boost::lexical_cast;
88	>	using boost::bad_lexical_cast;
89	>	// using namespace boost::posix_time;
90		using namespace boost::gregorian;
91		using namespace boost::posix_time;
92		ptime start_time(second_clock::local_time());
#	Line 76 | Line 100 | int globalizeData(void)
100		ofstream logfile("Globalize.log");
101		logfile << "Globalization started " << to_simple_string(start_time) << endl;
102		try {
103	<
103	>
104		char levels_cstr[15][3] = {"0", "1", "2", "3", "4", "6", "8", "9", "10", "11", "12", "13", "14", "18", "19"}; // the levels Oni has...probably should have made a string array. Oops.
105		//const vector<double> ck(cv, &cv[CvSize]);
106		vector<string> levels;
#	Line 95 | Line 119 | int globalizeData(void)
119		path Animations = "../GameDataFolder/level0_Animations";
120		path TRAC = Animations / "level0_TRAC";
121		path TRAM = Animations / "level0_TRAM";
122	<
122	>
123		vector<path> GDFPaths;
124		GDFPaths.push_back(Characters);
125		GDFPaths.push_back(Particles);
#	Line 103 | Line 127 | int globalizeData(void)
127		GDFPaths.push_back(Sounds);
128		GDFPaths.push_back(TRAC);
129		GDFPaths.push_back(TRAM);
130	<
131	<
130	>
131	>
132		path VanillaCharacters = "packages/VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
133		path VanillaParticles = "packages/VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
134		path VanillaTextures  = "packages/VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
#	Line 114 | Line 138 | int globalizeData(void)
138		path VanillaTRAM = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
139
140		vector<path> VanillaPaths;
141	<
141	>
142		VanillaPaths.push_back(VanillaCharacters);
143		VanillaPaths.push_back(VanillaParticles);
144		VanillaPaths.push_back(VanillaTextures);
145		VanillaPaths.push_back(VanillaSounds);
146		VanillaPaths.push_back(VanillaTRAC);
147		VanillaPaths.push_back(VanillaTRAM);
148	<
148	>
149		/*
150		if (exists("../GameDataFolder/"))
151		{
#	Line 142 | Line 166 | int globalizeData(void)
166		setStatusArea("Creating needed directories...");
167		logfile <<  "Creating needed directories...\n";
168		create_directory( "../GameDataFolder/" );
169	<
169	>
170		create_directory( "packages" );
171	<
171	>
172		if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats");
173		create_directory( "packages/VanillaDats" );
150	–
174		create_directory( "packages/VanillaDats/level0_Final/" );
175		//blah blah finish this.
176		//logfile <<  "packages/VanillaDats/level0_Final/ created";
#	Line 162 | Line 185 | int globalizeData(void)
185		int num_levels = 0;
186		for(int i = 1; i < 15; i++)
187		{
188	<	if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
188	>	if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
189		num_levels++;
190
191		}
#	Line 171 | Line 194 | int globalizeData(void)
194		int total_steps =  8 + 2 * num_levels;
195		for(int i = 0; i < 15; i++)
196		{
197	<
197	>
198		//printf(levels[i],"%d",levels[i]); // int to char array
199	<
199	>
200		if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
201		logfile << "level" << levels[i] << "_Final\n";
202		logfile << "\tExporting level" << levels[i] << "_Final.dat\n";
203		//printf(Step_x_x,"Step %d/%d: exporting level%d_final.dat", parts_done + 1,, levels[i]); setStatusArea((string)Step_x_x);
204		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " exporting level" + levels[i]+"_Final.dat");
205		create_directory( "../GameDataFolder/level" + levels[i] + "_Final" );
206	<	//                              setStatusArea(strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat");
206	>	//                              setStatusArea(strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat");
207		system((strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat").c_str());
208		create_directory( "packages/VanillaDats/level" + levels[i] + "_Final" );
209		create_directory( "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
#	Line 256 | Line 279 | int globalizeData(void)
279		else if (dir_itr->path().filename().substr(0,4) == "AGDB"
280		|| dir_itr->path().filename().substr(0,4) == "TRCM") {
281		cout <<dir_itr->path().filename() << "\n";
282	<
282	>
283		if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
284		else remove(dir_itr->path());
285		}
286	+	else if (dir_itr->path().filename().substr(0,4) == "ONWC") { //fix for buggy ONWC overriding
287	+	cout <<dir_itr->path().filename() << "\n";
288	+
289	+	if(!exists( "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
290	+	else remove(dir_itr->path());
291	+	}
292		if (exists(dir_itr->path())) {
293
294		}
#	Line 269 | Line 298 | int globalizeData(void)
298		}
299
300
301	<
301	>
302		}
303		logfile << "\tCleaning up TXMPs...\n";
304		system( (strOniSplit + " -move:delete " + Textures.string() + " ../GameDataFolder/level" + levels[i] + "_Final/TXMP*.oni").c_str());
305		parts_done++;
306
307		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
308	<
308	>
309		}
310		}
311		logfile << "Reimporting levels\n";
#	Line 286 | Line 315 | int globalizeData(void)
315		//printf(levels[i],"%d",levels[i]);
316		//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");
317		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
318	<	system( (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
319	<	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni > Globalize.oni").c_str());
318	>	logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
319	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
320	>	string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
321	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
322	>	system(sys_str.c_str() );
323		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
324	<	parts_done++;
324	>	parts_done++;
325		}
326		create_directory( VanillaCharacters.parent_path() );
327		create_directory( VanillaParticles.parent_path() );
328		create_directory( VanillaTextures.parent_path() );
329		create_directory( VanillaSounds.parent_path() );
330		create_directory( VanillaAnimations.remove_filename() );
331	<
331	>
332		for(int j = 0; j < GDFPaths.size(); j++) {
333		logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
334	<	setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
334	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
335		system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
336		parts_done++;
337		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
338		}
339	<	/*
339	>	/*
340		printf(Step_x_x,"Step %d/%d: reimporting level0_Characters", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
341		system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
342		parts_done++; printf(Step_x_x,"Step %d/%d: reimporting level0_Particles", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
#	Line 320 | Line 352 | int globalizeData(void)
352		system((strOniSplit + " " + strImportOption + " " + TRAM.string() + " " + VanillaTRAM.string()).c_str());
353		//parts_done++; setStatusArea((string)"Copying level scripts...");setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
354		if (exists("../GameDataFolder/IGMD")) remove_all("../GameDataFolder/IGMD");
355	<	*/
355	>	*/
356		create_directory((path)"../GameDataFolder/IGMD");
357	<	copy((path)"packages/VanillaBSL/", (path)"../GameDataFolder");
358	<	setProgressBar( 1000 );
359	<	setStatusArea((string)"Done! Now select your mod packages and click install.");
360	<	//      while(1) Sleep(-1);
357	>	copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
358	>	setProgressBar( 1000 );
359	>
360	>	copy("../../persist.dat","..");
361	>	copy("../../key_config.txt","..");
362	>
363	>	#ifndef WIN32
364	>	/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
365	>	Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never
366	>	run Oni before :-p */
367	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
368	>	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
369	>	strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
370	>	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
371	>	system(prefsCommand);
372
373	+	#endif
374	+
375	+
376	+	setStatusArea((string)"Done! Now select your mod packages and click install.");
377	+	//      while(1) Sleep(-1);
378	+
379		}
380	<	catch (exception ex) {
380	>	catch (exception & ex) {
381		setStatusArea("Warning, handled exception: " + (string)ex.what());
382		}
334	–
335	–	ptime end_time(second_clock::local_time());
336	–	time_period total_time (start_time, end_time);
337	–	logfile << "\n\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
338	–	//total_time.length().hours();
339	–	logfile.close();
383
384	+	ptime end_time(second_clock::local_time());
385	+	time_period total_time (start_time, end_time);
386	+	logfile << "\n\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
387	+	//total_time.length().hours();
388	+	logfile.close();
389	+	busy = 0;
390		return err;
391		}
392
#	Line 490 | Line 539 | ModPackage fileToModPackage(fstream &fil
539
540		void recompileAll(vector<string> installedMods)
541		{
542	+	busy = 1;
543		using namespace boost::gregorian;
544		using namespace boost::posix_time;
545	+	using boost::lexical_cast;
546	+	using boost::bad_lexical_cast;
547
548		setStatusArea("Importing levels...");
549		//setStatusArea("Recompiling Data...");
#	Line 550 | Line 602 | void recompileAll(vector<string> install
602		}
603		importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
604
605	<	printf(statusString,"%d/%i\0",j,numberOfDats);
605	>
606		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
607	<	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
607	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
608
609		system(importCommand.c_str());
610		//Sleep(1000);
#	Line 563 | Line 615 | void recompileAll(vector<string> install
615		}
616		catch ( const std::exception & ex )
617		{
618	<
619	<	remove("Install.log");
620	<	ofstream logfile("Install.log");
621	<
622	<
618	>
619	>	remove("Install.log");
620	>	ofstream logfile("Install.log");
621	>
622	>
623		logfile << "Warning, exception " << ex.what() << "!";
624		setStatusArea("Warning, exception " + (string)ex.what() + "!");
625	<	logfile.close();
625	>	logfile.close();
626		}
627		}
628
629		}
630		catch( const std::exception & ex ) {
631	<
632	<	remove("Install.log");
633	<	ofstream logfile("Install.log");
634	<
635	<
636	<	logfile << "Warning, exception " << ex.what() << "!";
637	<	setStatusArea("Warning, exception " + (string)ex.what() + "!");
638	<	logfile.close();
631	>
632	>	remove("Install.log");
633	>	ofstream logfile("Install.log");
634	>
635	>
636	>	logfile << "Warning, exception " << ex.what() << "!";
637	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
638	>	logfile.close();
639		}
640
641		}
#	Line 614 | Line 666 | logfile.close();
666		{
667		if ( is_directory( dir_itr->status() ) )
668		{
669	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
618	<	+ ".dat";
669	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
670		for (int i = 0; i < installedMods.size(); ++i) {
671		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
672		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
673		}
674		importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
675
676	<	printf(statusString,"%d/%i\0",j,numberOfDats);
676	>
677		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
678	<	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
678	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
679
680		system(importCommand.c_str());
681
#	Line 633 | Line 684 | logfile.close();
684		}
685		catch ( const std::exception & ex )
686		{
687	<
688	<	remove("Install.log");
689	<	ofstream logfile("Install.log");
690	<
691	<
692	<	logfile << "Warning, exception " << ex.what() << "!";
693	<	setStatusArea("Warning, exception " + (string)ex.what() + "!");
694	<	logfile.close();
687	>
688	>	remove("Install.log");
689	>	ofstream logfile("Install.log");
690	>
691	>
692	>	logfile << "Warning, exception " << ex.what() << "!";
693	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
694	>	logfile.close();
695		}}
696		}
697		logfile << "Writing config file";
698		writeInstalledMods(installedMods);
699		setProgressBar(1000);
700		setStatusArea("Done! You can now play Oni.");
650	–
651	–	ptime end_time(second_clock::local_time());
652	–	time_period total_time (start_time, end_time);
653	–
654	–
655	–	ofstream logfile2("Install.log", ios::app | ios::ate);
656	–	string outstring = (string)"\n\nGlobalization ended " + to_simple_string(end_time) + "\nThe process took ";// + (string)total_time.length();
657	–
658	–	logfile2 << "\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
659	–
660	–	//logfile2.write(outstring.c_str(), outstring.length());
661	–	logfile2.close();
701
702	<	//total_time.length().hours();
703	<
702	>	ptime end_time(second_clock::local_time());
703	>	time_period total_time (start_time, end_time);
704	>
705	>
706	>	ofstream logfile2("Install.log", ios::app | ios::ate);
707	>	string outstring = (string)"\n\nGlobalization ended " + to_simple_string(end_time) + "\nThe process took ";// + (string)total_time.length();
708	>
709	>	logfile2 << "\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
710	>
711	>	//logfile2.write(outstring.c_str(), outstring.length());
712	>	logfile2.close();
713	>
714	>	//total_time.length().hours();
715	>
716		Sleep(1000);
717		setProgressBar(0);
718	+	busy = 0;
719		}
720
721		void writeInstalledMods(vector<string> installedMods)
#	Line 775 | Line 827 | vector<ModPackage> globalPackages;
827		#endif
828
829		////@begin includes
830	<	#include "about_window.h"
830	>	#include "about.h"
831		////@end includes
832
833		#include "main_window.h"
834
835		////@begin XPM images
836	<	#include "redo.xpm"
836	>	#include "aelogosmall.xpm"
837	>	#include "undo.xpm"
838		#include "fileopen.xpm"
839		#include "filesaveas.xpm"
840		#include "quit.xpm"
#	Line 804 | Line 857 | IMPLEMENT_CLASS( MainWindow, wxFrame )
857		BEGIN_EVENT_TABLE( MainWindow, wxFrame )
858
859		////@begin MainWindow event table entries
860	<	EVT_CHECKBOX( SelectAll_Checkbox, MainWindow::OnSelectAllCheckboxClick )
860	>	EVT_CHECKBOX( SelectAll_Checkbox, MainWindow::OnSelectAllCheckboxClick )
861
862	<	EVT_BUTTON( Refresh_Button, MainWindow::OnRefreshButtonClick )
862	>	EVT_BUTTON( Refresh_Button, MainWindow::OnRefreshButtonClick )
863
864	<	EVT_LISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Selected )
865	<	EVT_CHECKLISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Toggled )
864	>	EVT_LISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Selected )
865	>	EVT_CHECKLISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Toggled )
866
867	<	EVT_UPDATE_UI( ID_STATUSBAR, MainWindow::OnStatusbarUpdate )
867	>	EVT_UPDATE_UI( ID_STATUSBAR, MainWindow::OnStatusbarUpdate )
868
869	<	EVT_BUTTON( Install_Button, MainWindow::OnInstallButtonClick )
869	>	EVT_BUTTON( Install_Button, MainWindow::OnInstallButtonClick )
870
871	<	EVT_RADIOBUTTON( Sep_RadioButton, MainWindow::OnSepRadioButtonSelected )
871	>	EVT_RADIOBUTTON( Sep_RadioButton, MainWindow::OnSepRadioButtonSelected )
872
873	<	EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
873	>	EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
874
875	<	EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected )
875	>	EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected )
876
877	<	EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
877	>	EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
878
879	<	EVT_BUTTON( ReGlobalize_Button, MainWindow::OnReGlobalizeButtonClick )
879	>	EVT_BUTTON( ReGlobalize_Button, MainWindow::OnReGlobalizeButtonClick )
880
881	<	EVT_MENU( wxID_LOAD, MainWindow::OnLoadClick )
881	>	EVT_MENU( wxID_LOAD, MainWindow::OnLoadClick )
882
883	<	EVT_MENU( wxID_SAVE, MainWindow::OnSaveClick )
883	>	EVT_MENU( wxID_SAVE, MainWindow::OnSaveClick )
884
885	<	EVT_MENU( wxID_EXIT, MainWindow::OnExitClick )
885	>	EVT_MENU( wxID_EXIT, MainWindow::OnExitClick )
886
887	<	EVT_MENU( wxID_OPTIONS, MainWindow::OnOptionsClick )
887	>	EVT_MENU( wxID_OPTIONS, MainWindow::OnOptionsClick )
888
889	<	EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
889	>	EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
890
891		////@end MainWindow event table entries
892
#	Line 863 | Line 916 | MainWindow::MainWindow( wxWindow* parent
916		bool MainWindow::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
917		{
918		////@begin MainWindow creation
919	<	wxFrame::Create( parent, id, caption, pos, size, style );
919	>	wxFrame::Create( parent, id, caption, pos, size, style );
920
921	<	CreateControls();
922	<	SetIcon(GetIconResource(wxT("oni_special.ico")));
923	<	Centre();
871	<
872	<
921	>	CreateControls();
922	>	SetIcon(GetIconResource(wxT("aelogosmall.png")));
923	>	Centre();
924		////@end MainWindow creation
925		return true;
926		}
#	Line 893 | Line 944 | MainWindow::~MainWindow()
944		void MainWindow::Init()
945		{
946		////@begin MainWindow member initialisation
947	<	MainSplitter = NULL;
948	<	SelectAll = NULL;
949	<	RefreshButton = NULL;
950	<	Mods_CheckboxList = NULL;
951	<	titleText = NULL;
952	<	creatorText = NULL;
953	<	descriptionText = NULL;
954	<	StatusArea = NULL;
955	<	ProgressBar = NULL;
956	<	InstallButton = NULL;
957	<	OptionsPanel = NULL;
958	<	SepRadio = NULL;
959	<	NoSepRadio = NULL;
960	<	SeparatedRadio = NULL;
961	<	CompleteRadio = NULL;
962	<	ReglobalizeButton = NULL;
947	>	MainSplitter = NULL;
948	>	SelectAll = NULL;
949	>	RefreshButton = NULL;
950	>	Mods_CheckboxList = NULL;
951	>	titleText = NULL;
952	>	creatorText = NULL;
953	>	descriptionText = NULL;
954	>	StatusArea = NULL;
955	>	ProgressBar = NULL;
956	>	InstallButton = NULL;
957	>	OptionsPanel = NULL;
958	>	SepRadio = NULL;
959	>	NoSepRadio = NULL;
960	>	SeperatedRadio = NULL;
961	>	CompleteRadio = NULL;
962	>	ReglobalizeButton = NULL;
963		////@end MainWindow member initialisation
964
965		}
#	Line 923 | Line 974 | wxGauge* TheProgressBar;
974		void MainWindow::CreateControls()
975		{
976		////@begin MainWindow content construction
977	<	// Generated by DialogBlocks, 31/05/2009 19:03:55 (unregistered)
927	<
928	<	MainWindow* itemFrame1 = this;
977	>	MainWindow* itemFrame1 = this;
978
979	<	wxMenuBar* menuBar = new wxMenuBar;
980	<	wxMenu* itemMenu37 = new wxMenu;
981	<	{
982	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_LOAD, _("&Load Configuration..."), wxEmptyString, wxITEM_NORMAL);
983	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("fileopen.xpm")));
984	<	menuItem->SetBitmap(bitmap);
985	<	itemMenu37->Append(menuItem);
986	<	}
987	<	{
988	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_SAVE, _("&Save Configuration..."), wxEmptyString, wxITEM_NORMAL);
989	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("filesaveas.xpm")));
990	<	menuItem->SetBitmap(bitmap);
991	<	itemMenu37->Append(menuItem);
992	<	}
993	<	itemMenu37->AppendSeparator();
994	<	{
995	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_EXIT, _("Exit"), wxEmptyString, wxITEM_NORMAL);
996	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("quit.xpm")));
997	<	menuItem->SetBitmap(bitmap);
998	<	itemMenu37->Append(menuItem);
999	<	}
1000	<	menuBar->Append(itemMenu37, _("&File"));
1001	<	wxMenu* itemMenu42 = new wxMenu;
1002	<	itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
1003	<	menuBar->Append(itemMenu42, _("Options"));
1004	<	wxMenu* itemMenu44 = new wxMenu;
1005	<	itemMenu44->Append(wxID_HELP, _("Help"), wxEmptyString, wxITEM_NORMAL);
979	>	wxMenuBar* menuBar = new wxMenuBar;
980	>	wxMenu* itemMenu37 = new wxMenu;
981	>	{
982	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_LOAD, _("&Load Configuration..."), wxEmptyString, wxITEM_NORMAL);
983	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("fileopen.xpm")));
984	>	menuItem->SetBitmap(bitmap);
985	>	itemMenu37->Append(menuItem);
986	>	}
987	>	{
988	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_SAVE, _("&Save Configuration..."), wxEmptyString, wxITEM_NORMAL);
989	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("filesaveas.xpm")));
990	>	menuItem->SetBitmap(bitmap);
991	>	itemMenu37->Append(menuItem);
992	>	}
993	>	itemMenu37->AppendSeparator();
994	>	{
995	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_EXIT, _("Exit"), wxEmptyString, wxITEM_NORMAL);
996	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("quit.xpm")));
997	>	menuItem->SetBitmap(bitmap);
998	>	itemMenu37->Append(menuItem);
999	>	}
1000	>	menuBar->Append(itemMenu37, _("&File"));
1001	>	wxMenu* itemMenu42 = new wxMenu;
1002	>	itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
1003	>	menuBar->Append(itemMenu42, _("Options"));
1004	>	wxMenu* itemMenu44 = new wxMenu;
1005	>	#ifdef WIN32
1006		itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1007		menuBar->Append(itemMenu44, _("Help"));
1008	<	itemFrame1->SetMenuBar(menuBar);
1008	>	#else
1009	>	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1010	>	#endif
1011
1012	<	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
962	<	itemFrame1->SetSizer(itemBoxSizer2);
1012	>	itemFrame1->SetMenuBar(menuBar);
1013
1014	<	MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
1015	<	MainSplitter->SetMinimumPaneSize(150);
966	<	MainSplitter->SetName(_T("MainSplitter"));
967	<
968	<	wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
969	<	wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
970	<	itemPanel4->SetSizer(itemBoxSizer5);
971	<
972	<	wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
973	<	itemBoxSizer5->Add(itemBoxSizer6, 0, wxGROW|wxALL, 0);
974	<	SelectAll = new wxCheckBox( itemPanel4, SelectAll_Checkbox, _("Select All/None"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
975	<	SelectAll->SetValue(false);
976	<	SelectAll->SetName(_T("SelectAll_Checkbox"));
977	<	itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
978	<
979	<	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("redo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
980	<	RefreshButton->SetName(_T("RefreshButton"));
981	<	itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
982	<
983	<	wxArrayString Mods_CheckboxListStrings;
984	<	Mods_CheckboxList = new wxCheckListBox( itemPanel4, Mods_CheckboxList1, wxDefaultPosition, wxDefaultSize, Mods_CheckboxListStrings, wxLB_HSCROLL );
985	<	Mods_CheckboxList->SetName(_T("Mods_CheckboxList"));
986	<	itemBoxSizer5->Add(Mods_CheckboxList, 1, wxGROW|wxALL, 0);
987	<
988	<	wxPanel* itemPanel10 = new wxPanel( MainSplitter, DescriptionHolder_Panel, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
989	<	itemPanel10->SetName(_T("DescriptionHolder_Panel"));
990	<	wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
991	<	itemPanel10->SetSizer(itemBoxSizer11);
992	<
993	<	wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
994	<	itemBoxSizer11->Add(itemBoxSizer12, 0, wxGROW|wxALL, 0);
995	<	wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
996	<	itemBoxSizer12->Add(itemBoxSizer13, 1, wxALIGN_CENTER_VERTICAL|wxALL, 0);
997	<	titleText = new wxTextCtrl( itemPanel10, Title_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
998	<	titleText->SetName(_T("Title_Text"));
999	<	titleText->SetBackgroundColour(wxColour(240, 240, 240));
1000	<	itemBoxSizer13->Add(titleText, 1, wxGROW|wxLEFT, 5);
1001	<
1002	<	wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
1003	<	itemBoxSizer12->Add(itemBoxSizer15, 1, wxGROW|wxALL, 0);
1004	<	creatorText = new wxTextCtrl( itemPanel10, Author_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_RIGHT );
1005	<	creatorText->SetName(_T("Author_Text"));
1006	<	creatorText->SetBackgroundColour(wxColour(240, 240, 240));
1007	<	itemBoxSizer15->Add(creatorText, 1, wxGROW|wxRIGHT, 5);
1008	<
1009	<	wxStaticLine* itemStaticLine17 = new wxStaticLine( itemPanel10, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
1010	<	itemStaticLine17->Show(false);
1011	<	itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
1012	<
1013	<	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_AUTO_URL );
1014	<	descriptionText->SetName(_T("DescriptionName"));
1015	<	descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1016	<	itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
1017	<
1018	<	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 150);
1019	<	itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
1020	<
1021	<	StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
1022	<	StatusArea->SetName(_T("StatusArea"));
1023	<	StatusArea->SetFieldsCount(1);
1024	<	StatusArea->SetStatusText(_("Status Area"), 0);
1025	<	itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
1026	<
1027	<	wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
1028	<	itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
1029	<
1030	<	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxSize(-1, 30), wxGA_SMOOTH );
1031	<	ProgressBar->SetValue(0);
1032	<	itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
1033	<
1034	<	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxSize(-1, 30), 0 );
1035	<	itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
1036	<
1037	<	wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
1038	<	itemBoxSizer2->Add(itemBoxSizer23, 0, wxGROW|wxALL, 0);
1039	<
1040	<	OptionsPanel = new wxPanel( itemFrame1, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1041	<	itemBoxSizer2->Add(OptionsPanel, 0, wxGROW, 0);
1042	<
1043	<	wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
1044	<	OptionsPanel->SetSizer(itemBoxSizer25);
1045	<
1046	<	wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
1047	<	itemBoxSizer25->Add(itemBoxSizer26, 0, wxGROW|wxALL, 5);
1048	<
1049	<	SepRadio = new wxRadioButton( OptionsPanel, Sep_RadioButton, _("Sep"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1050	<	SepRadio->SetValue(false);
1051	<	if (MainWindow::ShowToolTips())
1052	<	SepRadio->SetToolTip(_("For PC Demo and Mac"));
1053	<	itemBoxSizer26->Add(SepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1054	<
1055	<	NoSepRadio = new wxRadioButton( OptionsPanel, NoSep_RadioButton, _("NoSep"), wxDefaultPosition, wxDefaultSize, 0 );
1056	<	NoSepRadio->SetValue(false);
1057	<	if (MainWindow::ShowToolTips())
1058	<	NoSepRadio->SetToolTip(_("For PC Retail"));
1059	<	itemBoxSizer26->Add(NoSepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1060	<
1061	<	wxStaticLine* itemStaticLine29 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1062	<	itemBoxSizer25->Add(itemStaticLine29, 0, wxGROW|wxALL, 5);
1063	<
1064	<	wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1065	<	itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1066	<
1067	<	SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1068	<	SeparatedRadio->SetValue(false);
1069	<	SeparatedRadio->SetName(_T("Separated_RadioButton"));
1070	<	itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1071	<
1072	<	CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1073	<	CompleteRadio->SetValue(false);
1074	<	CompleteRadio->SetName(_T("Complete_RadioButton"));
1075	<	itemBoxSizer30->Add(CompleteRadio, 0, wxALIGN_LEFT|wxALL, 5);
1076	<
1077	<	wxStaticLine* itemStaticLine33 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1078	<	itemBoxSizer25->Add(itemStaticLine33, 0, wxGROW|wxALL, 5);
1079	<
1080	<	wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL);
1081	<	itemBoxSizer25->Add(itemBoxSizer34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1082	<
1083	<	ReglobalizeButton = new wxButton( OptionsPanel, ReGlobalize_Button, _("Reglobalize"), wxDefaultPosition, wxDefaultSize, 0 );
1084	<	ReglobalizeButton->SetName(_T("Reglobalize_Button"));
1085	<	itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
1014	>	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
1015	>	itemFrame1->SetSizer(itemBoxSizer2);
1016
1017	<	// Connect events and objects
1018	<	Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1017	>	MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
1018	>	MainSplitter->SetMinimumPaneSize(1);
1019	>	MainSplitter->SetName(_T("MainSplitter"));
1020	>
1021	>	wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1022	>	wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
1023	>	itemPanel4->SetSizer(itemBoxSizer5);
1024	>
1025	>	wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
1026	>	itemBoxSizer5->Add(itemBoxSizer6, 0, wxGROW|wxALL, 0);
1027	>	SelectAll = new wxCheckBox( itemPanel4, SelectAll_Checkbox, _("Select All/None"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
1028	>	SelectAll->SetValue(false);
1029	>	SelectAll->SetName(_T("SelectAll_Checkbox"));
1030	>	itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1031	>
1032	>	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("undo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
1033	>	RefreshButton->SetName(_T("RefreshButton"));
1034	>	itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
1035	>
1036	>	wxArrayString Mods_CheckboxListStrings;
1037	>	Mods_CheckboxList = new wxCheckListBox( itemPanel4, Mods_CheckboxList1, wxDefaultPosition, wxDefaultSize, Mods_CheckboxListStrings, wxLB_HSCROLL );
1038	>	Mods_CheckboxList->SetName(_T("Mods_CheckboxList"));
1039	>	itemBoxSizer5->Add(Mods_CheckboxList, 1, wxGROW|wxALL, 0);
1040	>
1041	>	wxPanel* itemPanel10 = new wxPanel( MainSplitter, DescriptionHolder_Panel, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1042	>	itemPanel10->SetName(_T("DescriptionHolder_Panel"));
1043	>	wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
1044	>	itemPanel10->SetSizer(itemBoxSizer11);
1045	>
1046	>	wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
1047	>	itemBoxSizer11->Add(itemBoxSizer12, 0, wxGROW|wxALL, 0);
1048	>	wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
1049	>	itemBoxSizer12->Add(itemBoxSizer13, 1, wxALIGN_CENTER_VERTICAL|wxALL, 0);
1050	>	titleText = new wxTextCtrl( itemPanel10, Title_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
1051	>	titleText->SetName(_T("Title_Text"));
1052	>	titleText->SetBackgroundColour(wxColour(240, 240, 240));
1053	>	itemBoxSizer13->Add(titleText, 1, wxGROW|wxLEFT, 5);
1054	>
1055	>	wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
1056	>	itemBoxSizer12->Add(itemBoxSizer15, 1, wxGROW|wxALL, 0);
1057	>	creatorText = new wxTextCtrl( itemPanel10, Author_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_RIGHT );
1058	>	creatorText->SetName(_T("Author_Text"));
1059	>	creatorText->SetBackgroundColour(wxColour(240, 240, 240));
1060	>	itemBoxSizer15->Add(creatorText, 1, wxGROW|wxRIGHT, 5);
1061	>
1062	>	wxStaticLine* itemStaticLine17 = new wxStaticLine( itemPanel10, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
1063	>	itemStaticLine17->Show(false);
1064	>	itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
1065	>
1066	>	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_RICH2 );
1067	>	descriptionText->SetName(_T("DescriptionName"));
1068	>	descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1069	>	itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
1070	>
1071	>	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 200);
1072	>	itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
1073	>
1074	>	StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
1075	>	StatusArea->SetName(_T("StatusArea"));
1076	>	StatusArea->SetFieldsCount(1);
1077	>	StatusArea->SetStatusText(_("AE Installer v1.0"), 0);
1078	>	itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
1079	>
1080	>	wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
1081	>	itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
1082	>
1083	>	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxDefaultSize, wxGA_SMOOTH );
1084	>	ProgressBar->SetValue(0);
1085	>	itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
1086	>
1087	>	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxDefaultSize, 0 );
1088	>	itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
1089	>
1090	>	wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
1091	>	itemBoxSizer2->Add(itemBoxSizer23, 0, wxGROW|wxALL, 0);
1092	>
1093	>	OptionsPanel = new wxPanel( itemFrame1, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1094	>	itemBoxSizer2->Add(OptionsPanel, 0, wxGROW, 0);
1095	>
1096	>	wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
1097	>	OptionsPanel->SetSizer(itemBoxSizer25);
1098	>
1099	>	wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
1100	>	itemBoxSizer25->Add(itemBoxSizer26, 0, wxGROW|wxALL, 5);
1101	>
1102	>	SepRadio = new wxRadioButton( OptionsPanel, Sep_RadioButton, _("Sep"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1103	>	SepRadio->SetValue(false);
1104	>	if (MainWindow::ShowToolTips())
1105	>	SepRadio->SetToolTip(_("For PC Demo and Mac"));
1106	>	itemBoxSizer26->Add(SepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1107	>
1108	>	NoSepRadio = new wxRadioButton( OptionsPanel, NoSep_RadioButton, _("NoSep"), wxDefaultPosition, wxDefaultSize, 0 );
1109	>	NoSepRadio->SetValue(false);
1110	>	if (MainWindow::ShowToolTips())
1111	>	NoSepRadio->SetToolTip(_("For PC Retail"));
1112	>	itemBoxSizer26->Add(NoSepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1113	>
1114	>	wxStaticLine* itemStaticLine29 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1115	>	itemBoxSizer25->Add(itemStaticLine29, 0, wxGROW|wxALL, 5);
1116	>
1117	>	wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1118	>	itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1119	>
1120	>	SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1121	>	SeperatedRadio->SetValue(false);
1122	>	SeperatedRadio->SetName(_T("Seperated_RadioButton"));
1123	>	itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1124	>
1125	>	CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1126	>	CompleteRadio->SetValue(false);
1127	>	CompleteRadio->SetName(_T("Complete_RadioButton"));
1128	>	itemBoxSizer30->Add(CompleteRadio, 0, wxALIGN_LEFT|wxALL, 5);
1129	>
1130	>	wxStaticLine* itemStaticLine33 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1131	>	itemBoxSizer25->Add(itemStaticLine33, 0, wxGROW|wxALL, 5);
1132	>
1133	>	wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL);
1134	>	itemBoxSizer25->Add(itemBoxSizer34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1135	>
1136	>	ReglobalizeButton = new wxButton( OptionsPanel, ReGlobalize_Button, _("Reglobalize"), wxDefaultPosition, wxDefaultSize, 0 );
1137	>	ReglobalizeButton->SetName(_T("Reglobalize_Button"));
1138	>	itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
1139	>
1140	>	// Connect events and objects
1141	>	Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1142		////@end MainWindow content construction
1143
1144	+	Handle = (HWND)GetHWND();
1145	+	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
1146	+
1147	+
1148		if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1149	<	static_cast<string>("-import:sep");
1149	>	strImportOption = "-import:sep";
1150		splitInstances = NOT_SPLIT;
1151		}
1152		else {
1153	<	static_cast<string>("-import:nosep");
1153	>	strImportOption = "-import:nosep";
1154		splitInstances = SPLIT;
1155		}
1156	<
1156	>
1157		globalPackages = getPackages();
1158		globalInstalledMods = getInstallString();
1159		for (int i = 0; i < globalPackages.size(); i++) {
#	Line 1108 | Line 1165 | void MainWindow::CreateControls()
1165		TheInstallButton = InstallButton;
1166		TheProgressBar = ProgressBar;
1167		OptionsPanel->Hide();
1168	<	if(splitInstances == SPLIT) SeparatedRadio->SetValue(true);
1168	>
1169	>	//#ifndef WIN32
1170	>	//      itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1171	>
1172	>	//#endif
1173	>
1174	>	if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
1175		else CompleteRadio->SetValue(true);
1113	–
1114	–
1115	–
1176		if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1177		else SepRadio->SetValue(true);
1178	<
1179	<
1178	>
1179	>
1180		#ifdef WIN32
1181		RedirectIOToConsole();
1182		HWND hWnd = GetConsoleWindow();
1183		ShowWindow( hWnd, SW_HIDE );
1184		#endif
1185	<
1186	<	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
1185	>
1186	>	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
1187		}
1188
1189
#	Line 1180 | Line 1240 | wxBitmap MainWindow::GetBitmapResource(
1240		{
1241		// Bitmap retrieval
1242		////@begin MainWindow bitmap retrieval
1243	<	wxUnusedVar(name);
1244	<	if (name == _T("redo.xpm"))
1245	<	{
1246	<	wxBitmap bitmap(redo_xpm);
1247	<	return bitmap;
1248	<	}
1249	<	else if (name == _T("fileopen.xpm"))
1250	<	{
1251	<	wxBitmap bitmap( fileopen_xpm);
1252	<	return bitmap;
1253	<	}
1254	<	else if (name == _T("filesaveas.xpm"))
1255	<	{
1256	<	wxBitmap bitmap( filesaveas_xpm);
1257	<	return bitmap;
1258	<	}
1259	<	else if (name == _T("quit.xpm"))
1260	<	{
1261	<	wxBitmap bitmap( quit_xpm);
1262	<	return bitmap;
1263	<	}
1264	<	return wxNullBitmap;
1243	>	wxUnusedVar(name);
1244	>	if (name == _T("undo.xpm"))
1245	>	{
1246	>	wxBitmap bitmap( undo_xpm);
1247	>	return bitmap;
1248	>	}
1249	>	else if (name == _T("fileopen.xpm"))
1250	>	{
1251	>	wxBitmap bitmap( fileopen_xpm);
1252	>	return bitmap;
1253	>	}
1254	>	else if (name == _T("filesaveas.xpm"))
1255	>	{
1256	>	wxBitmap bitmap( filesaveas_xpm);
1257	>	return bitmap;
1258	>	}
1259	>	else if (name == _T("quit.xpm"))
1260	>	{
1261	>	wxBitmap bitmap( quit_xpm);
1262	>	return bitmap;
1263	>	}
1264	>	return wxNullBitmap;
1265		////@end MainWindow bitmap retrieval
1266		}
1267
#	Line 1214 | Line 1274 | wxIcon MainWindow::GetIconResource( cons
1274
1275		// Icon retrieval
1276		////@begin MainWindow icon retrieval
1277	<	wxUnusedVar(name);
1278	<	if (name == _T("oni_special.ico"))
1279	<	{
1280	<	//      wxIcon icon(_T("oni_special.ico"), wxBITMAP_TYPE_ICO);
1281	<	//      return icon;
1282	<	}
1283	<	return wxNullIcon;
1277	>	wxUnusedVar(name);
1278	>	if (name == _T("aelogosmall.png"))
1279	>	{
1280	>	wxIcon icon(aelogosmall_xpm);
1281	>	return icon;
1282	>	}
1283	>	return wxNullIcon;
1284		////@end MainWindow icon retrieval
1285		}
1286
#	Line 1268 | Line 1328 | void MainWindow::OnModsCheckboxList1Togg
1328
1329		void MainWindow::OnOptionsClick( wxCommandEvent& event )
1330		{
1271	–
1272	–
1273	–
1274	–
1331		if (!event.GetInt() ) {
1332		OptionsPanel->Hide();
1333	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1333	>
1334	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1335		else {
1336	<	//Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1337	<	//wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                      "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
1338	<	//YesNoDialog->ShowModal();
1336	>	//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1337	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.",
1338	>	"AE Installer Alert",  wxOK | wxICON_EXCLAMATION     , wxDefaultPosition);
1339	>	YesNoDialog->ShowModal();
1340		OptionsPanel->Show();
1341	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
1341	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+1);
1342	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-1);
1343		}
1344		}
1345
#	Line 1320 | Line 1379 | void MainWindow::OnInstallButtonClick( w
1379		localPackages.push_back("Globalize");
1380		for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
1381		if ( !localPackages.empty() )   {
1382	<
1382	>
1383		//MainWindow::MainWindow().Hide();
1384		//      boost::thread thrd2(recompileAll(localPackages) );
1385		//MainWindow::MainWindow().Show();
1386	+	this->InstallButton->Disable();
1387	+	this->ReglobalizeButton->Disable();
1388		#ifdef WIN32
1389		recompile packages(localPackages);
1390		boost::thread thrd(packages);
1391		#else
1331	–	this->Disable();
1392		recompileAll(localPackages);
1333	–	this->Enable();
1393		#endif
1394
1395	+	this->InstallButton->Enable();
1396	+	this->ReglobalizeButton->Enable();
1397		}
1398
1399
#	Line 1352 | Line 1413 | void MainWindow::OnInstallButtonClick( w
1413
1414		void setProgressBar( int i ) {
1415		//TheProgressBar->SetValue(
1416	+	#ifdef WIN32
1417	+
1418	+
1419	+
1420	+	if (SUCCEEDED(pTaskbarList->QueryInterface(IID_ITaskbarList3, (void **)&pTaskbarList3)))
1421	+	{
1422	+
1423	+	pTaskbarList3->SetProgressValue(Handle,i, 1000);
1424	+	if ( i == 0 ) {
1425	+
1426	+	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
1427	+	}
1428	+	}
1429	+
1430
1431	+	#endif
1432		TheProgressBar->SetValue(i);
1433
1434		}
#	Line 1365 | Line 1441 | void setProgressBar( int i ) {
1441		void MainWindow::OnStatusbarUpdate( wxUpdateUIEvent& event )
1442		{
1443		////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1444	<	// Before editing this code, remove the block markers.
1445	<	event.Skip();
1444	>	// Before editing this code, remove the block markers.
1445	>	event.Skip();
1446		////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1447		}
1448
#	Line 1378 | Line 1454 | void MainWindow::OnStatusbarUpdate( wxUp
1454		void MainWindow::OnAboutClick( wxCommandEvent& event )
1455		{
1456		////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1457	<	// Before editing this code, remove the block markers.
1458	<	About* window = new About(this);
1459	<	int returnValue = window->ShowModal();
1460	<	window->Destroy();
1457	>	// Before editing this code, remove the block markers.
1458	>	About* window = new About(this);
1459	>	int returnValue = window->ShowModal();
1460	>	window->Destroy();
1461		////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1462		}
1463
#	Line 1410 | Line 1486 | void MainWindow::OnSepRadioButtonSelecte
1486		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
1487		*/
1488
1413	–	void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1414	–	{
1415	–	splitInstances = SPLIT;
1416	–
1417	–	}
1418	–
1419	–
1489		/*
1490		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
1491		*/
#	Line 1459 | Line 1528 | void MainWindow::refreshMods (vector<str
1528
1529		void MainWindow::OnLoadClick( wxCommandEvent& event )
1530		{
1531	+	if (busy == 1) return;
1532		static const wxChar *FILETYPES = _T(
1533		"Mod Loadouts (*.cfg)|*.cfg|"
1534		"All files (*.*)|*.*"
#	Line 1483 | Line 1553 | void MainWindow::OnLoadClick( wxCommandE
1553
1554		void MainWindow::OnSaveClick( wxCommandEvent& event )
1555		{
1556	+	if (busy == 1) return;
1557		static const wxChar *FILETYPES = _T(
1558		"Mod Loadouts (*.cfg)|*.cfg|"
1559		"All files (*.*)|*.*"
#	Line 1538 | Line 1609 | void MainWindow::OnSaveClick( wxCommandE
1609
1610		void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
1611		{
1612	<	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and reglobalize all of your data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION  , wxDefaultPosition);
1612	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and recreate it from the vanilla Oni game data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION    , wxDefaultPosition);
1613
1614		if (YesNoDialog->ShowModal() == wxID_NO) { //if the user said no...
1615	<
1615	>
1616		}
1617		else {
1547	–
1618
1619	+	this->InstallButton->Disable();
1620	+	this->ReglobalizeButton->Disable();
1621
1622		#ifdef WIN32
1623
1624	<	boost::thread thrd2(globalizeData);
1625	<	//globalizeData();
1626	<	//boost::thread::create_thread(&globalizeData);
1627	<	//       boost::thread_group Tg;
1628	<	// Tg.create_thread( &globalizeData(), this );
1624	>	boost::thread thrd2(globalizeData);
1625	>	//globalizeData();
1626	>	//boost::thread::create_thread(&globalizeData);
1627	>	//       boost::thread_group Tg;
1628	>	// Tg.create_thread( &globalizeData(), this );
1629		#else
1630	<	globalizeData();
1559	<	setProgressBar(1000);
1560	<	setStatusArea("Done!");
1630	>	globalizeData();
1631		#endif
1632	<	}
1632	>
1633	>	this->InstallButton->Enable();
1634	>	this->ReglobalizeButton->Enable();
1635	>	}
1636
1637		}
1638		/*
#	Line 1574 | Line 1647 | event.Skip();
1647		////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1648		}*/
1649
1650	+
1651	+	/*
1652	+	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
1653	+	*/
1654	+
1655	+	void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
1656	+	{
1657	+	splitInstances = SPLIT;
1658	+	}
1659	+

Diff Legend

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