Subversion Repositories spk

Rev

Rev 185 | Rev 196 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 185 Rev 191
Line 259... Line 259...
259
		CSpkFile *spk = (CSpkFile *)m_pPackage;
259
		CSpkFile *spk = (CSpkFile *)m_pPackage;
260
 
260
 
261
		this->ListWares->Items->Clear();
261
		this->ListWares->Items->Clear();
262
		for ( SWares *w = spk->GetWaresList()->First(); w; w = spk->GetWaresList()->Next() )
262
		for ( SWares *w = spk->GetWaresList()->First(); w; w = spk->GetWaresList()->Next() )
263
		{
263
		{
264
			ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(w->sID));
264
			ListViewItem ^item = gcnew ListViewItem(_US(w->sID));
265
			switch ( tolower(w->cType) )
265
			switch ( tolower(w->cType) )
266
			{
266
			{
267
				case 'b':
267
				case 'b':
268
					item->SubItems->Add("Bio");
268
					item->SubItems->Add("Bio");
269
					break;
269
					break;
Line 338... Line 338...
338
					this->splitContainer1->Panel2Collapsed = false;
338
					this->splitContainer1->Panel2Collapsed = false;
339
					for ( SWaresText *wt = w->lText.First(); wt; wt = w->lText.Next() )
339
					for ( SWaresText *wt = w->lText.First(); wt; wt = w->lText.Next() )
340
					{
340
					{
341
						ListViewItem ^item = gcnew ListViewItem(System::Convert::ToString(wt->iLang));
341
						ListViewItem ^item = gcnew ListViewItem(System::Convert::ToString(wt->iLang));
342
						item->ImageIndex = 0;
342
						item->ImageIndex = 0;
343
						item->SubItems->Add(SystemStringFromCyString(wt->sName));
343
						item->SubItems->Add(_US(wt->sName));
344
						item->SubItems->Add(SystemStringFromCyString(wt->sDesc));
344
						item->SubItems->Add(_US(wt->sDesc));
345
						this->ListWareText->Items->Add(item);
345
						this->ListWareText->Items->Add(item);
346
					}
346
					}
347
				}
347
				}
348
			}
348
			}
349
		}
349
		}
Line 366... Line 366...
366
		this->TextDesc->Text = _US(desc);
366
		this->TextDesc->Text = _US(desc);
367
 
367
 
368
		if ( m_pPackage->GetType() == TYPE_XSP )
368
		if ( m_pPackage->GetType() == TYPE_XSP )
369
		{
369
		{
370
			CXspFile *xsp = (CXspFile *)m_pPackage;
370
			CXspFile *xsp = (CXspFile *)m_pPackage;
371
			this->TextShipID->Text = SystemStringFromCyString(xsp->GetShipID());
371
			this->TextShipID->Text = _US(xsp->GetShipID());
372
			this->PanelShip->Show();
372
			this->PanelShip->Show();
373
			this->LabelShipWarning->Visible = true;
373
			this->LabelShipWarning->Visible = true;
374
			this->groupBox6->Visible = false;
374
			this->groupBox6->Visible = false;
375
 
375
 
376
			this->TextShipData->Text = SystemStringFromCyString(xsp->GetShipData());
376
			this->TextShipData->Text = _US(xsp->GetShipData());
377
 
377
 
378
			this->CheckShipID->Checked = xsp->IsExistingShip();
378
			this->CheckShipID->Checked = xsp->IsExistingShip();
379
			this->CheckExistingText->Checked = (xsp->GetOriginalDescription()) ? true : false;
379
			this->CheckExistingText->Checked = (xsp->GetOriginalDescription()) ? true : false;
380
			if ( xsp->GetOriginalDescription() )
380
			if ( xsp->GetOriginalDescription() )
381
				this->NumTextID->Value = xsp->GetOriginalDescription();
381
				this->NumTextID->Value = xsp->GetOriginalDescription();
Line 417... Line 417...
417
			{
417
			{
418
				this->RadioTypeScript->Checked = true;
418
				this->RadioTypeScript->Checked = true;
419
				this->ComboType->SelectedIndex = spk->GetScriptType();
419
				this->ComboType->SelectedIndex = spk->GetScriptType();
420
				this->ComboType->Enabled = true;
420
				this->ComboType->Enabled = true;
421
				if ( this->ComboType->SelectedIndex == CSpkFile::SCRIPTTYPE_CUSTOM )
421
				if ( this->ComboType->SelectedIndex == CSpkFile::SCRIPTTYPE_CUSTOM )
422
					this->TextCustomType->Text = SystemStringFromCyString(spk->GetCustomScriptType(m_pP->GetLanguage()));
422
					this->TextCustomType->Text = _US(spk->GetCustomScriptType(m_pP->GetLanguage()));
423
			}
423
			}
424
 
424
 
425
			this->CheckOther->Checked = spk->IsAnotherMod();
425
			this->CheckOther->Checked = spk->IsAnotherMod();
426
			this->TextOtherAuthor->Enabled = this->CheckOther->Checked;
426
			this->TextOtherAuthor->Enabled = this->CheckOther->Checked;
427
			this->TextOtherName->Enabled = this->CheckOther->Checked;
427
			this->TextOtherName->Enabled = this->CheckOther->Checked;
428
			this->ButFromFile->Enabled = this->CheckOther->Checked;
428
			this->ButFromFile->Enabled = this->CheckOther->Checked;
429
 
429
 
430
			if ( spk->IsAnotherMod() )
430
			if ( spk->IsAnotherMod() )
431
			{
431
			{
432
				this->TextOtherAuthor->Text = SystemStringFromCyString(spk->GetOtherAuthor());
432
				this->TextOtherAuthor->Text = _US(spk->GetOtherAuthor());
433
				this->TextOtherName->Text = SystemStringFromCyString(spk->GetOtherName());
433
				this->TextOtherName->Text = _US(spk->GetOtherName());
434
			}
434
			}
435
 
435
 
436
			this->UpdateWares();
436
			this->UpdateWares();
437
			this->UpdateScriptType();
437
			this->UpdateScriptType();
438
		}
438
		}
