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 353 by iritscen, Sun Jun 14 23:28:58 2009 UTC vs.
Revision 503 by gumby, Wed Mar 24 07:12:25 2010 UTC

#	Line 1 | Line 1
1	<	/*
2	<	AE/Mod Installer
3	<	by Gumby and Iritscen
4	<	*/
5	<
6	<	// To-do: - Disable Install button when nothing (new) is selected
7	<	//                - Institute lots of checks into file-handling
8	<	//                - Clear mod info fields when mod is de-selected
9	<
10	<	#define DEBUG
11	<	#include <stdio.h>
12	<	//#include <conio.h>
13	<	//#include <process.h>
14	<	#include <string>
15	<	#include <iostream>
16	<	#include <cctype>
17	<	#include <vector>
18	<	#include <fstream>
19	<	#include <errno.h>
20	<	#include <sstream>
21	<
22	<	#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
23	<
24	<	#include "installer.h"
25	<
26	<	#ifdef WIN32
27	<	#include <windows.h>
28	<	#else // assume we're on Mac
29	<	#include <stdlib.h>
30	<	#include <dirent.h>
31	<	#endif
32	<
33	<	const string strInstallerVersion = "1.0";
34	<	const bool SPLIT = 1;
35	<	const bool NOT_SPLIT = 0;
36	<	bool splitInstances = SPLIT;
1	>	/***************************************************************************\
2	>	| Project: AE Installer                                                                                                         |
3	>	| By: Gumby & Iritscen                                                                                                          |
4	>	| File: Main_Window.cpp                                                                                                         |
5	>	| Function: Handles the GUI.                                                                                            |
6	>	| Created: 07/05/2009 20:38:25                                                                                          |
7	>	\***************************************************************************/
8
9	<	#ifdef WIN32
10	<	const string strOniSplit = "Onisplit.exe";
40	<	string strImportOption = "-import:nosep";
41	<	const char* strClsCmd = "cls";
42	<	const char* strPauseCmd = "PAUSE";
43	<	#else // set up Mac equivalents since we're in Mac OS
44	<	const string strOniSplit = "mono Onisplit.exe";
45	<	string strImportOption = "-import:sep";
46	<	const char* strClsCmd = "clear";
47	<	const char* strPauseCmd = "read -n 1 -p \"Press any key to continue\"";
48	<	void Sleep(int ms) { sleep( ms / 1000 ); }
9	>	#ifndef NTDDI_VERSION
10	>	#define NTDDI_VERSION NTDDI_WIN7
11		#endif
50	–
51	–	using namespace boost::filesystem;
52	–	using namespace std;
53	–
54	–
55	–	/*
56	–	int main(void)
57	–	{
58	–	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) splitInstances = NOT_SPLIT;
59	–	else splitInstances = NOT_SPLIT;
60	–	//     SetConsoleTitle("AE Installer"); windows junk, convert to SDL
61	–	#ifdef WIN32
62	–	system("color 0A");
63	–	#endif
64	–	cout << "\nWelcome to the AE installer!\n";
65	–	cout << "\nWhat would you like to do?\n";
66	–
67	–	return mainMenu();
68	–	}
69	–	*/
70	–
71	–
72	–
73	–	int mainMenu(void)
74	–	{
75	–	char choice = '0';
76	–	bool exit = false;
77	–	int err = 0;
78	–	do
79	–	{
80	–	if( exists( "../GameDataFolder" ) ) {
81	–	cout << "\n1. Add new packages\n";
82	–	cout << "2. Remove packages\n";
83	–	cout << "3. See what is installed\n";
84	–	cout << "4. Globalize data\n";
85	–	cout << "5. About AE\n";
86	–	cout << "6. Quit\n\n";
87	–
88	–	choice = cin.get();
89	–	cin.ignore(128, '\n');
90	–	switch(choice)
91	–	{
92	–	case '1':
93	–	err = installPackages();
94	–	break;
95	–	case '2':
96	–	err = uninstallPackages();
97	–	break;
98	–	case '3':
99	–	err = listInstalledPackages();
100	–	break;
101	–	case '4':
102	–	err = globalizeData();
103	–	break;
104	–	case '5':
105	–	err = printInstallerInfo();
106	–	break;
107	–	case '6':
108	–	exit = true;
109	–	break;
110	–	default:
111	–	cout << "Please choose one of the above numbers, and press Enter.\n\n";
112	–	}
113	–	if (err) // if something fatal happened
114	–	exit = true;
115	–	}
116	–	else {
117	–	cout << "\n1. Globalize data\n";
118	–	cout << "2. About AE\n";
119	–	cout << "3. Quit\n\n";
120	–
121	–	choice = cin.get();
122	–	cin.ignore(128, '\n');
123	–	switch(choice)
124	–	{
125	–	case '1':
126	–	err = globalizeData();
127	–	break;
128	–	case '2':
129	–	err = printInstallerInfo();
130	–	break;
131	–	case '3':
132	–	exit = true;
133	–	break;
134	–	default:
135	–	cout << "Please choose one of the above numbers, and press Enter.\n\n";
136	–	}
137	–	if (err) // if something fatal happened
138	–	exit = true;
139	–	}
140	–	} while(!exit);
141	–
142	–	return err;
143	–	}
144	–
145	–	int globalizeData(void)
146	–	{
147	–	int err = 0;
148	–
149	–	try {
150	–	int levels[15] = {0, 1, 2, 3, 4, 6, 8, 9, 10, 11, 12, 13, 14, 18, 19}; // the levels Oni has
151	–	char choice = 0;
152	–
153	–	//SetCurrentDirectory("C:/Program Files/Oni/edition/install");
154	–	char levelnum[3];
155	–	path Characters = "../GameDataFolder/level0_Characters";
156	–	path Particles = "../GameDataFolder/level0_Particles";
157	–	path Archive = "../GameDataFolder/Archive";
158	–	path Textures  = "../GameDataFolder/level0_Textures";
159	–	path Sounds = "../GameDataFolder/level0_Sounds";
160	–	path Animations = "../GameDataFolder/level0_Animations";
161	–	path TRAC = Animations / "level0_TRAC";
162	–	path TRAM = Animations / "level0_TRAM";
163	–	/*
164	–	if (exists("../GameDataFolder/"))
165	–	{
166	–	//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.)"
167	–	//      << "\n1. Re-globalize"
168	–	//      << "\n2. Return to main menu\n";
169	–	//choice = cin.get();
170	–	cin.ignore(128, '\n');
171	–	if (choice == '1')
172	–	remove_all("../GameDataFolder"); // remove AE GDF
173	–	if (choice == '2')
174	–	return 0;
175	–	}
176	–	*/
177	–	create_directory( "../GameDataFolder/" );
178	–	create_directory( "packages" );
179	–	if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats");
180	–	create_directory( "packages/VanillaDats" );
181	–
182	–	create_directory( "packages/VanillaDats/level0_Final/" );
183	–	create_directory( Characters );
184	–	create_directory( Particles );
185	–	create_directory( Archive );
186	–	create_directory( Textures );
187	–	create_directory( Sounds );
188	–	create_directory( Animations );
189	–	create_directory( TRAC );
190	–	create_directory( TRAM );
191	–
192	–	for(int i = 0; i < 15; i++)
193	–	{
194	–	sprintf(levelnum,"%d",levels[i]); // int to char array
195	–	exists("../../GameDataFolder/level" + (string)levelnum + "_Final");
196	–	system((strOniSplit + " -export ../GameDataFolder/level" + (string)levelnum + "_Final ../../GameDataFolder/level" + (string)levelnum + "_Final.dat").c_str());
197	–
198	–	create_directory( "packages/VanillaDats/level" + (string)levelnum + "_Final" ); //remember to cast your arrays as strings :)
199	–	create_directory( "packages/VanillaDats/level" + (string)levelnum + "_Final/level" + (string)levelnum + "_Final" );
200	–
201	–	directory_iterator end_iter;
202	–	for ( directory_iterator dir_itr( "../GameDataFolder/level" + (string)levelnum + "_Final" ); dir_itr != end_iter; ++dir_itr )
203	–	{
204	–	//cout << dir_itr->path().filename();
205	–	if ( is_regular_file( dir_itr->status() ) )
206	–	{
207	–
208	–	if ( dir_itr->path().filename().substr(0,8) == "TXMPfail" ||
209	–	dir_itr->path().filename().substr(0,9) == "TXMPlevel" ||
210	–	( dir_itr->path().filename().substr(0,4) == "TXMP" && dir_itr->path().filename().find("intro")!=string::npos) ||
211	–	dir_itr->path().filename().substr(0,4) == "TXMB" ||
212	–	dir_itr->path().filename() == "M3GMpowerup_lsi.oni" ||
213	–	dir_itr->path().filename() == "TXMPlsi_icon.oni" ||
214	–	( dir_itr->path().filename().substr(0,4) == "TXMB" && dir_itr->path().filename().find("splash_screen.oni")!=string::npos)       )
215	–	{
216	–	cout <<dir_itr->path().filename() << "\n";
217	–	create_directory( dir_itr->path().parent_path() / "NoGlobal");
218	–	if(!exists( dir_itr->path().parent_path() / "NoGlobal" / dir_itr->filename())) rename(dir_itr->path(), dir_itr->path().parent_path() / "NoGlobal" /
219	–	dir_itr->filename());
220	–	else remove(dir_itr->path());
221	–	}
222	–	else if (dir_itr->path().filename().substr(0,4) == "TRAC") {
223	–	cout <<dir_itr->path().filename() << "\n";
224	–	if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
225	–	else remove(dir_itr->path());
226	–	}
227	–	else if (dir_itr->path().filename().substr(0,4) == "TRAM") {
228	–	cout <<dir_itr->path().filename() << "\n";
229	–	if(!exists( TRAM / dir_itr->filename())) rename(dir_itr->path(), TRAM / dir_itr->filename());
230	–	else remove(dir_itr->path());
231	–	}
232	–	else if (dir_itr->path().filename().substr(0,4) == "ONSK" ||
233	–	dir_itr->path().filename().substr(0,4) == "TXMP") {
234	–	cout <<dir_itr->path().filename() << "\n";\
235	–	create_directory( dir_itr->path().parent_path() / "TexFix");
236	–	if(!exists( Textures / dir_itr->filename())) rename(dir_itr->path(), Textures / dir_itr->filename());
237	–	//rename(dir_itr->path(), dir_itr->path().parent_path() / "TexFix" / dir_itr->filename());
238	–	}
239	–	else if (dir_itr->path().filename().substr(0,4) == "ONCC"
240	–	|| dir_itr->path().filename().substr(0,4) == "TRBS"
241	–	|| dir_itr->path().filename().substr(0,4) == "TRMA"
242	–	|| dir_itr->path().filename().substr(0,4) == "TRSC"
243	–	|| dir_itr->path().filename().substr(0,4) == "TRAS") {
244	–	cout <<dir_itr->path().filename() << "\n";
245	–	if(!exists( Characters / dir_itr->filename())) rename(dir_itr->path(), Characters / dir_itr->filename());
246	–	else remove(dir_itr->path());
247	–	}
248	–	else if (dir_itr->path().filename().substr(0,4) == "OSBD"
249	–	|| dir_itr->path().filename().substr(0,4) == "SNDD") {
250	–	cout << dir_itr->path().filename() << "\n";
251	–	if(!exists( Sounds / dir_itr->filename())) rename(dir_itr->path(), Sounds / dir_itr->filename());
252	–	else remove(dir_itr->path());
253	–	}
254	–	else if (dir_itr->path().filename().substr(0,5) == "BINA3"
255	–	|| dir_itr->path().filename().substr(0,10) == "M3GMdebris"
256	–	|| dir_itr->path().filename() == "M3GMtoxic_bubble.oni"
257	–	|| dir_itr->path().filename().substr(0,8) == "M3GMelec"
258	–	|| dir_itr->path().filename().substr(0,7) == "M3GMrat"
259	–	|| dir_itr->path().filename().substr(0,7) == "M3GMjet"
260	–	|| dir_itr->path().filename().substr(0,9) == "M3GMbomb_"
261	–	|| dir_itr->path().filename() == "M3GMbarab_swave.oni"
262	–	|| dir_itr->path().filename() == "M3GMbloodyfoot.oni"
263	–	){
264	–	cout <<dir_itr->path().filename() << "\n";
265	–	if(!exists( Particles / dir_itr->filename())) rename(dir_itr->path(), Particles / dir_itr->filename());
266	–	else remove(dir_itr->path());
267	–	}
268	–	else if (dir_itr->path().filename().substr(0,4) == "AGDB"
269	–	|| dir_itr->path().filename().substr(0,4) == "TRCM") {
270	–	cout <<dir_itr->path().filename() << "\n";
271	–
272	–	if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
273	–	else remove(dir_itr->path());
274	–	}
275	–	}
276	–
277	–
278	–	}
279	–	system( (strOniSplit + " -move:delete " + Textures.string() + " ../GameDataFolder/level" + (string)levelnum + "_Final/TXMP*.oni").c_str());
280	–
281	–	}
282	–
283	–	for (int i = 0; i < 15; i++)
284	–	{
285	–	sprintf(levelnum,"%d",levels[i]);
286	–	system( (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levelnum + "_Final packages/VanillaDats/level" + levelnum + "_Final/level"
287	–	+ levelnum + "_Final/level" + levelnum + "_Final.oni").c_str());
288	–	}
289	–	path VanillaCharacters = "packages/VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
290	–	path VanillaParticles = "packages/VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
291	–	path VanillaTextures  = "packages/VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
292	–	path VanillaSounds = "packages/VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
293	–	path VanillaAnimations = "packages/VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
294	–	path VanillaTRAC = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
295	–	path VanillaTRAM = "packages/VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
296	–	create_directory( VanillaCharacters.parent_path() );
297	–	create_directory( VanillaParticles.parent_path() );
298	–	create_directory( VanillaTextures.parent_path() );
299	–	create_directory( VanillaSounds.parent_path() );
300	–	create_directory( VanillaAnimations.remove_filename() );
301	–	system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
302	–	system((strOniSplit + " " + strImportOption + " " + Particles.string() + " " + VanillaParticles.string()).c_str());
303	–	system((strOniSplit + " " + strImportOption + " " + Textures.string() + " " + VanillaTextures.string()).c_str());
304	–	//system((strOniSplit   + " " + strImportOption + (string)" " + Animations.string() + (string)" " + VanillaAnimations.string()).c_str());
305	–	system((strOniSplit + " " + strImportOption + " " + TRAC.string() + " " + VanillaTRAC.string()).c_str());
306	–	system((strOniSplit + " " + strImportOption + " " + Sounds.string() + " " + VanillaSounds.string()).c_str());
307	–	system((strOniSplit + " " + strImportOption + " " + TRAM.string() + " " + VanillaTRAM.string()).c_str());
308	–
309	–	create_directory("../GameDataFolder/IGMD");
310	–	copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
311	–	}
312	–	catch (exception ex) {
313	–	cout << ex.what();
314	–	}
315	–	return err;
316	–	}
317	–
318	–	int installPackages(void)
319	–	{
320	–	bool installed_something = 0;
321	–	int err = 0;
322	–	ModPackage package;
323	–	vector<string> installed_packages;
324	–	vector<ModPackage> packages;
325	–	vector<ModPackage>::iterator iter;
326	–	vector<string> installString;
327	–
328	–	iter = packages.begin();
329	–	packages = getPackages();
330	–	vector<string> installedMods = getInstallString();
331	–
332	–	if (packages.empty())
333	–	{
334	–	cout << "Error: You have no packages!\n";
335	–	return 0;
336	–	}
337	–
338	–	cout << "Detecting installed packages...\n";
339	–
340	–	int index = 1;
341	–	char choice = '0';
342	–
343	–	for (vector<ModPackage>::iterator package_iter = packages.begin(); package_iter != packages.end(); ++package_iter)
344	–	{
345	–	if (!binary_search(installedMods.begin(), installedMods.end(), package_iter->modStringName))
346	–	{ //package_iter->isInstalled :< I forgot about this...
347	–	//cout << index << " ";
348	–	system(strClsCmd);
349	–	cout << (*package_iter).name << "\n";
350	–	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << '-';
351	–	cout << "\n"
352	–	<< (*package_iter).readme << "\n\n"
353	–	<< "Please enter a number choice\n"
354	–	<< " 1. Add\n"
355	–	<< " 2. Don't Add\n"
356	–	<< "";
357	–	index++;
358	–	choice = 0;
359	–
360	–	do
361	–	{
362	–	choice = cin.get();
363	–	cin.ignore(1280, '\n');
364	–	} while(choice == 0);
365	–
366	–	if (choice == '1')
367	–	{
368	–	cout << "\nInstalling...\n\n";
369	–	if (package_iter->hasOnis || (package_iter->hasDeltas /*(*package_iter).isUnpacked */ ))
370	–	{
371	–	installed_something = 1;
372	–	installedMods.push_back(package_iter->modStringName);
373	–	system(strPauseCmd);
374	–	}
375	–	}
376	–	}
377	–	}
378	–	if (index == 1)
379	–	{
380	–	cout << "Warning: All packages are already installed\n";
381	–	//would you like to recombine your data?
382	–	return 0;
383	–	}
384	–	if (installed_something == 0)
385	–	{
386	–	cout << "Warning: You didn't add anything!\n";
387	–	//would you like to recombine your data?
388	–	return 0;
389	–	}
390	–
391	–	sort(installedMods.begin(), installedMods.end());
392	–	//system(Onisplit.c_str());
393	–	recompileAll(installedMods);
394	–	system(strPauseCmd);
395	–
396	–	return err;
397	–	}
398	–
399	–	int uninstallPackages(void)
400	–	{
401	–	int err = 0;
402	–	ModPackage package;
403	–	vector<string> installed_packages;
404	–	vector<ModPackage> packages;
405	–	vector<ModPackage>::iterator iter;
406	–	vector<string> installString;
407	–
408	–	iter = packages.begin();
409	–	packages = getPackages();
410	–
411	–
412	–	cout << "Detecting installed packages...\n";
413	–
414	–	vector<string> installedMods = getInstallString();
415	–
416	–	if (packages.empty())
417	–	{
418	–	cout << "Error: You have no packages!\n";
419	–	return 0;
420	–	}
421	–
422	–	int index = 0;
423	–	int uninstalled_something = 0;
424	–	char choice = '0';
425	–
426	–	for (vector<ModPackage>::iterator package_iter = packages.begin(); package_iter != packages.end(); ++package_iter)
427	–	{
428	–	if (binary_search(installedMods.begin(), installedMods.end(), package_iter->modStringName))
429	–	{ //package_iter->isInstalled :< I forgot about this...
430	–	//cout << index << " ";
431	–	system(strClsCmd);
432	–	cout << (*package_iter).name << "\n";
433	–	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << '-';
434	–	cout << "\n"
435	–	<< (*package_iter).readme << "\n\n"
436	–	<< "Please enter a number choice\n"
437	–	<< " 1. Remove\n"
438	–	<< " 2. Don't Remove\n"
439	–	<< "";
440	–
441	–	choice = 0;
442	–
443	–	do
444	–	{
445	–	choice = cin.get();
446	–	cin.ignore(1280, '\n');
447	–	} while(choice == 0);
448	–
449	–	if (choice == '1')
450	–	{
451	–	cout << "\nUninstalling...\n\n";
452	–	installedMods.erase( installedMods.begin() + (index) );
453	–	system(strPauseCmd);
454	–	uninstalled_something = 1;
455	–
456	–	}
457	–	else {
458	–	index++;
459	–	}
460	–	}
461	–	}
462	–	if ( uninstalled_something == 0 )
463	–	{
464	–	if (index == 0) //bad practice, I need to implement a second vector or something. Meh.
465	–	{
466	–	cout << "\nWarning: You have no installed packages!";
467	–	}
468	–	else
469	–	{
470	–	cout << "\nWarning: You didn't remove anything!";
471	–	}
472	–	//would you like to recombine your data?
473	–	return 0;
474	–
475	–	}
476	–	sort(installedMods.begin(), installedMods.end());
477	–	//system(Onisplit.c_str());
478	–	recompileAll(installedMods);
479	–	system(strPauseCmd);
480	–
481	–	return err;
482	–	}
483	–
484	–	int listInstalledPackages(void)
485	–	{
486	–	cout << "\nThis feature not yet implemented.\n\n";
487	–
488	–	return 0;
489	–	}
490	–
491	–	int printInstallerInfo(void)
492	–	{
493	–	cout << "\nAE/Mod Installer\n";
494	–	cout << "version " << strInstallerVersion << "\n";
495	–	cout << "by Gumby & Iritscen\n";
496	–	cout << "see http://oni.bungie.org/community/forums for more info\n\n";
497	–
498	–	return 0;
499	–	}
500	–
501	–	vector<ModPackage> getPackages(void)
502	–	{
503	–	vector<ModPackage> packages;
504	–	packages.reserve(65536); // come on, we shouldn't need this much space...right?!
505	–	fstream file;
506	–	string filename = "\0";
507	–	string MODINFO_CFG = "Mod_Info.cfg";
508	–
509	–	try
510	–	{
511	–	directory_iterator end_iter;
512	–	for (directory_iterator dir_itr("./packages"); dir_itr != end_iter; ++dir_itr)
513	–	{
514	–	file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
515	–	//cout << filename << "\n";
516	–
517	–	if(!file.fail())
518	–	{
519	–	//cout << dir_itr->path().string() + MODINFO_CFG;
520	–	//would prefer to push a pointer to a package, but this will do for now
521	–	packages.push_back(fileToModPackage(file));
522	–	}
523	–	file.close();
524	–	file.clear();
525	–	}
526	–	}
527	–	catch (const std::exception & ex)
528	–	{
529	–	cout << "Warning, something odd happened!\n";
530	–	}
531	–
532	–	return packages;
533	–	}
534	–
535	–	ModPackage fileToModPackage(fstream &file)
536	–	{
537	–	/*
538	–	This converts a file to a ModPackage struct.
539	–
540	–	A few notes...
541	–	"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.
542	–	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
543	–	slower than reading a variable.
544	–	*/
545	–	ModPackage package;
546	–	string line;
547	–	static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
548	–	//I could have done it in reverse (*iter).compare("ModString") or
549	–	static string ARROW = "->";                             //did something like "ModString".compare(*iter), and it would have been
550	–	static string ModString = "ModString";  //functionably the same.
551	–	static string HasOnis = "HasOnis";
552	–	static string HasDeltas = "HasDeltas";
553	–	static string HasBSL = "HasBSL";
554	–	static string HasDats = "HasDats";
555	–	static string IsEngine = "IsEngine";
556	–	static string Readme = "Readme";
557	–	static string GlobalNeeded = "GlobalNeeded";
558	–	static string Category = "Category";
559	–	static string Creator = "Creator";
560	–	while (! file.eof() )
561	–	{
562	–	getline (file,line);
563	–	vector<string> tokens;
564	–	vector<string>::iterator iter;
565	–	tokenize(line, tokens);                                 //string to vector of "words"
566	–	if (tokens.capacity() >= 2) {                   //make sure they are using enough stuff
567	–	iter = tokens.begin();                          //what word we are on, starts at first word
568	–	/*
569	–	if (!AEInstallVersion.compare(*iter))
570	–	If mod is too old, skip this mod.
571	–	*/
572	–	/*else*/if (!NameOfMod.compare(*iter))  {       //if it contains the name
573	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
574	–	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) {                 //ignores "->" and "NameOfMod"
575	–	//cout << *iter;
576	–	//cout << " ";
577	–	package.name += *iter + " ";
578	–	}
579	–	}
580	–
581	–	}
582	–	else if (!ModString.compare(*iter)) {
583	–	iter++; iter++;
584	–	package.modStringName = *iter;
585	–	iter++;
586	–	package.modStringVersion = atoi((*iter).c_str());
587	–	}
588	–	else if (!HasOnis.compare(*iter)) {
589	–	iter++; iter++;
590	–	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
591	–	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,
592	–	iter++; iter++;}  // using "YFR" would probably set it off. :<
593	–
594	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasBSL = 1;
595	–	}
596	–	else if (!HasDeltas.compare(*iter)) {
597	–	iter++; iter++;
598	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDeltas = 1;
599	–	}
600	–	else if (!HasDats.compare(*iter)) {
601	–	iter++; iter++;
602	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDats = 1;
603	–	}
604	–	else if (!IsEngine.compare(*iter)) {
605	–	iter++; iter++;
606	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.isEngine = 1;
607	–	}
608	–	else if (!GlobalNeeded.compare(*iter)) {
609	–	iter++; iter++;
610	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.globalNeeded = 1;
611	–	else if (toupper((*iter)[0]) + toupper((*iter)[1]) == 'N' + 'O') package.globalNeeded = 1; //Really the only place where checking for "No" is important atm.
612	–	}
613	–	else if (!Category.compare(*iter))  {
614	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
615	–	if (ARROW.compare(*iter) && Category.compare(*iter)) {                  //ignores "->" and "Category"
616	–	//cout << *iter;
617	–	//cout << " ";
618	–	package.category += *iter + " ";
619	–	}
620	–	}
621	–	}
622	–	else if (!Creator.compare(*iter))  {    //if it contains the name
623	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
624	–	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   //ignores "->" and "Category"
625	–	//cout << *iter;
626	–	//cout << " ";
627	–	package.creator += *iter + " ";
628	–	}
629	–	}
630	–	}
631	–	else if (!Readme.compare(*iter))  {     //if it contains the name
632	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
633	–	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    //ignores "->" and "Category"
634	–	if(!(*iter).compare("\\n")) package.readme += '\n';
635	–	else package.readme += *iter + " ";
636	–	}
637	–	}
638	–	}
639	–	}
640	–
641	–	}
642	–	package.doOutput();
643	–	return package;
644	–	}
645	–
646	–	void recompileAll(vector<string> installedMods)
647	–	{
12		#ifdef WIN32
13	<	RedirectIOToConsole();
14	<	HWND hWnd = GetConsoleWindow();
15	<	ShowWindow( hWnd, SW_HIDE );
13	>	#include <windows.h>
14	>	#include <shobjidl.h>
15	>	HWND Handle;
16	>	ITaskbarList *pTaskbarList;
17	>	ITaskbarList3 *pTaskbarList3;
18		#endif
653	–	setStatusArea("Importing levels...");
654	–	//setStatusArea("Recompiling Data...");
655	–	path vanilla_dir = "./packages/VanillaDats/";
656	–	string importCommand = "";
657	–	char statusString[128];
658	–	int numberOfDats = 0;
659	–	int j = 1;
660	–	string datString;
661	–	std::stringstream out;
662	–
663	–
664	–	clearOldDats();
665	–	remove("Onisplit.log");
666	–	if(splitInstances == SPLIT){
667	–	recursive_directory_iterator end_iter;
668	–
669	–	for ( recursive_directory_iterator dir_itr( vanilla_dir );
670	–	dir_itr != end_iter;
671	–	++dir_itr )
672	–	{
673	–	try{
674	–	if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
675	–	{
676	–	numberOfDats++;
677	–	}
678	–	}
679	–	catch(exception ex) {
680	–
681	–	}
682	–	}
683	–
684	–	//recursive_directory_iterator end_iter;
685	–
686	–
687	–	out << numberOfDats;
688	–	datString = out.str();
689	–	try {
690	–	for ( recursive_directory_iterator dir_itr( vanilla_dir );
691	–	dir_itr != end_iter;
692	–	++dir_itr )
693	–	{
694	–	try
695	–	{
696	–	if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
697	–	{
698	–	importCommand = strOniSplit + " " + strImportOption + " " + dir_itr->path().parent_path().string() + '/' + dir_itr->path().filename();
699	–	for (int i = 0; i < installedMods.size(); ++i) {
700	–	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename()  ))
701	–	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
702	–
703	–	//else cout << " packages/VanillaDats/" + installedMods[i] + "/oni/";
704	–	}
705	–	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Onisplit.log";
706	–
707	–	sprintf(statusString,"%d/%i\0",j,numberOfDats);
708	–	setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
709	–	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
710	–
711	–	system(importCommand.c_str());
712	–	//Sleep(1000);
713	–	//cout << importCommand << "\n";
714	–	j++;
715	–
716	–	}
717	–	}
718	–	catch ( const std::exception & ex )
719	–	{
720	–	cout << "Warning, exception " << ex.what() << "!";
721	–	}
722	–	}
723	–
724	–	}
725	–	catch( const std::exception & ex ) {
726	–	cout << "Warning, exception " << ex.what() << "!\n"
727	–	<< "You probably need to re-globalize.";
728	–	//create_directory( "./packages/VanillaDats" );
729	–	}
730	–
731	–	}
732	–	else if(splitInstances == NOT_SPLIT){
733	–	directory_iterator end_iter;
734	–
735	–	for ( directory_iterator dir_itr( vanilla_dir );
736	–	dir_itr != end_iter;
737	–	++dir_itr )
738	–	{
739	–
740	–	if ( is_directory( dir_itr->status() ) )
741	–	{
742	–	numberOfDats++;
743	–	}
744	–
745	–
746	–	}
747	–
748	–	out << numberOfDats;
749	–	datString = out.str();
750	–
751	–	for ( directory_iterator dir_itr( vanilla_dir );
752	–	dir_itr != end_iter;
753	–	++dir_itr )
754	–	{
755	–	try
756	–	{
757	–	if ( is_directory( dir_itr->status() ) )
758	–	{
759	–	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
760	–	+ ".dat";
761	–	for (int i = 0; i < installedMods.size(); ++i) {
762	–	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
763	–	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
764	–	}
765	–	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat";
766	–
767	–	sprintf(statusString,"%d/%i\0",j,numberOfDats);
768	–	setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
769	–	setStatusArea("Importing " +  dir_itr->path().filename() + " " + statusString);
770	–
771	–	system(importCommand.c_str());
772	–
773	–	j++;
774	–	}
775	–	}
776	–	catch ( const std::exception & ex )
777	–	{
778	–	cout << "Warning, something odd happened!\n";
779	–	}
780	–	}
781	–	}
782	–	writeInstalledMods(installedMods);
783	–	setProgressBar(1000);
784	–	setStatusArea("Done!");
785	–	Sleep(1000);
786	–	setProgressBar(0);
787	–	}
788	–
789	–	void writeInstalledMods(vector<string> installedMods)
790	–	{
791	–
792	–	if ( exists( strInstallCfg ) )
793	–	{
794	–	remove( strInstallCfg );
795	–	}
796	–
797	–	ofstream file(strInstallCfg.c_str());
798	–
799	–	vector<string>list = installedMods;
800	–	vector<string>::iterator begin_iter = list.begin();
801	–	vector<string>::iterator end_iter = list.end();
802	–
803	–	sort( list.begin(), list.end() );
804	–
805	–	for( ; begin_iter != end_iter; ++begin_iter) {
806	–	file << *begin_iter << " ";
807	–	}
808	–
809	–	file.close();
810	–	file.clear();
811	–
812	–	}
813	–
814	–	vector<string> getInstallString(string Cfg)
815	–	{
816	–	//system(strPauseCmd);
817	–	vector<string> returnval;
818	–
819	–	string line;
820	–	fstream file;
821	–
822	–	if (exists( Cfg ))
823	–	{
824	–	file.open(Cfg.c_str());
825	–	getline(file, line);
826	–	tokenize(line, returnval);
827	–	file.close();
828	–	file.clear();
829	–	sort(returnval.begin(), returnval.end());
830	–	}
831	–	else cout << "fail";
832	–
833	–	return returnval;
834	–	}
835	–
836	–	//stolen token function...
837	–	void tokenize(const string& str, vector<string>& tokens, const string& delimiters)
838	–	{
839	–	// Skip delimiters at beginning.
840	–	string::size_type lastPos = str.find_first_not_of(delimiters, 0);
841	–	// Find first "non-delimiter".
842	–	string::size_type pos     = str.find_first_of(delimiters, lastPos);
843	–
844	–	while (string::npos != pos || string::npos != lastPos)
845	–	{
846	–	// Found a token, add it to the vector.
847	–	tokens.push_back(str.substr(lastPos, pos - lastPos));
848	–	// Skip delimiters.  Note the "not_of"
849	–	lastPos = str.find_first_not_of(delimiters, pos);
850	–	// Find next "non-delimiter"
851	–	pos = str.find_first_of(delimiters, lastPos);
852	–	}
853	–	}
19
855	–	void clearOldDats(void) {
856	–	directory_iterator end_iter_gdf;
857	–	for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );
858	–	dir_itr_gdf != end_iter_gdf;
859	–	++dir_itr_gdf )
860	–	{
861	–	//cout << dir_itr_gdf->path().extension() << "\n";
862	–	if ( dir_itr_gdf->path().extension() == ".dat" || dir_itr_gdf->path().extension() == ".raw" || dir_itr_gdf->path().extension() == ".sep" ) {
863	–	remove( dir_itr_gdf->path() );
864	–	}
865	–
866	–	}
867	–
868	–	}
869	–
870	–	vector<string> globalInstalledMods;
871	–	vector<ModPackage> globalPackages;
872	–	#include "boost/thread.hpp"
20		#include <boost/thread/mutex.hpp>
874	–
875	–	/////////////////////////////////////////////////////////////////////////////
876	–	// Name:        main_window.cpp
877	–	// Purpose:
878	–	// Author:
879	–	// Modified by:
880	–	// Created:     07/05/2009 20:38:25
881	–	// RCS-ID:
882	–	// Copyright:
883	–	// Licence:
884	–	/////////////////////////////////////////////////////////////////////////////
885	–
21		// For compilers that support precompilation, includes "wx/wx.h".
22		#include "wx/wxprec.h"
23
#	Line 895 | Line 30 | vector<ModPackage> globalPackages;
30		#endif
31
32		////@begin includes
33	<	#include "about_window.h"
899	<	////@end includes
900	<
33	>	#include "about.h"
34		#include "main_window.h"
35	+	#include "installer.h"
36	+	////@end includes
37
38		////@begin XPM images
39	<	#include "redo.xpm"
39	>	#include "aelogosmall.xpm"
40	>	#include "undo.xpm"
41		#include "fileopen.xpm"
42		#include "filesaveas.xpm"
43		#include "quit.xpm"
44		////@end XPM images
45
46	<	//#define wxDebug 1;
47	<	//#define wxUSE_UNICODE 1;
46	>	bool busy = false;
47	>	int updateStatus;
48	>	bool installerJustUpdated = false;
49	>	vector<string> globalInstalledMods;
50	>	vector<ModPackage> globalPackages;
51	>	// Variable declarations
52	>	#ifdef WIN32
53	>	bool splitInstances = true;
54	>	string strImportOption = "-import:nosep";
55	>	string strOniSplit = "Onisplit.exe";
56	>	#else
57	>	bool splitInstances = false;
58	>	string strImportOption = "-import:sep";
59	>	string strOniSplit = "mono Onisplit.exe";
60	>	#endif
61
62		/*
63	<	* MainWindow type definition
64	<	*/
63	>	* MainWindow type definition
64	>	*/
65
66		IMPLEMENT_CLASS( MainWindow, wxFrame )
67
68
69		/*
70	<	* MainWindow event table definition
71	<	*/
70	>	* MainWindow event table definition
71	>	*/
72
73		BEGIN_EVENT_TABLE( MainWindow, wxFrame )
74
#	Line 939 | Line 88 | BEGIN_EVENT_TABLE( MainWindow, wxFrame )
88
89		EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
90
91	<	EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected )
91	>	EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected )
92
93		EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
94
#	Line 955 | Line 104 | BEGIN_EVENT_TABLE( MainWindow, wxFrame )
104
105		EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
106
107	+	EVT_BUTTON( Dir_Button, MainWindow::OnDirButtonClick )
108		////@end MainWindow event table entries
109
110		END_EVENT_TABLE()
111
112
113		/*
114	<	* MainWindow constructors
115	<	*/
114	>	* MainWindow constructors
115	>	*/
116
117		MainWindow::MainWindow()
118	<	{
119	<	Init();
118	>	{
119	>	Init();
120		}
121
122		MainWindow::MainWindow( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
123		{
124	<	Init();
125	<	Create( parent, id, caption, pos, size, style );
124	>	Init();
125	>	Create( parent, id, caption, pos, size, style );
126		}
127
128
129		/*
130	<	* MainWindow creator
131	<	*/
130	>	* MainWindow creator
131	>	*/
132
133		bool MainWindow::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
134		{
135	<	////@begin MainWindow creation
135	>	////@begin MainWindow creation
136		wxFrame::Create( parent, id, caption, pos, size, style );
137
138		CreateControls();
139	<	SetIcon(GetIconResource(wxT("oni_special.ico")));
139	>	SetIcon(GetIconResource(wxT("aelogosmall.png")));
140		Centre();
141	<	////@end MainWindow creation
142	<	return true;
141	>	////@end MainWindow creation
142	>	return true;
143		}
144
995	–
145		/*
146	<	* MainWindow destructor
147	<	*/
146	>	* MainWindow destructor
147	>	*/
148
149		MainWindow::~MainWindow()
150		{
151	<	////@begin MainWindow destruction
152	<	////@end MainWindow destruction
151	>	////@begin MainWindow destruction
152	>	////@end MainWindow destruction
153		}
154
1006	–
155		/*
156	<	* Member initialisation
157	<	*/
156	>	* Member initialisation
157	>	*/
158
159		void MainWindow::Init()
160		{
161	<	////@begin MainWindow member initialisation
161	>	////@begin MainWindow member initialisation
162		MainSplitter = NULL;
163		SelectAll = NULL;
164		RefreshButton = NULL;
#	Line 1024 | Line 172 | void MainWindow::Init()
172		OptionsPanel = NULL;
173		SepRadio = NULL;
174		NoSepRadio = NULL;
175	<	SeparatedRadio = NULL;
175	>	SeperatedRadio = NULL;
176		CompleteRadio = NULL;
177		ReglobalizeButton = NULL;
1030	–	////@end MainWindow member initialisation
178
179	+	ChangeDirectoryButton = NULL;
180	+	////@end MainWindow member initialisation
181		}
182
1034	–
183		/*
184	<	* Control creation for MainWindow
185	<	*/
184	>	* Control creation for MainWindow
185	>	*/
186		wxStatusBar **TheStatusBar;
187		wxButton* TheInstallButton;
188		wxGauge* TheProgressBar;
189		void MainWindow::CreateControls()
190		{
191	<	////@begin MainWindow content construction
1044	<	// Generated by DialogBlocks, 31/05/2009 19:03:55 (unregistered)
1045	<
191	>	////@begin MainWindow content construction
192		MainWindow* itemFrame1 = this;
193
194		wxMenuBar* menuBar = new wxMenuBar;
#	Line 1070 | Line 216 | void MainWindow::CreateControls()
216		wxMenu* itemMenu42 = new wxMenu;
217		itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
218		menuBar->Append(itemMenu42, _("Options"));
219	<	wxMenu* itemMenu44 = new wxMenu;
220	<	itemMenu44->Append(wxID_HELP, _("Help"), wxEmptyString, wxITEM_NORMAL);
221	<	itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
222	<	menuBar->Append(itemMenu44, _("Help"));
219	>	//#ifdef WIN32
220	>	//      itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
221	>	//      menuBar->Append(itemMenu44, _("Help"));
222	>	//#else
223	>	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
224	>	//#endif
225	>
226		itemFrame1->SetMenuBar(menuBar);
227
228		wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
229		itemFrame1->SetSizer(itemBoxSizer2);
230
231		MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
232	<	MainSplitter->SetMinimumPaneSize(150);
232	>	MainSplitter->SetMinimumPaneSize(1);
233		MainSplitter->SetName(_T("MainSplitter"));
234
235		wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
#	Line 1094 | Line 243 | void MainWindow::CreateControls()
243		SelectAll->SetName(_T("SelectAll_Checkbox"));
244		itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
245
246	<	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("redo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
246	>	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("undo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
247		RefreshButton->SetName(_T("RefreshButton"));
248		itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
249
#	Line 1128 | Line 277 | void MainWindow::CreateControls()
277		itemStaticLine17->Show(false);
278		itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
279
280	<	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_AUTO_URL );
280	>	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_RICH2 );
281		descriptionText->SetName(_T("DescriptionName"));
282		descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
283		itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
284
285	<	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 150);
285	>	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 200);
286		itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
287
288		StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
289		StatusArea->SetName(_T("StatusArea"));
290		StatusArea->SetFieldsCount(1);
291	<	StatusArea->SetStatusText(_("Status Area"), 0);
291	>	string versionText = "AE Installer v" + (string)INSTALLER_VERSION;
292	>	StatusArea->SetStatusText(versionText.c_str(), 0);
293		itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
294
295		wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
296		itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
297
298	<	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxSize(-1, 30), wxGA_SMOOTH );
298	>	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxDefaultSize, wxGA_SMOOTH );
299		ProgressBar->SetValue(0);
300		itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
301
302	<	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxSize(-1, 30), 0 );
302	>	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxDefaultSize, 0 );
303		itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
304
305		wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
#	Line 1182 | Line 332 | void MainWindow::CreateControls()
332		wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
333		itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
334
335	<	SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
336	<	SeparatedRadio->SetValue(false);
337	<	SeparatedRadio->SetName(_T("Separated_RadioButton"));
338	<	itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
335	>	SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
336	>	SeperatedRadio->SetValue(false);
337	>	SeperatedRadio->SetName(_T("Seperated_RadioButton"));
338	>	itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
339
340		CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
341		CompleteRadio->SetValue(false);
#	Line 1202 | Line 352 | void MainWindow::CreateControls()
352		ReglobalizeButton->SetName(_T("Reglobalize_Button"));
353		itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
354
355	<	// Connect events and objects
355	>	wxStaticLine* itemStaticLine100 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
356	>	itemBoxSizer25->Add(itemStaticLine100, 0, wxGROW|wxALL, 5);
357	>
358	>	ChangeDirectoryButton =  new wxButton( OptionsPanel, Dir_Button, _("Change Dir"), wxDefaultPosition, wxDefaultSize, 0 );
359	>	ChangeDirectoryButton->SetName(_T("Dir_Button"));
360	>	itemBoxSizer34->Add(ChangeDirectoryButton, 0, wxGROW|wxALL, 5);
361	>
362	>	// Connect events and objects
363		Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
364	<	////@end MainWindow content construction
365	<
366	<	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
367	<	static_cast<string>("-import:sep");
368	<	splitInstances = NOT_SPLIT;
1212	<	}
1213	<	else {
1214	<	static_cast<string>("-import:nosep");
1215	<	splitInstances = SPLIT;
1216	<	}
364	>	////@end MainWindow content construction
365	>	#ifdef WIN32
366	>	Handle = (HWND)GetHWND();
367	>	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
368	>	#endif
369
370	+	updateStatus = GetUpdateStatus(&currentAE, &updateAE, &installerJustUpdated);
371	+
372		globalPackages = getPackages();
373		globalInstalledMods = getInstallString();
374	<	for (int i = 0; i < globalPackages.size(); i++) {
375	<	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
376	<	if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
374	>	for (unsigned int i = 0; i < globalPackages.size(); i++)
375	>	{
376	>	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
377	>	if (binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName)) Mods_CheckboxList->Check(i);
378		}
1224	–	TheStatusBar = &StatusArea;
1225	–	TheInstallButton = InstallButton;
1226	–	TheProgressBar = ProgressBar;
1227	–	OptionsPanel->Hide();
1228	–	if(splitInstances == SPLIT) SeparatedRadio->SetValue(true);
1229	–	else CompleteRadio->SetValue(true);
1230	–
1231	–
1232	–
1233	–	if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1234	–	else SepRadio->SetValue(true);
379
380	<	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
380	>	TheStatusBar = &StatusArea;
381	>	TheInstallButton = InstallButton;
382	>	TheProgressBar = ProgressBar;
383	>	OptionsPanel->Hide();
384	>
385	>	if(splitInstances) SeperatedRadio->SetValue(true);
386	>	else CompleteRadio->SetValue(true);
387	>	if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
388	>	else SepRadio->SetValue(true);
389	>
390	>	#ifdef WIN32
391	>	RedirectIOToConsole();
392	>	HWND hWnd = GetConsoleWindow();
393	>	ShowWindow( hWnd, SW_HIDE );
394	>	#endif
395		}
396
1239	–
397		/*
398	<	* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for SelectAll_Checkbox
399	<	*/
398	>	* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for SelectAll_Checkbox
399	>	*/
400
401		void MainWindow::OnSelectAllCheckboxClick( wxCommandEvent& event )
402		{
403	<	switch(SelectAll->Get3StateValue()) {
403	>	switch(SelectAll->Get3StateValue()) {
404		case wxCHK_UNCHECKED:
405	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1249	<	//SelectAll->Set3StateValue(wxCHK_CHECKED);
405	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
406		break;
407		case wxCHK_CHECKED:
408	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, true);
1253	<	//SelectAll->Set3StateValue(wxCHK_UNCHECKED);
408	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, true);
409		break;
410		case wxCHK_UNDETERMINED:
411	<	for(int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1257	<	//SelectAll->Set3StateValue(wxCHK_CHECKED);
411	>	for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
412		break;
1259	–
413		}
1261	–
414		}
415
1264	–
416		/*
417	<	* wxEVT_CREATE event handler for Mods_CheckboxList
418	<	*/
417	>	* wxEVT_CREATE event handler for Mods_CheckboxList
418	>	*/
419
420		void MainWindow::ModList_OnCreate( wxWindowCreateEvent& event )
421		{
422
1272	–
423		}
424
425
426		/*
427	<	* Should we show tooltips?
428	<	*/
427	>	* Should we show tooltips?
428	>	*/
429
430		bool MainWindow::ShowToolTips()
431		{
432	<	return true;
432	>	return true;
433		}
434
435		/*
436	<	* Get bitmap resources
437	<	*/
436	>	* Get bitmap resources
437	>	*/
438
439		wxBitmap MainWindow::GetBitmapResource( const wxString& name )
440		{
441	<	// Bitmap retrieval
442	<	////@begin MainWindow bitmap retrieval
441	>	// Bitmap retrieval
442	>	////@begin MainWindow bitmap retrieval
443		wxUnusedVar(name);
444	<	if (name == _T("redo.xpm"))
444	>	if (name == _T("undo.xpm"))
445		{
446	<	wxBitmap bitmap(redo_xpm);
446	>	wxBitmap bitmap( undo_xpm);
447		return bitmap;
448		}
449		else if (name == _T("fileopen.xpm"))
#	Line 1312 | Line 462 | wxBitmap MainWindow::GetBitmapResource(
462		return bitmap;
463		}
464		return wxNullBitmap;
465	<	////@end MainWindow bitmap retrieval
465	>	////@end MainWindow bitmap retrieval
466		}
467
468		/*
469	<	* Get icon resources
470	<	*/
469	>	* Get icon resources
470	>	*/
471
472		wxIcon MainWindow::GetIconResource( const wxString& name )
473		{
474	<	// Icon retrieval
475	<	////@begin MainWindow icon retrieval
474	>	// Icon retrieval
475	>	////@begin MainWindow icon retrieval
476		wxUnusedVar(name);
477	<	if (name == _T("oni_special.ico"))
477	>	if (name == _T("aelogosmall.png"))
478		{
479	<	wxIcon icon(_T("oni_special.ico"), wxBITMAP_TYPE_ICO);
479	>	wxIcon icon(aelogosmall_xpm);
480		return icon;
481		}
482		return wxNullIcon;
483	<	////@end MainWindow icon retrieval
483	>	////@end MainWindow icon retrieval
484		}
485
1336	–
486		/*
487	<	* wxEVT_COMMAND_LISTBOX_SELECTED event handler for Mods_CheckboxList1
488	<	*/
487	>	* wxEVT_COMMAND_LISTBOX_SELECTED event handler for Mods_CheckboxList1
488	>	*/
489
490		void MainWindow::OnModsCheckboxList1Selected( wxCommandEvent& event )
491		{
1343	–	//event.GetSelection
492		titleText->SetValue(globalPackages[event.GetSelection()].name.c_str());
493		creatorText->SetValue(globalPackages[event.GetSelection()].creator.c_str());
494		descriptionText->SetValue(globalPackages[event.GetSelection()].readme.c_str());
1347	–
1348	–	//creatorText->Refresh();
495		}
496
1351	–
497		/*
498	<	* wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event handler for Mods_CheckboxList1
499	<	*/
498	>	* wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event handler for Mods_CheckboxList1
499	>	*/
500
501		void MainWindow::OnModsCheckboxList1Toggled( wxCommandEvent& event )
502		{
503		SelectAll->Set3StateValue(wxCHK_UNDETERMINED);
504		if(event.GetInt()) {
505	<	/*
505	>	/*
506		switch(SelectAll->Get3StateValue()) {
507	<	case wxCHK_UNCHECKED:
507	>	case wxCHK_UNCHECKED:
508		break;
509	<	case wxCHK_CHECKED:
509	>	case wxCHK_CHECKED:
510		break;
511	<	case wxCHK_UNDETERMINED :
511	>	case wxCHK_UNDETERMINED :
512		break;
513	<	}
514	<	*/
513	>	}
514	>	*/
515		}
516		}
517
518
519		/*
520	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_OPTIONS
521	<	*/
520	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_OPTIONS
521	>	*/
522
523		void MainWindow::OnOptionsClick( wxCommandEvent& event )
524		{
1380	–
525		if (!event.GetInt() ) {
526		OptionsPanel->Hide();
527	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
527	>
528	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
529		else {
530	+	wxMessageDialog* YesNoDialog = new wxMessageDialog(this, "WARNING: These options are for advanced users only, use with caution.",
531	+	"AE Installer Alert",  wxOK | wxICON_EXCLAMATION     , wxDefaultPosition);
532	+	YesNoDialog->ShowModal();
533		OptionsPanel->Show();
534	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
534	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+1);
535	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-1);
536		}
537		}
538
1390	–
539		/*
540	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_EXIT
541	<	*/
540	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_EXIT
541	>	*/
542
543		void MainWindow::OnExitClick( wxCommandEvent& event )
544		{
545	<	exit(0);
545	>	exit(0);
546		}
547
1400	–
548		/*
549	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for Install_Button
550	<	*/
1404	<
549	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for Install_Button
550	>	*/
551
552		struct recompile
553		{
554	<	recompile(vector<string> localPackages) : thePackages(localPackages) { }
555	<	void operator()()
556	<	{
554	>	recompile(vector<string> localPackages) : thePackages(localPackages) { }
555	>	void operator()()
556	>	{
557		TheInstallButton->Disable();
558	<	recompileAll(thePackages);
559	<	TheInstallButton->Enable();
560	<	}
561	<
562	<	vector<string> thePackages;
558	>	recompileAll(thePackages);
559	>	TheInstallButton->Enable();
560	>
561	>	}
562	>	vector<string> thePackages;
563		};
564
565	+	void globalize2(void) {
566	+	TheInstallButton->Disable();
567	+	globalizeData();
568	+	TheInstallButton->Enable();
569	+	}
570	+
571		void MainWindow::OnInstallButtonClick( wxCommandEvent& event )
572		{
1421	–
573		vector<string> localPackages;
574	<	localPackages.push_back("Globalize");
575	<	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
574	>	localPackages.push_back("00000Globalize");
575	>	for(unsigned int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) localPackages.push_back( globalPackages[i].modStringName );
576		if ( !localPackages.empty() )   {
577	<
578	<	//MainWindow::MainWindow().Hide();
579	<	//      boost::thread thrd2(recompileAll(localPackages) );
580	<	//MainWindow::MainWindow().Show();
577	>	sort(localPackages.begin(), localPackages.end());
578	>	localPackages[0] = "Globalize";
579	>	this->InstallButton->Disable();
580	>	this->ReglobalizeButton->Disable();
581		#ifdef WIN32
582		recompile packages(localPackages);
583		boost::thread thrd(packages);
584		#else
1434	–	this->Disable();
585		recompileAll(localPackages);
1436	–	this->Enable();
586		#endif
587	<
587	>	this->InstallButton->Enable();
588	>	this->ReglobalizeButton->Enable();
589		}
1440	–
1441	–
590		}
591
592	<	/*void setStatusArea( string s ) {
593	<	//TheStatusBar = MainWindow::StatusArea;
594	<	(**TheStatusBar).SetStatusText(_(s.c_str()), 0);
595	<
596	<	//MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
597	<
598	<	//MainWindow::StatusBar->SetLabel("Importing Files...");
599	<	//StatusBar->SetLabel(s);
600	<	//->SetLabel(s);
601	<
602	<	}*/
603	<
1456	<	void setProgressBar( int i ) {
1457	<	//TheProgressBar->SetValue(
1458	<
592	>	void setProgressBar( int i )
593	>	{
594	>	#ifdef WIN32
595	>	if (SUCCEEDED(pTaskbarList->QueryInterface(IID_ITaskbarList3, (void **)&pTaskbarList3)))
596	>	{
597	>	pTaskbarList3->SetProgressValue(Handle,i, 1000);
598	>	if ( i == 0 )
599	>	{
600	>	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
601	>	}
602	>	}
603	>	#endif
604		TheProgressBar->SetValue(i);
1460	–
605		}
606
1463	–
607		/*
608	<	* wxEVT_UPDATE_UI event handler for ID_STATUSBAR
609	<	*/
608	>	* wxEVT_UPDATE_UI event handler for ID_STATUSBAR
609	>	*/
610
611		void MainWindow::OnStatusbarUpdate( wxUpdateUIEvent& event )
612		{
613	<	////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
613	>	////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
614		// Before editing this code, remove the block markers.
615		event.Skip();
616	<	////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
616	>	////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
617		}
618
1476	–
619		/*
620	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT
621	<	*/
620	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT
621	>	*/
622
623		void MainWindow::OnAboutClick( wxCommandEvent& event )
624		{
625	<	////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
625	>	////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
626		// Before editing this code, remove the block markers.
627	+	// TODO: Make About window work again!
628		About* window = new About(this);
629	<	int returnValue = window->ShowModal();
629	>	window->ShowModal();
630		window->Destroy();
631	<	////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
631	>	////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
632		}
633
1491	–
634		/*
635	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
636	<	*/
637	<
635	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
636	>	*/
637	>
638		void MainWindow::OnNoSepRadioButtonSelected( wxCommandEvent& event )
639		{
640		static_cast<string>("-import:nosep");
641		}
642
1501	–
643		/*
644	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Sep_RadioButton
645	<	*/
644	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Sep_RadioButton
645	>	*/
646
647		void MainWindow::OnSepRadioButtonSelected( wxCommandEvent& event )
648		{
649		static_cast<string>("-import:sep");
650		}
651
1511	–
652		/*
653	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
654	<	*/
1515	<
1516	<	void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1517	<	{
1518	<	splitInstances = SPLIT;
1519	<
1520	<	}
1521	<
653	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
654	>	*/
655
656		/*
657	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
658	<	*/
657	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
658	>	*/
659
660		void MainWindow::OnCompleteRadioButtonSelected( wxCommandEvent& event )
661		{
662	<	splitInstances = NOT_SPLIT;
1530	<
662	>	splitInstances = false;
663		}
664
1533	–
665		/*
666	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BITMAPBUTTON
667	<	*/
666	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BITMAPBUTTON
667	>	*/
668
669		void MainWindow::OnRefreshButtonClick( wxCommandEvent& event )
670		{
671	+	globalPackages = getPackages();
672		refreshMods(globalInstalledMods);
673		}
674
1543	–
675		/*
676	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_LOAD
677	<	*/
1547	<
676	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_LOAD
677	>	*/
678
679	<
680	<
681	<	void MainWindow::refreshMods (vector<string> s) {
1552	<
679	>	// TODO: Make refreshMods actually refresh the list in the window of available mods so we can see any new package info and deleted mods are removed from the list
680	>	void MainWindow::refreshMods (vector<string> s)
681	>	{
682		Mods_CheckboxList->Clear();
683	<	//globalInstalledMods = getPackages();
684	<	for (int i = 0; i < globalPackages.size(); i++) {
685	<	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
686	<	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
687	<	//else Mods_CheckboxList->Check(i,0);
1559	<
1560	<	}
683	>	for (unsigned int i = 0; i < globalPackages.size(); i++) {
684	>	Mods_CheckboxList->Append(globalPackages[i].name.c_str());
685	>	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) )
686	>	Mods_CheckboxList->Check(i);
687	>	}
688		}
689
690		void MainWindow::OnLoadClick( wxCommandEvent& event )
691		{
692	+	if (busy == 1) return;
693		static const wxChar *FILETYPES = _T(
694		"Mod Loadouts (*.cfg)|*.cfg|"
695		"All files (*.*)|*.*"
696	<	);
697	<
696	>	);
697	>
698		wxFileDialog* openFileDialog =
699		new wxFileDialog( this, _("Open Mod Loadout"), "", "", FILETYPES,
700	<	wxOPEN, wxDefaultPosition);
701	<
700	>	wxOPEN, wxDefaultPosition);
701	>
702		if ( openFileDialog->ShowModal() == wxID_OK )
703		{
704		refreshMods(getInstallString( string(openFileDialog->GetPath()) ));
705		}
1578	–
1579	–
706		}
707
1582	–
708		/*
709	<	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_SAVE
710	<	*/
709	>	* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_SAVE
710	>	*/
711
712		void MainWindow::OnSaveClick( wxCommandEvent& event )
713		{
714	+	if (busy == 1) return;
715		static const wxChar *FILETYPES = _T(
716		"Mod Loadouts (*.cfg)|*.cfg|"
717		"All files (*.*)|*.*"
718	<	);
718	>	);
719
720	<	wxFileDialog* openFileDialog =
720	>	wxFileDialog* openFileDialog =
721		new wxFileDialog( this, _("Open file"), "", "", FILETYPES,
722		wxSAVE, wxDefaultPosition);
723
724		if ( openFileDialog->ShowModal() == wxID_OK )
725		{
1600	–
1601	–
1602	–	//Mods_CheckboxList->
1603	–
1604	–
1605	–
1606	–	//
1607	–
726		if ( exists( openFileDialog->GetPath().c_str() ) )
727	<	{
728	<	remove( openFileDialog->GetPath().c_str() );
729	<	}
727	>	{
728	>	remove( openFileDialog->GetPath().c_str() );
729	>	}
730
731	<	ofstream file(openFileDialog->GetPath().c_str());
1614	<
1615	<	vector<string>list;
1616	<	for(int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
1617	<	vector<string>::iterator begin_iter = list.begin();
1618	<	vector<string>::iterator end_iter = list.end();
731	>	ofstream file(openFileDialog->GetPath().c_str());
732
733	<	sort( list.begin(), list.end() );
733	>	vector<string>list;
734	>	for(unsigned int i = 0; i < globalPackages.size(); i++) if(Mods_CheckboxList->IsChecked(i)) list.push_back( globalPackages[i].modStringName );
735	>	vector<string>::iterator begin_iter = list.begin();
736	>	vector<string>::iterator end_iter = list.end();
737
738	<	for( ; begin_iter != end_iter; ++begin_iter) {
739	<	file << *begin_iter << " ";
740	<	}
741	<
742	<	file.close();
1627	<	file.clear();
738	>	sort( list.begin(), list.end() );
739	>
740	>	for( ; begin_iter != end_iter; ++begin_iter) {
741	>	file << *begin_iter << " ";
742	>	}
743
744	<	//SetCurrentFilename(openFileDialog->GetFilename());
745	<	//theText->LoadFile(openFileDialog->GetFilename());
1631	<	//SetStatusText(GetCurrentFilename(), 0);
1632	<	//SetStatusText(openFileDialog->GetDirectory(),1);
744	>	file.close();
745	>	file.clear();
746		}
747		}
748
1636	–
749		/*
750	<	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ReGlobalize_Button
751	<	*/
750	>	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ReGlobalize_Button
751	>	*/
752
753		void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
754		{
755	<	globalizeData();
756	<	setProgressBar(1000);
757	<	setStatusArea("Done!");
1646	<	}
755	>	string YesNoMsg = "WARNING: This will DELETE the Edition's GameDataFolder and recreate it from the vanilla Oni game data.\n";
756	>	YesNoMsg = YesNoMsg + "Are you SURE you want to do this?";
757	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this, YesNoMsg.c_str(), "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION , wxDefaultPosition);
758
759	+	if (YesNoDialog->ShowModal() == wxID_NO)
760	+	{
761	+	//if the user said no...
762	+	}
763	+	else
764	+	{
765	+	this->InstallButton->Disable();
766	+	this->ReglobalizeButton->Disable();
767	+	#ifdef WIN32
768	+	boost::thread thrd2(globalizeData);
769	+	//globalizeData();
770	+	//boost::thread::create_thread(&globalizeData);
771	+	//       boost::thread_group Tg;
772	+	// Tg.create_thread( &globalizeData(), this );
773	+	#else
774	+	globalizeData();
775	+	#endif
776	+	this->InstallButton->Enable();
777	+	this->ReglobalizeButton->Enable();
778	+	}
779	+	}
780	+	/*
781	+	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
782	+	*/
783
784		/*
785	<	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
785	>	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
786		*/
787
788	<	/*void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
788	>	void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
789		{
790	<	////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
791	<	// Before editing this code, remove the block markers.
1657	<	event.Skip();
1658	<	////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1659	<	}*/
790	>	splitInstances = true;
791	>	}
792
793	+	void MainWindow::OnDirButtonClick( wxCommandEvent& event )
794	+	{
795	+	wxDirDialog* newDir = new wxDirDialog(this, "Set current directory", "", wxDD_DEFAULT_STYLE,
796	+	wxDefaultPosition, wxDefaultSize, "wxDirCtrl");
797	+	newDir->ShowModal();
798	+	if(newDir->GetPath()[0]) current_path( (path)newDir->GetPath() );
799	+	OnRefreshButtonClick(event);
800	+	}

Diff Legend

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