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

 #include "CustomiseShip.h"
 #include "SelectGame.h"
 #undef GetTempPath
-#define DESIGNER
 namespace Creator {
 	/// <summary>
 	/// Summary for PackageForm
 	///
 	///          associated with all .resx files this class depends on.  Otherwise,
 	///          the designers will not be able to interact properly with localized
 	///          resources associated with this form.
 	/// </summary>
 	///
+	/*
 	public ref class PackageForm : public System::Windows::Forms::Form
+	#define DESIGNER
+	*/
-		/*
 #ifdef DESIGNER
 	public ref class PackageForm : public System::Windows::Forms::Form
 #else
 	public ref class PackageForm : public Creator::BaseForm
 #endif
-*/
+	{
 	public:
 		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)
 #ifndef DESIGNER
 			: BaseForm(parent, ctrl, page, tool, p, imagelist, set),
 			this->panel21->Name = L"panel21";
 			this->panel21->Size = System::Drawing::Size(518, 43);
 			this->panel21->TabIndex = 44;
 			//
 			// ComboVersion
 			//
 			this->ComboVersion->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboVersion->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboVersion->Enabled = false;
 			this->ComboVersion->FormattingEnabled = true;
 			this->ComboVersion->Location = System::Drawing::Point(0, 0);
 			this->tabGlobals->Text = L"Globals";
 			this->tabGlobals->UseVisualStyleBackColor = true;
 			//
 			// butGlobalClear
 			//
+			this->butGlobalClear->Dock = System::Windows::Forms::DockStyle::Right;
 			this->butGlobalClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"butGlobalClear.Image")));
-			this->butGlobalClear->Location = System::Drawing::Point(621, 156);
+			this->butGlobalClear->Location = System::Drawing::Point(624, 156);
 			this->butGlobalClear->Name = L"butGlobalClear";
-			this->butGlobalClear->Size = System::Drawing::Size(121, 36);
+			this->butGlobalClear->Size = System::Drawing::Size(121, 39);
 			this->butGlobalClear->TabIndex = 2;
 			this->butGlobalClear->Text = L"Clear All";
 			this->butGlobalClear->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->butGlobalClear->UseVisualStyleBackColor = true;
 			this->butGlobalClear->Click += gcnew System::EventHandler(this, &PackageForm::butGlobalClear_Click);
 			//
 			// butAddGlobal
 			//
+			this->butAddGlobal->Dock = System::Windows::Forms::DockStyle::Left;
 			this->butAddGlobal->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"butAddGlobal.Image")));
-			this->butAddGlobal->Location = System::Drawing::Point(6, 156);
+			this->butAddGlobal->Location = System::Drawing::Point(3, 156);
 			this->butAddGlobal->Name = L"butAddGlobal";
-			this->butAddGlobal->Size = System::Drawing::Size(121, 36);
+			this->butAddGlobal->Size = System::Drawing::Size(121, 39);
 			this->butAddGlobal->TabIndex = 1;
 			this->butAddGlobal->Text = L"Add New";
 			this->butAddGlobal->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->butAddGlobal->UseVisualStyleBackColor = true;
 			this->butAddGlobal->Click += gcnew System::EventHandler(this, &PackageForm::butAddGlobal_Click);
 			this->listGlobals->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) {
 				this->ColGlobalName,
 					this->ColGlobalValue
 			});
 			this->listGlobals->ContextMenuStrip = this->contextGlobal;
+			this->listGlobals->Dock = System::Windows::Forms::DockStyle::Top;
+			this->listGlobals->FullRowSelect = true;
 			this->listGlobals->HideSelection = false;
-			this->listGlobals->Location = System::Drawing::Point(6, 6);
+			this->listGlobals->Location = System::Drawing::Point(3, 3);
+			this->listGlobals->Margin = System::Windows::Forms::Padding(10);
+			this->listGlobals->MultiSelect = false;
 			this->listGlobals->Name = L"listGlobals";
-			this->listGlobals->Size = System::Drawing::Size(736, 144);
+			this->listGlobals->Size = System::Drawing::Size(742, 153);
 			this->listGlobals->TabIndex = 0;
 			this->listGlobals->UseCompatibleStateImageBehavior = false;
 			this->listGlobals->View = System::Windows::Forms::View::Details;
 			//
 			// ColGlobalName
 				this->addNewToolStripMenuItem,
 					this->toolStripSeparator6, this->editSelectedToolStripMenuItem1, this->removeSelectedToolStripMenuItem, this->toolStripSeparator7,
 					this->clearAllToolStripMenuItem2
 			});
 			this->contextGlobal->Name = L"contextGlobal";
-			this->contextGlobal->Size = System::Drawing::Size(169, 120);
+			this->contextGlobal->Size = System::Drawing::Size(185, 142);
+			this->contextGlobal->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &PackageForm::contextGlobal_Opening);
 			//
 			// addNewToolStripMenuItem
 			//
 			this->addNewToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"addNewToolStripMenuItem.Image")));
 			this->addNewToolStripMenuItem->Name = L"addNewToolStripMenuItem";