Line 504... Line 504...
504
	void PackageForm::UpdateDependacies()
504
	void PackageForm::UpdateDependacies()
505
	{
505
	{
506
		this->ListDep->Items->Clear();
506
		this->ListDep->Items->Clear();
507
		for ( SNeededLibrary *nl = m_pPackage->GetNeededLibraries()->First(); nl; nl = m_pPackage->GetNeededLibraries()->Next() )
507
		for ( SNeededLibrary *nl = m_pPackage->GetNeededLibraries()->First(); nl; nl = m_pPackage->GetNeededLibraries()->Next() )
508
		{
508
		{
509
			ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(nl->sName));
509
			ListViewItem ^item = gcnew ListViewItem(_US(nl->sName));
510
			item->SubItems->Add(SystemStringFromCyString(nl->sAuthor));
510
			item->SubItems->Add(_US(nl->sAuthor));
511
			item->SubItems->Add(SystemStringFromCyString(nl->sMinVersion));
511
			item->SubItems->Add(_US(nl->sMinVersion));
512
			item->ImageIndex = 3;
512
			item->ImageIndex = 3;
513
			this->ListDep->Items->Add(item);
513
			this->ListDep->Items->Add(item);
514
		}
514
		}
515
		this->ListDep->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
515
		this->ListDep->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
516
	}
516
	}
Line 532... Line 532...
532
				this->ColumnPart1->Text = "Section";
532
				this->ColumnPart1->Text = "Section";
533
				this->ColumnPart2->Text = "ID";
533
				this->ColumnPart2->Text = "ID";
534
				this->ColumnPart3->Text = "Data";
534
				this->ColumnPart3->Text = "Data";
535
				for ( SComponent *c = xsp->GetComponents()->First(); c; c = xsp->GetComponents()->Next() )
535
				for ( SComponent *c = xsp->GetComponents()->First(); c; c = xsp->GetComponents()->Next() )
536
				{
536
				{
537
					ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(c->sSection));
537
					ListViewItem ^item = gcnew ListViewItem(_US(c->sSection));
538
					item->ImageKey = "components";
538
					item->ImageKey = "components";
539
					item->SubItems->Add(SystemStringFromCyString(c->sSection2));
539
					item->SubItems->Add(_US(c->sSection2));
540
					item->SubItems->Add(SystemStringFromCyString(c->sData));
540
					item->SubItems->Add(_US(c->sData));
541
					this->ListShipPart->Items->Add(item);
541
					this->ListShipPart->Items->Add(item);
542
				}
542
				}
543
				break;
543
				break;
544
			case 1: // dummies
544
			case 1: // dummies
545
				numColums = 2;
545
				numColums = 2;
546
				this->ColumnPart1->Text = "Section";
546
				this->ColumnPart1->Text = "Section";
547
				this->ColumnPart2->Text = "Data";
547
				this->ColumnPart2->Text = "Data";
548
				for ( SDummy *d = xsp->GetDummies()->First(); d; d = xsp->GetDummies()->Next() )
548
				for ( SDummy *d = xsp->GetDummies()->First(); d; d = xsp->GetDummies()->Next() )
549
				{
549
				{
550
					ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(d->sSection));
550
					ListViewItem ^item = gcnew ListViewItem(_US(d->sSection));
551
					item->SubItems->Add(SystemStringFromCyString(d->sData));
551
					item->SubItems->Add(_US(d->sData));
552
					item->ImageKey = "dummies";
552
					item->ImageKey = "dummies";
553
					this->ListShipPart->Items->Add(item);
553
					this->ListShipPart->Items->Add(item);
554
				}
