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 461 by gumby, Fri Oct 9 03:22:08 2009 UTC vs.
Revision 526 by gumby, Sat May 22 22:07:58 2010 UTC

#	Line 1 | Line 1
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		#ifndef NTDDI_VERSION
10		#define NTDDI_VERSION NTDDI_WIN7
11		#endif
12		#ifdef WIN32
13	<	#include <windows.h>
13	>	#include <windows.h>
14		#include <shobjidl.h>
15		HWND Handle;
8	–
16		ITaskbarList *pTaskbarList;
17		ITaskbarList3 *pTaskbarList3;
18		#endif
19
13	–	/*
14	–	AE/Mod Installer
15	–	by Gumby and Iritscen
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>
24	–	//#include <conio.h>
25	–	//#include <process.h>
26	–	#include <string>
27	–	#include <iostream>
28	–	#include <cctype>
29	–	#include <vector>
30	–	#include <fstream>
31	–	#include <errno.h>
32	–	#include <sstream>
33	–
34	–	#include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
35	–	#include "boost/lexical_cast.hpp" //int -> string
36	–	#include "boost/algorithm/string.hpp"
37	–	#include "installer.h"
38	–
39	–	#ifdef WIN32
40	–	#include <windows.h>
41	–	#else // assume we're on Mac
42	–	#include <stdlib.h>
43	–	#include <dirent.h>
44	–	#endif
45	–
46	–
47	–	const bool SPLIT = 1;
48	–	const bool NOT_SPLIT = 0;
49	–	bool splitInstances = SPLIT;
50	–	bool busy = 0;
51	–	#ifdef WIN32
52	–	const string strOniSplit = "Onisplit.exe";
53	–	string strImportOption = "-import:nosep";
54	–	const char* strClsCmd = "cls";
55	–	const char* strPauseCmd = "PAUSE";
56	–	#else // set up Mac equivalents since we're in Mac OS
57	–	const string strOniSplit = "mono Onisplit.exe";
58	–	string strImportOption = "-import:sep";
59	–	const char* strClsCmd = "clear";
60	–	const char* strPauseCmd = "read -n 1 -p \"Press any key to continue\"";
61	–	void Sleep(int ms) { sleep( ms / 1000 ); }
62	–	#endif
63	–
64	–	using namespace boost::filesystem;
65	–	using namespace std;
66	–
67	–
68	–	vector<string> globalInstalledMods;
69	–	vector<ModPackage> globalPackages;
70	–
71	–
72	–	#include "boost/date_time/gregorian/gregorian.hpp"
73	–	#include "boost/date_time/date_parsing.hpp"
74	–	#include "boost/date_time/posix_time/posix_time.hpp"
75	–
76	–	string escapePath(string input) {
77	–
78	–	string output;
79	–	string escape_me = "& ;()|<>\"'\\#*?$";
80	–	for(unsigned int i = 0; i < input.size(); i++)  {
81	–	for(unsigned int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
82	–	output += input[i];
83	–	}
84	–	return output;
85	–	}
86	–
87	–	int globalizeData(void)
88	–	{
89	–	busy = 1;
90	–	using boost::lexical_cast;
91	–	using boost::bad_lexical_cast;
92	–	// using namespace boost::posix_time;
93	–	using namespace boost::gregorian;
94	–	using namespace boost::posix_time;
95	–	ptime start_time(second_clock::local_time());
96	–
97	–	setStatusArea("Globalizing!");
98	–	int err = 0;
99	–	int parts_done = 0;
100	–	char Step_x_x[300];
101	–	//char levels[i][5];
102	–	remove("Globalize.log");
103	–	ofstream logfile("Globalize.log");
104	–	logfile << "Globalization started " << to_simple_string(start_time) << endl;
105	–	try {
106	–
107	–	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.
108	–	//const vector<double> ck(cv, &cv[CvSize]);
109	–	vector<string> levels;
110	–	for (int f = 0; f < 15; f++) {
111	–	levels.push_back(levels_cstr[f]);
112	–	}
113	–	char choice = 0;
114	–
115	–	//SetCurrentDirectory("C:/Program Files/Oni/edition/install");
116	–	///char levels[i][3];
117	–	path Characters = "../GameDataFolder/level0_Characters";
118	–	path Particles = "../GameDataFolder/level0_Particles";
119	–	path Archive = "../GameDataFolder/Archive";
120	–	path Textures  = "../GameDataFolder/level0_Textures";
121	–	path Sounds = "../GameDataFolder/level0_Sounds";
122	–	path Animations = "../GameDataFolder/level0_Animations";
123	–	path TRAC = Animations / "level0_TRAC";
124	–	path TRAM = Animations / "level0_TRAM";
125	–
126	–	vector<path> GDFPaths;
127	–	//GDFPaths.push_back(Characters);
128	–	GDFPaths.push_back(Particles);
129	–	GDFPaths.push_back(Textures);
130	–	GDFPaths.push_back(Sounds);
131	–	GDFPaths.push_back(TRAC);
132	–	GDFPaths.push_back(TRAM);
133	–
134	–
135	–	path VanillaCharacters = "VanillaDats/level0_Final/level0_Characters/level0_Characters.oni";
136	–	path VanillaParticles = "VanillaDats/level0_Final/level0_Particles/level0_Particles.oni";
137	–	path VanillaTextures  = "VanillaDats/level0_Final/level0_Textures/level0_Textures.oni";
138	–	path VanillaSounds = "VanillaDats/level0_Final/level0_Sounds/level0_Sounds.oni";
139	–	path VanillaAnimations = "VanillaDats/level0_Final/level0_Animations/level0_Animations.oni";
140	–	path VanillaTRAC = "VanillaDats/level0_Final/level0_Animations/level0_TRAC.oni";
141	–	path VanillaTRAM = "VanillaDats/level0_Final/level0_Animations/level0_TRAM.oni";
142	–
143	–	vector<path> VanillaPaths;
144	–
145	–	//VanillaPaths.push_back(VanillaCharacters);
146	–	VanillaPaths.push_back(VanillaParticles);
147	–	VanillaPaths.push_back(VanillaTextures);
148	–	VanillaPaths.push_back(VanillaSounds);
149	–	VanillaPaths.push_back(VanillaTRAC);
150	–	VanillaPaths.push_back(VanillaTRAM);
151	–
152	–	/*
153	–	if (exists("../GameDataFolder/"))
154	–	{
155	–	//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.)"
156	–	//       << "\n1. Re-globalize"
157	–	//       << "\n2. Return to main menu\n";
158	–	//choice = cin.get();
159	–	cin.ignore(128, '\n');
160	–	if (choice == '1')
161	–	remove_all("../GameDataFolder"); // remove AE GDF
162	–	if (choice == '2')
163	–	return 0;
164	–	}
165	–	*/
166	–	setStatusArea("Removing old GameDataFolder...\n");
167	–	logfile <<  "Removing old GameDataFolder...\n";
168	–	remove_all( "../GameDataFolder/" );
169	–	setStatusArea("Creating needed directories...");
170	–	logfile <<  "Creating needed directories...\n";
171	–	create_directory( "../GameDataFolder/" );
172	–
173	–	create_directory( "packages" );
174	–
175	–	if (exists("VanillaDats")) remove_all("VanillaDats");
176	–	create_directory( "VanillaDats" );
177	–	create_directory( "VanillaDats/level0_Final/" );
178	–	//blah blah finish this.
179	–	//logfile <<  "VanillaDats/level0_Final/ created";
180	–	create_directory( Characters );
181	–	create_directory( Particles );
182	–	create_directory( Archive );
183	–	create_directory( Textures );
184	–	create_directory( Sounds );
185	–	create_directory( Animations );
186	–	create_directory( TRAC );
187	–	create_directory( TRAM );
188	–	int num_levels = 0;
189	–	for(int i = 1; i < 15; i++)
190	–	{
191	–	if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
192	–	num_levels++;
193	–
194	–	}
195	–	}
196	–	logfile << "Exporting and moving...\n\n";
197	–	int total_steps =  8 + 2 * num_levels;
198	–	for(int i = 0; i < 15; i++)
199	–	{
200	–
201	–	//printf(levels[i],"%d",levels[i]); // int to char array
202	–
203	–	if (exists("../../GameDataFolder/level" + levels[i] + "_Final.dat")) {
204	–	logfile << "level" << levels[i] << "_Final\n";
205	–	logfile << "\tExporting level" << levels[i] << "_Final.dat\n";
206	–	//printf(Step_x_x,"Step %d/%d: exporting level%d_final.dat", parts_done + 1,, levels[i]); setStatusArea((string)Step_x_x);
207	–	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " exporting level" + levels[i]+"_Final.dat");
208	–	create_directory( "../GameDataFolder/level" + levels[i] + "_Final" );
209	–	//                              setStatusArea(strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat");
210	–	system((strOniSplit + " -export ../GameDataFolder/level" + levels[i] + "_Final ../../GameDataFolder/level" + levels[i] + "_Final.dat").c_str());
211	–	create_directory( "VanillaDats/level" + levels[i] + "_Final" );
212	–	create_directory( "VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final" );
213	–
214	–	directory_iterator end_iter;
215	–	for ( directory_iterator dir_itr( "../GameDataFolder/level" + levels[i] + "_Final" ); dir_itr != end_iter; ++dir_itr )
216	–	{
217	–	//cout << dir_itr->path().filename();
218	–	if ( is_regular_file( dir_itr->status() ) )
219	–	{
220	–	if ( dir_itr->path().filename().substr(0,8) == "TXMPfail" ||
221	–	dir_itr->path().filename().substr(0,9) == "TXMPlevel" ||
222	–	( dir_itr->path().filename().substr(0,4) == "TXMP" && dir_itr->path().filename().find("intro")!=string::npos) ||
223	–	dir_itr->path().filename().substr(0,4) == "TXMB" ||
224	–	dir_itr->path().filename() == "M3GMpowerup_lsi.oni" ||
225	–	dir_itr->path().filename() == "TXMPlsi_icon.oni" ||
226	–	( dir_itr->path().filename().substr(0,4) == "TXMB" && dir_itr->path().filename().find("splash_screen.oni")!=string::npos)       )
227	–	{
228	–	cout <<dir_itr->path().filename() << "\n";
229	–	create_directory( dir_itr->path().parent_path() / "NoGlobal");
230	–	if(!exists( dir_itr->path().parent_path() / "NoGlobal" / dir_itr->filename())) rename(dir_itr->path(), dir_itr->path().parent_path() / "NoGlobal" /
231	–	dir_itr->filename());
232	–	else remove(dir_itr->path());
233	–	}
234	–	else if (dir_itr->path().filename().substr(0,4) == "TRAC"
235	–	) {
236	–	cout <<dir_itr->path().filename() << "\n";
237	–	if(!exists( TRAC / dir_itr->filename())) rename(dir_itr->path(), TRAC / dir_itr->filename());
238	–	else remove(dir_itr->path());
239	–	}
240	–	else if (dir_itr->path().filename().substr(0,4) == "TRAM") {
241	–	cout <<dir_itr->path().filename() << "\n";
242	–	if(!exists( TRAM / dir_itr->filename())) rename(dir_itr->path(), TRAM / dir_itr->filename());
243	–	else remove(dir_itr->path());
244	–	}
245	–	else if (dir_itr->path().filename().substr(0,4) == "ONSK" ||
246	–	dir_itr->path().filename().substr(0,4) == "TXMP") {
247	–	cout <<dir_itr->path().filename() << "\n";\
248	–	create_directory( dir_itr->path().parent_path() / "TexFix");
249	–	if(!exists( Textures / dir_itr->filename())) rename(dir_itr->path(), Textures / dir_itr->filename());
250	–	//rename(dir_itr->path(), dir_itr->path().parent_path() / "TexFix" / dir_itr->filename());
251	–	}
252	–	else if (dir_itr->path().filename().substr(0,4) == "ONCC"
253	–	|| dir_itr->path().filename().substr(0,4) == "TRBS"
254	–	|| dir_itr->path().filename().substr(0,4) == "ONCV"
255	–	|| dir_itr->path().filename().substr(0,4) == "ONVL"
256	–	|| dir_itr->path().filename().substr(0,4) == "TRMA"
257	–	|| dir_itr->path().filename().substr(0,4) == "TRSC"
258	–	|| dir_itr->path().filename().substr(0,4) == "TRAS") {
259	–	cout <<dir_itr->path().filename() << "\n";
260	–	if(!exists( Characters / dir_itr->filename())) rename(dir_itr->path(), Characters / dir_itr->filename());
261	–	else remove(dir_itr->path());
262	–	}
263	–	else if (dir_itr->path().filename().substr(0,4) == "OSBD"
264	–	|| dir_itr->path().filename().substr(0,4) == "SNDD") {
265	–	cout << dir_itr->path().filename() << "\n";
266	–	if(!exists( Sounds / dir_itr->filename())) rename(dir_itr->path(), Sounds / dir_itr->filename());
267	–	else remove(dir_itr->path());
268	–	}
269	–	else if (dir_itr->path().filename().substr(0,5) == "BINA3"
270	–	|| dir_itr->path().filename().substr(0,10) == "M3GMdebris"
271	–	|| dir_itr->path().filename() == "M3GMtoxic_bubble.oni"
272	–	|| dir_itr->path().filename().substr(0,8) == "M3GMelec"
273	–	|| dir_itr->path().filename().substr(0,7) == "M3GMrat"
274	–	|| dir_itr->path().filename().substr(0,7) == "M3GMjet"
275	–	|| dir_itr->path().filename().substr(0,9) == "M3GMbomb_"
276	–	|| dir_itr->path().filename() == "M3GMbarab_swave.oni"
277	–	|| dir_itr->path().filename() == "M3GMbloodyfoot.oni"
278	–	){
279	–	cout <<dir_itr->path().filename() << "\n";
280	–	if(!exists( Particles / dir_itr->filename())) rename(dir_itr->path(), Particles / dir_itr->filename());
281	–	else remove(dir_itr->path());
282	–	}
283	–	else if (dir_itr->path().filename().substr(0,4) == "AGDB"
284	–	|| dir_itr->path().filename().substr(0,4) == "TRCM") {
285	–	cout <<dir_itr->path().filename() << "\n";
286	–
287	–	if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
288	–	else remove(dir_itr->path());
289	–	}
290	–	else if (dir_itr->path().filename().substr(0,4) == "ONWC") { //fix for buggy ONWC overriding
291	–	cout <<dir_itr->path().filename() << "\n";
292	–
293	–	if(!exists( "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
294	–	else remove(dir_itr->path());
295	–	}
296	–
297	–	if (exists(dir_itr->path())) {
298	–
299	–	}
300	–	else {
301	–	logfile << "\tMoved file: " << dir_itr->path().filename() << "\n";
302	–	}
303	–	}
304	–
305	–
306	–
307	–	}
308	–	logfile << "\tCleaning up TXMPs...\n";
309	–	system( (strOniSplit + " -move:delete " + Textures.string() + " ../GameDataFolder/level" + levels[i] + "_Final/TXMP*.oni").c_str());
310	–	parts_done++;
311	–
312	–	setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
313	–
314	–	}
315	–	}
316	–	logfile << "Reimporting levels\n";
317	–	for (int i = 0; i < 15; i++)
318	–	{
319	–	logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
320	–	//printf(levels[i],"%d",levels[i]);
321	–	//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");
322	–	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
323	–	logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
324	–	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
325	–	string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
326	–	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni");
327	–	system(sys_str.c_str() );
328	–	setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
329	–	parts_done++;
330	–	}
331	–	//create_directory( VanillaCharacters.parent_path() );
332	–	create_directory( VanillaParticles.parent_path() );
333	–	create_directory( VanillaTextures.parent_path() );
334	–	create_directory( VanillaSounds.parent_path() );
335	–	create_directory( VanillaAnimations.remove_filename() );
336	–
337	–	for(unsigned int j = 0; j < GDFPaths.size(); j++) {
338	–	logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
339	–	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
340	–	system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
341	–	parts_done++;
342	–	setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
343	–	}
344	–	logfile << "\nMoving level0_Characters\n";
345	–	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );
346	–	copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
347	–	/*
348	–	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) ));
349	–	system((strOniSplit + " " + strImportOption + " " + Characters.string() + " " + VanillaCharacters.string()).c_str());
350	–	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) ));
351	–	system((strOniSplit + " " + strImportOption + " " + Particles.string() + " " + VanillaParticles.string()).c_str());
352	–	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) ));
353	–	system((strOniSplit + " " + strImportOption + " " + Textures.string() + " " + VanillaTextures.string()).c_str());
354	–	//system((strOniSplit   + " " + strImportOption + (string)" " + Animations.string() + (string)" " + VanillaAnimations.string()).c_str());
355	–	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) ));
356	–	system((strOniSplit + " " + strImportOption + " " + TRAC.string() + " " + VanillaTRAC.string()).c_str());
357	–	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) ));
358	–	system((strOniSplit + " " + strImportOption + " " + Sounds.string() + " " + VanillaSounds.string()).c_str());
359	–	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) ));
360	–	system((strOniSplit + " " + strImportOption + " " + TRAM.string() + " " + VanillaTRAM.string()).c_str());
361	–	//parts_done++; setStatusArea((string)"Copying level scripts...");setProgressBar( (int)(1000 * (float)(parts_done) / (float)(7 + 2 * num_levels) ));
362	–	if (exists("../GameDataFolder/IGMD")) remove_all("../GameDataFolder/IGMD");
363	–	*/
364	–	create_directory((path)"../GameDataFolder/IGMD");
365	–	copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
366	–	setProgressBar( 1000 );
367	–
368	–	if(exists("../../persist.dat")) if(!exists("../persist.dat"))
369	–	copy("../../persist.dat","..");
370	–	if(exists("../../key_config.txt"))if(!exists("../key_config.txt"))
371	–	copy("../../key_config.txt","..");
372	–
373	–	#ifndef WIN32
374	–	/* 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).
375	–	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
376	–	run Oni before :-p */
377	–	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
378	–	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
379	–	strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
380	–	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
381	–	system(prefsCommand);
382	–
383	–	#endif
384	–
385	–
386	–	setStatusArea((string)"Done! Now select your mod packages and click install.");
387	–	//      while(1) Sleep(-1);
388	–
389	–	}
390	–	catch (exception & ex) {
391	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
392	–	}
393	–
394	–	ptime end_time(second_clock::local_time());
395	–	time_period total_time (start_time, end_time);
396	–	logfile << "\n\nGlobalization ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
397	–	//total_time.length().hours();
398	–	logfile.close();
399	–	busy = 0;
400	–	return err;
401	–	}
402	–
403	–
404	–	vector<ModPackage> getPackages(void)
405	–	{
406	–	vector<ModPackage> packages;
407	–	packages.reserve(65536); // come on, we shouldn't need this much space...right?!
408	–	fstream file;
409	–	string filename = "\0";
410	–	string MODINFO_CFG = "Mod_Info.cfg";
411	–
412	–	try
413	–	{
414	–	for (directory_iterator dir_itr("./packages"), end_itr; dir_itr != end_itr; ++dir_itr)
415	–	{
416	–	file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
417	–	//cout << filename << "\n";
418	–
419	–	if(!file.fail())
420	–	{
421	–	//cout << dir_itr->path().string() + MODINFO_CFG;
422	–	//would prefer to push a pointer to a package, but this will do for now
423	–	packages.push_back(fileToModPackage(file));
424	–	}
425	–	file.close();
426	–	file.clear();
427	–	}
428	–	sort(packages.begin(), packages.end());
429	–	}
430	–	catch (const std::exception & ex)
431	–	{
432	–	cout << "Warning, something odd happened!\n";
433	–	}
434	–
435	–	return packages;
436	–	}
437	–
438	–	ModPackage fileToModPackage(fstream &file)
439	–	{
440	–	/*
441	–	This converts a file to a ModPackage struct.
442	–
443	–	A few notes...
444	–	"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.
445	–	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
446	–	slower than reading a variable.
447	–	*/
448	–	ModPackage package;
449	–	string line;
450	–	static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
451	–	//I could have done it in reverse (*iter).compare("ModString") or
452	–	static string ARROW = "->";                             //did something like "ModString".compare(*iter), and it would have been
453	–	static string ModString = "ModString";  //functionably the same.
454	–	static string HasOnis = "HasOnis";
455	–	static string HasDeltas = "HasDeltas";
456	–	static string HasBSL = "HasBSL";
457	–	static string HasDats = "HasDats";
458	–	static string IsEngine = "IsEngine";
459	–	static string Readme = "Readme";
460	–	static string GlobalNeeded = "GlobalNeeded";
461	–	static string Category = "Category";
462	–	static string Creator = "Creator";
463	–	while (! file.eof() )
464	–	{
465	–	getline (file,line);
466	–	vector<string> tokens;
467	–	vector<string>::iterator iter;
468	–	tokenize(line, tokens);                                 //string to vector of "words"
469	–	if (tokens.capacity() >= 2) {                   //make sure they are using enough stuff
470	–	iter = tokens.begin();                          //what word we are on, starts at first word
471	–	/*
472	–	if (!AEInstallVersion.compare(*iter))
473	–	If mod is too old, skip this mod.
474	–	*/
475	–	/*else*/if (!NameOfMod.compare(*iter))  {       //if it contains the name
476	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
477	–	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) {                 //ignores "->" and "NameOfMod"
478	–	//cout << *iter;
479	–	//cout << " ";
480	–	package.name += *iter + " ";
481	–	}
482	–	}
483	–
484	–	}
485	–	else if (!ModString.compare(*iter)) {
486	–	iter++; iter++;
487	–	package.modStringName = *iter;
488	–	iter++;
489	–	package.modStringVersion = atoi((*iter).c_str());
490	–	}
491	–	else if (!HasOnis.compare(*iter)) {
492	–	iter++; iter++;
493	–	if ( boost::iequals(*iter, "Yes")) package.hasOnis = 1;
494	–	}
495	–	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,
496	–	iter++; iter++;  // using "YFR" would probably set it off. :<
497	–	if ( boost::iequals(*iter, "Yes")) package.hasBSL = 1;
498	–	else if ( boost::iequals(*iter, "Addon")) package.hasAddon = 1;
499	–	}
500	–	else if (!HasDeltas.compare(*iter)) {
501	–	iter++; iter++;
502	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDeltas = 1;
503	–	}
504	–	else if (!HasDats.compare(*iter)) {
505	–	iter++; iter++;
506	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDats = 1;
507	–	}
508	–	else if (!IsEngine.compare(*iter)) {
509	–	iter++; iter++;
510	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.isEngine = 1;
511	–	}
512	–	else if (!GlobalNeeded.compare(*iter)) {
513	–	iter++; iter++;
514	–	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.globalNeeded = 1;
515	–	else if (toupper((*iter)[0]) + toupper((*iter)[1]) == 'N' + 'O') package.globalNeeded = 1; //Really the only place where checking for "No" is important atm.
516	–	}
517	–	else if (!Category.compare(*iter))  {
518	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
519	–	if (ARROW.compare(*iter) && Category.compare(*iter)) {                  //ignores "->" and "Category"
520	–	//cout << *iter;
521	–	//cout << " ";
522	–	package.category += *iter + " ";
523	–	}
524	–	}
525	–	}
526	–	else if (!Creator.compare(*iter))  {    //if it contains the name
527	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
528	–	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   //ignores "->" and "Category"
529	–	//cout << *iter;
530	–	//cout << " ";
531	–	package.creator += *iter + " ";
532	–	}
533	–	}
534	–	}
535	–	else if (!Readme.compare(*iter))  {     //if it contains the name
536	–	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     //interates through the words, ends if it reaches the end of the line or a "//" comment
537	–	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    //ignores "->" and "Category"
538	–	if(!(*iter).compare("\\n")) package.readme += '\n';
539	–	else package.readme += *iter + " ";
540	–	}
541	–	}
542	–	}
543	–	}
544	–
545	–	}
546	–	package.doOutput();
547	–	return package;
548	–	}
549	–
550	–	void recompileAll(vector<string> installedMods)
551	–	{try {
552	–	busy = 1;
553	–	using namespace boost::gregorian;
554	–	using namespace boost::posix_time;
555	–	using boost::lexical_cast;
556	–	using boost::bad_lexical_cast;
557	–	path vanilla_dir = "./VanillaDats/";
558	–	string importCommand = "";
559	–	char statusString[128];
560	–	int numberOfDats = 0;
561	–	int j = 1;
562	–	string datString;
563	–
564	–
565	–	setStatusArea("Importing levels...");
566	–	//setStatusArea("Recompiling Data...");
567	–
568	–	std::stringstream out;
569	–
570	–	ptime start_time(second_clock::local_time());
571	–	clearOldDats();
572	–
573	–	if(exists("Install.log")) remove("Install.log");
574	–	ofstream logfile("Install.log");
575	–	logfile << "Mod Installation started " << to_simple_string(start_time) << endl;
576	–	logfile.close();
577	–
578	–
579	–	if(splitInstances == SPLIT){
580	–	recursive_directory_iterator end_iter;
581	–
582	–	for ( recursive_directory_iterator dir_itr( vanilla_dir );
583	–	dir_itr != end_iter;
584	–	++dir_itr )
585	–	{
586	–	try{
587	–	if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
588	–	{
589	–	numberOfDats++;
590	–	}
591	–	}
592	–	catch(exception & ex) {
593	–	remove("Install.log");
594	–	ofstream logfile("Install.log");
595	–
596	–
597	–	logfile << "Warning, exception " << ex.what() << "!";
598	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
599	–	logfile.close();
600	–	}
601	–	}
602	–	try {
603	–	//recursive_directory_iterator end_iter;
604	–
605	–
606	–	out << numberOfDats;
607	–	datString = out.str();
608	–	for ( recursive_directory_iterator dir_itr( vanilla_dir );
609	–	dir_itr != end_iter;
610	–	++dir_itr )
611	–	{
612	–	try
613	–	{
614	–	if ( is_directory( dir_itr->status() ) &&  dir_itr.level() == 1)
615	–	{
616	–	importCommand = strOniSplit + " " + strImportOption + " " + dir_itr->path().parent_path().string() + '/' + dir_itr->path().filename();
617	–	for (unsigned int i = 0; i < installedMods.size(); ++i) {
618	–	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename()  ))
619	–	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().parent_path().filename() + '/' + dir_itr->path().filename();
620	–
621	–	//else cout << " VanillaDats/" + installedMods[i] + "/oni/";
622	–	}
623	–	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
624	–
625	–
626	–	setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
627	–	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
628	–
629	–	system(importCommand.c_str());
630	–	//Sleep(1000);
631	–	//cout << importCommand << "\n";
632	–	j++;
633	–
634	–	}
635	–	}
636	–	catch ( const std::exception & ex )
637	–	{
638	–
639	–	remove("Install.log");
640	–	ofstream logfile("Install.log");
641	–
642	–
643	–	logfile << "Warning, exception " << ex.what() << "!";
644	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
645	–	logfile.close();
646	–	}
647	–	}
648	–
649	–	}
650	–	catch( const std::exception & ex ) {
651	–
652	–	remove("Install.log");
653	–	ofstream logfile("Install.log");
654	–
655	–
656	–	logfile << "Warning, exception " << ex.what() << "!";
657	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
658	–	logfile.close();
659	–	}
660	–
661	–	}
662	–	else if(splitInstances == NOT_SPLIT){
663	–	directory_iterator end_iter;
664	–
665	–	for ( directory_iterator dir_itr( vanilla_dir );
666	–	dir_itr != end_iter;
667	–	++dir_itr )
668	–	{
669	–
670	–	if ( is_directory( dir_itr->status() ) )
671	–	{
672	–	numberOfDats++;
673	–	}
674	–
675	–
676	–	}
677	–
678	–	out << numberOfDats;
679	–	datString = out.str();
680	–
681	–	for ( directory_iterator dir_itr( vanilla_dir );
682	–	dir_itr != end_iter;
683	–	++dir_itr )
684	–	{
685	–	try
686	–	{
687	–	if ( is_directory( dir_itr->status() ) )
688	–	{
689	–	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
690	–	for (unsigned int i = 0; i < installedMods.size(); ++i) {
691	–	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
692	–	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
693	–	}
694	–	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
695	–
696	–
697	–	setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
698	–	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
699	–
700	–	system(importCommand.c_str());
701	–
702	–	j++;
703	–	}
704	–	}
705	–	catch ( const std::exception & ex )
706	–	{
707	–
708	–	remove("Install.log");
709	–	ofstream logfile("Install.log");
710	–
711	–
712	–	logfile << "Warning, exception " << ex.what() << "!";
713	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
714	–	logfile.close();
715	–	}}
716	–	}
717	–
718	–
719	–
720	–
721	–
722	–
723	–
724	–
725	–	ofstream BSLlog("BSL.log");
726	–
727	–	vector<string> BSLfolders;
728	–	vector<string> skippedfolders;
729	–
730	–
731	–
732	–	for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
733	–	dir_itr != end_itr;
734	–	++dir_itr ) {
735	–	if( exists(dir_itr->path().string() + "/ignore.txt") ){
736	–	BSLfolders.push_back(dir_itr->path().filename());
737	–	skippedfolders.push_back(dir_itr->path().filename());
738	–	}
739	–	}
740	–
741	–	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
742	–	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
743	–	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
744	–	BSLlog << "Testing " << globalPackages[j].modStringName << "\n"
745	–	<< "HasBSL: " << globalPackages[j].hasBSL << "\n"
746	–	<< "HasAddon: " << globalPackages[j].hasAddon << "\n";
747	–	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
748	–	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL" ) )
749	–	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
750	–	}
751	–
752	–	}
753	–	}
754	–
755	–	ModPackage emptyPackage;
756	–	copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
757	–	BSLlog.close();
758	–
759	–
760	–	logfile << "Writing config file";
761	–	writeInstalledMods(installedMods);
762	–	setProgressBar(1000);
763	–
764	–	string finallyDone = "Done! You can now play Oni.";
765	–
766	–	a
767	–
768	–	setStatusArea(finallyDone);
769	–
770	–	ptime end_time(second_clock::local_time());
771	–	time_period total_time (start_time, end_time);
772	–
773	–
774	–	ofstream logfile2("Install.log", ios::app | ios::ate);
775	–	string outstring = (string)"\n\nGlobalization ended " + to_simple_string(end_time) + "\nThe process took ";// + (string)total_time.length();
776	–
777	–	logfile2 << "\nInstallation ended " << to_simple_string(end_time) << "\nThe process took " << total_time.length();
778	–
779	–	//logfile2.write(outstring.c_str(), outstring.length());
780	–	logfile2.close();
781	–
782	–	//total_time.length().hours();
783	–
784	–	Sleep(1000);
785	–	setProgressBar(0);
786	–
787	–	}
788	–	catch(exception & ex) {
789	–	remove("Install.log"); //why did we do this? :|
790	–	ofstream logfile("Install.log");
791	–
792	–
793	–	logfile << "Warning, exception " << ex.what() << "!";
794	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
795	–	logfile.close();
796	–	}
797	–	busy = 0;
798	–	}
799	–
800	–	void copyBSL(string copypath, vector<string> BSLfolders, ModPackage pkg) {
801	–	try {
802	–	for ( directory_iterator dir_itr( copypath ), end_itr;
803	–	dir_itr != end_itr;
804	–	++dir_itr ) {
805	–
806	–	if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
807	–	int skip_folder = 0;
808	–	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
809	–	if(dir_itr->path().filename() == BSLfolders[k]) {
810	–	skip_folder = 1;
811	–	break;
812	–	}
813	–	}
814	–	if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
815	–	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
816	–	Sleep(100);
817	–	create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
818	–
819	–	for ( directory_iterator bsl_itr( dir_itr->path() );
820	–	bsl_itr != end_itr;
821	–	bsl_itr++ ) {
822	–	if ( bsl_itr->path().extension() == ".bsl" ) {
823	–	copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
824	–	}
825	–	}
826	–	BSLfolders.push_back( dir_itr->path().filename() );
827	–	}
828	–	}
829	–	}
830	–	}
831	–	catch ( const std::exception & ex )
832	–	{
833	–	setStatusArea("Warning, exception " + (string)ex.what() + "!");
834	–	while(1) Sleep(1000);
835	–	}
836	–
837	–	}
838	–
839	–
840	–	void writeInstalledMods(vector<string> installedMods)
841	–	{
842	–
843	–	if ( exists( strInstallCfg ) )
844	–	{
845	–	remove( strInstallCfg );
846	–	}
847	–
848	–	ofstream file(strInstallCfg.c_str());
849	–
850	–	vector<string>list = installedMods;
851	–	vector<string>::iterator begin_iter = list.begin();
852	–	vector<string>::iterator end_iter = list.end();
853	–
854	–	sort( list.begin(), list.end() );
855	–
856	–	for( ; begin_iter != end_iter; ++begin_iter) {
857	–	file << *begin_iter << " ";
858	–	}
859	–
860	–	file.close();
861	–	file.clear();
862	–
863	–	}
864	–
865	–	vector<string> getInstallString(string Cfg)
866	–	{
867	–	//system(strPauseCmd);
868	–	vector<string> returnval;
869	–
870	–	string line;
871	–	fstream file;
872	–
873	–	if (exists( Cfg ))
874	–	{
875	–	file.open(Cfg.c_str());
876	–	getline(file, line);
877	–	tokenize(line, returnval);
878	–	file.close();
879	–	file.clear();
880	–	sort(returnval.begin(), returnval.end());
881	–	}
882	–	else cout << "fail";
883	–
884	–	return returnval;
885	–	}
886	–
887	–	//stolen token function...
888	–	void tokenize(const string& str, vector<string>& tokens, const string& delimiters)
889	–	{
890	–	// Skip delimiters at beginning.
891	–	string::size_type lastPos = str.find_first_not_of(delimiters, 0);
892	–	// Find first "non-delimiter".
893	–	string::size_type pos     = str.find_first_of(delimiters, lastPos);
894	–
895	–	while (string::npos != pos || string::npos != lastPos)
896	–	{
897	–	// Found a token, add it to the vector.
898	–	tokens.push_back(str.substr(lastPos, pos - lastPos));
899	–	// Skip delimiters.  Note the "not_of"
900	–	lastPos = str.find_first_not_of(delimiters, pos);
901	–	// Find next "non-delimiter"
902	–	pos = str.find_first_of(delimiters, lastPos);
903	–	}
904	–	}
905	–
906	–	void clearOldDats(void) {
907	–	directory_iterator end_iter_gdf;
908	–	for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );
909	–	dir_itr_gdf != end_iter_gdf;
910	–	++dir_itr_gdf )
911	–	{
912	–	//cout << dir_itr_gdf->path().extension() << "\n";
913	–	if ( dir_itr_gdf->path().extension() == ".dat" || dir_itr_gdf->path().extension() == ".raw" || dir_itr_gdf->path().extension() == ".sep" ) {
914	–	remove( dir_itr_gdf->path() );
915	–	}
916	–
917	–	}
918	–
919	–	}
920	–
921	–	#include "boost/thread.hpp"
20		#include <boost/thread/mutex.hpp>
923	–
924	–	/////////////////////////////////////////////////////////////////////////////
925	–	// Name:        main_window.cpp
926	–	// Purpose:
927	–	// Author:
928	–	// Modified by:
929	–	// Created:     07/05/2009 20:38:25
930	–	// RCS-ID:
931	–	// Copyright:
932	–	// Licence:
933	–	/////////////////////////////////////////////////////////////////////////////
934	–
21		// For compilers that support precompilation, includes "wx/wx.h".
22		#include "wx/wxprec.h"
23
#	Line 945 | Line 31 | void clearOldDats(void) {
31
32		////@begin includes
33		#include "about.h"
948	–	////@end includes
949	–
34		#include "main_window.h"
35	+	#include "installer.h"
36	+	////@end includes
37
38		////@begin XPM images
39		#include "aelogosmall.xpm"
#	Line 957 | Line 43 | void clearOldDats(void) {
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 = false;
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
#	Line 1005 | 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()
#	Line 1015 | Line 115 | END_EVENT_TABLE()
115		*/
116
117		MainWindow::MainWindow()
118	<	{
118	>	{
119		Init();
120		}
121
#	Line 1042 | Line 142 | bool MainWindow::Create( wxWindow* paren
142		return true;
143		}
144
1045	–
145		/*
146		* MainWindow destructor
147		*/
#	Line 1053 | Line 152 | MainWindow::~MainWindow()
152		////@end MainWindow destruction
153		}
154
1056	–
155		/*
156		* Member initialisation
157		*/
#	Line 1077 | Line 175 | void MainWindow::Init()
175		SeperatedRadio = NULL;
176		CompleteRadio = NULL;
177		ReglobalizeButton = NULL;
1080	–	////@end MainWindow member initialisation
178
179	+	ChangeDirectoryButton = NULL;
180	+	////@end MainWindow member initialisation
181		}
182
1084	–
183		/*
184		* Control creation for MainWindow
185		*/
#	Line 1118 | 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	<	#ifdef WIN32
221	<	itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
222	<	menuBar->Append(itemMenu44, _("Help"));
1125	<	#else
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
224	>	//#endif
225
226		itemFrame1->SetMenuBar(menuBar);
227
#	Line 1191 | Line 288 | void MainWindow::CreateControls()
288		StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
289		StatusArea->SetName(_T("StatusArea"));
290		StatusArea->SetFieldsCount(1);
291	<	StatusArea->SetStatusText(_("AE Installer v1.0.1"), 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);
#	Line 1254 | 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		#ifdef WIN32
#	Line 1262 | Line 367 | void MainWindow::CreateControls()
367		::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
368		#endif
369
370	<
1266	<	/*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1267	<	strImportOption = "-import:sep";
1268	<	splitInstances = NOT_SPLIT;
1269	<	}
1270	<	else {
1271	<	strImportOption = "-import:nosep";
1272	<	splitInstances = SPLIT;
1273	<	}*/
1274	<
1275	<
1276	<	#ifndef WIN32
1277	<	strImportOption = "-import:sep";
1278	<	splitInstances = NOT_SPLIT;
1279	<	#else
1280	<	strImportOption = "-import:nosep";
1281	<	splitInstances = SPLIT;
1282	<	#endif
1283	<
1284	<	#ifndef WIN32
1285	<	strImportOption = "-import:sep";
1286	<	splitInstances = NOT_SPLIT;
1287	<	#else
1288	<	strImportOption = "-import:nosep";
1289	<	splitInstances = SPLIT;
1290	<	#endif
370	>	updateStatus = GetUpdateStatus(&currentAE, &updateAE, &installerJustUpdated);
371
372		globalPackages = getPackages();
373		globalInstalledMods = getInstallString();
374	<	for (unsigned int i = 0; i < globalPackages.size(); 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);
377	>	if (binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName)) Mods_CheckboxList->Check(i);
378		}
379
380		TheStatusBar = &StatusArea;
#	Line 1301 | Line 382 | void MainWindow::CreateControls()
382		TheProgressBar = ProgressBar;
383		OptionsPanel->Hide();
384
385	<	//#ifndef WIN32
1305	<	//      itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1306	<
1307	<	//#endif
1308	<
1309	<	if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
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
1314	–
390		#ifdef WIN32
391		RedirectIOToConsole();
392		HWND hWnd = GetConsoleWindow();
393		ShowWindow( hWnd, SW_HIDE );
394		#endif
1320	–
1321	–	//MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight() );
395		}
396
1324	–
397		/*
398		* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for SelectAll_Checkbox
399		*/
#	Line 1331 | Line 403 | void MainWindow::OnSelectAllCheckboxClic
403		switch(SelectAll->Get3StateValue()) {
404		case wxCHK_UNCHECKED:
405		for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1334	–	//SelectAll->Set3StateValue(wxCHK_CHECKED);
406		break;
407		case wxCHK_CHECKED:
408		for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, true);
1338	–	//SelectAll->Set3StateValue(wxCHK_UNCHECKED);
409		break;
410		case wxCHK_UNDETERMINED:
411		for(unsigned int i = 0; i < globalPackages.size(); i++) Mods_CheckboxList->Check(i, false);
1342	–	//SelectAll->Set3StateValue(wxCHK_CHECKED);
412		break;
1344	–
413		}
1346	–
414		}
415
1349	–
416		/*
417		* wxEVT_CREATE event handler for Mods_CheckboxList
418		*/
#	Line 1354 | Line 420 | void MainWindow::OnSelectAllCheckboxClic
420		void MainWindow::ModList_OnCreate( wxWindowCreateEvent& event )
421		{
422
1357	–
423		}
424
425
#	Line 1406 | Line 471 | wxBitmap MainWindow::GetBitmapResource(
471
472		wxIcon MainWindow::GetIconResource( const wxString& name )
473		{
1409	–
474		// Icon retrieval
475		////@begin MainWindow icon retrieval
476		wxUnusedVar(name);
#	Line 1419 | Line 483 | wxIcon MainWindow::GetIconResource( cons
483		////@end MainWindow icon retrieval
484		}
485
1422	–
486		/*
487		* wxEVT_COMMAND_LISTBOX_SELECTED event handler for Mods_CheckboxList1
488		*/
489
490		void MainWindow::OnModsCheckboxList1Selected( wxCommandEvent& event )
491		{
1429	–	//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());
1433	–
1434	–	//creatorText->Refresh();
495		}
496
1437	–
497		/*
498		* wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event handler for Mods_CheckboxList1
499		*/
#	Line 1468 | Line 527 | void MainWindow::OnOptionsClick( wxComma
527
528		this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
529		else {
530	<	//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1472	<	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.",
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();
#	Line 1478 | Line 536 | void MainWindow::OnOptionsClick( wxComma
536		}
537		}
538
1481	–
539		/*
540		* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_EXIT
541		*/
#	Line 1488 | Line 545 | void MainWindow::OnExitClick( wxCommandE
545		exit(0);
546		}
547
1491	–
548		/*
549		* wxEVT_COMMAND_BUTTON_CLICKED event handler for Install_Button
550		*/
551
1496	–
552		struct recompile
553		{
554		recompile(vector<string> localPackages) : thePackages(localPackages) { }
#	Line 1504 | Line 559 | struct recompile
559		TheInstallButton->Enable();
560
561		}
1507	–
562		vector<string> thePackages;
563		};
564
#	Line 1514 | Line 568 | void globalize2(void) {
568		TheInstallButton->Enable();
569		}
570
1517	–
1518	–
571		void MainWindow::OnInstallButtonClick( wxCommandEvent& event )
572		{
1521	–
573		vector<string> localPackages;
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		sort(localPackages.begin(), localPackages.end());
578		localPackages[0] = "Globalize";
1528	–	//MainWindow::MainWindow().Hide();
1529	–	//      boost::thread thrd2(recompileAll(localPackages) );
1530	–	//MainWindow::MainWindow().Show();
579		this->InstallButton->Disable();
580		this->ReglobalizeButton->Disable();
581		#ifdef WIN32
#	Line 1536 | Line 584 | void MainWindow::OnInstallButtonClick( w
584		#else
585		recompileAll(localPackages);
586		#endif
1539	–
587		this->InstallButton->Enable();
588		this->ReglobalizeButton->Enable();
589		}
1543	–
1544	–
590		}
591
592	<	/*void setStatusArea( string s ) {
593	<	//TheStatusBar = MainWindow::StatusArea;
1549	<	(**TheStatusBar).SetStatusText(_(s.c_str()), 0);
1550	<
1551	<	//MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
1552	<
1553	<	//MainWindow::StatusBar->SetLabel("Importing Files...");
1554	<	//StatusBar->SetLabel(s);
1555	<	//->SetLabel(s);
1556	<
1557	<	}*/
1558	<
1559	<	void setProgressBar( int i ) {
1560	<	//TheProgressBar->SetValue(
592	>	void setProgressBar( int i )
593	>	{
594		#ifdef WIN32
1562	–
1563	–
1564	–
595		if (SUCCEEDED(pTaskbarList->QueryInterface(IID_ITaskbarList3, (void **)&pTaskbarList3)))
596		{
1567	–
597		pTaskbarList3->SetProgressValue(Handle,i, 1000);
598	<	if ( i == 0 ) {
599	<
600	<	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
598	>	if ( i == 0 )
599	>	{
600	>	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
601		}
602		}
1574	–
1575	–
603		#endif
604		TheProgressBar->SetValue(i);
1578	–
605		}
606
1581	–
607		/*
608		* wxEVT_UPDATE_UI event handler for ID_STATUSBAR
609		*/
#	Line 1591 | Line 616 | void MainWindow::OnStatusbarUpdate( wxUp
616		////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
617		}
618
1594	–
619		/*
620		* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT
621		*/
#	Line 1601 | Line 625 | void MainWindow::OnAboutClick( wxCommand
625		////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
626		// Before editing this code, remove the block markers.
627		About* window = new About(this);
628	<	int returnValue = window->ShowModal();
628	>	window->ShowModal();
629		window->Destroy();
630		////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
631		}
632
1609	–
633		/*
634		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
635		*/
636	<
636	>
637		void MainWindow::OnNoSepRadioButtonSelected( wxCommandEvent& event )
638		{
639		static_cast<string>("-import:nosep");
640		}
641
1619	–
642		/*
643		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Sep_RadioButton
644		*/
#	Line 1626 | Line 648 | void MainWindow::OnSepRadioButtonSelecte
648		static_cast<string>("-import:sep");
649		}
650
1629	–
651		/*
652		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
653		*/
#	Line 1637 | Line 658 | void MainWindow::OnSepRadioButtonSelecte
658
659		void MainWindow::OnCompleteRadioButtonSelected( wxCommandEvent& event )
660		{
661	<	splitInstances = NOT_SPLIT;
1641	<
661	>	splitInstances = false;
662		}
663
1644	–
664		/*
665		* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BITMAPBUTTON
666		*/
667
668		void MainWindow::OnRefreshButtonClick( wxCommandEvent& event )
669		{
670	+	globalPackages = getPackages();
671		refreshMods(globalInstalledMods);
672		}
673
1654	–
674		/*
675		* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_LOAD
676		*/
677
678	<
679	<
1661	<
1662	<	void MainWindow::refreshMods (vector<string> s) {
1663	<
678	>	void MainWindow::refreshMods (vector<string> s)
679	>	{
680		Mods_CheckboxList->Clear();
1665	–	//globalInstalledMods = getPackages();
681		for (unsigned int i = 0; i < globalPackages.size(); i++) {
682		Mods_CheckboxList->Append(globalPackages[i].name.c_str());
683	<	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
684	<	//else Mods_CheckboxList->Check(i,0);
1670	<
683	>	if( binary_search(s.begin(), s.end(), globalPackages[i].modStringName ) )
684	>	Mods_CheckboxList->Check(i);
685		}
686		}
687
#	Line 1687 | Line 701 | void MainWindow::OnLoadClick( wxCommandE
701		{
702		refreshMods(getInstallString( string(openFileDialog->GetPath()) ));
703		}
1690	–
1691	–
704		}
705
1694	–
706		/*
707		* wxEVT_COMMAND_MENU_SELECTED event handler for wxID_SAVE
708		*/
#	Line 1710 | Line 721 | void MainWindow::OnSaveClick( wxCommandE
721
722		if ( openFileDialog->ShowModal() == wxID_OK )
723		{
1713	–
1714	–
1715	–	//Mods_CheckboxList->
1716	–
1717	–
1718	–
1719	–	//
1720	–
724		if ( exists( openFileDialog->GetPath().c_str() ) )
725		{
726		remove( openFileDialog->GetPath().c_str() );
#	Line 1738 | Line 741 | void MainWindow::OnSaveClick( wxCommandE
741
742		file.close();
743		file.clear();
1741	–
1742	–	//SetCurrentFilename(openFileDialog->GetFilename());
1743	–	//theText->LoadFile(openFileDialog->GetFilename());
1744	–	//SetStatusText(GetCurrentFilename(), 0);
1745	–	//SetStatusText(openFileDialog->GetDirectory(),1);
744		}
745		}
746
1749	–
1750	–
747		/*
748		* wxEVT_COMMAND_BUTTON_CLICKED event handler for ReGlobalize_Button
749		*/
750
751		void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
752		{
753	<	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);
754	<
755	<	if (YesNoDialog->ShowModal() == wxID_NO) { //if the user said no...
753	>	string YesNoMsg = "WARNING: This will DELETE the Edition's GameDataFolder and recreate it from the vanilla Oni game data.\n";
754	>	YesNoMsg = YesNoMsg + "Are you SURE you want to do this?";
755	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this, YesNoMsg.c_str(), "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION , wxDefaultPosition);
756
757	+	if (YesNoDialog->ShowModal() == wxID_NO)
758	+	{
759	+	//if the user said no...
760		}
761	<	else {
762	<
761	>	else
762	>	{
763		this->InstallButton->Disable();
764		this->ReglobalizeButton->Disable();
1766	–
765		#ifdef WIN32
1768	–
766		boost::thread thrd2(globalizeData);
767		//globalizeData();
768		//boost::thread::create_thread(&globalizeData);
#	Line 1774 | Line 771 | void MainWindow::OnReGlobalizeButtonClic
771		#else
772		globalizeData();
773		#endif
1777	–
774		this->InstallButton->Enable();
775		this->ReglobalizeButton->Enable();
776		}
1781	–
777		}
778		/*
779		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
780		*/
781
1787	–	/*void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1788	–	{
1789	–	////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1790	–	// Before editing this code, remove the block markers.
1791	–	event.Skip();
1792	–	////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1793	–	}*/
1794	–
1795	–
782		/*
783		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
784		*/
785
786		void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
787		{
788	<	splitInstances = SPLIT;
788	>	splitInstances = true;
789		}
790
791	+	void MainWindow::OnDirButtonClick( wxCommandEvent& event )
792	+	{
793	+	wxDirDialog* newDir = new wxDirDialog(this, "Set current directory", "", wxDD_DEFAULT_STYLE,
794	+	wxDefaultPosition, wxDefaultSize, "wxDirCtrl");
795	+	newDir->ShowModal();
796	+	if(newDir->GetPath()[0]) current_path( (path)newDir->GetPath() );
797	+	OnRefreshButtonClick(event);
798	+	}

Diff Legend

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