WebSVN – spk – Diff – /Creator/src/Forms/Options.h

 #pragma once
+#include "GameDirectories.h"
 using namespace System;
 using namespace System::ComponentModel;
 using namespace System::Collections;
 using namespace System::Windows::Forms;
 using namespace System::Data;
 using namespace System::Drawing;
-typedef struct SGameDir {
-	bool			bLoad;
-	Utils::String	dir;
-	Utils::String	name;
-	int				iGame;
-	CVirtualFileSystem *pVfs;
-} SGameDir;
 namespace Creator {
 	typedef struct SSettings {
 		bool	bGenerateUpdate;
 	} SSettings;
 	///          resources associated with this form.
 	/// </summary>
 	public ref class Options : public System::Windows::Forms::Form
+	{
 	public:
-		Options(ImageList ^gameImages, CLinkList<SGameDir> *gameDir, CPackages *p, SSettings *set)
+		Options(ImageList ^gameImages, CGameDirectories *gameDir, CPackages *p, SSettings *set)
+		{
 			InitializeComponent();
 			m_bLoadText = false;
 			m_pGameImages = gameImages;
-			m_pGameDir = gameDir;
+			_pGameDir = gameDir;
 			m_pP = p;
 			this->Init();
 			this->ListGameDir->LargeImageList = this->m_pGameImages;
 			this->ListGameDir->SmallImageList = this->m_pGameImages;
+						}
+					}
 					delete lines;
+				}
 			}
+		}
 		void UpdateGameDirs()
