Subversion Repositories spk

Rev

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

Rev 182 Rev 191
Line 196... Line 196...
196
					if ( m_pDirList->FindData(CyString::Number(i))->str != "-1" )
196
					if ( m_pDirList->FindData(CyString::Number(i))->str != "-1" )
197
						added = true;
197
						added = true;
198
				}
198
				}
199
 
199
 
200
				SGameExe *exe = p.GetGameExe()->GetGame(i);
200
				SGameExe *exe = p.GetGameExe()->GetGame(i);
201
				this->ComboGame->Items->Add(SystemStringFromCyString(exe->sName));
201
				this->ComboGame->Items->Add(_US(exe->sName));
202
				System::Windows::Forms::ToolStripMenuItem ^newMenu = gcnew System::Windows::Forms::ToolStripMenuItem;
202
				System::Windows::Forms::ToolStripMenuItem ^newMenu = gcnew System::Windows::Forms::ToolStripMenuItem;
203
				newMenu->Text = SystemStringFromCyString(exe->sName);
203
				newMenu->Text = _US(exe->sName);
204
				this->gamesToolStripMenuItem->DropDownItems->Add(newMenu);
204
				this->gamesToolStripMenuItem->DropDownItems->Add(newMenu);
205
				System::Windows::Forms::ToolStripMenuItem ^newMenuDir = gcnew System::Windows::Forms::ToolStripMenuItem;
205
				System::Windows::Forms::ToolStripMenuItem ^newMenuDir = gcnew System::Windows::Forms::ToolStripMenuItem;
206
				if ( added )
206
				if ( added )
207
					newMenuDir->Text = SystemStringFromCyString(m_pDirList->FindData(CyString::Number(i))->str);
207
					newMenuDir->Text = _US(m_pDirList->FindData(Utils::String::Number(i))->str.ToString());
208
				else
208
				else
209
					newMenuDir->Text = "No Directory";
209
					newMenuDir->Text = "No Directory";
210
				newMenuDir->Enabled = false;
210
				newMenuDir->Enabled = false;
211
				newMenu->DropDownItems->Add(newMenuDir);
211
				newMenu->DropDownItems->Add(newMenuDir);
212
				newMenu->DropDownItems->Add(gcnew System::Windows::Forms::ToolStripSeparator);
212
				newMenu->DropDownItems->Add(gcnew System::Windows::Forms::ToolStripSeparator);
213
				System::Windows::Forms::ToolStripMenuItem ^newMenuChange = gcnew System::Windows::Forms::ToolStripMenuItem;
213
				System::Windows::Forms::ToolStripMenuItem ^newMenuChange = gcnew System::Windows::Forms::ToolStripMenuItem;
214
				newMenuChange->Text = "Set Directory";
214
				newMenuChange->Text = "Set Directory";
215
				newMenuChange->Tag = SystemStringFromCyString(CyString::Number(i)) + " " + SystemStringFromCyString(exe->sName);
215
				newMenuChange->Tag = _US(Utils::String::Number(i)) + " " + _US(exe->sName);
216
				newMenuChange->Click += gcnew System::EventHandler(this, &Form1::Event_ChangeDirectory);
216
				newMenuChange->Click += gcnew System::EventHandler(this, &Form1::Event_ChangeDirectory);
217
				newMenu->DropDownItems->Add(newMenuChange);
217
				newMenu->DropDownItems->Add(newMenuChange);
218
 
218
 
219
				if ( added )
219
				if ( added )
220
				{
220
				{
221
					System::Windows::Forms::ToolStripMenuItem ^newMenuRemove = gcnew System::Windows::Forms::ToolStripMenuItem;
221
					System::Windows::Forms::ToolStripMenuItem ^newMenuRemove = gcnew System::Windows::Forms::ToolStripMenuItem;
222
					newMenu->DropDownItems->Add(newMenuRemove);
222
					newMenu->DropDownItems->Add(newMenuRemove);
223
					newMenuRemove->Text = "Remove Directory";
223
					newMenuRemove->Text = "Remove Directory";
224
					newMenuRemove->Tag = SystemStringFromCyString(CyString::Number(i)) + " " + SystemStringFromCyString(exe->sName);
224
					newMenuRemove->Tag = _US(Utils::String::Number(i)) + " " + _US(exe->sName);
225
					newMenuRemove->Click += gcnew System::EventHandler(this, &Form1::Event_RemoveDirectory);
225
					newMenuRemove->Click += gcnew System::EventHandler(this, &Form1::Event_RemoveDirectory);
226
				}
226
				}
227
			}
227
			}
228
		}
228
		}
229
 
229
 
230
		void UpdateTitle()
230
		void UpdateTitle()