-			this->addNewToolStripMenuItem->Size = System::Drawing::Size(168, 26);
+			this->addNewToolStripMenuItem->Size = System::Drawing::Size(184, 26);
 			this->addNewToolStripMenuItem->Text = L"Add New";
+			this->addNewToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::addNewToolStripMenuItem_Click);
 			//
 			// toolStripSeparator6
 			//
 			this->toolStripSeparator6->Name = L"toolStripSeparator6";
-			this->toolStripSeparator6->Size = System::Drawing::Size(165, 6);
+			this->toolStripSeparator6->Size = System::Drawing::Size(181, 6);
 			//
 			// editSelectedToolStripMenuItem1
 			//
 			this->editSelectedToolStripMenuItem1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"editSelectedToolStripMenuItem1.Image")));
 			this->editSelectedToolStripMenuItem1->Name = L"editSelectedToolStripMenuItem1";
-			this->editSelectedToolStripMenuItem1->Size = System::Drawing::Size(168, 26);
+			this->editSelectedToolStripMenuItem1->Size = System::Drawing::Size(184, 26);
 			this->editSelectedToolStripMenuItem1->Text = L"Edit Selected";
+			this->editSelectedToolStripMenuItem1->Click += gcnew System::EventHandler(this, &PackageForm::editSelectedToolStripMenuItem1_Click);
 			//
 			// removeSelectedToolStripMenuItem
 			//
 			this->removeSelectedToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"removeSelectedToolStripMenuItem.Image")));
 			this->removeSelectedToolStripMenuItem->Name = L"removeSelectedToolStripMenuItem";
-			this->removeSelectedToolStripMenuItem->Size = System::Drawing::Size(168, 26);
+			this->removeSelectedToolStripMenuItem->Size = System::Drawing::Size(184, 26);
 			this->removeSelectedToolStripMenuItem->Text = L"Remove Selected";
+			this->removeSelectedToolStripMenuItem->Click += gcnew System::EventHandler(this, &PackageForm::removeSelectedToolStripMenuItem_Click);
 			//
 			// toolStripSeparator7
 			//
 			this->toolStripSeparator7->Name = L"toolStripSeparator7";
-			this->toolStripSeparator7->Size = System::Drawing::Size(165, 6);
+			this->toolStripSeparator7->Size = System::Drawing::Size(181, 6);
 			//
 			// clearAllToolStripMenuItem2
 			//
 			this->clearAllToolStripMenuItem2->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"clearAllToolStripMenuItem2.Image")));
 			this->clearAllToolStripMenuItem2->Name = L"clearAllToolStripMenuItem2";
-			this->clearAllToolStripMenuItem2->Size = System::Drawing::Size(168, 26);
+			this->clearAllToolStripMenuItem2->Size = System::Drawing::Size(184, 26);
 			this->clearAllToolStripMenuItem2->Text = L"Clear All";
+			this->clearAllToolStripMenuItem2->Click += gcnew System::EventHandler(this, &PackageForm::clearAllToolStripMenuItem2_Click);
 			//
 			// CheckShipID
 			//
 			this->CheckShipID->AutoSize = true;
 			this->CheckShipID->Dock = System::Windows::Forms::DockStyle::Left;
 			 this->UpdatePackageNames();
 			 this->UpdateChanged();