+		{
 			this->ListGameDir->Items->Clear();
-			for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
+			for ( Utils::String dir = _pGameDir->first(); !dir.empty(); dir = _pGameDir->next() ) {
-			{
-				ListViewItem ^item = gcnew ListViewItem(_US(gd->dir));
+				ListViewItem ^item = gcnew ListViewItem(_US(dir));
-				item->ImageIndex = gd->iGame;
+				item->ImageIndex = _pGameDir->currentGame();
-				item->SubItems->Add(_US(gd->name));
+				item->SubItems->Add(_US(_pGameDir->currentName()));
-				if ( gd->bLoad )
+				if ( _pGameDir->currentLoad() )
 					item->SubItems->Add("Yes");
 				else
 					item->SubItems->Add("No");
 				this->ListGameDir->Items->Add(item);
 			}
 			this->ListGameDir->AutoResizeColumns(ColumnHeaderAutoResizeStyle::HeaderSize);
 			this->columnHeader3->Width = 100;
 			this->columnHeader1->Width += 50;
 			this->ButClear->Enabled = (this->ListGameDir->Items->Count) ? true : false;
+		}
 		void AddDir(String ^sDir, bool ask, bool load)
+		{
 			Utils::String dir = _S(sDir);
-			CyString exe;
-			CyString game = m_pP->GetGameName(dir);
+			Utils::String game = m_pP->GetGameName(dir).ToString();
 			int iGame = m_pP->GetGameExe()->GetGameType(dir);
 			dir = m_pP->GetGameExe()->GetProperDir(dir);
 			dir = dir.findReplace("\\", "/");
 			dir = dir.findReplace("//", "/");
-			bool found = false;
-			for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-			{
-				if ( gd->dir == dir )
-				{
-					found = true;
-					break;
-				}
-			}
-			if ( !found )
-			{
-				SGameDir *gd = new SGameDir;
-				gd->dir = dir;
-				gd->name = game.ToString();
-				gd->iGame = iGame;
-				gd->pVfs = new CVirtualFileSystem();
-				gd->pVfs->setLanguage(44);
-				gd->pVfs->LoadFilesystem(gd->dir);
-				SGameExe *exe = m_pP->GetGameExe()->GetGame(gd->iGame);
-				if ( exe ) gd->pVfs->SetAddon(exe->sAddon);
-				gd->bLoad = (ask) ? false : load;
-				m_pGameDir->push_back(gd);
+			SGameExe *exe = m_pP->GetGameExe()->GetGame(iGame);
-				if ( ask )
+			if ( !_pGameDir->isDir(dir) && ask ) {
+				if ( MessageBox::Show(this, "Do you want to load text from this directory\n" + _US(dir), "Load Game Text", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes )
+				{
-					if ( MessageBox::Show(this, "Do you want to load text from this directory\n" + _US(dir), "Load Game Text", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == System::Windows::Forms::DialogResult::Yes )
-					{
-						gd->bLoad = true;
+					load = true;
-						m_bLoadText = true;
+					m_bLoadText = true;
-					}
+				}
+			}
+			if ( _pGameDir->add(dir, game, iGame, (exe) ? exe->sAddon : Utils::String::Null(), load) ) {
 				this->UpdateGameDirs();
+			}
+		}
 		void AddNewDir()
 	private: System::Windows::Forms::ColumnHeader^  columnHeader2;
 	private: System::Windows::Forms::ColumnHeader^  columnHeader3;
 	private: System::Windows::Forms::Panel^  panel3;
 	private: System::Windows::Forms::Button^  button3;
 	private: System::Windows::Forms::Button^  button2;
 	private: System::Windows::Forms::Label^  label1;
 	private: System::ComponentModel::IContainer^  components;
 	protected:
 	private:
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
 		ImageList ^m_pGameImages;
-		CLinkList<SGameDir> *m_pGameDir;
+		CGameDirectories *_pGameDir;
 		ListViewItem ^m_pSelectedItem;
 		CyStringList *m_sDirs;
 	private: System::Windows::Forms::ToolTip^  toolTip1;
 	private: System::Windows::Forms::ContextMenuStrip^  contextMenuStrip1;
 #pragma endregion
 	private: System::Void listView1_MouseDoubleClick(System::Object^  sender, System::Windows::Forms::MouseEventArgs^  e) {
 			 for ( int i = 0; i < this->ListGameDir->SelectedItems->Count; i++ )
+			 {
 				 Utils::String dir = _S(this->ListGameDir->SelectedItems[i]->Text);
-				for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				{
-					if ( gd->dir.Compare(dir) )
+				 if ( _pGameDir->findDir(dir) ) {
-					{
-						gd->bLoad = !gd->bLoad;
+					 _pGameDir->setLoad(!_pGameDir->currentLoad());
-						if ( gd->bLoad )
+					if ( _pGameDir->currentLoad() )
-							this->ListGameDir->SelectedItems[i]->SubItems[2]->Text = "Yes";
+						this->ListGameDir->SelectedItems[i]->SubItems[2]->Text = "Yes";
-						else
+					else
-							this->ListGameDir->SelectedItems[i]->SubItems[2]->Text = "No";
+						this->ListGameDir->SelectedItems[i]->SubItems[2]->Text = "No";
-						break;
-					}
+				 }
-				}
+			 }
+		 }
 private: System::Void button1_Click(System::Object^  sender, System::EventArgs^  e) {
 			 this->contextMenuStrip2->Show(this->button1, this->button1->PointToClient(this->button1->MousePosition));
+		 }
 private: System::Void ListGameDir_SelectedIndexChanged(System::Object^  sender, System::EventArgs^  e) {
 			this->ButDel->Enabled = (this->ListGameDir->SelectedItems->Count) ? true : false;
+		 }
 private: System::Void ButClear_Click(System::Object^  sender, System::EventArgs^  e) {
-			 m_pGameDir->MemoryClear();
+			 _pGameDir->clear();
 			 this->UpdateGameDirs();
+		 }
 private: System::Void ButDel_Click(System::Object^  sender, System::EventArgs^  e) {
 			 for ( int i = 0; i < this->ListGameDir->SelectedItems->Count; i++ )
+			 {
 				 Utils::String dir = _S(this->ListGameDir->SelectedItems[i]->Text);
-				for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				{
-					if ( gd->dir.Compare(dir) )
-					{
-						m_pGameDir->RemoveCurrent();
+				 _pGameDir->remove(dir);
-						break;
-					}
-				}
+			 }
 			 this->UpdateGameDirs();
+		 }
 private: System::Void toolTip1_Popup(System::Object^  sender, System::Windows::Forms::PopupEventArgs^  e) {
+		 }
 			this->clearAllToolStripMenuItem->Visible = (this->ListGameDir->Items->Count) ? true : false;
 			this->toolStripSeparator1->Visible = (this->ListGameDir->Items->Count) ? true : false;
 			 for ( int i = (this->addDirectoryToolStripMenuItem->DropDownItems->Count - 1); i >= 2; --i )
 				 this->addDirectoryToolStripMenuItem->DropDownItems->RemoveAt(i);
 			 // add any unadded directories
 			 System::ComponentModel::ComponentResourceManager^  resources = (gcnew System::ComponentModel::ComponentResourceManager(Options::typeid));
 			 for ( SStringList *str = m_sDirs->Head(); str; str = str->next )
+			 {
-				 bool found = false;
-				 for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				 {
-					 if ( gd->dir.Compare(str->str.ToString()) )
+				 if ( !_pGameDir->isDir(str->str.ToString()) ) {
-					 {
-						 found = true;
-						 break;
-					 }
-				 }
-				 if ( !found )
-				 {
 					 ToolStripMenuItem ^newItem = gcnew ToolStripMenuItem();
 					 newItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"testDirToolStripMenuItem.Image")));
 					 newItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 					 newItem->Text = SystemStringFromCyString(str->str) + " (" + SystemStringFromCyString(str->data) + ")";
 					 newItem->Tag = SystemStringFromCyString(str->str);
 					 newItem->Click += gcnew System::EventHandler(this, &Options::testDirToolStripMenuItem_Click);
 					 this->addDirectoryToolStripMenuItem->DropDownItems->Add(newItem);
 				 }
+			 }
 			 this->toolStripSeparator4->Visible = true;
 			 if ( this->addDirectoryToolStripMenuItem->DropDownItems->Count == 2 )
 				 this->toolStripSeparator4->Visible = false;
+		 }
 private: System::Void addDirectoryToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			 this->AddNewDir();
+		 }
 private: System::Void clearAllToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