554
				}
555
				break;
555
				break;
556
			case 2: // Cockpit
556
			case 2: // Cockpit
Line 558... Line 558...
558
				this->ColumnPart1->Text = "ID";
558
				this->ColumnPart1->Text = "ID";
559
				this->ColumnPart2->Text = "Index";
559
				this->ColumnPart2->Text = "Index";
560
				this->ColumnPart3->Text = "Data";
560
				this->ColumnPart3->Text = "Data";
561
				for ( SCockpit *c = xsp->GetCockpits()->First(); c; c = xsp->GetCockpits()->Next() )
561
				for ( SCockpit *c = xsp->GetCockpits()->First(); c; c = xsp->GetCockpits()->Next() )
562
				{
562
				{
563
					CyString cName = c->sCockpit;
563
					Utils::String cName = c->sCockpit;
564
					cName = cName.GetToken(";", -2);
564
					cName = cName.token(";", -2);
565
					while ( cName.Right(1) == ";" )
565
					while ( cName.right(1) == ";" )
566
						cName.Truncate(-1);
566
						cName.truncate(-1);
567
					ListViewItem ^item = gcnew ListViewItem(SystemStringFromCyString(cName));
567
					ListViewItem ^item = gcnew ListViewItem(_US(cName));
568
					if ( c->iIndex == -1 )
568
					if ( c->iIndex == -1 )
569
						item->SubItems->Add("<PACKAGE>");
569
						item->SubItems->Add("<PACKAGE>");
570
					else
570
					else
571
						item->SubItems->Add(Convert::ToString(c->iIndex));
571
						item->SubItems->Add(Convert::ToString(c->iIndex));
572
					item->SubItems->Add(SystemStringFromCyString(c->sCockpit));
572
					item->SubItems->Add(_US(c->sCockpit));
573
					item->ImageKey = "cockpit";
573
					item->ImageKey = "cockpit";
574
					this->ListShipPart->Items->Add(item);
574
					this->ListShipPart->Items->Add(item);
575
				}
575
				}
576
				break;
576
				break;
577
			case 3: // CutData
577
			case 3: // CutData
Line 628... Line 628...
628
 
628
 
629
		for ( SText *t = xsp->GetTexts()->First(); t; t = xsp->GetTexts()->Next() )
629
		for ( SText *t = xsp->GetTexts()->First(); t; t = xsp->GetTexts()->Next() )
630
		{
630
		{
631
			ListViewItem ^item = gcnew ListViewItem(System::Convert::ToString(t->iId));
631
			ListViewItem ^item = gcnew ListViewItem(System::Convert::ToString(t->iId));
632
			item->ImageIndex = 0;
632
			item->ImageIndex = 0;
633
			item->SubItems->Add(SystemStringFromCyString(t->sName));
633
			item->SubItems->Add(_US(t->sName));
634
			item->SubItems->Add(SystemStringFromCyString(t->sDesc));
634
			item->SubItems->Add(_US(t->sDesc));
635
			this->ListShipText->Items->Add(item);
635
			this->ListShipText->Items->Add(item);
636
		}
636
		}
637
 
637
 
638
		this->ListShipText->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
638
		this->ListShipText->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
639
	}
639
	}
Line 754... Line 754...
754
		{			
754
		{			
755
			ComboVersion->Items->Add("Original");
755
			ComboVersion->Items->Add("Original");
756
			for ( int i = 0; i < exe->lVersions.size(); i++ )
756
			for ( int i = 0; i < exe->lVersions.size(); i++ )
757
			{
757
			{
758
				SGameExeVersion *v = exe->lVersions[i];
758
				SGameExeVersion *v = exe->lVersions[i];
759
				ComboVersion->Items->Add(SystemStringFromCyString(v->sName));
759
				ComboVersion->Items->Add(_US(v->sName));
760
			}
760
			}
761
			ComboVersion->Items->Add("Exact (Custom)");
761
			ComboVersion->Items->Add("Exact (Custom)");
762
			ComboVersion->Enabled = true;
762
			ComboVersion->Enabled = true;
763
		}
763
		}
764
		else
764
		else
Line 1063... Line 1063...
1063
					item->SubItems->Add("Game: " + file->game());
1063
					item->SubItems->Add("Game: " + file->game());
1064
				}
1064
				}
1065
			}
1065
			}
1066
		}
1066
		}
1067
 
1067
 
1068
		item->Tag = SystemStringFromCyString(CyString::Number(file->GetPos()));
1068
		item->Tag = _US(Utils::WString::Number(file->GetPos()));
1069
		if ( file->IsFakePatch() )