+		 }
 private: System::Void addToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			 InputBox ^input = gcnew InputBox("Enter the language id (ie 44)", "");
 			if ( input->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
+			{
 				InputBox ^input2 = gcnew InputBox("Enter the package name (Language: " + input->GetInput() + ")", "");
 				if ( input2->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
+				{
 					m_pPackage->addName(Convert::ToInt32(input->GetInput()), _WS(input2->GetInput()));
 			 this->UpdateChanged();
 			 this->UpdateRatings();
+		 }
 private: System::Void PicEase5_Click(System::Object^  sender, System::EventArgs^  e) {
 			 m_pPackage->setEaseOfUse(5);
 			 this->UpdateChanged();
 			 this->UpdateRatings();
 		 }
 private: System::Void PicRec1_Click(System::Object^  sender, System::EventArgs^  e) {
 			 m_pPackage->setRecommended(1);
 			 this->UpdateChanged();
 			 this->UpdateRatings();
+		 }
 				 if ( aw->GetID()->Length < 1 )
 					 MessageBox::Show(this, "Invalid ware ID, entry cant be empty", "Invalid Entry", MessageBoxButtons::OK, MessageBoxIcon::Warning);
 				 else
+				 {
 					 SWares *w = new SWares;
 					 w->iTextID = aw->GetTextID();
 					 w->iTextPage = aw->GetTextPage();
 					 w->cType = CPackages::ConvertWareTypeBack(aw->GetType());
 					 w->iNotority = aw->GetMinNotoriety();
 					 w->iPrice = aw->GetPrice();
 					 w->iVolumn = aw->GetVolumn();
 					 w->iSize = aw->GetSize();
 					 w->sID = _WS(aw->GetID());
 					 ((CSpkFile *)m_pPackage)->addWare(w);
 					 this->UpdateWares();
+				 }
+			 }
 			 this->UpdateChanged();
+		 }
 private: System::Void CheckSYArgon_CheckedChanged(System::Object^  sender, System::EventArgs^  e) {
 			 if ( !m_bLoading )
 				((CXspFile *)m_pPackage)->SetShipyard(SHIPYARD_ARGON, this->CheckSYArgon->Checked);
 			 this->UpdateChanged();
 		 }
 private: System::Void CheckSYBoron_CheckedChanged(System::Object^  sender, System::EventArgs^  e) {
 			 if ( !m_bLoading )
 				((CXspFile *)m_pPackage)->SetShipyard(SHIPYARD_BORON, this->CheckSYBoron->Checked);
 			 this->UpdateChanged();
+		 }
 				if ( input->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
+				{
 					m_pPackage->removeWebMirror(_WS(item->Text));
 					m_pPackage->addWebMirror(_WS(input->GetInput()));
 					item->Text = input->GetInput();
 					this->UpdateChanged();
 				}
 			 }
 		 }
 private: System::Void ListWares_MouseDoubleClick(System::Object^  sender, System::Windows::Forms::MouseEventArgs^  e) {
 			 if ( this->ListWares->Items->Count )
+			 {
 				 ListViewItem ^item = this->ListWares->SelectedItems[0];
 				 SWares *w = ((CSpkFile *)m_pPackage)->findWare(_WS(item->Text));
 						 w->iVolumn = aw->GetVolumn();
 						 w->iSize = aw->GetSize();
 						 w->iTextID = aw->GetTextID();
 						 w->iTextPage = aw->GetTextPage();
 						 this->UpdateWares();
 						 this->UpdateChanged();
 					 }
 				 }
 			 }
 		 }
 private: System::Void ListWareText_MouseDoubleClick(System::Object^  sender, System::Windows::Forms::MouseEventArgs^  e) {
 			 if ( this->ListWareText->Items->Count )
+			 {
 				 ListViewItem ^item = this->ListWareText->SelectedItems[0];
 				 SWares *w = ((CSpkFile *)m_pPackage)->findWare(_WS(this->ListWares->SelectedItems[0]->Text));
+			}
+		}
 private: System::Void ContextShipPart_Opening(System::Object^  sender, System::ComponentModel::CancelEventArgs^  e) {
 			 Point ^mousePoint = this->ListShipPart->PointToClient(this->ContextShipPart->MousePosition);
 			ListViewItem ^item = this->ListShipPart->GetItemAt(mousePoint->X, mousePoint->Y);
 			this->ContextShipPartEdit->Visible = (item) ? true : false;
 			this->ContextShipPartSep1->Visible = (item) ? true : false;
 			this->ContextShipPartRemove->Visible = (item) ? true : false;
 			this->ContextShipPartClear->Visible = (this->ListShipPart->Items->Count) ? true : false;
 				this->UpdateShipText();
 				this->UpdateChanged();
+			}
+		 }
 private: System::Void fromDirectoryToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 				FolderBrowserDialog ^fbd = gcnew FolderBrowserDialog;
 				fbd->Description = "Select the path to load text files from";
 				if ( fbd->ShowDialog(this) == System::Windows::Forms::DialogResult::OK )
+				{
 					bool added = false;
 					array <System::String ^> ^Files = System::IO::Directory::GetFiles(fbd->SelectedPath, "*.xml");
+		}
 private: System::Void butGlobalClear_Click(System::Object^ sender, System::EventArgs^ e) {
 			m_pPackage->clearGlobals();
 			this->UpdateGlobals();
 			this->UpdateChanged();
+		}
+private: System::Void addNewToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
+			this->AddNewGlobal();
+		}
+private: System::Void editSelectedToolStripMenuItem1_Click(System::Object^ sender, System::EventArgs^ e) {
+			this->EditGlobal();
+		}
+private: System::Void removeSelectedToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
+			m_pPackage->removeGlobal(_WS(m_pSelectedItem->Text));
+			this->UpdateGlobals();
+			this->UpdateChanged();
+		}
+private: System::Void clearAllToolStripMenuItem2_Click(System::Object^ sender, System::EventArgs^ e) {
+			m_pPackage->clearGlobals();
+			this->UpdateGlobals();
+			this->UpdateChanged();
+		}
+private: System::Void contextGlobal_Opening(System::Object^ sender, System::ComponentModel::CancelEventArgs^ e) {
+			Point^ mousePoint = this->listGlobals->PointToClient(this->contextGlobal->MousePosition);
+			ListViewItem^ item = this->listGlobals->GetItemAt(mousePoint->X, mousePoint->Y);
+			this->editSelectedToolStripMenuItem1->Visible = (item) ? true : false;
+			this->removeSelectedToolStripMenuItem->Visible = (item) ? true : false;
+			this->toolStripSeparator6->Visible = (item) ? true : false;
+			bool clear = (this->listGlobals->Items->Count) ? true : false;
+			this->clearAllToolStripMenuItem2->Visible = clear;
+			this->toolStripSeparator7->Visible = clear;
+			m_pSelectedItem = item;
+			e->Cancel = false;
+		}
 };
+}

Subversion Repositories spk

(root)/Creator/src/Forms/PackageForm.h – Rev 237 → 238