ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 357 by gumby, Fri Jun 19 21:32:17 2009 UTC vs.
Revision 399 by gumby, Mon Jul 6 22:56:35 2009 UTC

#	Line 1 | Line 1
1	+	#ifndef NTDDI_VERSION
2	+	#define NTDDI_VERSION NTDDI_WIN7
3	+	#endif
4	+	#ifdef WIN32
5	+	#include <windows.h>
6	+	#include <shobjidl.h>
7	+	HWND Handle;
8	+
9	+	ITaskbarList *pTaskbarList;
10	+	ITaskbarList3 *pTaskbarList3;
11	+	#endif
12	+
13		/*
14	<	AE/Mod Installer
15	<	by Gumby and Iritscen
14	>	AE/Mod Installer
15	>	by Gumby and Iritscen
16		*/
17
18	<	// To-do: -
18	>	// To-do: - Load credits from text resource file
19		//                - Institute lots of checks into file-handling
20	<	//                - Clear mod info fields when mod is de-selected ???
20	>	//                - Clear mod info fields when mod is de-selected
21
22		#define DEBUG
23		#include <stdio.h>
#	Line 30 | Line 42 | by Gumby and Iritscen
42		#include <dirent.h>
43		#endif
44
45	<	const string strInstallerVersion = "1.0";
45	>	//const string strInstallerVersion = "1.0";
46		const bool SPLIT = 1;
47		const bool NOT_SPLIT = 0;
48		bool splitInstances = SPLIT;
#	Line 58 | Line 70 | using namespace std;
70		#include "boost/date_time/date_parsing.hpp"
71		#include "boost/date_time/posix_time/posix_time.hpp"
72
73	+	string escapePath(string input) {
74	+
75	+	string output;
76	+	string escape_me = "& ;()|<>\"'\\#*?$";
77	+	for(int i = 0; i < input.size(); i++)  {
78	+	for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
79	+	output += input[i];
80	+	}
81	+	return output;
82	+	}
83	+
84		int globalizeData(void)
85		{
86		busy = 1;
#	Line 148 | Line 171 | int globalizeData(void)
171
172		if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats");
173		create_directory( "packages/VanillaDats" );
151	–
174		create_directory( "packages/VanillaDats/level0_Final/" );
175		//blah blah finish this.
176		//logfile <<  "packages/VanillaDats/level0_Final/ created";
#	Line 261 | Line 283 | int globalizeData(void)
283		if(!exists( Archive / dir_itr->filename())) rename(dir_itr->path(), Archive / dir_itr->filename());
284		else remove(dir_itr->path());
285		}
286	+	else if (dir_itr->path().filename().substr(0,4) == "ONWC") { //fix for buggy ONWC overriding
287	+	cout <<dir_itr->path().filename() << "\n";
288	+
289	+	if(!exists( "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "packages/VanillaDats/level0_Final/level0_Final/" +  dir_itr->filename());
290	+	else remove(dir_itr->path());
291	+	}
292		if (exists(dir_itr->path())) {
293
294		}
#	Line 287 | Line 315 | int globalizeData(void)
315		//printf(levels[i],"%d",levels[i]);
316		//printf(Step_x_x,"Step %d/%d: reimporting level", parts_done + 1, 7 + 2 * num_levels); setStatusArea((string)Step_x_x + levels[i] + (string)"_Final.dat");
317		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
318	<	system( (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
319	<	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni > Globalize.oni").c_str());
318	>	logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
319	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
320	>	string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
321	>	+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
322	>	system(sys_str.c_str() );
323		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
324		parts_done++;
325		}
#	Line 300 | Line 331 | int globalizeData(void)
331
332		for(int j = 0; j < GDFPaths.size(); j++) {
333		logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
334	<	setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
334	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
335		system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
336		parts_done++;
337		setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
#	Line 323 | Line 354 | int globalizeData(void)
354		if (exists("../GameDataFolder/IGMD")) remove_all("../GameDataFolder/IGMD");
355		*/
356		create_directory((path)"../GameDataFolder/IGMD");
357	<	copy((path)"packages/VanillaBSL/", (path)"../GameDataFolder");
358	<	setProgressBar( 1000 );
357	>	copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
358	>	setProgressBar( 1000 );
359	>
360	>	copy("../../persist.dat","..");
361	>	copy("../../key_config.txt","..");
362	>
363	>	#ifndef WIN32
364	>	/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
365	>	Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never
366	>	run Oni before :-p */
367	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
368	>	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
369	>	strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
370	>	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
371	>	system(prefsCommand);
372	>
373	>	#endif
374	>
375	>
376		setStatusArea((string)"Done! Now select your mod packages and click install.");
377		//      while(1) Sleep(-1);
378
379		}
380	<	catch (exception ex) {
380	>	catch (exception & ex) {
381		setStatusArea("Warning, handled exception: " + (string)ex.what());
382		}
383
#	Line 618 | Line 666 | void recompileAll(vector<string> install
666		{
667		if ( is_directory( dir_itr->status() ) )
668		{
669	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
622	<	+ ".dat";
669	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
670		for (int i = 0; i < installedMods.size(); ++i) {
671		if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
672		importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
#	Line 780 | Line 827 | vector<ModPackage> globalPackages;
827		#endif
828
829		////@begin includes
830	<	#include "about_window.h"
830	>	#include "about.h"
831		////@end includes
832
833		#include "main_window.h"
834
835		////@begin XPM images
836	<	#include "redo.xpm"
836	>	#include "aelogosmall.xpm"
837	>	#include "undo.xpm"
838		#include "fileopen.xpm"
839		#include "filesaveas.xpm"
840		#include "quit.xpm"
#	Line 809 | Line 857 | IMPLEMENT_CLASS( MainWindow, wxFrame )
857		BEGIN_EVENT_TABLE( MainWindow, wxFrame )
858
859		////@begin MainWindow event table entries
860	<	EVT_CHECKBOX( SelectAll_Checkbox, MainWindow::OnSelectAllCheckboxClick )
860	>	EVT_CHECKBOX( SelectAll_Checkbox, MainWindow::OnSelectAllCheckboxClick )
861
862	<	EVT_BUTTON( Refresh_Button, MainWindow::OnRefreshButtonClick )
862	>	EVT_BUTTON( Refresh_Button, MainWindow::OnRefreshButtonClick )
863
864	<	EVT_LISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Selected )
865	<	EVT_CHECKLISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Toggled )
864	>	EVT_LISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Selected )
865	>	EVT_CHECKLISTBOX( Mods_CheckboxList1, MainWindow::OnModsCheckboxList1Toggled )
866
867	<	EVT_UPDATE_UI( ID_STATUSBAR, MainWindow::OnStatusbarUpdate )
867	>	EVT_UPDATE_UI( ID_STATUSBAR, MainWindow::OnStatusbarUpdate )
868
869	<	EVT_BUTTON( Install_Button, MainWindow::OnInstallButtonClick )
869	>	EVT_BUTTON( Install_Button, MainWindow::OnInstallButtonClick )
870
871	<	EVT_RADIOBUTTON( Sep_RadioButton, MainWindow::OnSepRadioButtonSelected )
871	>	EVT_RADIOBUTTON( Sep_RadioButton, MainWindow::OnSepRadioButtonSelected )
872
873	<	EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
873	>	EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
874
875	<	EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected )
875	>	EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected )
876
877	<	EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
877	>	EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
878
879	<	EVT_BUTTON( ReGlobalize_Button, MainWindow::OnReGlobalizeButtonClick )
879	>	EVT_BUTTON( ReGlobalize_Button, MainWindow::OnReGlobalizeButtonClick )
880
881	<	EVT_MENU( wxID_LOAD, MainWindow::OnLoadClick )
881	>	EVT_MENU( wxID_LOAD, MainWindow::OnLoadClick )
882
883	<	EVT_MENU( wxID_SAVE, MainWindow::OnSaveClick )
883	>	EVT_MENU( wxID_SAVE, MainWindow::OnSaveClick )
884
885	<	EVT_MENU( wxID_EXIT, MainWindow::OnExitClick )
885	>	EVT_MENU( wxID_EXIT, MainWindow::OnExitClick )
886
887	<	EVT_MENU( wxID_OPTIONS, MainWindow::OnOptionsClick )
887	>	EVT_MENU( wxID_OPTIONS, MainWindow::OnOptionsClick )
888
889	<	EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
889	>	EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
890
891		////@end MainWindow event table entries
892
#	Line 868 | Line 916 | MainWindow::MainWindow( wxWindow* parent
916		bool MainWindow::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
917		{
918		////@begin MainWindow creation
919	<	wxFrame::Create( parent, id, caption, pos, size, style );
872	<
873	<	CreateControls();
874	<	SetIcon(GetIconResource(wxT("oni_special.ico")));
875	<	Centre();
876	<
919	>	wxFrame::Create( parent, id, caption, pos, size, style );
920
921	+	CreateControls();
922	+	SetIcon(GetIconResource(wxT("aelogosmall.png")));
923	+	Centre();
924		////@end MainWindow creation
925		return true;
926		}
#	Line 898 | Line 944 | MainWindow::~MainWindow()
944		void MainWindow::Init()
945		{
946		////@begin MainWindow member initialisation
947	<	MainSplitter = NULL;
948	<	SelectAll = NULL;
949	<	RefreshButton = NULL;
950	<	Mods_CheckboxList = NULL;
951	<	titleText = NULL;
952	<	creatorText = NULL;
953	<	descriptionText = NULL;
954	<	StatusArea = NULL;
955	<	ProgressBar = NULL;
956	<	InstallButton = NULL;
957	<	OptionsPanel = NULL;
958	<	SepRadio = NULL;
959	<	NoSepRadio = NULL;
960	<	SeparatedRadio = NULL;
961	<	CompleteRadio = NULL;
962	<	ReglobalizeButton = NULL;
947	>	MainSplitter = NULL;
948	>	SelectAll = NULL;
949	>	RefreshButton = NULL;
950	>	Mods_CheckboxList = NULL;
951	>	titleText = NULL;
952	>	creatorText = NULL;
953	>	descriptionText = NULL;
954	>	StatusArea = NULL;
955	>	ProgressBar = NULL;
956	>	InstallButton = NULL;
957	>	OptionsPanel = NULL;
958	>	SepRadio = NULL;
959	>	NoSepRadio = NULL;
960	>	SeperatedRadio = NULL;
961	>	CompleteRadio = NULL;
962	>	ReglobalizeButton = NULL;
963		////@end MainWindow member initialisation
964
965		}
#	Line 928 | Line 974 | wxGauge* TheProgressBar;
974		void MainWindow::CreateControls()
975		{
976		////@begin MainWindow content construction
977	<	// Generated by DialogBlocks, 31/05/2009 19:03:55 (unregistered)
932	<
933	<	MainWindow* itemFrame1 = this;
977	>	MainWindow* itemFrame1 = this;
978
979	<	wxMenuBar* menuBar = new wxMenuBar;
980	<	wxMenu* itemMenu37 = new wxMenu;
981	<	{
982	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_LOAD, _("&Load Configuration..."), wxEmptyString, wxITEM_NORMAL);
983	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("fileopen.xpm")));
984	<	menuItem->SetBitmap(bitmap);
985	<	itemMenu37->Append(menuItem);
986	<	}
987	<	{
988	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_SAVE, _("&Save Configuration..."), wxEmptyString, wxITEM_NORMAL);
989	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("filesaveas.xpm")));
990	<	menuItem->SetBitmap(bitmap);
991	<	itemMenu37->Append(menuItem);
992	<	}
993	<	itemMenu37->AppendSeparator();
994	<	{
995	<	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_EXIT, _("Exit"), wxEmptyString, wxITEM_NORMAL);
996	<	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("quit.xpm")));
997	<	menuItem->SetBitmap(bitmap);
998	<	itemMenu37->Append(menuItem);
999	<	}
1000	<	menuBar->Append(itemMenu37, _("&File"));
1001	<	wxMenu* itemMenu42 = new wxMenu;
1002	<	itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
1003	<	menuBar->Append(itemMenu42, _("Options"));
1004	<	wxMenu* itemMenu44 = new wxMenu;
1005	<	itemMenu44->Append(wxID_HELP, _("Help"), wxEmptyString, wxITEM_NORMAL);
979	>	wxMenuBar* menuBar = new wxMenuBar;
980	>	wxMenu* itemMenu37 = new wxMenu;
981	>	{
982	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_LOAD, _("&Load Configuration..."), wxEmptyString, wxITEM_NORMAL);
983	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("fileopen.xpm")));
984	>	menuItem->SetBitmap(bitmap);
985	>	itemMenu37->Append(menuItem);
986	>	}
987	>	{
988	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_SAVE, _("&Save Configuration..."), wxEmptyString, wxITEM_NORMAL);
989	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("filesaveas.xpm")));
990	>	menuItem->SetBitmap(bitmap);
991	>	itemMenu37->Append(menuItem);
992	>	}
993	>	itemMenu37->AppendSeparator();
994	>	{
995	>	wxMenuItem* menuItem = new wxMenuItem(itemMenu37, wxID_EXIT, _("Exit"), wxEmptyString, wxITEM_NORMAL);
996	>	wxBitmap bitmap(itemFrame1->GetBitmapResource(wxT("quit.xpm")));
997	>	menuItem->SetBitmap(bitmap);
998	>	itemMenu37->Append(menuItem);
999	>	}
1000	>	menuBar->Append(itemMenu37, _("&File"));
1001	>	wxMenu* itemMenu42 = new wxMenu;
1002	>	itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
1003	>	menuBar->Append(itemMenu42, _("Options"));
1004	>	wxMenu* itemMenu44 = new wxMenu;
1005	>	#ifdef WIN32
1006		itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1007		menuBar->Append(itemMenu44, _("Help"));
1008	<	itemFrame1->SetMenuBar(menuBar);
1009	<
1010	<	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
1011	<	itemFrame1->SetSizer(itemBoxSizer2);
1008	>	#else
1009	>	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1010	>	#endif
1011	>
1012	>	itemFrame1->SetMenuBar(menuBar);
1013	>
1014	>	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
1015	>	itemFrame1->SetSizer(itemBoxSizer2);
1016
1017	<	MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
1018	<	MainSplitter->SetMinimumPaneSize(150);
1019	<	MainSplitter->SetName(_T("MainSplitter"));
1020	<
1021	<	wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1022	<	wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
1023	<	itemPanel4->SetSizer(itemBoxSizer5);
1024	<
1025	<	wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
1026	<	itemBoxSizer5->Add(itemBoxSizer6, 0, wxGROW|wxALL, 0);
1027	<	SelectAll = new wxCheckBox( itemPanel4, SelectAll_Checkbox, _("Select All/None"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
1028	<	SelectAll->SetValue(false);
1029	<	SelectAll->SetName(_T("SelectAll_Checkbox"));
1030	<	itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1031	<
1032	<	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("redo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
1033	<	RefreshButton->SetName(_T("RefreshButton"));
1034	<	itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
1035	<
1036	<	wxArrayString Mods_CheckboxListStrings;
1037	<	Mods_CheckboxList = new wxCheckListBox( itemPanel4, Mods_CheckboxList1, wxDefaultPosition, wxDefaultSize, Mods_CheckboxListStrings, wxLB_HSCROLL );
1038	<	Mods_CheckboxList->SetName(_T("Mods_CheckboxList"));
1039	<	itemBoxSizer5->Add(Mods_CheckboxList, 1, wxGROW|wxALL, 0);
1040	<
1041	<	wxPanel* itemPanel10 = new wxPanel( MainSplitter, DescriptionHolder_Panel, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1042	<	itemPanel10->SetName(_T("DescriptionHolder_Panel"));
1043	<	wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
1044	<	itemPanel10->SetSizer(itemBoxSizer11);
1045	<
1046	<	wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
1047	<	itemBoxSizer11->Add(itemBoxSizer12, 0, wxGROW|wxALL, 0);
1048	<	wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
1049	<	itemBoxSizer12->Add(itemBoxSizer13, 1, wxALIGN_CENTER_VERTICAL|wxALL, 0);
1050	<	titleText = new wxTextCtrl( itemPanel10, Title_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
1051	<	titleText->SetName(_T("Title_Text"));
1052	<	titleText->SetBackgroundColour(wxColour(240, 240, 240));
1053	<	itemBoxSizer13->Add(titleText, 1, wxGROW|wxLEFT, 5);
1054	<
1055	<	wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
1056	<	itemBoxSizer12->Add(itemBoxSizer15, 1, wxGROW|wxALL, 0);
1057	<	creatorText = new wxTextCtrl( itemPanel10, Author_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_RIGHT );
1058	<	creatorText->SetName(_T("Author_Text"));
1059	<	creatorText->SetBackgroundColour(wxColour(240, 240, 240));
1060	<	itemBoxSizer15->Add(creatorText, 1, wxGROW|wxRIGHT, 5);
1061	<
1062	<	wxStaticLine* itemStaticLine17 = new wxStaticLine( itemPanel10, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
1063	<	itemStaticLine17->Show(false);
1064	<	itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
1065	<
1066	<	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_AUTO_URL );
1067	<	descriptionText->SetName(_T("DescriptionName"));
1068	<	descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1069	<	itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
1070	<
1071	<	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 150);
1072	<	itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
1073	<
1074	<	StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
1075	<	StatusArea->SetName(_T("StatusArea"));
1076	<	StatusArea->SetFieldsCount(1);
1077	<	StatusArea->SetStatusText(_("Status Area"), 0);
1078	<	itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
1079	<
1080	<	wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
1081	<	itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
1082	<
1083	<	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxSize(-1, 30), wxGA_SMOOTH );
1084	<	ProgressBar->SetValue(0);
1085	<	itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
1086	<
1087	<	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxSize(-1, 30), 0 );
1088	<	itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
1089	<
1090	<	wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
1091	<	itemBoxSizer2->Add(itemBoxSizer23, 0, wxGROW|wxALL, 0);
1092	<
1093	<	OptionsPanel = new wxPanel( itemFrame1, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1094	<	itemBoxSizer2->Add(OptionsPanel, 0, wxGROW, 0);
1095	<
1096	<	wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
1097	<	OptionsPanel->SetSizer(itemBoxSizer25);
1098	<
1099	<	wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
1100	<	itemBoxSizer25->Add(itemBoxSizer26, 0, wxGROW|wxALL, 5);
1101	<
1102	<	SepRadio = new wxRadioButton( OptionsPanel, Sep_RadioButton, _("Sep"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1103	<	SepRadio->SetValue(false);
1104	<	if (MainWindow::ShowToolTips())
1105	<	SepRadio->SetToolTip(_("For PC Demo and Mac"));
1106	<	itemBoxSizer26->Add(SepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1107	<
1108	<	NoSepRadio = new wxRadioButton( OptionsPanel, NoSep_RadioButton, _("NoSep"), wxDefaultPosition, wxDefaultSize, 0 );
1109	<	NoSepRadio->SetValue(false);
1110	<	if (MainWindow::ShowToolTips())
1111	<	NoSepRadio->SetToolTip(_("For PC Retail"));
1112	<	itemBoxSizer26->Add(NoSepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1113	<
1114	<	wxStaticLine* itemStaticLine29 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1115	<	itemBoxSizer25->Add(itemStaticLine29, 0, wxGROW|wxALL, 5);
1116	<
1117	<	wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1118	<	itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1119	<
1120	<	SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1121	<	SeparatedRadio->SetValue(false);
1122	<	SeparatedRadio->SetName(_T("Separated_RadioButton"));
1123	<	itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1124	<
1125	<	CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1126	<	CompleteRadio->SetValue(false);
1127	<	CompleteRadio->SetName(_T("Complete_RadioButton"));
1128	<	itemBoxSizer30->Add(CompleteRadio, 0, wxALIGN_LEFT|wxALL, 5);
1129	<
1130	<	wxStaticLine* itemStaticLine33 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1131	<	itemBoxSizer25->Add(itemStaticLine33, 0, wxGROW|wxALL, 5);
1132	<
1133	<	wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL);
1134	<	itemBoxSizer25->Add(itemBoxSizer34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1135	<
1136	<	ReglobalizeButton = new wxButton( OptionsPanel, ReGlobalize_Button, _("Reglobalize"), wxDefaultPosition, wxDefaultSize, 0 );
1137	<	ReglobalizeButton->SetName(_T("Reglobalize_Button"));
1138	<	itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
1017	>	MainSplitter = new wxSplitterWindow( itemFrame1, ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_LIVE_UPDATE|wxNO_BORDER );
1018	>	MainSplitter->SetMinimumPaneSize(1);
1019	>	MainSplitter->SetName(_T("MainSplitter"));
1020	>
1021	>	wxPanel* itemPanel4 = new wxPanel( MainSplitter, ID_PANEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1022	>	wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
1023	>	itemPanel4->SetSizer(itemBoxSizer5);
1024	>
1025	>	wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
1026	>	itemBoxSizer5->Add(itemBoxSizer6, 0, wxGROW|wxALL, 0);
1027	>	SelectAll = new wxCheckBox( itemPanel4, SelectAll_Checkbox, _("Select All/None"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
1028	>	SelectAll->SetValue(false);
1029	>	SelectAll->SetName(_T("SelectAll_Checkbox"));
1030	>	itemBoxSizer6->Add(SelectAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1031	>
1032	>	RefreshButton = new wxBitmapButton( itemPanel4, Refresh_Button, itemFrame1->GetBitmapResource(wxT("undo.xpm")), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
1033	>	RefreshButton->SetName(_T("RefreshButton"));
1034	>	itemBoxSizer6->Add(RefreshButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
1035	>
1036	>	wxArrayString Mods_CheckboxListStrings;
1037	>	Mods_CheckboxList = new wxCheckListBox( itemPanel4, Mods_CheckboxList1, wxDefaultPosition, wxDefaultSize, Mods_CheckboxListStrings, wxLB_HSCROLL );
1038	>	Mods_CheckboxList->SetName(_T("Mods_CheckboxList"));
1039	>	itemBoxSizer5->Add(Mods_CheckboxList, 1, wxGROW|wxALL, 0);
1040	>
1041	>	wxPanel* itemPanel10 = new wxPanel( MainSplitter, DescriptionHolder_Panel, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1042	>	itemPanel10->SetName(_T("DescriptionHolder_Panel"));
1043	>	wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
1044	>	itemPanel10->SetSizer(itemBoxSizer11);
1045	>
1046	>	wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
1047	>	itemBoxSizer11->Add(itemBoxSizer12, 0, wxGROW|wxALL, 0);
1048	>	wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
1049	>	itemBoxSizer12->Add(itemBoxSizer13, 1, wxALIGN_CENTER_VERTICAL|wxALL, 0);
1050	>	titleText = new wxTextCtrl( itemPanel10, Title_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
1051	>	titleText->SetName(_T("Title_Text"));
1052	>	titleText->SetBackgroundColour(wxColour(240, 240, 240));
1053	>	itemBoxSizer13->Add(titleText, 1, wxGROW|wxLEFT, 5);
1054	>
1055	>	wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
1056	>	itemBoxSizer12->Add(itemBoxSizer15, 1, wxGROW|wxALL, 0);
1057	>	creatorText = new wxTextCtrl( itemPanel10, Author_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_RIGHT );
1058	>	creatorText->SetName(_T("Author_Text"));
1059	>	creatorText->SetBackgroundColour(wxColour(240, 240, 240));
1060	>	itemBoxSizer15->Add(creatorText, 1, wxGROW|wxRIGHT, 5);
1061	>
1062	>	wxStaticLine* itemStaticLine17 = new wxStaticLine( itemPanel10, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
1063	>	itemStaticLine17->Show(false);
1064	>	itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
1065	>
1066	>	descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_RICH2 );
1067	>	descriptionText->SetName(_T("DescriptionName"));
1068	>	descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1069	>	itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
1070	>
1071	>	MainSplitter->SplitVertically(itemPanel4, itemPanel10, 200);
1072	>	itemBoxSizer2->Add(MainSplitter, 1, wxGROW|wxALL, 0);
1073	>
1074	>	StatusArea = new wxStatusBar( itemFrame1, ID_STATUSBAR, 0 );
1075	>	StatusArea->SetName(_T("StatusArea"));
1076	>	StatusArea->SetFieldsCount(1);
1077	>	StatusArea->SetStatusText(_("AE Installer v1.0"), 0);
1078	>	itemBoxSizer2->Add(StatusArea, 0, wxGROW|wxALL, 0);
1079	>
1080	>	wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
1081	>	itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
1082	>
1083	>	ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxDefaultSize, wxGA_SMOOTH );
1084	>	ProgressBar->SetValue(0);
1085	>	itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
1086	>
1087	>	InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxDefaultSize, 0 );
1088	>	itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
1089	>
1090	>	wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
1091	>	itemBoxSizer2->Add(itemBoxSizer23, 0, wxGROW|wxALL, 0);
1092	>
1093	>	OptionsPanel = new wxPanel( itemFrame1, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
1094	>	itemBoxSizer2->Add(OptionsPanel, 0, wxGROW, 0);
1095	>
1096	>	wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
1097	>	OptionsPanel->SetSizer(itemBoxSizer25);
1098	>
1099	>	wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
1100	>	itemBoxSizer25->Add(itemBoxSizer26, 0, wxGROW|wxALL, 5);
1101	>
1102	>	SepRadio = new wxRadioButton( OptionsPanel, Sep_RadioButton, _("Sep"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1103	>	SepRadio->SetValue(false);
1104	>	if (MainWindow::ShowToolTips())
1105	>	SepRadio->SetToolTip(_("For PC Demo and Mac"));
1106	>	itemBoxSizer26->Add(SepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1107	>
1108	>	NoSepRadio = new wxRadioButton( OptionsPanel, NoSep_RadioButton, _("NoSep"), wxDefaultPosition, wxDefaultSize, 0 );
1109	>	NoSepRadio->SetValue(false);
1110	>	if (MainWindow::ShowToolTips())
1111	>	NoSepRadio->SetToolTip(_("For PC Retail"));
1112	>	itemBoxSizer26->Add(NoSepRadio, 0, wxALIGN_LEFT|wxALL, 5);
1113	>
1114	>	wxStaticLine* itemStaticLine29 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1115	>	itemBoxSizer25->Add(itemStaticLine29, 0, wxGROW|wxALL, 5);
1116	>
1117	>	wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1118	>	itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1119	>
1120	>	SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1121	>	SeperatedRadio->SetValue(false);
1122	>	SeperatedRadio->SetName(_T("Seperated_RadioButton"));
1123	>	itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1124	>
1125	>	CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1126	>	CompleteRadio->SetValue(false);
1127	>	CompleteRadio->SetName(_T("Complete_RadioButton"));
1128	>	itemBoxSizer30->Add(CompleteRadio, 0, wxALIGN_LEFT|wxALL, 5);
1129	>
1130	>	wxStaticLine* itemStaticLine33 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
1131	>	itemBoxSizer25->Add(itemStaticLine33, 0, wxGROW|wxALL, 5);
1132	>
1133	>	wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL);
1134	>	itemBoxSizer25->Add(itemBoxSizer34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
1135	>
1136	>	ReglobalizeButton = new wxButton( OptionsPanel, ReGlobalize_Button, _("Reglobalize"), wxDefaultPosition, wxDefaultSize, 0 );
1137	>	ReglobalizeButton->SetName(_T("Reglobalize_Button"));
1138	>	itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
1139
1140	<	// Connect events and objects
1141	<	Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1140	>	// Connect events and objects
1141	>	Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1142		////@end MainWindow content construction
1143
1144	+	Handle = (HWND)GetHWND();
1145	+	::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
1146	+
1147	+
1148		if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1149	<	static_cast<string>("-import:sep");
1149	>	strImportOption = "-import:sep";
1150		splitInstances = NOT_SPLIT;
1151		}
1152		else {
1153	<	static_cast<string>("-import:nosep");
1153	>	strImportOption = "-import:nosep";
1154		splitInstances = SPLIT;
1155		}
1156	<
1156	>
1157		globalPackages = getPackages();
1158		globalInstalledMods = getInstallString();
1159		for (int i = 0; i < globalPackages.size(); i++) {
#	Line 1113 | Line 1165 | void MainWindow::CreateControls()
1165		TheInstallButton = InstallButton;
1166		TheProgressBar = ProgressBar;
1167		OptionsPanel->Hide();
1168	<	if(splitInstances == SPLIT) SeparatedRadio->SetValue(true);
1168	>
1169	>	//#ifndef WIN32
1170	>	//      itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
1171	>
1172	>	//#endif
1173	>
1174	>	if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
1175		else CompleteRadio->SetValue(true);
1118	–
1119	–
1120	–
1176		if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
1177		else SepRadio->SetValue(true);
1178
#	Line 1185 | Line 1240 | wxBitmap MainWindow::GetBitmapResource(
1240		{
1241		// Bitmap retrieval
1242		////@begin MainWindow bitmap retrieval
1243	<	wxUnusedVar(name);
1244	<	if (name == _T("redo.xpm"))
1245	<	{
1246	<	wxBitmap bitmap(redo_xpm);
1247	<	return bitmap;
1248	<	}
1249	<	else if (name == _T("fileopen.xpm"))
1250	<	{
1251	<	wxBitmap bitmap( fileopen_xpm);
1252	<	return bitmap;
1253	<	}
1254	<	else if (name == _T("filesaveas.xpm"))
1255	<	{
1256	<	wxBitmap bitmap( filesaveas_xpm);
1257	<	return bitmap;
1258	<	}
1259	<	else if (name == _T("quit.xpm"))
1260	<	{
1261	<	wxBitmap bitmap( quit_xpm);
1262	<	return bitmap;
1263	<	}
1264	<	return wxNullBitmap;
1243	>	wxUnusedVar(name);
1244	>	if (name == _T("undo.xpm"))
1245	>	{
1246	>	wxBitmap bitmap( undo_xpm);
1247	>	return bitmap;
1248	>	}
1249	>	else if (name == _T("fileopen.xpm"))
1250	>	{
1251	>	wxBitmap bitmap( fileopen_xpm);
1252	>	return bitmap;
1253	>	}
1254	>	else if (name == _T("filesaveas.xpm"))
1255	>	{
1256	>	wxBitmap bitmap( filesaveas_xpm);
1257	>	return bitmap;
1258	>	}
1259	>	else if (name == _T("quit.xpm"))
1260	>	{
1261	>	wxBitmap bitmap( quit_xpm);
1262	>	return bitmap;
1263	>	}
1264	>	return wxNullBitmap;
1265		////@end MainWindow bitmap retrieval
1266		}
1267
#	Line 1219 | Line 1274 | wxIcon MainWindow::GetIconResource( cons
1274
1275		// Icon retrieval
1276		////@begin MainWindow icon retrieval
1277	<	wxUnusedVar(name);
1278	<	if (name == _T("oni_special.ico"))
1279	<	{
1280	<	//      wxIcon icon(_T("oni_special.ico"), wxBITMAP_TYPE_ICO);
1281	<	//      return icon;
1282	<	}
1283	<	return wxNullIcon;
1277	>	wxUnusedVar(name);
1278	>	if (name == _T("aelogosmall.png"))
1279	>	{
1280	>	wxIcon icon(aelogosmall_xpm);
1281	>	return icon;
1282	>	}
1283	>	return wxNullIcon;
1284		////@end MainWindow icon retrieval
1285		}
1286
#	Line 1273 | Line 1328 | void MainWindow::OnModsCheckboxList1Togg
1328
1329		void MainWindow::OnOptionsClick( wxCommandEvent& event )
1330		{
1276	–
1277	–
1278	–
1279	–
1331		if (!event.GetInt() ) {
1332		OptionsPanel->Hide();
1333	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1333	>
1334	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
1335		else {
1336	<	//Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1337	<	//wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                      "WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION       , wxDefaultPosition);
1338	<	//YesNoDialog->ShowModal();
1336	>	//              Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
1337	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: These options are for advanced users only, use with caution.",
1338	>	"AE Installer Alert",  wxOK | wxICON_EXCLAMATION     , wxDefaultPosition);
1339	>	YesNoDialog->ShowModal();
1340		OptionsPanel->Show();
1341	<	MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
1341	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight()+1);
1342	>	this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-1);
1343		}
1344		}
1345
#	Line 1359 | Line 1413 | void MainWindow::OnInstallButtonClick( w
1413
1414		void setProgressBar( int i ) {
1415		//TheProgressBar->SetValue(
1416	+	#ifdef WIN32
1417	+
1418
1419	+
1420	+	if (SUCCEEDED(pTaskbarList->QueryInterface(IID_ITaskbarList3, (void **)&pTaskbarList3)))
1421	+	{
1422	+
1423	+	pTaskbarList3->SetProgressValue(Handle,i, 1000);
1424	+	if ( i == 0 ) {
1425	+
1426	+	pTaskbarList3->SetProgressState(Handle,TBPF_NOPROGRESS);
1427	+	}
1428	+	}
1429	+
1430	+
1431	+	#endif
1432		TheProgressBar->SetValue(i);
1433
1434		}
#	Line 1372 | Line 1441 | void setProgressBar( int i ) {
1441		void MainWindow::OnStatusbarUpdate( wxUpdateUIEvent& event )
1442		{
1443		////@begin wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1444	<	// Before editing this code, remove the block markers.
1445	<	event.Skip();
1444	>	// Before editing this code, remove the block markers.
1445	>	event.Skip();
1446		////@end wxEVT_UPDATE_UI event handler for ID_STATUSBAR in MainWindow.
1447		}
1448
#	Line 1385 | Line 1454 | void MainWindow::OnStatusbarUpdate( wxUp
1454		void MainWindow::OnAboutClick( wxCommandEvent& event )
1455		{
1456		////@begin wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1457	<	// Before editing this code, remove the block markers.
1458	<	About* window = new About(this);
1459	<	int returnValue = window->ShowModal();
1460	<	window->Destroy();
1457	>	// Before editing this code, remove the block markers.
1458	>	About* window = new About(this);
1459	>	int returnValue = window->ShowModal();
1460	>	window->Destroy();
1461		////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow.
1462		}
1463
#	Line 1417 | Line 1486 | void MainWindow::OnSepRadioButtonSelecte
1486		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton
1487		*/
1488
1420	–	void MainWindow::OnSeparatedRadioButtonSelected( wxCommandEvent& event )
1421	–	{
1422	–	splitInstances = SPLIT;
1423	–
1424	–	}
1425	–
1426	–
1489		/*
1490		* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Complete_RadioButton
1491		*/
#	Line 1547 | Line 1609 | void MainWindow::OnSaveClick( wxCommandE
1609
1610		void MainWindow::OnReGlobalizeButtonClick( wxCommandEvent& event )
1611		{
1612	<	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and reglobalize all of your data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION  , wxDefaultPosition);
1612	>	wxMessageDialog* YesNoDialog = new wxMessageDialog(this,                        "WARNING: This will DELETE the Edition's GameDataFolder and recreate it from the vanilla Oni game data. \n Are you SURE you want to do this? ", "AE Installer Alert",  wxYES_NO | wxICON_EXCLAMATION    , wxDefaultPosition);
1613
1614		if (YesNoDialog->ShowModal() == wxID_NO) { //if the user said no...
1615
#	Line 1566 | Line 1628 | void MainWindow::OnReGlobalizeButtonClic
1628		// Tg.create_thread( &globalizeData(), this );
1629		#else
1630		globalizeData();
1569	–	setProgressBar(1000);
1570	–	setStatusArea("Done!");
1631		#endif
1632
1633		this->InstallButton->Enable();
#	Line 1587 | Line 1647 | event.Skip();
1647		////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Separated_RadioButton in MainWindow.
1648		}*/
1649
1650	+
1651	+	/*
1652	+	* wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
1653	+	*/
1654	+
1655	+	void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
1656	+	{
1657	+	splitInstances = SPLIT;
1658	+	}
1659	+

Diff Legend

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