1069
		if ( file->IsFakePatch() )
1070
			item->ImageKey = "fakepatch";
1070
			item->ImageKey = "fakepatch";
1071
		else
1071
		else
1072
			item->ImageIndex = file->GetFileType();
1072
			item->ImageIndex = file->GetFileType();
1073
 
1073
 
Line 1084... Line 1084...
1084
		System::String ^filter;
1084
		System::String ^filter;
1085
		for ( int i = 0; i < FILETYPE_MAX; i++ )
1085
		for ( int i = 0; i < FILETYPE_MAX; i++ )
1086
		{
1086
		{
1087
			if ( filter )
1087
			if ( filter )
1088
				filter += "|";
1088
				filter += "|";
1089
			filter += SystemStringFromCyString(GetFileTypeString(i));
1089
			filter += _US(GetFileTypeString(i));
1090
			filter += "|";
1090
			filter += "|";
1091
			// add extensions
1091
			// add extensions
1092
			switch ( i )
1092
			switch ( i )
1093
			{
1093
			{
1094
				case FILETYPE_SCRIPT:
1094
				case FILETYPE_SCRIPT:
Line 1554... Line 1554...
1554
 
1554
 
1555
			case 2:
1555
			case 2:
1556
				{
1556
				{
1557
					AddCockpit ^cockpit = gcnew AddCockpit();
1557
					AddCockpit ^cockpit = gcnew AddCockpit();
1558
					if ( edit )
1558
					if ( edit )
1559
						cockpit->SetEdit(m_pSelectedItem->Text, SystemStringFromCyString(CyStringFromSystemString(m_pSelectedItem->SubItems[2]->Text).GetToken(";", 8, 8)), CyStringFromSystemString(m_pSelectedItem->SubItems[2]->Text).GetToken(&quot;;", 9, 9).ToInt());
1559
						cockpit->SetEdit(m_pSelectedItem->Text, _US(_WS(m_pSelectedItem->SubItems[2]->Text).token(L";", 8)), _WS(m_pSelectedItem->SubItems[2]->Text).token(L&quot;;", 9).toInt());
1560
					if ( cockpit->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1560
					if ( cockpit->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1561
					{
1561
					{
1562
						if ( !edit )
1562
						if ( !edit )
1563
						{
1563
						{
1564
							xsp->NewCockpit(_S(cockpit->GetID()), _S(cockpit->GetScene()), cockpit->GetMask());
1564
							xsp->NewCockpit(_S(cockpit->GetID()), _S(cockpit->GetScene()), cockpit->GetMask());
1565
							this->UpdateShipPartList();
1565
							this->UpdateShipPartList();
1566
						}
1566
						}
1567
						else
1567
						else
1568
						{
1568
						{
1569
							xsp->EditCockpit(_S(cockpit->GetID()), _S(cockpit->GetScene()), cockpit->GetMask());
1569
							xsp->EditCockpit(_S(cockpit->GetID()), _S(cockpit->GetScene()), cockpit->GetMask());
1570
							m_pSelectedItem->SubItems[2]->Text = SystemStringFromCyString(xsp->GetCockpitData(_S(cockpit->GetID())));
1570
							m_pSelectedItem->SubItems[2]->Text = _US(xsp->GetCockpitData(_S(cockpit->GetID())));
1571
						}
1571
						}
1572
					}
1572
					}
1573
				}
1573
				}
1574
				break;
1574
				break;
1575
 
1575
 
1576
			case 3:
1576
			case 3:
1577
				{
1577
				{
1578
					if ( edit )
1578
					if ( edit )
1579
					{
1579
					{
1580
						InputBox ^input2 = gcnew InputBox("Enter the filename for cut id: " + SystemStringFromCyString(CyStringFromSystemString(m_pSelectedItem->Text).GetToken(";", 1, 1)), SystemStringFromCyString(CyStringFromSystemString(m_pSelectedItem->;Text).GetToken(";;", 2, 2)));
1580
						InputBox ^input2 = gcnew InputBox("Enter the filename for cut id: " + _US(_WS(m_pSelectedItem->Text).token(L";", 1)), _US(_WS(m_pSelectedItem->;Text).token(L";;", 2)));
1581
						if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1581
						if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )
1582
						{
1582
						{
1583
							xsp->removeCutData(_S(m_pSelectedItem->Text));
1583
							xsp->removeCutData(_S(m_pSelectedItem->Text));
1584
							xsp->addCutData(_S(m_pSelectedItem->Text).token(";", 1) + "; " + _S(input2->GetInput()));
1584
							xsp->addCutData(_S(m_pSelectedItem->Text).token(";", 1) + "; " + _S(input2->GetInput()));
1585
							this->UpdateShipPartList();
1585
							this->UpdateShipPartList();