-			 m_pGameDir->MemoryClear();
+			 _pGameDir->clear();
 			 this->UpdateGameDirs();
+		 }
 private: System::Void removeSelectedToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			 for ( int i = 0; i < this->ListGameDir->SelectedItems->Count; i++ )
+			 {
 				 Utils::String dir = _S(this->ListGameDir->SelectedItems[i]->Text);
-				for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				{
-					if ( gd->dir.Compare(dir) )
-					{
-						m_pGameDir->RemoveCurrent();
+				 _pGameDir->remove(dir);
-						break;
-					}
-				}
+			 }
 			 this->UpdateGameDirs();
+		 }
 private: System::Void yesToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
-				for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				{
-					if ( gd->dir.Compare(_S(m_pSelectedItem->Text)) )
+			 if ( _pGameDir->findDir(_S(m_pSelectedItem->Text)) ) {
-					{
-						gd->bLoad = true;
+				 _pGameDir->setLoad(true);
-						m_pSelectedItem->SubItems[2]->Text = "Yes";
+				m_pSelectedItem->SubItems[2]->Text = "Yes";
-						break;
-					}
-				}
+			 }
+		 }
 private: System::Void noToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
-				for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				{
-					if ( gd->dir.Compare(_S(m_pSelectedItem->Text)) )
+			 if ( _pGameDir->findDir(_S(m_pSelectedItem->Text)) ) {
-					{
-						gd->bLoad = false;
+				 _pGameDir->setLoad(false);
-						m_pSelectedItem->SubItems[2]->Text = "No";
+				m_pSelectedItem->SubItems[2]->Text = "No";
-						break;
-					}
-				}
+			 }
+		 }
 private: System::Void addDirectoryToolStripMenuItem1_Click(System::Object^  sender, System::EventArgs^  e) {
 			 this->AddNewDir();
+		 }
 private: System::Void contextMenuStrip2_Opening(System::Object^  sender, System::ComponentModel::CancelEventArgs^  e) {
 			 // add any unadded directories
 			 System::ComponentModel::ComponentResourceManager^  resources = (gcnew System::ComponentModel::ComponentResourceManager(Options::typeid));
 			 for ( SStringList *str = m_sDirs->Head(); str; str = str->next )
+			 {
-				 bool found = false;
-				 for ( SGameDir *gd = m_pGameDir->First(); gd; gd = m_pGameDir->Next() )
-				 {
-					 if ( gd->dir.Compare(str->str.ToString()) )
+				 if ( !_pGameDir->isDir(m_pP->GetGameExe()->GetProperDir(str->str.ToString())) ) {
-					 {
-						 found = true;
-						 break;
-					 }
-				 }
-				 if ( !found )
-				 {
 					 ToolStripMenuItem ^newItem = gcnew ToolStripMenuItem();
 					 newItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"testDirToolStripMenuItem.Image")));
 					 newItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 					 newItem->Text = SystemStringFromCyString(str->str) + " (" + SystemStringFromCyString(str->data) + ")";
 					 newItem->Tag = SystemStringFromCyString(str->str);

Subversion Repositories spk

(root)/Creator/src/Forms/Options.h – Rev 68 → 94