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



		this->ListWareText->Items->Clear();
		this->splitContainer1->Panel2Collapsed = true;
 
		if ( this->ListWares->SelectedItems->Count )
		{
			SWares *w = ((CSpkFile *)m_pPackage)->findWare(_WS(this->ListWares->SelectedItems[0]->Text));
			if ( w )
			{
				if ( w->iTextPage <= 0 && w->iTextID <= 0 )
				{			
					this->ListWareText->Items->Clear();

				this->ColumnPart1->Text = "ID";
				this->ColumnPart2->Text = "Index";
				this->ColumnPart3->Text = "Data";
				for ( SCockpit *c = xsp->GetCockpits()->First(); c; c = xsp->GetCockpits()->Next() )
				{
					Utils::WString cName = c->sCockpit;
					cName = cName.token(L";", -2);
					while ( cName.right(1) == L";" )
						cName.truncate(-1);
					ListViewItem ^item = gcnew ListViewItem(_US(cName));
					if ( c->iIndex == -1 )
						item->SubItems->Add("<PACKAGE>");
					else

				numColums = 2;
				this->ColumnPart1->Text = "Section";
				this->ColumnPart2->Text = "Bodies";
				for(auto itr = xsp->getBodies().begin(); itr != xsp->getBodies().end(); itr++)
				{
					ListViewItem ^item = gcnew ListViewItem(_US((*itr)->str.token(L";", 1)));
					item->SubItems->Add(_US((*itr)->str.tokens(L";", 2)));
					item->ImageKey = "bodies";
					this->ListShipPart->Items->Add(item);
				}
				break;
			case 5: // Animations

					}
 
					if ( component->ShowDialog(this) == Windows::Forms::DialogResult::OK )
					{
						if ( edit )
							xsp->removeComponent(_WS(m_pSelectedItem->Text), _WS(m_pSelectedItem->SubItems[1]->Text), _WS(m_pSelectedItem->SubItems[2]->Text));
						xsp->addComponent(_WS(component->GetSection()), _WS(component->GetSection2()), _WS(component->GetData()));
						if ( !edit )
							this->UpdateShipPartList();
						else
						{
							m_pSelectedItem->Text = component->GetSection();

					}
 
					if ( dummy->ShowDialog(this) == Windows::Forms::DialogResult::OK )
					{
						if ( edit )
							xsp->removeDummy(_WS(m_pSelectedItem->Text), _WS(m_pSelectedItem->SubItems[1]->Text));
						xsp->addDummy(_WS(dummy->GetSection()), _WS(dummy->GetData()));
						if ( !edit )
							this->UpdateShipPartList();
						else
						{
							m_pSelectedItem->Text = dummy->GetSection();

					if ( edit )
					{
						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)));
						if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )
						{
							xsp->removeCutData(_WS(m_pSelectedItem->Text));
							xsp->addCutData(_WS(m_pSelectedItem->Text).token(L";", 1) + L"; " + _WS(input2->GetInput()));
							this->UpdateShipPartList();
						}
					}
					else
					{

						if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )
						{
							InputBox ^input2 = gcnew InputBox("Enter the filename for cut id: " + input->GetInput());
							if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )
							{
								xsp->addCutData(_WS(input->GetInput() + L"; " + input2->GetInput()));
								this->UpdateShipPartList();
							}
						}
					}
				}

					InputBox ^input = gcnew InputBox("Enter the animation data to add", (!edit) ? "" : m_pSelectedItem->Text);
					input->Large();
					if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )
					{
						if ( edit )
							xsp->removeAnimation(_WS(m_pSelectedItem->Text));
						xsp->addAnimation(_S(input->GetInput()));
						this->UpdateShipPartList();
					}
				}
				break;

 
		if ( load->ShowDialog(this) == Windows::Forms::DialogResult::OK )
		{
			for(auto itr = load->GetDataList()->begin(); itr != load->GetDataList()->end(); itr++)
			{
				Utils::WString data = list.findString((*itr)->str);
				if (!data.empty())
				{
					switch ( type )
					{
						case 0:
							((CXspFile *)m_pPackage)->addComponent(data.token(L";", 1), data.token(L";", 2), data.tokens(L";", 3));
							break;
						case 2:
							((CXspFile *)m_pPackage)->addCockpit(data.tokens(L" ", 2), 0, -1, data.token(L" ", 1).toInt());
							break;
						case 3:
							((CXspFile *)m_pPackage)->addCutData(data.tokens(L" ", 2));
							break;
						case 4:
							((CXspFile *)m_pPackage)->addBodies(data.tokens(L" ", 2));
							break;
						case 1:
							((CXspFile *)m_pPackage)->addDummy(data.tokens(L" ", 2).token(L";", 1), data.tokens(L" ", 2).tokens(L";", 2));
							break;
					}
				}
			}
 

Rev 214	Rev 216
Line 327...	Line 327...
327	`this->ListWareText->Items->Clear();`	327	`this->ListWareText->Items->Clear();`
328	`this->splitContainer1->Panel2Collapsed = true;`	328	`this->splitContainer1->Panel2Collapsed = true;`
329		329
330	`if ( this->ListWares->SelectedItems->Count )`	330	`if ( this->ListWares->SelectedItems->Count )`
331	`{`	331	`{`
332	`SWares w = ((CSpkFile )m_pPackage)->FindWare(CyStringFromSystemString(this->ListWares->SelectedItems[0]->Text).ToString());`	332	`SWares w = ((CSpkFile )m_pPackage)->findWare(_WS(this->ListWares->SelectedItems[0]->Text));`
333	`if ( w )`	333	`if ( w )`
334	`{`	334	`{`
335	`if ( w->iTextPage <= 0 && w->iTextID <= 0 )`	335	`if ( w->iTextPage <= 0 && w->iTextID <= 0 )`
336	`{`	336	`{`
337	`this->ListWareText->Items->Clear();`	337	`this->ListWareText->Items->Clear();`
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	`Utils::String cName = c->sCockpit;`	563	`Utils::WString cName = c->sCockpit;`
564	`cName = cName.token(";", -2);`	564	`cName = cName.token(L";", -2);`
565	`while ( cName.right(1) == ";" )`	565	`while ( cName.right(1) == L";" )`
566	`cName.truncate(-1);`	566	`cName.truncate(-1);`
567	`ListViewItem ^item = gcnew ListViewItem(_US(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`
Line 588...	Line 588...
588	`numColums = 2;`	588	`numColums = 2;`
589	`this->ColumnPart1->Text = "Section";`	589	`this->ColumnPart1->Text = "Section";`
590	`this->ColumnPart2->Text = "Bodies";`	590	`this->ColumnPart2->Text = "Bodies";`
591	`for(auto itr = xsp->getBodies().begin(); itr != xsp->getBodies().end(); itr++)`	591	`for(auto itr = xsp->getBodies().begin(); itr != xsp->getBodies().end(); itr++)`
592	`{`	592	`{`
593	`ListViewItem ^item = gcnew ListViewItem(_US((*itr)->str.token(";", 1)));`	593	`ListViewItem ^item = gcnew ListViewItem(_US((*itr)->str.token(L";", 1)));`
594	`item->SubItems->Add(_US((*itr)->str.tokens(";", 2)));`	594	`item->SubItems->Add(_US((*itr)->str.tokens(L";", 2)));`
595	`item->ImageKey = "bodies";`	595	`item->ImageKey = "bodies";`
596	`this->ListShipPart->Items->Add(item);`	596	`this->ListShipPart->Items->Add(item);`
597	`}`	597	`}`
598	`break;`	598	`break;`
599	`case 5: // Animations`	599	`case 5: // Animations`
Line 1510...	Line 1510...
1510	`}`	1510	`}`
1511		1511
1512	`if ( component->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1512	`if ( component->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1513	`{`	1513	`{`
1514	`if ( edit )`	1514	`if ( edit )`
1515	`xsp->removeComponent(_S(m_pSelectedItem->Text), _S(m_pSelectedItem->SubItems[1]->Text), _S(m_pSelectedItem->SubItems[2]->Text));`	1515	`xsp->removeComponent(_WS(m_pSelectedItem->Text), _WS(m_pSelectedItem->SubItems[1]->Text), _WS(m_pSelectedItem->SubItems[2]->Text));`
1516	`xsp->AddComponent(_S(component->GetSection()), _S(component->GetSection2()), _S(component->GetData()));`	1516	`xsp->addComponent(_WS(component->GetSection()), _WS(component->GetSection2()), _WS(component->GetData()));`
1517	`if ( !edit )`	1517	`if ( !edit )`
1518	`this->UpdateShipPartList();`	1518	`this->UpdateShipPartList();`
1519	`else`	1519	`else`
1520	`{`	1520	`{`
1521	`m_pSelectedItem->Text = component->GetSection();`	1521	`m_pSelectedItem->Text = component->GetSection();`
Line 1537...	Line 1537...
1537	`}`	1537	`}`
1538		1538
1539	`if ( dummy->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1539	`if ( dummy->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1540	`{`	1540	`{`
1541	`if ( edit )`	1541	`if ( edit )`
1542	`xsp->removeDummy(_S(m_pSelectedItem->Text), _S(m_pSelectedItem->SubItems[1]->Text));`	1542	`xsp->removeDummy(_WS(m_pSelectedItem->Text), _WS(m_pSelectedItem->SubItems[1]->Text));`
1543	`xsp->AddDummy(_S(dummy->GetSection()), _S(dummy->GetData()));`	1543	`xsp->addDummy(_WS(dummy->GetSection()), _WS(dummy->GetData()));`
1544	`if ( !edit )`	1544	`if ( !edit )`
1545	`this->UpdateShipPartList();`	1545	`this->UpdateShipPartList();`
1546	`else`	1546	`else`
1547	`{`	1547	`{`
1548	`m_pSelectedItem->Text = dummy->GetSection();`	1548	`m_pSelectedItem->Text = dummy->GetSection();`
Line 1578...	Line 1578...
1578	`if ( edit )`	1578	`if ( edit )`
1579	`{`	1579	`{`
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)));`	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(_WS(m_pSelectedItem->Text));`
1584	`xsp->addCutData(_S(m_pSelectedItem->Text).token(";", 1) + "; " + _S(input2->GetInput()));`	1584	`xsp->addCutData(_WS(m_pSelectedItem->Text).token(L";", 1) + L"; " + _WS(input2->GetInput()));`
1585	`this->UpdateShipPartList();`	1585	`this->UpdateShipPartList();`
1586	`}`	1586	`}`
1587	`}`	1587	`}`
1588	`else`	1588	`else`
1589	`{`	1589	`{`
Line 1591...	Line 1591...
1591	`if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1591	`if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1592	`{`	1592	`{`
1593	`InputBox ^input2 = gcnew InputBox("Enter the filename for cut id: " + input->GetInput());`	1593	`InputBox ^input2 = gcnew InputBox("Enter the filename for cut id: " + input->GetInput());`
1594	`if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1594	`if ( input2->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1595	`{`	1595	`{`
1596	`xsp->addCutData(_S(input->GetInput() + "; " + input2->GetInput()));`	1596	`xsp->addCutData(_WS(input->GetInput() + L"; " + input2->GetInput()));`
1597	`this->UpdateShipPartList();`	1597	`this->UpdateShipPartList();`
1598	`}`	1598	`}`
1599	`}`	1599	`}`
1600	`}`	1600	`}`
1601	`}`	1601	`}`
Line 1633...	Line 1633...
1633	`InputBox ^input = gcnew InputBox("Enter the animation data to add", (!edit) ? "" : m_pSelectedItem->Text);`	1633	`InputBox ^input = gcnew InputBox("Enter the animation data to add", (!edit) ? "" : m_pSelectedItem->Text);`
1634	`input->Large();`	1634	`input->Large();`
1635	`if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1635	`if ( input->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1636	`{`	1636	`{`
1637	`if ( edit )`	1637	`if ( edit )`
1638	`xsp->removeAnimation(_S(m_pSelectedItem->Text));`	1638	`xsp->removeAnimation(_WS(m_pSelectedItem->Text));`
1639	`xsp->addAnimation(_S(input->GetInput()));`	1639	`xsp->addAnimation(_S(input->GetInput()));`
1640	`this->UpdateShipPartList();`	1640	`this->UpdateShipPartList();`
1641	`}`	1641	`}`
1642	`}`	1642	`}`
1643	`break;`	1643	`break;`
Line 1849...	Line 1849...
1849		1849
1850	`if ( load->ShowDialog(this) == Windows::Forms::DialogResult::OK )`	1850	`if ( load->ShowDialog(this) == Windows::Forms::DialogResult::OK )`
1851	`{`	1851	`{`
1852	`for(auto itr = load->GetDataList()->begin(); itr != load->GetDataList()->end(); itr++)`	1852	`for(auto itr = load->GetDataList()->begin(); itr != load->GetDataList()->end(); itr++)`
1853	`{`	1853	`{`
1854	`Utils::String data = list.findString((*itr)->str);`	1854	`Utils::WString data = list.findString((*itr)->str);`
1855	`if (!data.empty())`	1855	`if (!data.empty())`
1856	`{`	1856	`{`
1857	`switch ( type )`	1857	`switch ( type )`
1858	`{`	1858	`{`
1859	`case 0:`	1859	`case 0:`
1860	`((CXspFile *)m_pPackage)->AddComponent(data.token(";", 1), data.token(";", 2), data.tokens(";", 3));`	1860	`((CXspFile *)m_pPackage)->addComponent(data.token(L";", 1), data.token(L";", 2), data.tokens(L";", 3));`
1861	`break;`	1861	`break;`
1862	`case 2:`	1862	`case 2:`
1863	`((CXspFile *)m_pPackage)->AddCockpit(data.tokens(" ", 2), 0, -1, data.token(" ", 1).toInt());`	1863	`((CXspFile *)m_pPackage)->addCockpit(data.tokens(L" ", 2), 0, -1, data.token(L" ", 1).toInt());`
1864	`break;`	1864	`break;`
1865	`case 3:`	1865	`case 3:`
1866	`((CXspFile *)m_pPackage)->addCutData(data.tokens(" ", 2));`	1866	`((CXspFile *)m_pPackage)->addCutData(data.tokens(L" ", 2));`
1867	`break;`	1867	`break;`
1868	`case 4:`	1868	`case 4:`
1869	`((CXspFile *)m_pPackage)->addBodies(data.tokens(" ", 2));`	1869	`((CXspFile *)m_pPackage)->addBodies(data.tokens(L" ", 2));`
1870	`break;`	1870	`break;`
1871	`case 1:`	1871	`case 1:`
1872	`((CXspFile *)m_pPackage)->AddDummy(data.tokens(" ", 2).token(";", 1), data.tokens(" ", 2).tokens(";", 2));`	1872	`((CXspFile *)m_pPackage)->addDummy(data.tokens(L" ", 2).token(L";", 1), data.tokens(L" ", 2).tokens(L";", 2));`
1873	`break;`	1873	`break;`
1874	`}`	1874	`}`
1875	`}`	1875	`}`
1876	`}`	1876	`}`
1877		1877

Subversion Repositories spk

(root)/Creator/src/Forms/PackageForm.cpp – Rev 214 → 216