WebSVN – spk – Diff – /Creator/src/Forms/PackageForm.cpp

 #include "SaveDialog.h"
 #include <Package/InstallText.h>
 namespace Creator {
+	PackageForm::PackageForm(System::Windows::Forms::Form ^parent, System::Windows::Forms::TabControl ^ctrl, System::Windows::Forms::TabPage ^page, System::Windows::Forms::ToolStripMenuItem ^tool, CPackages *p, Windows::Forms::ImageList ^imagelist, SSettings *set)
+		: BaseForm(parent, ctrl, page, tool, p, imagelist, set),
+		_addGameItem(nullptr),
+		_removeGameItem(nullptr)
+	{
+		InitializeComponent();
+		this->LabelShipWarning->Visible = false;
+		this->TextExactVersion->Visible = false;
+		this->DoToolTips();
+		this->ListDep->LargeImageList = this->imageList1;
+		this->ListDep->SmallImageList = this->imageList1;
+		m_pSettings = set;
+		m_iFormType = FORMTYPE_SINGLE;
+		m_pDisplayFile = NULL;
+		this->NumTextID->Visible = false;
+		m_iSelectedGame = -1;
+		this->Closing += gcnew CancelEventHandler(this, &PackageForm::PackageForm_Closing);
+		_pPackages = new CPackages();
+		_pPackages->startup(".", ".", ".");
+		m_pPackage = NULL;
+		m_pTypeList = new CyStringList;
+		this->ComboShipPart->SelectedIndex = 0;
+		m_bLoading = false;
+	}
+	PackageForm::~PackageForm()
+	{
+		if (components)
+			delete components;
+		delete m_pTypeList;
+		if (m_pPackage)
+			delete m_pPackage;
+		if (_pPackages)
+			delete _pPackages;
+	}
 	bool PackageForm::LoadPackage(CBaseFile *base, System::String ^filename)
+	{
 		m_sFilename = filename;
 		if ( !base )
 		ComboVersion->BeginUpdate();
 		ComboVersion->Items->Clear();
 		this->TextExactVersion->Hide();
 		SGameExe *exe = NULL;
 		if ( ButGame->ImageIndex >= 0 )
 			exe = m_pP->GetGameExe()->GetGame((m_pPackage) ? ButGame->ImageIndex : -1);
 		if ( exe )
+		{
 				SGameExeVersion *v = exe->lVersions[i];
 				ComboVersion->Items->Add(SystemStringFromCyString(v->sName));
+			}
 			ComboVersion->Items->Add("Exact (Custom)");
 			ComboVersion->Enabled = true;
 		}
 		else
+		{
 			ComboVersion->Enabled = false;
+		}
 		if ( !restoreLoad )
 			m_bLoading = false;
+	}
 	void PackageForm::UpdateRatings()
 	{
 		this->PicEase1->BackColor = System::Drawing::Color::Transparent;
 		this->PicEase2->BackColor = System::Drawing::Color::Transparent;
 		this->PicEase3->BackColor = System::Drawing::Color::Transparent;
 		this->PicEase4->BackColor = System::Drawing::Color::Transparent;
 		this->PicEase5->BackColor = System::Drawing::Color::Transparent;
 		if ( m_pPackage->easeOfUse() < 0 )
 			this->GroupEase->Text = "Ease of Use";
 		else
 			this->GroupEase->Text = "Ease of Use (" + System::Convert::ToString(m_pPackage->easeOfUse()) + ")";
 		if ( m_pPackage->gameChanging() < 0 )
 			this->GroupChange->Text = "Game Changing";
 		else
 			this->GroupChange->Text = "Game Changing (" + System::Convert::ToString(m_pPackage->gameChanging()) + ")";
 		if ( m_pPackage->recommended() < 0 )
 			this->GroupRec->Text = "Recommended";
 		else
 			this->GroupRec->Text = "Recommended (" + System::Convert::ToString(m_pPackage->recommended()) + ")";
+	}
 	void PackageForm::Setup()
