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 325 by iritscen, Tue May 26 18:51:14 2009 UTC vs.
Revision 403 by iritscen, Tue Jul 7 00:55:49 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
3	–	v1.0
15		by Gumby and Iritscen
16	<	*/
16	>	*/
17	>
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
21
22		#define DEBUG
23		#include <stdio.h>
#	Line 17 | Line 32
32		#include <sstream>
33
34		#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
35	<
35	>	#include "boost/lexical_cast.hpp" //int -> string
36		#include "installer.h"
37
38		#ifdef WIN32
#	Line 27 | Line 42
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 42 | Line 57 | const string strOniSplit = "mono Onispli
57		string strImportOption = "-import:sep";
58		const char* strClsCmd = "clear";
59		const char* strPauseCmd = "read -n 1 -p \"Press any key to continue\"";
60	+	void Sleep(int ms) { sleep( ms / 1000 ); }
61		#endif
62
63		using namespace boost::filesystem;
64		using namespace std;
65
66
51	–	/*
52	–	int main(void)
53	–	{
54	–	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) splitInstances = NOT_SPLIT;
55	–	else splitInstances = NOT_SPLIT;
56	–	//     SetConsoleTitle("AE Installer"); windows junk, convert to SDL
57	–	#ifdef WIN32
58	–	system("color 0A");
59	–	#endif
60	–	cout << "\nWelcome to the AE installer!\n";
61	–	cout << "\nWhat would you like to do?\n";
62	–
63	–	return mainMenu();
64	–	}
65	–	*/
66	–
67
68
69	<	int mainMenu(void)
70	<	{
71	<	char choice = '0';
72	<	bool exit = false;
73	<	int err = 0;
74	<	do
75	<	{
76	<	if( exists( "../GameDataFolder" ) ) {
77	<	cout << "\n1. Add new packages\n";
78	<	cout << "2. Remove packages\n";
79	<	cout << "3. See what is installed\n";
80	<	cout << "4. Globalize data\n";
81	<	cout << "5. About AE\n";
82	<	cout << "6. Quit\n\n";
83	<
84	<	choice = cin.get();
85	<	cin.ignore(128, '\n');
86	<	switch(choice)
87	<	{
88	<	case '1':
89	<	err = installPackages();
90	<	break;
91	<	case '2':
92	<	err = uninstallPackages();
93	<	break;
94	<	case '3':
95	<	err = listInstalledPackages();
96	<	break;
97	<	case '4':
98	<	err = globalizeData();
99	<	break;
100	<	case '5':
101	<	err = printInstallerInfo();
102	<	break;
103	<	case '6':
104	<	exit = true;
105	<	break;
106	<	default:
107	<	cout << "Please choose one of the above numbers, and press Enter.\n\n";
108	<	}
109	<	if (err) // if something fatal happened
110	<	exit = true;
111	<	}
112	<	else {
113	<	cout << "\n1. Globalize data\n";
114	<	cout << "2. About AE\n";
115	<	cout << "3. Quit\n\n";
116	<
117	<	choice = cin.get();
118	<	cin.ignore(128, '\n');
119	<	switch(choice)
120	<	{
121	<	case '1':
122	<	err = globalizeData();
123	<	break;
124	<	case '2':
125	<	err = printInstallerInfo();
126	<	break;
127	<	case '3':
128	<	exit = true;
129	<	break;
130	<	default:
131	<	cout << "Please choose one of the above numbers, and press Enter.\n\n";
132	<	}
133	<	if (err) // if something fatal happened
134	<	exit = true;
135	<	}
136	<	} while(!exit);
137	<
138	<	return err;
69	>	#include "boost/date_time/gregorian/gregorian.hpp"
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	+	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());
93	+
94	+	setStatusArea("Globalizing!");
95		int err = 0;
96	<
96	>	int parts_done = 0;
97	>	char Step_x_x[300];
98	>	//char levels[i][5];
99	>	remove("Globalize.log");
100	>	ofstream logfile("Globalize.log");
101	>	logfile << "Globalization started " << to_simple_string(start_time) << endl;
102		try {
103	<	int levels[15] = {0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 18, 19}; // the levels Oni has
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;
107	>	for (int f = 0; f < 15; f++) {
108	>	levels.push_back(levels_cstr[f]);
109	>	}
110		char choice = 0;
111	<
111	>
112		//SetCurrentDirectory("C:/Program Files/Oni/edition/install");
113	<	char levelnum[3];
113	>	///char levels[i][3];
114		path Characters = "../GameDataFolder/level0_Characters";
115		path Particles = "../GameDataFolder/level0_Particles";
116		path Archive = "../GameDataFolder/Archive";
#	Line 156 | Line 119 | int globalizeData(void)
119		path Animations = "../GameDataFolder/level0_Animations";
120		path TRAC = Animations / "level0_TRAC";
121		path TRAM = Animations / "level0_TRAM";
122	+
123	+	vector<path> GDFPaths;
124	+	GDFPaths.push_back(Characters);
125	+	GDFPaths.push_back(Particles);
126	+	GDFPaths.push_back(Textures);
127	+	GDFPaths.push_back(Sounds);
128	+	GDFPaths.push_back(TRAC);
129	+	GDFPaths.push_back(TRAM);
130	+
131	+
132	+	path VanillaCharacters = "VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
133	+	path VanillaParticles = "VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
134	+	path VanillaTextures  = "VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
135	+	path VanillaSounds = "VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
136	+	path VanillaAnimations = "VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
137	+	path VanillaTRAC = "VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
138	+	path VanillaTRAM = "VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
139	+
140	+	vector<path> VanillaPaths;
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	+
149		/*
150	<	if (exists("../GameDataFolder/"))
151	<	{
152	<	//cout << "\nIt looks like you've already globalized Oni's data.\nDo you want to re-globalize?\n(This will erase existing mods installed to the AE's game data.)"
153	<	//      << "\n1. Re-globalize"
154	<	//      << "\n2. Return to main menu\n";
155	<	//choice = cin.get();
156	<	cin.ignore(128, '\n');
157	<	if (choice == '1')
158	<	remove_all("../GameDataFolder"); // remove AE GDF
159	<	if (choice == '2')
160	<	return 0;
161	<	}
162	<	*/
150	>	if (exists("../GameDataFolder/"))
151	>	{
152	>	//cout << "\nIt looks like you've already globalized Oni's data.\nDo you want to re-globalize?\n(This will erase existing mods installed to the AE's game data.)"
153	>	//       << "\n1. Re-globalize"
154	>	//       << "\n2. Return to main menu\n";
155	>	//choice = cin.get();
156	>	cin.ignore(128, '\n');
157	>	if (choice == '1')
158	>	remove_all("../GameDataFolder"); // remove AE GDF
159	>	if (choice == '2')
160	>	return 0;
161	>	}
162	>	*/
163	>	setStatusArea("Removing old GameDataFolder...\n");
164	>	logfile <<  "Removing old GameDataFolder...\n";
165	>	remove_all( "../GameDataFolder/" );
166	>	setStatusArea("Creating needed directories...");
167	>	logfile <<  "Creating needed directories...\n";
168		create_directory( "../GameDataFolder/" );
169	+
170		create_directory( "packages" );
171	<	if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats");
172	<	create_directory( "packages/VanillaDats" );
173	<
174	<	create_directory( "packages/VanillaDats/level0_Final/" );
171	>
172	>	if (exists("VanillaDats")) remove_all("VanillaDats");
173	>	create_directory( "VanillaDats" );
174	>	create_directory( "VanillaDats/level0_Final/" );
175	>	//blah blah finish this.
176	>	//logfile <<  "VanillaDats/level0_Final/ created";
177		create_directory( Characters );
178		create_directory( Particles );
179		create_directory( Archive );
#	Line 184 | Line 182 | int globalizeData(void)
182		create_directory( Animations );
183		create_directory( TRAC );
184		create_directory( TRAM );
185	<
185	>	int num_levels = 0;
186	>	for(int i = 1; i < 15; i++)
187	>	{
188	>	if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
189	>	num_levels++;
190	>
191	>	}
192	>	}
193	>	logfile << "Exporting and moving...\n\n";
194	>	int total_steps =  8 + 2 * num_levels;
195		for(int i = 0; i < 15; i++)
196		{
197	<	sprintf(levelnum,"%d",levels[i]); // int to char array
198	<	exists("../../GameDataFolder/level" + (string)levelnum + "_Final");
199	<	system((strOniSplit + " -export ../GameDataFolder/level" + (string)levelnum + "_Final ../../GameDataFolder/level" + (string)levelnum + "_Final.dat").c_str());
200	<
201	<	create_directory( "packages/VanillaDats/level" + (string)levelnum + "_Final" ); //remember to cast your arrays as strings :)
202	<	create_directory( "packages/VanillaDats/level" + (string)levelnum + "_Final/level" + (string)levelnum + "_Final" );
203	<
204	<	directory_iterator end_iter;
205	<	for ( directory_iterator dir_itr( "../GameDataFolder/level" + (string)levelnum + "_Final" ); dir_itr != end_iter; ++dir_itr )
206	<	{
207	<	//cout << dir_itr->path().filename();
208	<	if ( is_regular_file( dir_itr->status() ) )
197	>
198	>	//printf(levels[i],"%d",levels[i]); // int to char array
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");
207	>	system((strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat").c_str());
208	>	create_directory( "VanillaDats/level" + levels[i] + "_Final" );
209	>	create_directory( "VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
210	>
211	>	directory_iterator end_iter;
212	>	for ( directory_iterator dir_itr( "../GameDataFolder/level" + levels[i] + "_Final" ); dir_itr != end_iter; ++dir_itr )
213		{
214	<
215	<	if ( dir_itr->path().filename().substr(0,8) == "TXMPfail" ||
205	<	dir_itr->path().filename().substr(0,9) == "TXMPlevel" ||
206	<	( dir_itr->path().filename().substr(0,4) == "TXMP" && dir_itr->path().filename().find("intro")!=string::npos) ||
207	<	dir_itr->path().filename().substr(0,4) == "TXMB" ||
208	<	dir_itr->path().filename() == "M3GMpowerup_lsi.oni" ||
209	<	dir_itr->path().filename() == "TXMPlsi_icon.oni" ||
210	<	( dir_itr->path().filename().substr(0,4) == "TXMB" && dir_itr->path().filename().find("splash_screen.oni")!=string::npos)       )
214	>	//cout << dir_itr->path().filename();
215	>	if ( is_regular_file( dir_itr->status() ) )
216		{
217	<	cout <<dir_itr->path().filename() << "\n";
218	<	create_directory( dir_itr->path().parent_path() / "NoGlobal");
219	<	if(!exists( dir_itr->path().parent_path() / "NoGlobal" / dir_itr->filename())) rename(dir_itr->path(), dir_itr->path().parent_path() / "NoGlobal" /
220	<	dir_itr->filename());
221	<	else remove(dir_itr->path());
222	<	}
223	<	else if (dir_itr->path().filename().substr(0,4) == "TRAC") {
224	<	cout <<dir_itr->path().filename() << "\n";
225	<	if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
226	<	else remove(dir_itr->path());
227	<	}
228	<	else if (dir_itr->path().filename().substr(0,4) == "TRAM") {
229	<	cout <<dir_itr->path().filename() << "\n";
230	<	if(!exists( TRAM / dir_itr->filename())) rename(dir_itr->path(), TRAM / dir_itr->filename());
231	<	else remove(dir_itr->path());
232	<	}
233	<	else if (dir_itr->path().filename().substr(0,4) == "ONSK" ||
234	<	dir_itr->path().filename().substr(0,4) == "TXMP") {
235	<	cout <<dir_itr->path().filename() << "\n";\
236	<	create_directory( dir_itr->path().parent_path() / "TexFix");
237	<	if(!exists( Textures / dir_itr->filename())) rename(dir_itr->path(), Textures / dir_itr->filename());
238	<	//rename(dir_itr->path(), dir_itr->path().parent_path() / "TexFix" / dir_itr->filename());
239	<	}
240	<	else if (dir_itr->path().filename().substr(0,4) == "ONCC"
241	<	|| dir_itr->path().filename().substr(0,4) == "TRBS"
242	<	|| dir_itr->path().filename().substr(0,4) == "TRMA"
243	<	|| dir_itr->path().filename().substr(0,4) == "TRSC"
244	<	|| dir_itr->path().filename().substr(0,4) == "TRAS") {
245	<	cout <<dir_itr->path().filename() << "\n";
246	<	if(!exists( Characters / dir_itr->filename())) rename(dir_itr->path(), Characters / dir_itr->filename());
247	<	else remove(dir_itr->path());
248	<	}
249	<	else if (dir_itr->path().filename().substr(0,4) == "OSBD"
250	<	|| dir_itr->path().filename().substr(0,4) == "SNDD") {
251	<	cout << dir_itr->path().filename() << "\n";
252	<	if(!exists( Sounds / dir_itr->filename())) rename(dir_itr->path(), Sounds / dir_itr->filename());
253	<	else remove(dir_itr->path());
254	<	}
255	<	else if (dir_itr->path().filename().substr(0,5) == "BINA3"
256	<	|| dir_itr->path().filename().substr(0,10) == "M3GMdebris"
257	<	|| dir_itr->path().filename() == "M3GMtoxic_bubble.oni"
258	<	|| dir_itr->path().filename().substr(0,8) == "M3GMelec"
259	<	|| dir_itr->path().filename().substr(0,7) == "M3GMrat"
260	<	|| dir_itr->path().filename().substr(0,7) == "M3GMjet"
261	<	|| dir_itr->path().filename().substr(0,9) == "M3GMbomb_"
262	<	|| dir_itr->path().filename() == "M3GMbarab_swave.oni"
263	<	|| dir_itr->path().filename() == "M3GMbloodyfoot.oni"
264	<	){
265	<	cout <<dir_itr->path().filename() << "\n";
266	<	if(!exists( Particles / dir_itr->filename())) rename(dir_itr->path(), Particles / dir_itr->filename());
267	<	else remove(dir_itr->path());
268	<	}
269	<	else if (dir_itr->path().filename().substr(0,4) == "AGDB"
270	<	|| dir_itr->path().filename().substr(0,4) == "TRCM") {
271	<	cout <<dir_itr->path().filename() << "\n";
272	<
273	<	if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
274	<	else remove(dir_itr->path());
217	>	if ( dir_itr->path().filename().substr(0,8) == "TXMPfail" ||
218	>	dir_itr->path().filename().substr(0,9) == "TXMPlevel" ||
219	>	( dir_itr->path().filename().substr(0,4) == "TXMP" && dir_itr->path().filename().find("intro")!=string::npos) ||
220	>	dir_itr->path().filename().substr(0,4) == "TXMB" ||
221	>	dir_itr->path().filename() == "M3GMpowerup_lsi.oni" ||
222	>	dir_itr->path().filename() == "TXMPlsi_icon.oni" ||
223	>	( dir_itr->path().filename().substr(0,4) == "TXMB" && dir_itr->path().filename().find("splash_screen.oni")!=string::npos)       )
224	>	{
225	>	cout <<dir_itr->path().filename() << "\n";
226	>	create_directory( dir_itr->path().parent_path() / "NoGlobal");
227	>	if(!exists( dir_itr->path().parent_path() / "NoGlobal" / dir_itr->filename())) rename(dir_itr->path(), dir_itr->path().parent_path() / "NoGlobal" /
228	>	dir_itr->filename());
229	>	else remove(dir_itr->path());
230	>	}
231	>	else if (dir_itr->path().filename().substr(0,4) == "TRAC"
232	>	|| dir_itr->path().filename().substr(0,4) == "ONVL") {
233	>	cout <<dir_itr->path().filename() << "\n";
234	>	if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
235	>	else remove(dir_itr->path());
236	>	}
237	>	else if (dir_itr->path().filename().substr(0,4) == "TRAM") {
238	>	cout <<dir_itr->path().filename() << "\n";
239	>	if(!exists( TRAM / dir_itr->filename())) rename(dir_itr->path(), TRAM / dir_itr->filename());
240	>	else remove(dir_itr->path());
241	>	}
242	>	else if (dir_itr->path().filename().substr(0,4) == "ONSK" ||
243	>	dir_itr->path().filename().substr(0,4) == "TXMP") {
244	>	cout <<dir_itr->path().filename() << "\n";\
245	>	create_directory( dir_itr->path().parent_path() / "TexFix");
246	>	if(!exists( Textures / dir_itr->filename())) rename(dir_itr->path(), Textures / dir_itr->filename());
247	>	//rename(dir_itr->path(), dir_itr->path().parent_path() / "TexFix" / dir_itr->filename());
248	>	}
249	>	else if (dir_itr->path().filename().substr(0,4) == "ONCC"
250	>	|| dir_itr->path().filename().substr(0,4) == "TRBS"
251	>	|| dir_itr->path().filename().substr(0,4) == "ONCV"
252	>	|| dir_itr->path().filename().substr(0,4) == "TRMA"
253	>	|| dir_itr->path().filename().substr(0,4) == "TRSC"
254	>	|| dir_itr->path().filename().substr(0,4) == "TRAS") {
255	>	cout <<dir_itr->path().filename() << "\n";
256	>	if(!exists( Characters / dir_itr->filename())) rename(dir_itr->path(), Characters / dir_itr->filename());
257	>	else remove(dir_itr->path());
258	>	}
259	>	else if (dir_itr->path().filename().substr(0,4) == "OSBD"
260	>	|| dir_itr->path().filename().substr(0,4) == "SNDD") {
261	>	cout << dir_itr->path().filename() << "\n";
262	>	if(!exists( Sounds / dir_itr->filename())) rename(dir_itr->path(), Sounds / dir_itr->filename());
263	>	else remove(dir_itr->path());
264	>	}
265	>	else if (dir_itr->path().filename().substr(0,5) == "BINA3"
266	>	|| dir_itr->path().filename().substr(0,10) == "M3GMdebris"
267	>	|| dir_itr->path().filename() == "M3GMtoxic_bubble.oni"
268	>	|| dir_itr->path().filename().substr(0,8) == "M3GMelec"
269	>	|| dir_itr->path().filename().substr(0,7) == "M3GMrat"
270	>	|| dir_itr->path().filename().substr(0,7) == "M3GMjet"
271	>	|| dir_itr->path().filename().substr(0,9) == "M3GMbomb_"
272	>	|| dir_itr->path().filename() == "M3GMbarab_swave.oni"
273	>	|| dir_itr->path().filename() == "M3GMbloodyfoot.oni"
274	>	){
275	>	cout <<dir_itr->path().filename() << "\n";
276	>	if(!exists( Particles / dir_itr->filename())) rename(dir_itr->path(), Particles / dir_itr->filename());
277	>	else remove(dir_itr->path());
278	>	}
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	>
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( "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
290	>	else remove(dir_itr->path());
291	>	}
292	>	if (exists(dir_itr->path())) {
293	>
294	>	}
295	>	else {
296	>	logfile << "\tMoved file: " << dir_itr->path().filename() << "\n";
297	>	}
298		}
299	+
300	+
301	+
302		}
303	<
304	<
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	>
309		}
275	–	system( (strOniSplit + " -move:delete " + Textures.string() + " ../GameDataFolder/level" + (string)levelnum + "_Final/TXMP*.oni").c_str());
276	–
310		}
311	<
311	>	logfile << "Reimporting levels\n";
312		for (int i = 0; i < 15; i++)
313		{
314	<	sprintf(levelnum,"%d",levels[i]);
315	<	system( (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levelnum + "_Final packages/VanillaDats/level" + levelnum + "_Final/level"
316	<	+ levelnum + "_Final/level" + levelnum + "_Final.oni").c_str());
314	>	logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
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	>	logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final 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 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++;
325		}
285	–	path VanillaCharacters = "packages/VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
286	–	path VanillaParticles = "packages/VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
287	–	path VanillaTextures  = "packages/VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
288	–	path VanillaSounds = "packages/VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
289	–	path VanillaAnimations = "packages/VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
290	–	path VanillaTRAC = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
291	–	path VanillaTRAM = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
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	+
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() );
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	+	/*
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) ));
343		system((strOniSplit + " " + strImportOption + " " + Particles.string() + " " + VanillaParticles.string()).c_str());
344	+	parts_done++; printf(Step_x_x,"Step %d/%d: reimporting level0_Textures", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
345		system((strOniSplit + " " + strImportOption + " " + Textures.string() + " " + VanillaTextures.string()).c_str());
346		//system((strOniSplit   + " " + strImportOption + (string)" " + Animations.string() + (string)" " + VanillaAnimations.string()).c_str());
347	+	parts_done++; printf(Step_x_x,"Step %d/%d: reimporting level0_TRAC", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
348		system((strOniSplit + " " + strImportOption + " " + TRAC.string() + " " + VanillaTRAC.string()).c_str());
349	+	parts_done++; printf(Step_x_x,"Step %d/%d: reimporting level0_Sounds", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
350		system((strOniSplit + " " + strImportOption + " " + Sounds.string() + " " + VanillaSounds.string()).c_str());
351	<	system((strOniSplit + " " + strImportOption + " " + TRAM.string() + " " + VanillaTRAM.string()).c_str());
352	<
353	<	create_directory("../GameDataFolder/IGMD");
351	>	parts_done++; printf(Step_x_x,"Step %d/%d: reimporting level0_TRAM", parts_done,7 + 2 * num_levels); setStatusArea((string)Step_x_x);setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
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	>	*/
356	>	create_directory((path)"../GameDataFolder/IGMD");
357		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
358	<	}
308	<	catch (exception ex) {
309	<	cout << ex.what();
310	<	}
311	<	return err;
312	<	}
358	>	setProgressBar( 1000 );
359
360	<	int installPackages(void)
361	<	{
362	<	bool installed_something = 0;
363	<	int err = 0;
364	<	ModPackage package;
365	<	vector<string> installed_packages;
366	<	vector<ModPackage> packages;
367	<	vector<ModPackage>::iterator iter;
368	<	vector<string> installString;
369	<
370	<	iter = packages.begin();
371	<	packages = getPackages();
372	<	vector<string> installedMods = getInstallString();
373	<
374	<	if (packages.empty())
375	<	{
376	<	cout << "Error: You have no packages!\n";
377	<	return 0;
378	<	}
379	<
334	<	cout << "Detecting installed packages...\n";
335	<
336	<	int index = 1;
337	<	char choice = '0';
338	<
339	<	for (vector<ModPackage>::iterator package_iter = packages.begin(); package_iter != packages.end(); ++package_iter)
340	<	{
341	<	if (!binary_search(installedMods.begin(), installedMods.end(), package_iter->modStringName))
342	<	{ //package_iter->isInstalled :< I forgot about this...
343	<	//cout << index << " ";
344	<	system(strClsCmd);
345	<	cout << (*package_iter).name << "\n";
346	<	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << '-';
347	<	cout << "\n"
348	<	<< (*package_iter).readme << "\n\n"
349	<	<< "Please enter a number choice\n"
350	<	<< " 1. Add\n"
351	<	<< " 2. Don't Add\n"
352	<	<< "";
353	<	index++;
354	<	choice = 0;
355	<
356	<	do
357	<	{
358	<	choice = cin.get();
359	<	cin.ignore(1280, '\n');
360	<	} while(choice == 0);
361	<
362	<	if (choice == '1')
363	<	{
364	<	cout << "\nInstalling...\n\n";
365	<	if (package_iter->hasOnis || (package_iter->hasDeltas /*(*package_iter).isUnpacked */ ))
366	<	{
367	<	installed_something = 1;
368	<	installedMods.push_back(package_iter->modStringName);
369	<	system(strPauseCmd);
370	<	}
371	<	}
372	<	}
373	<	}
374	<	if (index == 1)
375	<	{
376	<	cout << "Warning: All packages are already installed\n";
377	<	//would you like to recombine your data?
378	<	return 0;
379	<	}
380	<	if (installed_something == 0)
381	<	{
382	<	cout << "Warning: You didn't add anything!\n";
383	<	//would you like to recombine your data?
384	<	return 0;
385	<	}
386	<
387	<	sort(installedMods.begin(), installedMods.end());
388	<	//system(Onisplit.c_str());
389	<	recompileAll(installedMods);
390	<	system(strPauseCmd);
391	<
392	<	return err;
393	<	}
360	>	if(!exists("../persist.dat"))
361	>	copy("../../persist.dat","..");
362	>	if(!exists("../key_config.txt"))
363	>	copy("../../key_config.txt","..");
364	>
365	>	#ifndef WIN32
366	>	/* 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).
367	>	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
368	>	run Oni before :-p */
369	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
370	>	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
371	>	strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
372	>	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
373	>	system(prefsCommand);
374	>
375	>	#endif
376	>
377	>
378	>	setStatusArea((string)"Done! Now select your mod packages and click install.");
379	>	//      while(1) Sleep(-1);
380
395	–	int uninstallPackages(void)
396	–	{
397	–	int err = 0;
398	–	ModPackage package;
399	–	vector<string> installed_packages;
400	–	vector<ModPackage> packages;
401	–	vector<ModPackage>::iterator iter;
402	–	vector<string> installString;
403	–
404	–	iter = packages.begin();
405	–	packages = getPackages();
406	–
407	–
408	–	cout << "Detecting installed packages...\n";
409	–
410	–	vector<string> installedMods = getInstallString();
411	–
412	–	if (packages.empty())
413	–	{
414	–	cout << "Error: You have no packages!\n";
415	–	return 0;
381		}
382	<
383	<	int index = 0;
419	<	int uninstalled_something = 0;
420	<	char choice = '0';
421	<
422	<	for (vector<ModPackage>::iterator package_iter = packages.begin(); package_iter != packages.end(); ++package_iter)
423	<	{
424	<	if (binary_search(installedMods.begin(), installedMods.end(), package_iter->modStringName))
425	<	{ //package_iter->isInstalled :< I forgot about this...
426	<	//cout << index << " ";
427	<	system(strClsCmd);
428	<	cout << (*package_iter).name << "\n";
429	<	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << '-';
430	<	cout << "\n"
431	<	<< (*package_iter).readme << "\n\n"
432	<	<< "Please enter a number choice\n"
433	<	<< " 1. Remove\n"
434	<	<< " 2. Don't Remove\n"
435	<	<< "";
436	<
437	<	choice = 0;
438	<
439	<	do
440	<	{
441	<	choice = cin.get();
442	<	cin.ignore(1280, '\n');
443	<	} while(choice == 0);
444	<
445	<	if (choice == '1')
446	<	{
447	<	cout << "\nUninstalling...\n\n";
448	<	installedMods.erase( installedMods.begin() + (index) );
449	<	system(strPauseCmd);
450	<	uninstalled_something = 1;
451	<
452	<	}
453	<	else {
454	<	index++;
455	<	}
456	<	}
382	>	catch (exception & ex) {
383	>	setStatusArea("Warning, handled exception: " + (string)ex.what());
384		}
458	–	if ( uninstalled_something == 0 )
459	–	{
460	–	if (index == 0) //bad practice, I need to implement a second vector or something. Meh.
461	–	{
462	–	cout << "\nWarning: You have no installed packages!";
463	–	}
464	–	else
465	–	{
466	–	cout << "\nWarning: You didn't remove anything!";
467	–	}
468	–	//would you like to recombine your data?
469	–	return 0;
470	–
471	–	}
472	–	sort(installedMods.begin(), installedMods.end());
473	–	//system(Onisplit.c_str());
474	–	recompileAll(installedMods);
475	–	system(strPauseCmd);
476	–
477	–	return err;
478	–	}
385
386	<	int listInstalledPackages(void)
387	<	{
388	<	cout << "\nThis feature not yet implemented.\n\n";
389	<
390	<	return 0;
386	>	ptime end_time(second_clock::local_time());
387	>	time_period total_time (start_time, end_time);
388	>	logfile << "\n\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
389	>	//total_time.length().hours();
390	>	logfile.close();
391	>	busy = 0;
392	>	return err;
393		}
394
487	–	int printInstallerInfo(void)
488	–	{
489	–	cout << "\nAE/Mod Installer\n";
490	–	cout << "version " << strInstallerVersion << "\n";
491	–	cout << "by Gumby & Iritscen\n";
492	–	cout << "see http://oni.bungie.org/community/forums for more info\n\n";
493	–
494	–	return 0;
495	–	}
395
396		vector<ModPackage> getPackages(void)
397		{
#	Line 501 | Line 400 | vector<ModPackage> getPackages(void)
400		fstream file;
401		string filename = "\0";
402		string MODINFO_CFG = "Mod_Info.cfg";
403	<
403	>
404		try
405		{
406		directory_iterator end_iter;
#	Line 509 | Line 408 | vector<ModPackage> getPackages(void)
408		{
409		file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
410		//cout << filename << "\n";
411	<
411	>
412		if(!file.fail())
413		{
414		//cout << dir_itr->path().string() + MODINFO_CFG;
#	Line 519 | Line 418 | vector<ModPackage> getPackages(void)
418		file.close();
419		file.clear();
420		}
421	+	sort(packages.begin(), packages.end());
422		}
423		catch (const std::exception & ex)
424		{
425		cout << "Warning, something odd happened!\n";
426		}
427	<
427	>
428		return packages;
429		}
430
431		ModPackage fileToModPackage(fstream &file)
432		{
433		/*
434	<	This converts a file to a ModPackage struct.
435	<
436	<	A few notes...
437	<	"iter" is the current word we are on. I should have named it "token" or something, but I don't have multiple iterators, so its ok.
438	<	I refer to (*iter) at the beginning of each if statement block. I could probably store it as a variable, but I'm pretty sure that dereferencing a pointer\iterator isn't much
439	<	slower than reading a variable.
440	<	*/
434	>	This converts a file to a ModPackage struct.
435	>
436	>	A few notes...
437	>	"iter" is the current word we are on. I should have named it "token" or something, but I don't have multiple iterators, so its ok.
438	>	I refer to (*iter) at the beginning of each if statement block. I could probably store it as a variable, but I'm pretty sure that dereferencing a pointer\iterator isn't much
439	>	slower than reading a variable.
440	>	*/
441		ModPackage package;
442		string line;
443		static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
#	Line 562 | Line 462 | ModPackage fileToModPackage(fstream &fil
462		if (tokens.capacity() >= 2) {                   //make sure they are using enough stuff
463		iter = tokens.begin();                          //what word we are on, starts at first word
464		/*
465	<	if (!AEInstallVersion.compare(*iter))
466	<	If mod is too old, skip this mod.
467	<	*/
465	>	if (!AEInstallVersion.compare(*iter))
466	>	If mod is too old, skip this mod.
467	>	*/
468		/*else*/if (!NameOfMod.compare(*iter))  {       //if it contains the name
469		for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
470		if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) {                 //ignores "->" and "NameOfMod"
#	Line 573 | Line 473 | ModPackage fileToModPackage(fstream &fil
473		package.name += *iter + " ";
474		}
475		}
476	<
476	>
477		}
478		else if (!ModString.compare(*iter)) {
479		iter++; iter++;
#	Line 585 | Line 485 | ModPackage fileToModPackage(fstream &fil
485		iter++; iter++;
486		if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasOnis = 1; //Gotta love c++'s lack of a standard case-insensitive
487		else if (!HasBSL.compare(*iter)) { // string comparer...I know my implementation here sucks. I need to change it to check each character one by one. At the moment,
488	<	iter++; iter++;}  // using "YFR" would probably set it off. :<
489	<
488	>	iter++; iter++;}  // using "YFR" would probably set it off. :<
489	>
490		if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasBSL = 1;
491		}
492		else if (!HasDeltas.compare(*iter)) {
#	Line 633 | Line 533 | ModPackage fileToModPackage(fstream &fil
533		}
534		}
535		}
536	<
536	>
537		}
538		package.doOutput();
539		return package;
#	Line 641 | Line 541 | ModPackage fileToModPackage(fstream &fil
541
542		void recompileAll(vector<string> installedMods)
543		{
544	<	#ifdef WIN32
545	<	RedirectIOToConsole();
546	<	HWND hWnd = GetConsoleWindow();
547	<	ShowWindow( hWnd, SW_HIDE );
548	<	#endif
544	>	busy = 1;
545	>	using namespace boost::gregorian;
546	>	using namespace boost::posix_time;
547	>	using boost::lexical_cast;
548	>	using boost::bad_lexical_cast;
549	>
550		setStatusArea("Importing levels...");
551		//setStatusArea("Recompiling Data...");
552	<	path vanilla_dir = "./packages/VanillaDats/";
552	>	path vanilla_dir = "./VanillaDats/";
553		string importCommand = "";
554		char statusString[128];
555		int numberOfDats = 0;
556		int j = 1;
557		string datString;
558		std::stringstream out;
559	<
560	<
559	>
560	>	ptime start_time(second_clock::local_time());
561		clearOldDats();
562	<	remove("Onisplit.log");
562	>	remove("Install.log");
563	>	ofstream logfile("Install.log");
564	>	logfile << "Mod Installation started " << to_simple_string(start_time) << endl;
565	>	logfile.close();
566		if(splitInstances == SPLIT){
567		recursive_directory_iterator end_iter;
568	<
568	>
569		for ( recursive_directory_iterator dir_itr( vanilla_dir );
570	<	dir_itr != end_iter;
571	<	++dir_itr )
570	>	dir_itr != end_iter;
571	>	++dir_itr )
572		{
573		try{
574		if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
#	Line 673 | Line 577 | void recompileAll(vector<string> install
577		}
578		}
579		catch(exception ex) {
580	<
580	>
581		}
582		}
583	<
583	>	try {
584		//recursive_directory_iterator end_iter;
585	<
586	<
585	>
586	>
587		out << numberOfDats;
588		datString = out.str();
685	–	try {
589		for ( recursive_directory_iterator dir_itr( vanilla_dir );
590	<	dir_itr != end_iter;
591	<	++dir_itr )
590	>	dir_itr != end_iter;
591	>	++dir_itr )
592		{
593		try
594		{
#	Line 695 | Line 598 | void recompileAll(vector<string> install
598		for (int i = 0; i < installedMods.size(); ++i) {
599		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename()  ))
600		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
601	<
602	<	//else cout << " packages/VanillaDats/" + installedMods[i] + "/oni/";
601	>
602	>	//else cout << " VanillaDats/" + installedMods[i] + "/oni/";
603		}
604	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Onisplit.log";
604	>	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
605	>
606
703	–	sprintf(statusString,"%d/%i\0",j,numberOfDats);
607		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
608	<	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
609	<
608	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
609	>
610		system(importCommand.c_str());
611		//Sleep(1000);
612		//cout << importCommand << "\n";
613		j++;
614	<
614	>
615		}
616		}
617		catch ( const std::exception & ex )
618		{
619	<	cout << "Warning, exception " << ex.what() << "!";
619	>
620	>	remove("Install.log");
621	>	ofstream logfile("Install.log");
622	>
623	>
624	>	logfile << "Warning, exception " << ex.what() << "!";
625	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
626	>	logfile.close();
627		}
628		}
629	<
629	>
630		}
631		catch( const std::exception & ex ) {
632	<	cout << "Warning, exception " << ex.what() << "!\n"
633	<	<< "You probably need to re-globalize.";
634	<	//create_directory( "./packages/VanillaDats" );
632	>
633	>	remove("Install.log");
634	>	ofstream logfile("Install.log");
635	>
636	>
637	>	logfile << "Warning, exception " << ex.what() << "!";
638	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
639	>	logfile.close();
640		}
641	<
641	>
642		}
643		else if(splitInstances == NOT_SPLIT){
644		directory_iterator end_iter;
645	<
645	>
646		for ( directory_iterator dir_itr( vanilla_dir );
647	<	dir_itr != end_iter;
648	<	++dir_itr )
647	>	dir_itr != end_iter;
648	>	++dir_itr )
649		{
650	<
650	>
651		if ( is_directory( dir_itr->status() ) )
652		{
653		numberOfDats++;
654		}
655	<
656	<
655	>
656	>
657		}
658	<
658	>
659		out << numberOfDats;
660		datString = out.str();
661	<
661	>
662		for ( directory_iterator dir_itr( vanilla_dir );
663	<	dir_itr != end_iter;
664	<	++dir_itr )
663	>	dir_itr != end_iter;
664	>	++dir_itr )
665		{
666		try
667		{
668		if ( is_directory( dir_itr->status() ) )
669		{
670	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
756	<	+ ".dat";
670	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
671		for (int i = 0; i < installedMods.size(); ++i) {
672		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
673		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
674		}
675	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat";
676	<
677	<	sprintf(statusString,"%d/%i\0",j,numberOfDats);
675	>	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
676	>
677	>
678		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
679	<	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
680	<
679	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
680	>
681		system(importCommand.c_str());
682	<
682	>
683		j++;
684		}
685		}
686		catch ( const std::exception & ex )
687		{
688	<	cout << "Warning, something odd happened!\n";
689	<	}
690	<	}
688	>
689	>	remove("Install.log");
690	>	ofstream logfile("Install.log");
691	>
692	>
693	>	logfile << "Warning, exception " << ex.what() << "!";
694	>	setStatusArea("Warning, exception " + (string)ex.what() + "!");
695	>	logfile.close();
696	>	}}
697		}
698	+	logfile << "Writing config file";
699		writeInstalledMods(installedMods);
700		setProgressBar(1000);
701	<	setStatusArea("Done!");
702	<	sleep(1000);
701	>	setStatusArea("Done! You can now play Oni.");
702	>
703	>	ptime end_time(second_clock::local_time());
704	>	time_period total_time (start_time, end_time);
705	>
706	>
707	>	ofstream logfile2("Install.log", ios::app | ios::ate);
708	>	string outstring = (string)"\n\nGlobalization ended " + to_simple_string(end_time) + "\nThe process took ";// + (string)total_time.length();
709	>
710	>	logfile2 << "\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
711	>
712	>	//logfile2.write(outstring.c_str(), outstring.length());
713	>	logfile2.close();
714	>
715	>	//total_time.length().hours();
716	>
717	>	Sleep(1000);
718		setProgressBar(0);
719	<
719	>	busy = 0;
720		}
721
722		void writeInstalledMods(vector<string> installedMods)
723		{
724	<
724	>
725		if ( exists( strInstallCfg ) )
726		{
727		remove( strInstallCfg );
728		}
729	<
729	>
730		ofstream file(strInstallCfg.c_str());
731	<
731	>
732		vector<string>list = installedMods;
733		vector<string>::iterator begin_iter = list.begin();
734		vector<string>::iterator end_iter = list.end();
735	<
735	>
736		sort( list.begin(), list.end() );
737	<
737	>
738		for( ; begin_iter != end_iter; ++begin_iter) {
739		file << *begin_iter << " ";
740		}
741	<
741	>
742		file.close();
743		file.clear();
744	<
744	>
745		}
746
747		vector<string> getInstallString(string Cfg)
748		{
749		//system(strPauseCmd);
750		vector<string> returnval;
751	<
751	>
752		string line;
753		fstream file;
754	<
754	>
755		if (exists( Cfg ))
756		{
757		file.open(Cfg.c_str());
#	Line 826 | Line 762 | vector<string> getInstallString(string C
762		sort(returnval.begin(), returnval.end());
763		}
764		else cout << "fail";
765	<
765	>
766		return returnval;
767		}
768
#	Line 837 | Line 773 | void tokenize(const string& str, vector<
773		string::size_type lastPos = str.find_first_not_of(delimiters, 0);
774		// Find first "non-delimiter".
775		string::size_type pos     = str.find_first_of(delimiters, lastPos);
776	<
776	>
777		while (string::npos != pos || string::npos != lastPos)
778		{
779		// Found a token, add it to the vector.
#	Line 852 | Line 788 | void tokenize(const string& str, vector<
788		void clearOldDats(void) {
789		directory_iterator end_iter_gdf;
790		for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );
791	<	dir_itr_gdf != end_iter_gdf;
792	<	++dir_itr_gdf )
791	>	dir_itr_gdf != end_iter_gdf;
792	>	++dir_itr_gdf )
793		{
794		//cout << dir_itr_gdf->path().extension() << "\n";
795		if ( dir_itr_gdf->path().extension() == ".dat" || dir_itr_gdf->path().extension() == ".raw" || dir_itr_gdf->path().extension() == ".sep" ) {
796		remove( dir_itr_gdf->path() );
797		}
798	<
798	>
799		}
800	<
800	>
801		}
802
803		vector<string> globalInstalledMods;
#	Line 892 | Line 828 | vector<ModPackage> globalPackages;
828		#endif
829
830		////@begin includes
831	<	#include "about_window.h"
831	>	#include "about.h"
832		////@end includes
833
834		#include "main_window.h"
835
836		////@begin XPM images
837	<	#include "redo.xpm"
837	>	#include "aelogosmall.xpm"
838	>	#include "undo.xpm"
839		#include "fileopen.xpm"
840		#include "filesaveas.xpm"
841		#include "quit.xpm"
#	Line 908 | Line 845 | vector<ModPackage> globalPackages;
845		//#define wxUSE_UNICODE 1;
846
847		/*
848	<	* MainWindow type definition
849	<	*/
848	>	* MainWindow type definition
849	>	*/
850
851		IMPLEMENT_CLASS( MainWindow, wxFrame )
852
853
854		/*
855	<	* MainWindow event table definition
856	<	*/
855	>	* MainWindow event table definition
856	>	*/
857
858		BEGIN_EVENT_TABLE( MainWindow, wxFrame )
859
#	Line 936 | Line 873 | BEGIN_EVENT_TABLE( MainWindow, wxFrame )
873
874		EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
875
876	<	EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected )
876	>	EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected )
877
878		EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
879
#	Line 958 | Line 895 | END_EVENT_TABLE()
895
896
897		/*
898	<	* MainWindow constructors
899	<	*/
898	>	* MainWindow constructors
899	>	*/
900
901		MainWindow::MainWindow()
902		{
903	<	Init();
903	>	Init();
904		}
905
906		MainWindow::MainWindow( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
907		{
908	<	Init();
909	<	Create( parent, id, caption, pos, size, style );
908	>	Init();
909	>	Create( parent, id, caption, pos, size, style );
910		}
911
912
913		/*
914	<	* MainWindow creator
915	<	*/
914	>	* MainWindow creator
915	>	*/
916
917		bool MainWindow::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
918		{
919	<	////@begin MainWindow creation
919	>	////@begin MainWindow creation
920		wxFrame::Create( parent, id, caption, pos, size, style );
921
922		CreateControls();
923	<	SetIcon(GetIconResource(wxT("oni_special.ico")));
923	>	SetIcon(GetIconResource(wxT("aelogosmall.png")));
924		Centre();
925	<	////@end MainWindow creation
926	<	return true;
925	>	////@end MainWindow creation
926	>	return true;
927		}
928
929
930		/*
931	<	* MainWindow destructor
932	<	*/
931	>	* MainWindow destructor
932	>	*/
933
934		MainWindow::~MainWindow()
935		{
936	<	////@begin MainWindow destruction
937	<	////@end MainWindow destruction
936	>	////@begin MainWindow destruction
937	>	////@end MainWindow destruction
938		}
939
940
941		/*
942	<	* Member initialisation
943	<	*/
942	>	* Member initialisation
943	>	*/
944
945		void MainWindow::Init()
946		{
947	<	////@begin MainWindow member initialisation
947	>	////@begin MainWindow member initialisation
948		MainSplitter = NULL;
949		SelectAll = NULL;
950		RefreshButton = NULL;
#	Line 1021 | Line 958 | void MainWindow::Init()
958		OptionsPanel = NULL;
959		SepRadio = NULL;
960		NoSepRadio = NULL;
961	<	SeparatedRadio = NULL;
961	>	SeperatedRadio = NULL;
962		CompleteRadio = NULL;
963		ReglobalizeButton = NULL;
964	<	////@end MainWindow member initialisation
964	>	////@end MainWindow member initialisation
965
966		}
967
968
969		/*
970	<	* Control creation for MainWindow
971	<	*/
972	<	wxStatusBar* TheStatusBar;
970	>	* Control creation for MainWindow
971	>	*/
972	>	wxStatusBar **TheStatusBar;
973		wxButton* TheInstallButton;
974		wxGauge* TheProgressBar;
975		void MainWindow::CreateControls()
976		{
977	<	////@begin MainWindow content construction
977	>	////@begin MainWindow content construction
978		MainWindow* itemFrame1 = this;
979
980		wxMenuBar* menuBar = new wxMenuBar;
#	Line 1066 | Line 1003 | void MainWindow::CreateControls()
1003		itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
1004		menuBar->Append(itemMenu42, _("Options"));
1005		wxMenu* itemMenu44 = new wxMenu;
1006	<	itemMenu44->Append(wxID_HELP, _("Help"), wxEmptyString, wxITEM_NORMAL);
1007	<	itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1008	<	menuBar->Append(itemMenu44, _("Help"));
1006	>	#ifdef WIN32
1007	>	itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1008	>	menuBar->Append(itemMenu44, _("Help"));
1009	>	#else
1010	>	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1011	>	#endif
1012	>
1013		itemFrame1->SetMenuBar(menuBar);
1014
1015		wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
1016		itemFrame1->SetSizer(itemBoxSizer2);
1017
1018		MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
1019	<	MainSplitter->SetMinimumPaneSize(150);
1019	>	MainSplitter->SetMinimumPaneSize(1);
1020		MainSplitter->SetName(_T("MainSplitter"));
1021
1022		wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
#	Line 1089 | Line 1030 | void MainWindow::CreateControls()
1030		SelectAll->SetName(_T("SelectAll_Checkbox"));
1031		itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1032
1033	<	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("redo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
1033	>	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("undo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
1034		RefreshButton->SetName(_T("RefreshButton"));
1035		itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
1036
#	Line 1128 | Line 1069 | void MainWindow::CreateControls()
1069		descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1070		itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
1071
1072	<	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 150);
1072	>	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 200);
1073		itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
1074
1075		StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
1076		StatusArea->SetName(_T("StatusArea"));
1077		StatusArea->SetFieldsCount(1);
1078	<	StatusArea->SetStatusText(_("Status Area"), 0);
1078	>	StatusArea->SetStatusText(_("AE Installer v1.0"), 0);
1079		itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
1080
1081		wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
#	Line 1177 | Line 1118 | void MainWindow::CreateControls()
1118		wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1119		itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1120
1121	<	SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1122	<	SeparatedRadio->SetValue(false);
1123	<	SeparatedRadio->SetName(_T("Separated_RadioButton"));
1124	<	itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1121	>	SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1122	>	SeperatedRadio->SetValue(false);
1123	>	SeperatedRadio->SetName(_T("Seperated_RadioButton"));
1124	>	itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1125
1126		CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1127		CompleteRadio->SetValue(false);
#	Line 1199 | Line 1140 | void MainWindow::CreateControls()
1140
1141		// Connect events and objects
1142		Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1143	<	////@end MainWindow content construction
1144	<
1143	>	////@end MainWindow content construction
1144	>	#ifdef WIN32
1145	>	Handle = (HWND)GetHWND();
1146	>	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
1147	>	#endif
1148	>
1149		if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1150	<	static_cast<string>("-import:sep");
1150	>	strImportOption = "-import:sep";
1151		splitInstances = NOT_SPLIT;
1152		}
1153		else {
1154	<	static_cast<string>("-import:nosep");
1154	>	strImportOption = "-import:nosep";
1155		splitInstances = SPLIT;
1156		}
1157	<
1157	>
1158		globalPackages = getPackages();
1159		globalInstalledMods = getInstallString();
1160	<	for (int i = 0; i < globalPackages.size(); i++) {
1161	<	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1162	<	if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1163	<	}
1219	<	TheStatusBar = StatusArea;
1220	<	TheInstallButton = InstallButton;
1221	<	TheProgressBar = ProgressBar;
1222	<	OptionsPanel->Hide();
1223	<	if(splitInstances == SPLIT) SeparatedRadio->SetValue(true);
1224	<	else CompleteRadio->SetValue(true);
1225	<
1226	<
1227	<
1228	<	if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1229	<	else SepRadio->SetValue(true);
1160	>	for (int i = 0; i < globalPackages.size(); i++) {
1161	>	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1162	>	if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1163	>	}
1164
1165	<	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
1165	>	TheStatusBar = &StatusArea;
1166	>	TheInstallButton = InstallButton;
1167	>	TheProgressBar = ProgressBar;
1168	>	OptionsPanel->Hide();
1169	>
1170	>	//#ifndef WIN32
1171	>	//      itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1172	>
1173	>	//#endif
1174	>
1175	>	if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
1176	>	else CompleteRadio->SetValue(true);
1177	>	if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1178	>	else SepRadio->SetValue(true);
1179	>
1180	>
1181	>	#ifdef WIN32
1182	>	RedirectIOToConsole();
1183	>	HWND hWnd = GetConsoleWindow();
1184	>	ShowWindow( hWnd, SW_HIDE );
1185	>	#endif
1186	>
1187	>	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
1188		}
1189
1190	<
1190	>
1191		/*
1192	<	* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for SelectAll_Checkbox
1193	<	*/
1192	>	* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for SelectAll_Checkbox
1193	>	*/
1194
1195		void MainWindow::OnSelectAllCheckboxClick( wxCommandEvent& event )
1196		{
1197	<	switch(SelectAll->Get3StateValue()) {
1197	>	switch(SelectAll->Get3StateValue()) {
1198		case wxCHK_UNCHECKED:
1199		for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1200		//SelectAll->Set3StateValue(wxCHK_CHECKED);
#	Line 1253 | Line 1209 | void MainWindow::OnSelectAllCheckboxClic
1209		break;
1210
1211		}
1212	<
1212	>
1213		}
1214
1215
1216		/*
1217	<	* wxEVT_CREATE event handler for Mods_CheckboxList
1218	<	*/
1217	>	* wxEVT_CREATE event handler for Mods_CheckboxList
1218	>	*/
1219
1220		void MainWindow::ModList_OnCreate( wxWindowCreateEvent& event )
1221		{
#	Line 1269 | Line 1225 | void MainWindow::ModList_OnCreate( wxWin
1225
1226
1227		/*
1228	<	* Should we show tooltips?
1229	<	*/
1228	>	* Should we show tooltips?
1229	>	*/
1230
1231		bool MainWindow::ShowToolTips()
1232		{
1233	<	return true;
1233	>	return true;
1234		}
1235
1236		/*
1237	<	* Get bitmap resources
1238	<	*/
1237	>	* Get bitmap resources
1238	>	*/
1239
1240		wxBitmap MainWindow::GetBitmapResource( const wxString& name )
1241		{
1242	<	// Bitmap retrieval
1243	<	////@begin MainWindow bitmap retrieval
1242	>	// Bitmap retrieval
1243	>	////@begin MainWindow bitmap retrieval
1244		wxUnusedVar(name);
1245	<	if (name == _T("redo.xpm"))
1245	>	if (name == _T("undo.xpm"))
1246		{
1247	<	wxBitmap bitmap(redo_xpm);
1247	>	wxBitmap bitmap( undo_xpm);
1248		return bitmap;
1249		}
1250		else if (name == _T("fileopen.xpm"))
#	Line 1307 | Line 1263 | wxBitmap MainWindow::GetBitmapResource(
1263		return bitmap;
1264		}
1265		return wxNullBitmap;
1266	<	////@end MainWindow bitmap retrieval
1266	>	////@end MainWindow bitmap retrieval
1267		}
1268
1269		/*
1270	<	* Get icon resources
1271	<	*/
1270	>	* Get icon resources
1271	>	*/
1272
1273		wxIcon MainWindow::GetIconResource( const wxString& name )
1274		{
1275	<	// Icon retrieval
1276	<	////@begin MainWindow icon retrieval
1275	>
1276	>	// Icon retrieval
1277	>	////@begin MainWindow icon retrieval
1278		wxUnusedVar(name);
1279	<	if (name == _T("oni_special.ico"))
1279	>	if (name == _T("aelogosmall.png"))
1280		{
1281	<	wxIcon icon(_T("oni_special.ico"), wxBITMAP_TYPE_ICO);
1281	>	wxIcon icon(aelogosmall_xpm);
1282		return icon;
1283		}
1284		return wxNullIcon;
1285	<	////@end MainWindow icon retrieval
1285	>	////@end MainWindow icon retrieval
1286		}
1287
1288
1289		/*
1290	<	* wxEVT_COMMAND_LISTBOX_SELECTED event handler for Mods_CheckboxList1
1291	<	*/
1290	>	* wxEVT_COMMAND_LISTBOX_SELECTED event handler for Mods_CheckboxList1
1291	>	*/
1292
1293		void MainWindow::OnModsCheckboxList1Selected( wxCommandEvent& event )
1294		{
1295		//event.GetSelection
1296	<	titleText->SetLabel(wxT(globalPackages[event.GetSelection()].name.c_str()));
1297	<	creatorText->SetLabel(globalPackages[event.GetSelection()].creator.c_str());
1298	<	descriptionText->SetLabel(globalPackages[event.GetSelection()].readme.c_str());
1296	>	titleText->SetValue(globalPackages[event.GetSelection()].name.c_str());
1297	>	creatorText->SetValue(globalPackages[event.GetSelection()].creator.c_str());
1298	>	descriptionText->SetValue(globalPackages[event.GetSelection()].readme.c_str());
1299
1300	<	creatorText->Refresh();
1300	>	//creatorText->Refresh();
1301		}
1302
1303
1304		/*
1305	<	* wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event handler for Mods_CheckboxList1
1306	<	*/
1305	>	* wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event handler for Mods_CheckboxList1
1306	>	*/
1307
1308		void MainWindow::OnModsCheckboxList1Toggled( wxCommandEvent& event )
1309		{
1310		SelectAll->Set3StateValue(wxCHK_UNDETERMINED);
1311		if(event.GetInt()) {
1312	<	/*
1312	>	/*
1313		switch(SelectAll->Get3StateValue()) {
1314	<	case wxCHK_UNCHECKED:
1314	>	case wxCHK_UNCHECKED:
1315		break;
1316	<	case wxCHK_CHECKED:
1316	>	case wxCHK_CHECKED:
1317		break;
1318	<	case wxCHK_UNDETERMINED :
1318	>	case wxCHK_UNDETERMINED :
1319		break;
1320	<	}
1321	<	*/
1320	>	}
1321	>	*/
1322		}
1323		}
1324
1325
1326		/*
1327	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_OPTIONS
1328	<	*/
1327	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_OPTIONS
1328	>	*/
1329
1330		void MainWindow::OnOptionsClick( wxCommandEvent& event )
1331		{
1375	–
1332		if (!event.GetInt() ) {
1333		OptionsPanel->Hide();
1334	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1334	>
1335	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1336		else {
1337	+	//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1338	+	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.",
1339	+	"AE Installer Alert",  wxOK | wxICON_EXCLAMATION     , wxDefaultPosition);
1340	+	YesNoDialog->ShowModal();
1341		OptionsPanel->Show();
1342	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
1342	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+1);
1343	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-1);
1344		}
1345		}
1346
1347
1348		/*
1349	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_EXIT
1350	<	*/
1349	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_EXIT
1350	>	*/
1351
1352		void MainWindow::OnExitClick( wxCommandEvent& event )
1353		{
1354	<	exit(0);
1354	>	exit(0);
1355		}
1356
1357
1358		/*
1359	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for Install_Button
1360	<	*/
1359	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for Install_Button
1360	>	*/
1361
1362
1363		struct recompile
1364		{
1365	<	recompile(vector<string> localPackages) : thePackages(localPackages) { }
1366	<	void operator()()
1367	<	{
1365	>	recompile(vector<string> localPackages) : thePackages(localPackages) { }
1366	>	void operator()()
1367	>	{
1368		TheInstallButton->Disable();
1369	<	recompileAll(thePackages);
1370	<	TheInstallButton->Enable();
1371	<	}
1369	>	recompileAll(thePackages);
1370	>	TheInstallButton->Enable();
1371	>	}
1372
1373	<	vector<string> thePackages;
1373	>	vector<string> thePackages;
1374		};
1375
1376		void MainWindow::OnInstallButtonClick( wxCommandEvent& event )
1377		{
1378	<
1378	>
1379		vector<string> localPackages;
1380		localPackages.push_back("Globalize");
1381		for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
1382		if ( !localPackages.empty() )   {
1383	<
1383	>
1384		//MainWindow::MainWindow().Hide();
1385	<	//      boost::thread thrd2(recompileAll(localPackages) );
1385	>	//      boost::thread thrd2(recompileAll(localPackages) );
1386		//MainWindow::MainWindow().Show();
1387	<	recompile packages(localPackages);
1388	<	boost::thread thrd(packages);
1387	>	this->InstallButton->Disable();
1388	>	this->ReglobalizeButton->Disable();
1389	>	#ifdef WIN32
1390	>	recompile packages(localPackages);
1391	>	boost::thread thrd(packages);
1392	>	#else
1393	>	recompileAll(localPackages);
1394	>	#endif
1395
1396	+	this->InstallButton->Enable();
1397	+	this->ReglobalizeButton->Enable();
1398		}
1399	<
1400	<
1399	>
1400	>
1401		}
1402
1403	<	void setStatusArea( string s ) {
1404	<	TheStatusBar->SetStatusText(_(s.c_str()));
1405	<
1406	<	//MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
1407	<
1408	<	//MainWindow::StatusBar->SetLabel("Importing Files...");
1409	<	//StatusBar->SetLabel(s);
1403	>	/*void setStatusArea( string s ) {
1404	>	//TheStatusBar = MainWindow::StatusArea;
1405	>	(**TheStatusBar).SetStatusText(_(s.c_str()), 0);
1406	>
1407	>	//MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
1408	>
1409	>	//MainWindow::StatusBar->SetLabel("Importing Files...");
1410	>	//StatusBar->SetLabel(s);
1411		//->SetLabel(s);
1412	+
1413	+	}*/
1414	+
1415	+	void setProgressBar( int i ) {
1416	+	//TheProgressBar->SetValue(
1417	+	#ifdef WIN32
1418
1419	+
1420	+
1421	+	if (SUCCEEDED(pTaskbarList->QueryInterface(IID_ITaskbarList3, (void **)&pTaskbarList3)))
1422	+	{
1423	+
1424	+	pTaskbarList3->SetProgressValue(Handle,i, 1000);
1425	+	if ( i == 0 ) {
1426	+
1427	+	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
1428	+	}
1429		}
1430
1444	–	void setProgressBar( int i ) {
1445	–	//TheProgressBar->SetValue(
1431
1432	+	#endif
1433		TheProgressBar->SetValue(i);
1434
1435		}
1436
1437
1438		/*
1439	<	* wxEVT_UPDATE_UI event handler for ID_STATUSBAR
1440	<	*/
1439	>	* wxEVT_UPDATE_UI event handler for ID_STATUSBAR
1440	>	*/
1441
1442		void MainWindow::OnStatusbarUpdate( wxUpdateUIEvent& event )
1443		{
1444	<	////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1444	>	////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1445		// Before editing this code, remove the block markers.
1446		event.Skip();
1447	<	////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1447	>	////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1448		}
1449
1450
1451		/*
1452	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT
1453	<	*/
1452	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT
1453	>	*/
1454
1455		void MainWindow::OnAboutClick( wxCommandEvent& event )
1456		{
1457	<	////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1457	>	////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1458		// Before editing this code, remove the block markers.
1459		About* window = new About(this);
1460		int returnValue = window->ShowModal();
1461		window->Destroy();
1462	<	////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1462	>	////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1463		}
1464
1465
1466		/*
1467	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
1468	<	*/
1467	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
1468	>	*/
1469
1470		void MainWindow::OnNoSepRadioButtonSelected( wxCommandEvent& event )
1471		{
#	Line 1488 | Line 1474 | void MainWindow::OnNoSepRadioButtonSelec
1474
1475
1476		/*
1477	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Sep_RadioButton
1478	<	*/
1477	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Sep_RadioButton
1478	>	*/
1479
1480		void MainWindow::OnSepRadioButtonSelected( wxCommandEvent& event )
1481		{
#	Line 1498 | Line 1484 | void MainWindow::OnSepRadioButtonSelecte
1484
1485
1486		/*
1487	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
1488	<	*/
1503	<
1504	<	void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1505	<	{
1506	<	splitInstances = SPLIT;
1507	<
1508	<	}
1509	<
1487	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
1488	>	*/
1489
1490		/*
1491	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
1492	<	*/
1491	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
1492	>	*/
1493
1494		void MainWindow::OnCompleteRadioButtonSelected( wxCommandEvent& event )
1495		{
1496	<	splitInstances = NOT_SPLIT;
1496	>	splitInstances = NOT_SPLIT;
1497
1498		}
1499
1500
1501		/*
1502	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BITMAPBUTTON
1503	<	*/
1502	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BITMAPBUTTON
1503	>	*/
1504
1505		void MainWindow::OnRefreshButtonClick( wxCommandEvent& event )
1506		{
#	Line 1530 | Line 1509 | void MainWindow::OnRefreshButtonClick( w
1509
1510
1511		/*
1512	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_LOAD
1513	<	*/
1512	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_LOAD
1513	>	*/
1514
1515
1516
1517
1518		void MainWindow::refreshMods (vector<string> s) {
1519	<
1519	>
1520		Mods_CheckboxList->Clear();
1521	<	//globalInstalledMods = getPackages();
1522	<	for (int i = 0; i < globalPackages.size(); i++) {
1523	<	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1524	<	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1525	<	//else Mods_CheckboxList->Check(i,0);
1526	<
1527	<	}
1521	>	//globalInstalledMods = getPackages();
1522	>	for (int i = 0; i < globalPackages.size(); i++) {
1523	>	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
1524	>	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
1525	>	//else Mods_CheckboxList->Check(i,0);
1526	>
1527	>	}
1528		}
1529
1530		void MainWindow::OnLoadClick( wxCommandEvent& event )
1531		{
1532	+	if (busy == 1) return;
1533		static const wxChar *FILETYPES = _T(
1534		"Mod Loadouts (*.cfg)|*.cfg|"
1535		"All files (*.*)|*.*"
1536	<	);
1537	<
1536	>	);
1537	>
1538		wxFileDialog* openFileDialog =
1539		new wxFileDialog( this, _("Open Mod Loadout"), "", "", FILETYPES,
1540	<	wxOPEN, wxDefaultPosition);
1541	<
1540	>	wxOPEN, wxDefaultPosition);
1541	>
1542		if ( openFileDialog->ShowModal() == wxID_OK )
1543		{
1544		refreshMods(getInstallString( string(openFileDialog->GetPath()) ));
#	Line 1569 | Line 1549 | void MainWindow::OnLoadClick( wxCommandE
1549
1550
1551		/*
1552	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_SAVE
1553	<	*/
1552	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_SAVE
1553	>	*/
1554
1555		void MainWindow::OnSaveClick( wxCommandEvent& event )
1556		{
1557	+	if (busy == 1) return;
1558		static const wxChar *FILETYPES = _T(
1559		"Mod Loadouts (*.cfg)|*.cfg|"
1560		"All files (*.*)|*.*"
1561	<	);
1561	>	);
1562
1563	<	wxFileDialog* openFileDialog =
1563	>	wxFileDialog* openFileDialog =
1564		new wxFileDialog( this, _("Open file"), "", "", FILETYPES,
1565		wxSAVE, wxDefaultPosition);
1566
1567		if ( openFileDialog->ShowModal() == wxID_OK )
1568		{
1569
1570	<
1571	<	//Mods_CheckboxList->
1570	>
1571	>	//Mods_CheckboxList->
1572
1573
1574
1575		//
1576	<
1576	>
1577		if ( exists( openFileDialog->GetPath().c_str() ) )
1578	<	{
1579	<	remove( openFileDialog->GetPath().c_str() );
1580	<	}
1578	>	{
1579	>	remove( openFileDialog->GetPath().c_str() );
1580	>	}
1581
1582	<	ofstream file(openFileDialog->GetPath().c_str());
1602	<
1603	<	vector<string>list;
1604	<	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
1605	<	vector<string>::iterator begin_iter = list.begin();
1606	<	vector<string>::iterator end_iter = list.end();
1582	>	ofstream file(openFileDialog->GetPath().c_str());
1583
1584	<	sort( list.begin(), list.end() );
1584	>	vector<string>list;
1585	>	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
1586	>	vector<string>::iterator begin_iter = list.begin();
1587	>	vector<string>::iterator end_iter = list.end();
1588
1589	<	for( ; begin_iter != end_iter; ++begin_iter) {
1590	<	file << *begin_iter << " ";
1591	<	}
1592	<
1593	<	file.close();
1594	<	file.clear();
1589	>	sort( list.begin(), list.end() );
1590	>
1591	>	for( ; begin_iter != end_iter; ++begin_iter) {
1592	>	file << *begin_iter << " ";
1593	>	}
1594	>
1595	>	file.close();
1596	>	file.clear();
1597
1598		//SetCurrentFilename(openFileDialog->GetFilename());
1599		//theText->LoadFile(openFileDialog->GetFilename());
#	Line 1622 | Line 1603 | void MainWindow::OnSaveClick( wxCommandE
1603		}
1604
1605
1606	+
1607		/*
1608	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ReGlobalize_Button
1609	<	*/
1608	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ReGlobalize_Button
1609	>	*/
1610
1611		void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
1612		{
1613	<	globalizeData();
1614	<	setProgressBar(1000);
1615	<	setStatusArea("Done!");
1613	>	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);
1614	>
1615	>	if (YesNoDialog->ShowModal() == wxID_NO) { //if the user said no...
1616	>
1617	>	}
1618	>	else {
1619	>
1620	>	this->InstallButton->Disable();
1621	>	this->ReglobalizeButton->Disable();
1622	>
1623	>	#ifdef WIN32
1624	>
1625	>	boost::thread thrd2(globalizeData);
1626	>	//globalizeData();
1627	>	//boost::thread::create_thread(&globalizeData);
1628	>	//       boost::thread_group Tg;
1629	>	// Tg.create_thread( &globalizeData(), this );
1630	>	#else
1631	>	globalizeData();
1632	>	#endif
1633	>
1634	>	this->InstallButton->Enable();
1635	>	this->ReglobalizeButton->Enable();
1636	>	}
1637	>
1638	>	}
1639	>	/*
1640	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
1641	>	*/
1642	>
1643	>	/*void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1644	>	{
1645	>	////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1646	>	// Before editing this code, remove the block markers.
1647	>	event.Skip();
1648	>	////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1649	>	}*/
1650	>
1651	>
1652	>	/*
1653	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
1654	>	*/
1655	>
1656	>	void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
1657	>	{
1658	>	splitInstances = SPLIT;
1659		}
1660

Diff Legend

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