231
		{
231
		{
232
			System::String ^title = "XSP Convertor V" + SystemStringFromCyString(CyString::CreateFromFloat((float)VERSION, 2));
232
			System::String ^title = "XSP Convertor V" + _US(Utils::String::FromFloat((float)VERSION, 2));
233
			if ( m_pLoadedShip )
233
			if ( m_pLoadedShip )
234
			{
234
			{
235
				if ( m_bChanged || m_pLoadedShip->hasChanged() )
235
				if ( m_bChanged || m_pLoadedShip->hasChanged() )
236
					this->Text = title + " [*" + _US(m_pLoadedShip->filename()) + "]";
236
					this->Text = title + " [*" + _US(m_pLoadedShip->filename()) + "]";
237
				else
237
				else
Line 375... Line 375...
375
 
375
 
376
			for ( int i = 0; i < 32; i++ )
376
			for ( int i = 0; i < 32; i++ )
377
			{
377
			{
378
				if ( lasers.Count() > i )
378
				if ( lasers.Count() > i )
379
				{
379
				{
380
					this->WeaponList->Items->Add(SystemStringFromCyString(lasers.GetAt(i)->data));
380
					this->WeaponList->Items->Add(_US(lasers.GetAt(i)->data.ToString()));
381
					this->CockpitWeapons->Items->Add(SystemStringFromCyString(lasers.GetAt(i)->data));
381
					this->CockpitWeapons->Items->Add(_US(lasers.GetAt(i)->data.ToString()));
382
					addedLaser = true;
382
					addedLaser = true;
383
				}
383
				}
384
 
384
 
385
				if ( missiles.Count() > i )
385
				if ( missiles.Count() > i )
386
				{
386
				{
387
					this->MissileList->Items->Add(SystemStringFromCyString(missiles.GetAt(i)->data));
387
					this->MissileList->Items->Add(_US(missiles.GetAt(i)->data.ToString()));
388
					addedMissile = true;
388
					addedMissile = true;
389
				}
389
				}
390
 
390
 
391
				if ( !addedLaser )
391
				if ( !addedLaser )
392
				{
392
				{
393
					this->WeaponList->Items->Add(SystemStringFromCyString(CyString::Number(i + 1)));
393
					this->WeaponList->Items->Add(_US(Utils::String::Number(i + 1)));
394
					this->CockpitWeapons->Items->Add(SystemStringFromCyString(CyString::Number(i + 1)));
394
					this->CockpitWeapons->Items->Add(_US(Utils::String::Number(i + 1)));
395
				}
395
				}
396
				if ( !addedMissile )
396
				if ( !addedMissile )
397
					this->MissileList->Items->Add(SystemStringFromCyString(CyString::Number(i + 1)));
397
					this->MissileList->Items->Add(_US(Utils::String::Number(i + 1)));
398
			}
398
			}
399
		}
399
		}
400
 
400
 
401
		void OpenFile(System::String ^open)
401
		void OpenFile(System::String ^open)
402
		{
402
		{
Line 684... Line 684...
684
						fbd->Description = "Select the path for " + _US(exe->sName);
684
						fbd->Description = "Select the path for " + _US(exe->sName);
685
						if ( fbd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
685
						if ( fbd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
686
						{
686
						{
687
							CDirIO Dir(_S(fbd->SelectedPath));
687
							CDirIO Dir(_S(fbd->SelectedPath));
688
							if ( !Dir.exists(exe->sExe) )
688
							if ( !Dir.exists(exe->sExe) )
689
								MessageBox::Show(this, "Unable to find " + SystemStringFromCyString(exe->sExe) + " in " + fbd->SelectedPath, "Game Directory", MessageBoxButtons::OK, MessageBoxIcon::Warning);
689
								MessageBox::Show(this, "Unable to find " + _US(exe->sExe) + " in " + fbd->SelectedPath, "Game Directory", MessageBoxButtons::OK, MessageBoxIcon::Warning);
690
							else
690
							else
691
								m_pDirList->PushBack(CyStringFromSystemString(fbd->SelectedPath), CyString::Number(i));
691
								m_pDirList->PushBack(CyStringFromSystemString(fbd->SelectedPath), CyString::Number(i));
692
						}
692
						}
693
					}
693
					}
694
					else
694
					else
Line 817... Line 817...
817
		void Event_ChangeDirectory(System::Object ^sender, System::EventArgs ^E)
817
		void Event_ChangeDirectory(System::Object ^sender, System::EventArgs ^E)
818
		{
818
		{
819
			System::Windows::Forms::ToolStripMenuItem ^item = cli::safe_cast<System::Windows::Forms::ToolStripMenuItem ^>(sender);
819
			System::Windows::Forms::ToolStripMenuItem ^item = cli::safe_cast<System::Windows::Forms::ToolStripMenuItem ^>(sender);
820
			if ( item )
820
			if ( item )
821
			{
821
			{
822
				CyString tag = CyStringFromSystemString(cli::safe_cast<System::String ^>(item->Tag));
822
				Utils::String tag = _S(cli::safe_cast<System::String ^>(item->Tag));
823
				CyString game = tag.GetToken(" ", 1, 1);
823
				Utils::String game = tag.token(" ", 1);
824
				if ( m_pDirList->FindData(game) )
824
				if ( m_pDirList->FindData(game) )
825
				{
825
				{
826
					FolderBrowserDialog ^fbd = gcnew FolderBrowserDialog;
826
					FolderBrowserDialog ^fbd = gcnew FolderBrowserDialog;
827
					fbd->Description = "Select the path for " + SystemStringFromCyString(tag.GetToken(" ", 2));
827
					fbd->Description = "Select the path for " + _US(tag.tokens(" ", 2));
828
					if ( fbd->ShowDialog() == System::Windows::Forms::DialogResult::OK )
828
					if ( fbd->ShowDialog() == System::Windows::Forms::DialogResult::OK )
829
					{
829
					{
830
						m_pDirList->FindData(game)->str = CyStringFromSystemString(fbd->SelectedPath);
830
						m_pDirList->FindData(game)->str = _S(fbd->SelectedPath);
831
						this->UpdateGames();
831
						this->UpdateGames();
832
					}					
832
					}					
833
				}
833
				}
834
			}
834
			}
835
		}
835
		}