+	{
 		m_bLoading = true;
 		this->ComboFileType->Items->Add("All Files");
 		for ( int i = 0; i < FILETYPE_MAX; i++ )
-			this->ComboFileType->Items->Add(SystemStringFromCyString(GetFileTypeString(i)));
+			this->ComboFileType->Items->Add(_US(GetFileTypeString(i)));
 		this->ComboFileType->SelectedIndex = 0;
 		this->PanelShip->Hide();
 		m_bSortingAsc = true;
 		m_iSortingCol = 1;
 		this->ListFiles->ColumnClick += gcnew ColumnClickEventHandler(this, &Creator::PackageForm::SortList);
 		this->ListFiles->ItemChecked += gcnew ItemCheckedEventHandler(this, &PackageForm::Event_FileChecked);
 		this->ContextGames->Items->Clear();
 		this->ComboGameFilter->Items->Clear();
 		this->ToolGame->DropDownItems->Clear();
 		this->ComboGameFilter->Items->Add("- None -");
 		this->ComboGameFilter->Items->Add("- All Games -");
+		ToolStripItem ^newItem = this->ToolGame->DropDownItems->Add("- All Games -");
+		newItem->Tag = Convert::ToString(0);
+		newItem->Click += gcnew System::EventHandler(this, &PackageForm::SetGame_Selected);
+		newItem = this->ToolGame->DropDownItems->Add("------");
+		newItem->Enabled = false;
+		if (!_addGameItem)
+		{
+			_addGameItem = gcnew System::Windows::Forms::ToolStripMenuItem;
+			_addGameItem->Text = "Add Game";
+		}
+		this->ToolGame->DropDownItems->Add(_addGameItem);
+		if (!_removeGameItem)
+		{
+			_removeGameItem = gcnew System::Windows::Forms::ToolStripMenuItem;
+			_removeGameItem->Text = "Remove Game";
+		}
+		this->ToolGame->DropDownItems->Add(_removeGameItem);
+		newItem = this->ToolGame->DropDownItems->Add("------");
+		newItem->Enabled = false;
 		for ( int i = 0; i < m_pP->GetGameExe()->GetNumGames(); i++ )
+		{
 			SGameExe *gameExe = m_pP->GetGameExe()->GetGame(i);
 			if ( gameExe )
+			{
 				System::Windows::Forms::ToolStripMenuItem ^newItem = gcnew System::Windows::Forms::ToolStripMenuItem;
-				newItem->Text = SystemStringFromCyString(gameExe->sName);
+				newItem->Text = _US(gameExe->sName);
 				newItem->Tag = Convert::ToString(i + 1);
 				if (i < this->imageListGames->Images->Count)
 					newItem->Image = this->imageListGames->Images[i];
 				newItem->Click += gcnew System::EventHandler(this, &PackageForm::ContextGame_Selected);
 				this->ContextGames->Items->Add(newItem);
 				System::Windows::Forms::ToolStripMenuItem ^newItem2 = gcnew System::Windows::Forms::ToolStripMenuItem;
-				newItem2->Text = SystemStringFromCyString(gameExe->sName);
+				newItem2->Text = _US(gameExe->sName);
 				newItem2->Tag = Convert::ToString(i + 1);
 				if (i < this->imageListGames->Images->Count)
 					newItem2->Image = this->imageListGames->Images[i];
 				newItem2->Click += gcnew System::EventHandler(this, &PackageForm::SetGame_Selected);
 				this->ToolGame->DropDownItems->Add(newItem2);
+				this->ComboGameFilter->Items->Add(_US(gameExe->sName));
+				newItem2 = gcnew System::Windows::Forms::ToolStripMenuItem;
-				this->ComboGameFilter->Items->Add(SystemStringFromCyString(gameExe->sName));
+				newItem2->Text = _US(gameExe->sName);
+				newItem2->Tag = Convert::ToString(i + 1);
+				if (i < this->imageListGames->Images->Count)
+					newItem2->Image = this->imageListGames->Images[i];
+				newItem2->Click += gcnew System::EventHandler(this, &PackageForm::AddGame_Selected);
+				_addGameItem->DropDownItems->Add(newItem2);
+				newItem2 = gcnew System::Windows::Forms::ToolStripMenuItem;
+				newItem2->Text = _US(gameExe->sName);
+				newItem2->Tag = Convert::ToString(i + 1);
+				if (i < this->imageListGames->Images->Count)
+					newItem2->Image = this->imageListGames->Images[i];
+				newItem2->Click += gcnew System::EventHandler(this, &PackageForm::RemoveGame_Selected);
+				_removeGameItem->DropDownItems->Add(newItem2);
 			}
+		}
 		this->ComboGameFilter->SelectedIndex = 0;
 		this->ButGame->Text = "- Select Game -";
 		m_pTypeList->Clear();
 		for ( int i = 0; i < CSpkFile::SCRIPTTYPE_MAX; i++ )
+		{
 			m_pTypeList->PushBack(CSpkFile::GetScriptTypeStringStatic(i).c_str());
-			ComboType->Items->Add(SystemStringFromCyString(CSpkFile::GetScriptTypeStringStatic(i)));
+			ComboType->Items->Add(_US(CSpkFile::GetScriptTypeStringStatic(i)));
+		}
 		this->CreationDate->Value = DateTime::Today;
 		m_bLoading = false;
 		this->ListFiles->Items->Clear();
 		if ( m_pPackage ) {
 			for ( C_File *file = m_pPackage->GetFileList()->First(); file; file = m_pPackage->GetFileList()->Next() )
+			{
 				file->SetPos(pos++);
-				if ( this->;ComboGameFilter->SelectedIndex > 0 ) {
+				if (this->;ComboGameFilter->SelectedIndex == 1)
+				{
+					if (file->game() > 0 && file->game() != 1 << 31)
+						continue;
+				}
+				else if (this->ComboGameFilter->SelectedIndex > 0)
+				{
-					if ( this-&gt;ComboGameFilter->;SelectedIndex - 1 != file->GetGame() )
+					if (!(1 << (this-&gt;ComboGameFilter->;SelectedIndex - 1) & file->game()))
 						continue;
+				}
 				if ( this->ComboFileType->SelectedIndex == 0 || (this->ComboFileType->SelectedIndex - 1) == file->GetFileType() )
 					this->AddFile(file);
+			}
 		if ( !file->GetDir().Empty() )
 			item->SubItems->Add(SystemStringFromCyString(file->GetDir()));
 		else
 			item->SubItems->Add("");
 		if ( file->IsSigned() )
 			item->SubItems->Add("Yes");
 		else
 			item->SubItems->Add("No");
-		if ( !file->GetGame() )
+		if ( !file->game() || file->game() == (1 << 31))
 			item->SubItems->Add("All Games");
-		else {
+		else
+		{
+			if (file->game() & (1 << 31))
+			{
+				Utils::String sGames = "";
+				for (int i = 0; i < 31; ++i)
+				{
-			CPackages p;
+					int gameMask = 1 << i;
+					if (file->game() & gameMask)
+					{
-			p.Startup(".", ".", ".");
+						Utils::String sGame;
-			SGameExe *exe = p.GetGameExe()->GetGame(file->GetGame() - 1);
+						SGameExe *exe = _pPackages->GetGameExe()->GetGame(i - 1);
-			if ( exe ) {
+						if (exe)
+							sGame = exe->sName;
+						else
+							sGame = "Game: " + Utils::String::Number(i);
+						if (sGames.empty())
+							sGames = sGame;
+						else
+							sGames = sGames + "\n" + sGame;
+					}
+				}
-				item->SubItems->Add(SystemStringFromCyString(exe->sName));
+				item->SubItems->Add(_US(sGames));
+			}
+			else
+			{
+				SGameExe *exe = _pPackages->GetGameExe()->GetGame(file->game() - 1);
+				if (exe) {
+					item->SubItems->Add(_US(exe->sName));
+				}
-			else {
+				else {
-				item->SubItems->Add("Game: " + file->GetGame());
+					item->SubItems->Add("Game: " + file->game());
+				}
+			}
+		}
 		item->Tag = SystemStringFromCyString(CyString::Number(file->GetPos()));
 		if ( file->IsFakePatch() )
 					filter += "*.cat";
 					break;
 				case FILETYPE_SOUND:
 					filter += "*.wav";
 					break;
 				case FILETYPE_SCREEN:
 				case FILETYPE_ADVERT:
 					filter += "*.jpg;*.png";
 					break;
+			}
 			array<System::String ^> ^fileArray = ofd->FileNames;
 			for ( int i = 0; i < fileArray->Length; i++ )
+			{
 				System::String ^file = fileArray[i];
 				int filetype = m_pP->AdjustFileType(CyStringFromSystemString(file), ofd->FilterIndex - 1);
-				C_File *f = m_pPackage->AddFile(CyStringFromSystemString(file), dir, filetype);
+				C_File *f = m_pPackage->AddFile(CyStringFromSystemString(file), dir, filetype, this->ComboGameFilter->SelectedIndex > 1 ? (1 << (this->ComboGameFilter->SelectedIndex - 1) | 1 << 31) : 0);
 				if ( (ofd->FilterIndex - 1) == FILETYPE_MOD )
 					m_pPackage->AddFile(CFileIO(CyStringFromSystemString(file)).ChangeFileExtension("dat"), dir, filetype);
+			}
 			m_pPackage->UpdateSigned(false);
 			this->UpdateFileList();
 					if ( ((CSpkFile *)m_pPackage)->version().compareVersion(n->sMinVersion) != COMPARE_OLDER )
+					{
 						MessageBox::Show(this, "The depencay vesion (" + _US(n->sMinVersion) + ") is too high, it must be lower than the current version (" + _US(m_pPackage->version()) + ")", "Invalid Entry", MessageBoxButtons::OK, MessageBoxIcon::Stop);
 						return false;
+					}
 				}
 			}
 			else if ( ((CSpkFile *)m_pPackage)->IsCustomStart() )
 			{
 				if ( !((CSpkFile *)m_pPackage)->CheckValidCustomStart() )
+				{
 					MessageBox::Show(this, "For a custom start, you must include an initplayer script", "Invalid Entry", MessageBoxButtons::OK, MessageBoxIcon::Stop);
 					return false;
+				}
 		return true;
+	}
 	void PackageForm::Save()
 	{
 		if ( !this->CheckSave() )
 			return;
 		if ( m_pPackage->filename().empty() )
+		{
 			this->SaveAs();
 			return;
+		}
+	}
 	System::Void PackageForm::PackageForm_Closing(System::Object^  sender, CancelEventArgs^  e)	{
 		if ( m_pPackage->hasChanged() )
 		{
 			String ^name = m_pTabPage->Text;
 			if ( name[name->Length - 1] == '*' )
 				name = name->Remove(name->Length - 1);
 			System::Windows::Forms::DialogResult result = MessageBox::Show("Would you like to save changes to the package?\n\n" + name, "Save Package", MessageBoxButtons::YesNoCancel, MessageBoxIcon::Question);
 	void PackageForm::AddDisplayIcon()
+	{
 		OpenFileDialog ^ofd = gcnew OpenFileDialog();
 		ofd->Filter = "Icon Files|*.ico;*.png;*.bmp";
 		ofd->FilterIndex = 1;
 		ofd->RestoreDirectory = true;
 		ofd->Multiselect = false;
 		ofd->Title = "Select the Icon file to add";
 		if ( ofd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
 		{
-			CyString file = CyStringFromSystemString(ofd->FileName);
+			Utils::String file = _S(ofd->FileName);
 			C_File *icon = new C_File(file);
 			if ( icon->ReadFromFile() )
 				m_pPackage->SetIcon(icon, CFileIO(file).GetFileExtension());
 			this->UpdateDisplayIcon();
 			this->UpdateChanged();
 		}
+	}
 	void PackageForm::SaveText()
+	{
 		if ( this->TextText->Text->Length )
 				if ( this->RadioInstallAfter->Checked )			m_pPackage->addInstallText(lang, false, _S(this->TextText->Text));
 				else if ( this->RadioInstallBefore->Checked )	m_pPackage->addInstallText(lang, true, _S(this->TextText->Text));
 				else if ( this->RadioUninstallBefore->Checked )	m_pPackage->addUninstallText(lang, true, _S(this->TextText->Text));
 				else if ( this->RadioUninstallAfter->Checked )	m_pPackage->addUninstallText(lang, false, _S(this->TextText->Text));
 				this->UpdateChanged();
 			}
 		}
+	}
 	void PackageForm::LoadShipData()
+	{
 		OpenFileDialog ^ofd = gcnew OpenFileDialog();
 	void PackageForm::EditShipParts(bool edit)
+	{
 		 CXspFile *xsp = (CXspFile *)m_pPackage;
 		 switch ( this->ComboShipPart->SelectedIndex )
 		 {
 			case 0:
+				{
 					AddShipPart ^component = gcnew AddShipPart((Form1 ^)this->MdiParent);
 					component->SetComponent(edit);
 					if ( edit )
 					{
 						component->SetSection(m_pSelectedItem->Text);
 						component->SetSection2(m_pSelectedItem->SubItems[1]->Text);
 						component->SetData(m_pSelectedItem->SubItems[2]->Text);
+					}
 						else
+						{
 							m_pSelectedItem->Text = component->GetSection();
 							m_pSelectedItem->SubItems[1]->Text = component->GetSection2();
 							m_pSelectedItem->SubItems[2]->Text = component->GetData();
 						}
 					}
 				}
 				break;
 			case 1:
+				{
 					AddShipPart ^dummy = gcnew AddShipPart((Form1 ^)this->MdiParent);
 					dummy->SetDummy(edit);
 					if ( edit )
+					{
 						dummy->SetSection(m_pSelectedItem->Text);
 						dummy->SetData(m_pSelectedItem->SubItems[1]->Text);
 					}
 					if ( dummy->ShowDialog(this) == Windows::Forms::DialogResult::OK )
+					{
 						if ( edit )
 							xsp->RemoveDummy(_S(m_pSelectedItem->Text), _S(m_pSelectedItem->SubItems[1]->Text));
 						xsp->AddDummy(_S(dummy->GetSection()), _S(dummy->GetData()));
 						if ( !edit )
 							this->UpdateShipPartList();
 						else
 						{
 							m_pSelectedItem->Text = dummy->GetSection();
 							m_pSelectedItem->SubItems[1]->Text = dummy->GetData();
 						}
 					}
 				}
 				break;
 			case 2:
+				{
 					AddCockpit ^cockpit = gcnew AddCockpit();
 					if ( edit )
 						cockpit->SetEdit(m_pSelectedItem->Text, SystemStringFromCyString(CyStringFromSystemString(m_pSelectedItem->SubItems[2]->Text).GetToken(";", 8, 8)), CyStringFromSystemString(m_pSelectedItem->SubItems[2]->Text).GetToken(";", 9, 9).ToInt());
 		if ( String::Compare(IO::FileInfo(file).Extension, ".xml") == 0 )
 			return file;
 		if ( String::Compare(IO::FileInfo(file).Extension, ".pck") == 0 )
+		{
-			C_File F(CyStringFromSystemString(file));
+			C_File F(_S(file));
 			F.UnPCKFile();
 			if ( F.WriteToFile(CPackages::tempDirectory() + "tmp.dat") )
 				return _US(CPackages::tempDirectory() + "tmp.dat");
+		}
 		else if ( String::Compare(IO::FileInfo(file).Extension, ".cat") == 0 )
+	{
 		return ((Form1 ^)this->MdiParent)->gameDirectories();
+	}
 	void PackageForm::ImportData(String ^file, int type)
 	{
 		CFileIO F(CyStringFromSystemString(file));
 		if ( !F.exists() )
 			return;
 		CyStringList *lines = F.ReadLinesStr();
 		if ( !lines )
 			return;
 				else
+				{
 					CyString id;
 					if ( dataPos == -1 )
 						id = str->str;
 					else
 						id = str->str.GetToken(";", dataPos, dataPos);
 					if ( dataPos2 )
 						load->AddShip(SystemStringFromCyString(id), SystemStringFromCyString(str->str.GetToken(";", dataPos2, dataPos2)));
 					else
+				{
 					switch ( type )
+					{
 						case 0:
 							((CXspFile *)m_pPackage)->AddComponent(s->data.GetToken(";", 1, 1).ToString(), s->data.GetToken(";", 2, 2).ToString(), s->data.GetToken(";", 3).ToString());
 							break;
 						case 2:
 							((CXspFile *)m_pPackage)->AddCockpit(s->data.GetToken(" ", 2).ToString(), 0, -1, s->data.GetToken(" ", 1, 1).ToInt());
 							break;
 						case 3:
 							((CXspFile *)m_pPackage)->AddCutData(s->data.GetToken(" ", 2).ToString());
 	void PackageForm::ImportAnimations(String ^file)
+	{
 		CFileIO F(CyStringFromSystemString(file));
 		if ( !F.exists() )
 			return;
 		CyStringList *lines = F.ReadLinesStr();
 		if ( !lines )
 			return;
 				 m_pPackage->AddNeededLibrary(_S(depend->GetName()), _S(depend->GetAuthor()), _S(depend->GetVersion()));
+			 }
 			 this->UpdateDependacies();
 			 this->UpdateChanged();
+		 }
+	}
+	System::Void PackageForm::SetGame_Selected(System::Object^  sender, System::EventArgs^  e)
+	{
+		System::Windows::Forms::ToolStripMenuItem ^item = cli::safe_cast<System::Windows::Forms::ToolStripMenuItem ^>(sender);
+		int done = 0;
+		if (ListFiles->SelectedItems->Count)
+		{
+			for (int i = 0; i < ListFiles->SelectedItems->Count; i++)
+			{
+				int id = _S(cli::safe_cast<System::String ^>(this->ListFiles->SelectedItems[i]->Tag)).toInt();
+				C_File *file = m_pPackage->GetFileList()->Get(id);
+				if (file) {
+					int iGame = Convert::ToInt32(item->Tag);
+					if(!iGame)
+						file->setGame(0);
+					else
+						file->setGame(1 << 31 | 1 << iGame);
+					++done;
+				}
+			}
+		}
+		if (done) {
+			this->UpdateFileList();
+			this->UpdateChanged();
+		}
+	}
+	System::Void PackageForm::AddGame_Selected(System::Object^  sender, System::EventArgs^  e)
+	{
+		System::Windows::Forms::ToolStripMenuItem ^item = cli::safe_cast<System::Windows::Forms::ToolStripMenuItem ^>(sender);
+		int done = 0;
+		if (ListFiles->SelectedItems->Count)
+		{
+			for (int i = 0; i < ListFiles->SelectedItems->Count; i++)
+			{
+				int id = _S(cli::safe_cast<System::String ^>(this->ListFiles->SelectedItems[i]->Tag)).toInt();
+				C_File *file = m_pPackage->GetFileList()->Get(id);
+				if (file) {
+					int iGame = Convert::ToInt32(item->Tag);
+					if (iGame)
+						file->setGame(file->game() | 1 << iGame | 1 << 31);
+					++done;
+				}
+			}
+		}
+		if (done) {
+			this->UpdateFileList();
+			this->UpdateChanged();
+		}
+	}
+	System::Void PackageForm::RemoveGame_Selected(System::Object^  sender, System::EventArgs^  e)
+	{
+		System::Windows::Forms::ToolStripMenuItem ^item = cli::safe_cast<System::Windows::Forms::ToolStripMenuItem ^>(sender);
+		int done = 0;
+		if (ListFiles->SelectedItems->Count)
+		{
+			for (int i = 0; i < ListFiles->SelectedItems->Count; i++)
+			{
+				int id = _S(cli::safe_cast<System::String ^>(this->ListFiles->SelectedItems[i]->Tag)).toInt();
+				C_File *file = m_pPackage->GetFileList()->Get(id);
+				if (file) {
+					int iGame = Convert::ToInt32(item->Tag);
+					if (iGame)
+						file->setGame(file->game() & ~(1 << iGame));
+					++done;
+				}
+			}
+		}
+		if (done) {
+			this->UpdateFileList();
+			this->UpdateChanged();
+		}
+	}
+}

Subversion Repositories spk

(root)/Creator/src/Forms/PackageForm.cpp – Rev 126 → 127