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

 	///          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
-/*
+		/*
 #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),
 			_addGameItem(nullptr),
 			_removeGameItem(nullptr)
 #endif
-*/
 		{
 			InitializeComponent();
 			m_pSettings = set;
 			_init();
 		}
 		void _init();
 		void SetImageLists(ImageList ^smallList, ImageList ^largeList, ImageList ^gameList, ImageList ^fileList);
 		CGameDirectories *gameDirectories();
 		void CreateShip() {
 			if ( m_pPackage ) delete m_pPackage;
 				return;
 			String ^text = _US(CFileIO(m_pPackage->filename()).filename());
 			String ^addonText = "";
 			if ( text->Length < 1 )
 			{
 				if ( m_pPackage->GetType() == TYPE_XSP )
 					text = "New Ship";
 				else
 					text = "New Package";
+			}
 		void UpdateWareText();
 		void UpdateShipText();
 		void LoadShipData();
 		void UpdateShipPartList();
 		void UpdateDependacies();
+		void UpdateGlobals();
 		void DoToolTips();
 		void EditShipParts(bool edit);
 		void RemoveSelectedFiles();
 		void UpdateScriptType();
 		void ImportData(String ^file, int type);
 		void ImportAnimations(String ^file);
 		String ^ExtractImport(String ^text, String ^type);
 		void EditDepend();
+		void AddNewGlobal();
+		void EditGlobal();
 		Windows::Forms::ImageList ^imageListFiles;
 		CBaseFile *m_pPackage;
 		bool	m_bSortingAsc;
 		int		m_iSortingCol;
 private: System::Windows::Forms::ColumnHeader^  columnHeader1;
 private: System::Windows::Forms::ColumnHeader^  columnHeader2;
 private: System::Windows::Forms::ColumnHeader^  columnHeader3;
 private: System::Windows::Forms::ColumnHeader^  columnHeader4;
 private: System::Windows::Forms::ColumnHeader^  columnHeader5;
+private: System::Windows::Forms::TabPage^ tabGlobals;
+private: System::Windows::Forms::Button^ butGlobalClear;
+private: System::Windows::Forms::Button^ butAddGlobal;
+private: System::Windows::Forms::ListView^ listGlobals;
+private: System::Windows::Forms::ColumnHeader^ ColGlobalName;
+private: System::Windows::Forms::ColumnHeader^ ColGlobalValue;
+private: System::Windows::Forms::ContextMenuStrip^ contextGlobal;
+private: System::Windows::Forms::ToolStripMenuItem^ addNewToolStripMenuItem;
+private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator6;
+private: System::Windows::Forms::ToolStripMenuItem^ editSelectedToolStripMenuItem1;
+private: System::Windows::Forms::ToolStripMenuItem^ removeSelectedToolStripMenuItem;
+private: System::Windows::Forms::ToolStripSeparator^ toolStripSeparator7;
+private: System::Windows::Forms::ToolStripMenuItem^ clearAllToolStripMenuItem2;
-private: System::ComponentModel::IContainer^  components;
+private: System::ComponentModel::IContainer^ components;
 		 /// <summary>
 		/// Required designer variable.
 		/// </summary>
 			this->ContextShipPartSep2 = (gcnew System::Windows::Forms::ToolStripSeparator());
 			this->ContextShipPartClear = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->panel25 = (gcnew System::Windows::Forms::Panel());
 			this->ComboShipPart = (gcnew System::Windows::Forms::ComboBox());
 			this->label18 = (gcnew System::Windows::Forms::Label());
+			this->tabGlobals = (gcnew System::Windows::Forms::TabPage());
+			this->butGlobalClear = (gcnew System::Windows::Forms::Button());
+			this->butAddGlobal = (gcnew System::Windows::Forms::Button());
+			this->listGlobals = (gcnew System::Windows::Forms::ListView());
+			this->ColGlobalName = (gcnew System::Windows::Forms::ColumnHeader());
+			this->ColGlobalValue = (gcnew System::Windows::Forms::ColumnHeader());
+			this->contextGlobal = (gcnew System::Windows::Forms::ContextMenuStrip(this->components));
+			this->addNewToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+			this->toolStripSeparator6 = (gcnew System::Windows::Forms::ToolStripSeparator());
+			this->editSelectedToolStripMenuItem1 = (gcnew System::Windows::Forms::ToolStripMenuItem());
+			this->removeSelectedToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+			this->toolStripSeparator7 = (gcnew System::Windows::Forms::ToolStripSeparator());
+			this->clearAllToolStripMenuItem2 = (gcnew System::Windows::Forms::ToolStripMenuItem());
 			this->CheckShipID = (gcnew System::Windows::Forms::CheckBox());
 			this->panel1 = (gcnew System::Windows::Forms::Panel());
 			this->TextName = (gcnew System::Windows::Forms::TextBox());
 			this->label1 = (gcnew System::Windows::Forms::Label());
 			this->panel2 = (gcnew System::Windows::Forms::Panel());
 			this->flowLayoutPanel3->SuspendLayout();
 			this->PageShipComp->SuspendLayout();
 			this->panel26->SuspendLayout();
 			this->ContextShipPart->SuspendLayout();
 			this->panel25->SuspendLayout();
+			this->tabGlobals->SuspendLayout();
+			this->contextGlobal->SuspendLayout();
 			this->panel1->SuspendLayout();
 			this->panel2->SuspendLayout();
 			this->panel3->SuspendLayout();
 			this->panel4->SuspendLayout();
 			this->PanelShip->SuspendLayout();
 			this->panel6->Controls->Add(this->button2);
 			this->panel6->Controls->Add(this->button1);
 			this->panel6->Dock = System::Windows::Forms::DockStyle::Bottom;
 			this->panel6->Location = System::Drawing::Point(3, 287);
 			this->panel6->Name = L"panel6";
-			this->panel6->Padding = System::Windows::Forms::Padding(5, 5, 5, 5);
+			this->panel6->Padding = System::Windows::Forms::Padding(5);
 			this->panel6->Size = System::Drawing::Size(750, 40);
 			this->panel6->TabIndex = 2;
 			//
 			// ButRemoveFile
 			//
 			this->tabControl1->Controls->Add(this->tabPage4);
 			this->tabControl1->Controls->Add(this->PageWares);
 			this->tabControl1->Controls->Add(this->PageShip);
 			this->tabControl1->Controls->Add(this->PageRaw);
 			this->tabControl1->Controls->Add(this->PageShipComp);
+			this->tabControl1->Controls->Add(this->tabGlobals);
 			this->tabControl1->Dock = System::Windows::Forms::DockStyle::Top;
 			this->tabControl1->Location = System::Drawing::Point(5, 133);
-			this->tabControl1->Margin = System::Windows::Forms::Padding(6, 6, 6, 6);
+			this->tabControl1->Margin = System::Windows::Forms::Padding(6);
 			this->tabControl1->Multiline = true;
 			this->tabControl1->Name = L"tabControl1";
 			this->tabControl1->SelectedIndex = 0;
 			this->tabControl1->Size = System::Drawing::Size(756, 242);
 			this->tabControl1->TabIndex = 1;
 			this->tabPage1->Controls->Add(this->groupBox2);
 			this->tabPage1->Controls->Add(this->panel13);
 			this->tabPage1->Controls->Add(this->panel12);
 			this->tabPage1->Controls->Add(this->panel11);
 			this->tabPage1->Controls->Add(this->LabelShipWarning);
-			this->tabPage1->Location = System::Drawing::Point(4, 22);
+			this->tabPage1->Location = System::Drawing::Point(4, 40);
 			this->tabPage1->Name = L"tabPage1";
-			this->tabPage1->Padding = System::Windows::Forms::Padding(8, 8, 8, 8);
+			this->tabPage1->Padding = System::Windows::Forms::Padding(8);
-			this->tabPage1->Size = System::Drawing::Size(748, 216);
+			this->tabPage1->Size = System::Drawing::Size(748, 198);
 			this->tabPage1->TabIndex = 0;
 			this->tabPage1->Text = L"Basic Settings";
 			this->tabPage1->UseVisualStyleBackColor = true;
 			//
 			// groupBox2
 			//
 			this->groupBox2->Controls->Add(this->TextDesc);
 			this->groupBox2->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->groupBox2->Location = System::Drawing::Point(8, 89);
 			this->groupBox2->Name = L"groupBox2";
-			this->groupBox2->Padding = System::Windows::Forms::Padding(5, 5, 5, 5);
+			this->groupBox2->Padding = System::Windows::Forms::Padding(5);
-			this->groupBox2->Size = System::Drawing::Size(732, 119);
+			this->groupBox2->Size = System::Drawing::Size(732, 101);
 			this->groupBox2->TabIndex = 1;
 			this->groupBox2->TabStop = false;
 			this->groupBox2->Text = L"Description";
 			//
 			// TextDesc
 			//
 			this->TextDesc->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextDesc->Location = System::Drawing::Point(5, 18);
 			this->TextDesc->Name = L"TextDesc";
-			this->TextDesc->Size = System::Drawing::Size(722, 96);
+			this->TextDesc->Size = System::Drawing::Size(722, 78);
 			this->TextDesc->TabIndex = 0;
 			this->TextDesc->Text = L"";
 			this->TextDesc->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextDesc_TextChanged);
 			//
 			// panel13
 			//
 			// tabPage5
 			//
 			this->tabPage5->Controls->Add(this->ListGames);
 			this->tabPage5->Controls->Add(this->groupBox8);
-			this->tabPage5->Location = System::Drawing::Point(4, 22);
+			this->tabPage5->Location = System::Drawing::Point(4, 40);
 			this->tabPage5->Name = L"tabPage5";
-			this->tabPage5->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->tabPage5->Padding = System::Windows::Forms::Padding(3);
-			this->tabPage5->Size = System::Drawing::Size(747, 216);
+			this->tabPage5->Size = System::Drawing::Size(748, 198);
 			this->tabPage5->TabIndex = 10;
 			this->tabPage5->Text = L"Game Compatability";
 			this->tabPage5->UseVisualStyleBackColor = true;
 			//
 			// ListGames
 			this->ListGames->FullRowSelect = true;
 			this->ListGames->HideSelection = false;
 			this->ListGames->Location = System::Drawing::Point(3, 3);
 			this->ListGames->MultiSelect = false;
 			this->ListGames->Name = L"ListGames";
-			this->ListGames->Size = System::Drawing::Size(741, 140);
+			this->ListGames->Size = System::Drawing::Size(742, 122);
 			this->ListGames->TabIndex = 2;
 			this->ListGames->UseCompatibleStateImageBehavior = false;
 			this->ListGames->View = System::Windows::Forms::View::Details;
 			this->ListGames->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListGames_SelectedIndexChanged);
 			this->ListGames->DoubleClick += gcnew System::EventHandler(this, &PackageForm::ListGames_DoubleClick);
 			//
 			// groupBox8
 			//
 			this->groupBox8->Controls->Add(this->panel10);
 			this->groupBox8->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->groupBox8->Location = System::Drawing::Point(3, 143);
+			this->groupBox8->Location = System::Drawing::Point(3, 125);
 			this->groupBox8->Name = L"groupBox8";
-			this->groupBox8->Size = System::Drawing::Size(741, 70);
+			this->groupBox8->Size = System::Drawing::Size(742, 70);
 			this->groupBox8->TabIndex = 1;
 			this->groupBox8->TabStop = false;
 			this->groupBox8->Text = L"Add/Edit Game";
 			//
 			// panel10
 			this->panel10->Controls->Add(this->panel21);
 			this->panel10->Controls->Add(this->ButGame);
 			this->panel10->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel10->Location = System::Drawing::Point(3, 16);
 			this->panel10->Name = L"panel10";
-			this->panel10->Size = System::Drawing::Size(735, 43);
+			this->panel10->Size = System::Drawing::Size(736, 43);
 			this->panel10->TabIndex = 44;
 			//
 			// panel21
 			//
 			this->panel21->Controls->Add(this->ComboVersion);
 			this->panel21->Controls->Add(this->TextExactVersion);
 			this->panel21->Controls->Add(this->ButGameAdd);
 			this->panel21->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->panel21->Location = System::Drawing::Point(218, 0);
 			this->panel21->Name = L"panel21";
-			this->panel21->Size = System::Drawing::Size(517, 43);
+			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->ComboVersion->Name = L"ComboVersion";
-			this->ComboVersion->Size = System::Drawing::Size(464, 21);
+			this->ComboVersion->Size = System::Drawing::Size(465, 21);
 			this->ComboVersion->TabIndex = 41;
 			this->ComboVersion->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboVersion_SelectedIndexChanged);
 			//
 			// TextExactVersion
 			//
 			this->TextExactVersion->Dock = System::Windows::Forms::DockStyle::Bottom;
 			this->TextExactVersion->Location = System::Drawing::Point(0, 23);
 			this->TextExactVersion->Name = L"TextExactVersion";
-			this->TextExactVersion->Size = System::Drawing::Size(464, 20);
+			this->TextExactVersion->Size = System::Drawing::Size(465, 20);
 			this->TextExactVersion->TabIndex = 42;
 			//
 			// ButGameAdd
 			//
 			this->ButGameAdd->Dock = System::Windows::Forms::DockStyle::Right;
 			this->ButGameAdd->ForeColor = System::Drawing::Color::Green;
-			this->ButGameAdd->Location = System::Drawing::Point(464, 0);
+			this->ButGameAdd->Location = System::Drawing::Point(465, 0);
 			this->ButGameAdd->Name = L"ButGameAdd";
 			this->ButGameAdd->Size = System::Drawing::Size(53, 43);
 			this->ButGameAdd->TabIndex = 43;
 			this->ButGameAdd->Text = L"Save!";
 			this->ButGameAdd->UseVisualStyleBackColor = true;
 			// PagePackage
 			//
 			this->PagePackage->Controls->Add(this->groupBox3);
 			this->PagePackage->Controls->Add(this->panel22);
 			this->PagePackage->Controls->Add(this->panel7);
-			this->PagePackage->Location = System::Drawing::Point(4, 22);
+			this->PagePackage->Location = System::Drawing::Point(4, 40);
 			this->PagePackage->Name = L"PagePackage";
-			this->PagePackage->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->PagePackage->Padding = System::Windows::Forms::Padding(3);
-			this->PagePackage->Size = System::Drawing::Size(747, 216);
+			this->PagePackage->Size = System::Drawing::Size(748, 198);
 			this->PagePackage->TabIndex = 2;
 			this->PagePackage->Text = L"Package Settings";
 			this->PagePackage->UseVisualStyleBackColor = true;
 			//
 			// groupBox3
 			this->groupBox3->Controls->Add(this->CheckOther);
 			this->groupBox3->Controls->Add(this->TextOtherAuthor);
 			this->groupBox3->Controls->Add(this->ButFromFile);
 			this->groupBox3->Dock = System::Windows::Forms::DockStyle::Top;
 			this->groupBox3->Location = System::Drawing::Point(3, 95);
-			this->groupBox3->Margin = System::Windows::Forms::Padding(10, 10, 10, 10);
+			this->groupBox3->Margin = System::Windows::Forms::Padding(10);
 			this->groupBox3->Name = L"groupBox3";
-			this->groupBox3->Padding = System::Windows::Forms::Padding(10, 10, 10, 10);
+			this->groupBox3->Padding = System::Windows::Forms::Padding(10);
-			this->groupBox3->Size = System::Drawing::Size(741, 53);
+			this->groupBox3->Size = System::Drawing::Size(742, 53);
 			this->groupBox3->TabIndex = 1;
 			this->groupBox3->TabStop = false;
 			this->groupBox3->Text = L"Requires Parent Mod/Package";
 			//
 			// TextOtherName
 			//
 			this->TextOtherName->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextOtherName->Location = System::Drawing::Point(107, 23);
 			this->TextOtherName->Name = L"TextOtherName";
-			this->TextOtherName->Size = System::Drawing::Size(333, 20);
+			this->TextOtherName->Size = System::Drawing::Size(334, 20);
 			this->TextOtherName->TabIndex = 1;
 			this->TextOtherName->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextOtherName_TextChanged);
 			//
 			// label13
 			//
 			this->label13->Dock = System::Windows::Forms::DockStyle::Right;
 			this->label13->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
-			this->label13->Location = System::Drawing::Point(440, 23);
+			this->label13->Location = System::Drawing::Point(441, 23);
 			this->label13->Name = L"label13";
 			this->label13->Size = System::Drawing::Size(77, 20);
 			this->label13->TabIndex = 3;
 			this->label13->Text = L"Author";
 			this->label13->TextAlign = System::Drawing::ContentAlignment::MiddleRight;
 			this->CheckOther->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckOther_CheckedChanged);
 			//
 			// TextOtherAuthor
 			//
 			this->TextOtherAuthor->Dock = System::Windows::Forms::DockStyle::Right;
-			this->TextOtherAuthor->Location = System::Drawing::Point(517, 23);
+			this->TextOtherAuthor->Location = System::Drawing::Point(518, 23);
 			this->TextOtherAuthor->Name = L"TextOtherAuthor";
 			this->TextOtherAuthor->Size = System::Drawing::Size(139, 20);
 			this->TextOtherAuthor->TabIndex = 4;
 			this->TextOtherAuthor->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextOtherName_TextChanged);
 			//
 			// ButFromFile
 			//
 			this->ButFromFile->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButFromFile->Location = System::Drawing::Point(656, 23);
+			this->ButFromFile->Location = System::Drawing::Point(657, 23);
 			this->ButFromFile->Name = L"ButFromFile";
 			this->ButFromFile->Size = System::Drawing::Size(75, 20);
 			this->ButFromFile->TabIndex = 5;
 			this->ButFromFile->Text = L"From File";
 			this->ButFromFile->UseVisualStyleBackColor = true;
 			this->panel22->Controls->Add(this->ComboPluginType);
 			this->panel22->Controls->Add(this->label15);
 			this->panel22->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel22->Location = System::Drawing::Point(3, 63);
 			this->panel22->Name = L"panel22";
-			this->panel22->Size = System::Drawing::Size(741, 32);
+			this->panel22->Size = System::Drawing::Size(742, 32);
 			this->panel22->TabIndex = 2;
 			//
 			// ComboPluginType
 			//
 			this->ComboPluginType->Dock = System::Windows::Forms::DockStyle::Fill;
 				L"Normal", L"Stable", L"Experimental", L"Cheat",
 					L"Mod"
 			});
 			this->ComboPluginType->Location = System::Drawing::Point(157, 0);
 			this->ComboPluginType->Name = L"ComboPluginType";
-			this->ComboPluginType->Size = System::Drawing::Size(584, 21);
+			this->ComboPluginType->Size = System::Drawing::Size(585, 21);
 			this->ComboPluginType->TabIndex = 7;
 			this->ComboPluginType->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboPluginType_SelectedIndexChanged);
 			//
 			// label15
 			//
 			this->panel7->Controls->Add(this->label7);
 			this->panel7->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel7->Location = System::Drawing::Point(3, 3);
 			this->panel7->Name = L"panel7";
 			this->panel7->Padding = System::Windows::Forms::Padding(5, 5, 5, 10);
-			this->panel7->Size = System::Drawing::Size(741, 60);
+			this->panel7->Size = System::Drawing::Size(742, 60);
 			this->panel7->TabIndex = 0;
 			//
 			// panel8
 			//
 			this->panel8->Controls->Add(this->flowLayoutPanel1);
 			this->panel8->Controls->Add(this->panel9);
 			this->panel8->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->panel8->Location = System::Drawing::Point(162, 5);
 			this->panel8->Name = L"panel8";
-			this->panel8->Size = System::Drawing::Size(574, 45);
+			this->panel8->Size = System::Drawing::Size(575, 45);
 			this->panel8->TabIndex = 2;
 			//
 			// flowLayoutPanel1
 			//
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypeUpdate);
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypeStart);
 			this->flowLayoutPanel1->Controls->Add(this->RadioTypePatch);
 			this->flowLayoutPanel1->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->flowLayoutPanel1->Location = System::Drawing::Point(0, 0);
 			this->flowLayoutPanel1->Name = L"flowLayoutPanel1";
-			this->flowLayoutPanel1->Size = System::Drawing::Size(574, 22);
+			this->flowLayoutPanel1->Size = System::Drawing::Size(575, 22);
 			this->flowLayoutPanel1->TabIndex = 4;
 			//
 			// RadioTypeUpdate
 			//
 			this->RadioTypeUpdate->AutoSize = true;
 			this->panel9->Controls->Add(this->ComboType);
 			this->panel9->Controls->Add(this->RadioTypeScript);
 			this->panel9->Dock = System::Windows::Forms::DockStyle::Bottom;
 			this->panel9->Location = System::Drawing::Point(0, 22);
 			this->panel9->Name = L"panel9";
-			this->panel9->Size = System::Drawing::Size(574, 23);
+			this->panel9->Size = System::Drawing::Size(575, 23);
 			this->panel9->TabIndex = 6;
 			//
 			// TextCustomType
 			//
 			this->TextCustomType->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextCustomType->Location = System::Drawing::Point(146, 0);
 			this->TextCustomType->Name = L"TextCustomType";
-			this->TextCustomType->Size = System::Drawing::Size(428, 20);
+			this->TextCustomType->Size = System::Drawing::Size(429, 20);
 			this->TextCustomType->TabIndex = 7;
 			this->TextCustomType->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextCustomType_TextChanged);
 			//
 			// ComboType
 			//
 			//
 			this->tabPage3->Controls->Add(this->groupBox7);
 			this->tabPage3->Controls->Add(this->groupBox6);
 			this->tabPage3->Controls->Add(this->groupBox5);
 			this->tabPage3->Controls->Add(this->panel15);
-			this->tabPage3->Location = System::Drawing::Point(4, 22);
+			this->tabPage3->Location = System::Drawing::Point(4, 40);
 			this->tabPage3->Name = L"tabPage3";
-			this->tabPage3->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->tabPage3->Padding = System::Windows::Forms::Padding(3);
-			this->tabPage3->Size = System::Drawing::Size(747, 216);
+			this->tabPage3->Size = System::Drawing::Size(748, 198);
 			this->tabPage3->TabIndex = 4;
 			this->tabPage3->Text = L"Display";
 			this->tabPage3->UseVisualStyleBackColor = true;
 			//
 			// groupBox7
 			this->groupBox7->Controls->Add(this->panel18);
 			this->groupBox7->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->groupBox7->Location = System::Drawing::Point(210, 66);
 			this->groupBox7->Name = L"groupBox7";
 			this->groupBox7->Padding = System::Windows::Forms::Padding(5, 0, 5, 5);
-			this->groupBox7->Size = System::Drawing::Size(534, 147);
+			this->groupBox7->Size = System::Drawing::Size(535, 129);
 			this->groupBox7->TabIndex = 4;
 			this->groupBox7->TabStop = false;
 			this->groupBox7->Text = L"Text";
 			//
 			// TextText
 			//
 			this->TextText->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextText->Location = System::Drawing::Point(104, 40);
 			this->TextText->Name = L"TextText";
-			this->TextText->Size = System::Drawing::Size(425, 102);
+			this->TextText->Size = System::Drawing::Size(426, 84);
 			this->TextText->TabIndex = 3;
 			this->TextText->Text = L"";
 			this->TextText->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextText_TextChanged);
 			//
 			// panel19
 			this->panel19->Controls->Add(this->ListLang);
 			this->panel19->Controls->Add(this->panel20);
 			this->panel19->Dock = System::Windows::Forms::DockStyle::Left;
 			this->panel19->Location = System::Drawing::Point(5, 40);
 			this->panel19->Name = L"panel19";
-			this->panel19->Size = System::Drawing::Size(99, 102);
+			this->panel19->Size = System::Drawing::Size(99, 84);
 			this->panel19->TabIndex = 5;
 			//
 			// ListLang
 			//
 			this->ListLang->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListLang->FormattingEnabled = true;
 			this->ListLang->Items->AddRange(gcnew cli::array< System::Object^  >(1) { L"- Default -" });
 			this->ListLang->Location = System::Drawing::Point(0, 0);
 			this->ListLang->Name = L"ListLang";
-			this->ListLang->Size = System::Drawing::Size(99, 82);
+			this->ListLang->Size = System::Drawing::Size(99, 64);
 			this->ListLang->TabIndex = 4;
 			this->ListLang->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListLang_SelectedIndexChanged);
 			//
 			// panel20
 			//
 			this->panel20->Controls->Add(this->ButTextDel);
 			this->panel20->Controls->Add(this->ButTextAdd);
 			this->panel20->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel20->Location = System::Drawing::Point(0, 82);
+			this->panel20->Location = System::Drawing::Point(0, 64);
 			this->panel20->Name = L"panel20";
 			this->panel20->Size = System::Drawing::Size(99, 20);
 			this->panel20->TabIndex = 7;
 			//
 			// ButTextDel
 			this->panel18->Controls->Add(this->RadioInstallAfter);
 			this->panel18->Controls->Add(this->RadioInstallBefore);
 			this->panel18->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel18->Location = System::Drawing::Point(5, 13);
 			this->panel18->Name = L"panel18";
-			this->panel18->Size = System::Drawing::Size(524, 27);
+			this->panel18->Size = System::Drawing::Size(525, 27);
 			this->panel18->TabIndex = 2;
 			//
 			// RadioUninstallAfter
 			//
 			this->RadioUninstallAfter->AutoSize = true;
 			//
 			this->groupBox6->Controls->Add(this->panel17);
 			this->groupBox6->Dock = System::Windows::Forms::DockStyle::Top;
 			this->groupBox6->Location = System::Drawing::Point(210, 3);
 			this->groupBox6->Name = L"groupBox6";
-			this->groupBox6->Size = System::Drawing::Size(534, 63);
+			this->groupBox6->Size = System::Drawing::Size(535, 63);
 			this->groupBox6->TabIndex = 3;
 			this->groupBox6->TabStop = false;
 			this->groupBox6->Text = L"Ratings";
 			//
 			// panel17
 			this->panel17->Controls->Add(this->GroupRec);
 			this->panel17->Controls->Add(this->GroupEase);
 			this->panel17->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->panel17->Location = System::Drawing::Point(3, 16);
 			this->panel17->Name = L"panel17";
-			this->panel17->Size = System::Drawing::Size(528, 44);
+			this->panel17->Size = System::Drawing::Size(529, 44);
 			this->panel17->TabIndex = 4;
 			//
 			// GroupChange
 			//
 			this->GroupChange->Controls->Add(this->PicChange5);
 			this->groupBox5->Controls->Add(this->DisplayIcon);
 			this->groupBox5->Controls->Add(this->button4);
 			this->groupBox5->Dock = System::Windows::Forms::DockStyle::Left;
 			this->groupBox5->Location = System::Drawing::Point(153, 3);
 			this->groupBox5->Name = L"groupBox5";
-			this->groupBox5->Size = System::Drawing::Size(57, 210);
+			this->groupBox5->Size = System::Drawing::Size(57, 192);
 			this->groupBox5->TabIndex = 2;
 			this->groupBox5->TabStop = false;
 			this->groupBox5->Text = L"Icon";
 			//
 			// ButIconDel
 			this->panel15->Controls->Add(this->DisplayPicture);
 			this->panel15->Controls->Add(this->panel16);
 			this->panel15->Dock = System::Windows::Forms::DockStyle::Left;
 			this->panel15->Location = System::Drawing::Point(3, 3);
 			this->panel15->Name = L"panel15";
-			this->panel15->Size = System::Drawing::Size(150, 210);
+			this->panel15->Size = System::Drawing::Size(150, 192);
 			this->panel15->TabIndex = 1;
 			//
 			// DisplayPicture
 			//
 			this->DisplayPicture->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->DisplayPicture->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"DisplayPicture.Image")));
 			this->DisplayPicture->Location = System::Drawing::Point(0, 0);
 			this->DisplayPicture->Name = L"DisplayPicture";
-			this->DisplayPicture->Size = System::Drawing::Size(150, 181);
+			this->DisplayPicture->Size = System::Drawing::Size(150, 163);
 			this->DisplayPicture->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->DisplayPicture->TabIndex = 0;
 			this->DisplayPicture->TabStop = false;
 			//
 			// panel16
 			this->panel16->Controls->Add(this->ButPicAdd);
 			this->panel16->Controls->Add(this->ButPicDel);
 			this->panel16->Controls->Add(this->ButPicNext);
 			this->panel16->Controls->Add(this->ButPicBack);
 			this->panel16->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel16->Location = System::Drawing::Point(0, 181);
+			this->panel16->Location = System::Drawing::Point(0, 163);
 			this->panel16->Name = L"panel16";
 			this->panel16->Size = System::Drawing::Size(150, 29);
 			this->panel16->TabIndex = 2;
 			//
 			// ButPicAdd
 			//
 			// tabPage2
 			//
 			this->tabPage2->Controls->Add(this->ListNames);
 			this->tabPage2->Controls->Add(this->groupBox4);
-			this->tabPage2->Location = System::Drawing::Point(4, 22);
+			this->tabPage2->Location = System::Drawing::Point(4, 40);
 			this->tabPage2->Name = L"tabPage2";
-			this->tabPage2->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->tabPage2->Padding = System::Windows::Forms::Padding(3);
-			this->tabPage2->Size = System::Drawing::Size(747, 216);
+			this->tabPage2->Size = System::Drawing::Size(748, 198);
 			this->tabPage2->TabIndex = 3;
 			this->tabPage2->Text = L"Advanced";
 			this->tabPage2->UseVisualStyleBackColor = true;
 			//
 			// ListNames
 			this->ListNames->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListNames->FullRowSelect = true;
 			this->ListNames->HideSelection = false;
 			this->ListNames->Location = System::Drawing::Point(3, 121);
 			this->ListNames->Name = L"ListNames";
-			this->ListNames->Size = System::Drawing::Size(741, 92);
+			this->ListNames->Size = System::Drawing::Size(742, 74);
 			this->ListNames->TabIndex = 1;
 			this->ListNames->UseCompatibleStateImageBehavior = false;
 			this->ListNames->View = System::Windows::Forms::View::Details;
 			this->ListNames->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListNames_MouseDoubleClick);
 			//
 			this->groupBox4->Controls->Add(this->ListMirrors);
 			this->groupBox4->Controls->Add(this->panel14);
 			this->groupBox4->Dock = System::Windows::Forms::DockStyle::Top;
 			this->groupBox4->Location = System::Drawing::Point(3, 3);
 			this->groupBox4->Name = L"groupBox4";
-			this->groupBox4->Size = System::Drawing::Size(741, 118);
+			this->groupBox4->Size = System::Drawing::Size(742, 118);
 			this->groupBox4->TabIndex = 0;
 			this->groupBox4->TabStop = false;
 			this->groupBox4->Text = L"Automatic Update";
 			//
 			// ListMirrors
 			this->ListMirrors->LabelWrap = false;
 			this->ListMirrors->Location = System::Drawing::Point(3, 40);
 			this->ListMirrors->MultiSelect = false;
 			this->ListMirrors->Name = L"ListMirrors";
 			this->ListMirrors->ShowGroups = false;
-			this->ListMirrors->Size = System::Drawing::Size(735, 75);
+			this->ListMirrors->Size = System::Drawing::Size(736, 75);
 			this->ListMirrors->Sorting = System::Windows::Forms::SortOrder::Ascending;
 			this->ListMirrors->TabIndex = 1;
 			this->ListMirrors->UseCompatibleStateImageBehavior = false;
 			this->ListMirrors->View = System::Windows::Forms::View::Details;
 			this->ListMirrors->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListMirrors_MouseDoubleClick);
 			this->panel14->Controls->Add(this->TextWebAddress);
 			this->panel14->Controls->Add(this->label14);
 			this->panel14->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel14->Location = System::Drawing::Point(3, 16);
 			this->panel14->Name = L"panel14";
-			this->panel14->Size = System::Drawing::Size(735, 24);
+			this->panel14->Size = System::Drawing::Size(736, 24);
 			this->panel14->TabIndex = 2;
 			//
 			// TextWebAddress
 			//
 			this->TextWebAddress->DetectUrls = false;
 			this->TextWebAddress->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextWebAddress->Location = System::Drawing::Point(142, 0);
 			this->TextWebAddress->Name = L"TextWebAddress";
-			this->TextWebAddress->Size = System::Drawing::Size(593, 24);
+			this->TextWebAddress->Size = System::Drawing::Size(594, 24);
 			this->TextWebAddress->TabIndex = 1;
 			this->TextWebAddress->Text = L"";
 			this->TextWebAddress->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextWebAddress_TextChanged_1);
 			//
 			// label14
 			this->label14->Text = L"Primary Address";
 			//
 			// tabPage4
 			//
 			this->tabPage4->Controls->Add(this->ListDep);
-			this->tabPage4->Location = System::Drawing::Point(4, 22);
+			this->tabPage4->Location = System::Drawing::Point(4, 40);
 			this->tabPage4->Name = L"tabPage4";
-			this->tabPage4->Padding = System::Windows::Forms::Padding(15, 15, 15, 15);
+			this->tabPage4->Padding = System::Windows::Forms::Padding(15);
-			this->tabPage4->Size = System::Drawing::Size(747, 216);
+			this->tabPage4->Size = System::Drawing::Size(748, 198);
 			this->tabPage4->TabIndex = 9;
 			this->tabPage4->Text = L"Dependacies";
 			this->tabPage4->UseVisualStyleBackColor = true;
 			//
 			// ListDep
 			this->ListDep->FullRowSelect = true;
 			this->ListDep->HideSelection = false;
 			this->ListDep->Location = System::Drawing::Point(15, 15);
 			this->ListDep->MultiSelect = false;
 			this->ListDep->Name = L"ListDep";
-			this->ListDep->Size = System::Drawing::Size(717, 186);
+			this->ListDep->Size = System::Drawing::Size(718, 168);
 			this->ListDep->TabIndex = 0;
 			this->ListDep->UseCompatibleStateImageBehavior = false;
 			this->ListDep->View = System::Windows::Forms::View::Details;
 			this->ListDep->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListDep_MouseDoubleClick);
 			//
 			this->ContextDepClear->Click += gcnew System::EventHandler(this, &PackageForm::ContextDepClear_Click);
 			//
 			// PageWares
 			//
 			this->PageWares->Controls->Add(this->splitContainer1);
-			this->PageWares->Location = System::Drawing::Point(4, 22);
+			this->PageWares->Location = System::Drawing::Point(4, 40);
 			this->PageWares->Name = L"PageWares";
-			this->PageWares->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->PageWares->Padding = System::Windows::Forms::Padding(3);
-			this->PageWares->Size = System::Drawing::Size(747, 216);
+			this->PageWares->Size = System::Drawing::Size(748, 198);
 			this->PageWares->TabIndex = 5;
 			this->PageWares->Text = L"Custom Wares";
 			this->PageWares->UseVisualStyleBackColor = true;
 			//
 			// splitContainer1
 			this->splitContainer1->Panel1->Controls->Add(this->ListWares);
 			//
 			// splitContainer1.Panel2
 			//
 			this->splitContainer1->Panel2->Controls->Add(this->ListWareText);
-			this->splitContainer1->Size = System::Drawing::Size(741, 210);
+			this->splitContainer1->Size = System::Drawing::Size(742, 192);
-			this->splitContainer1->SplitterDistance = 107;
+			this->splitContainer1->SplitterDistance = 97;
 			this->splitContainer1->TabIndex = 0;
 			//
 			// ListWares
 			//
 			this->ListWares->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(7) {
 			this->ListWares->FullRowSelect = true;
 			this->ListWares->HideSelection = false;
 			this->ListWares->Location = System::Drawing::Point(0, 0);
 			this->ListWares->MultiSelect = false;
 			this->ListWares->Name = L"ListWares";
-			this->ListWares->Size = System::Drawing::Size(741, 107);
+			this->ListWares->Size = System::Drawing::Size(742, 97);
 			this->ListWares->TabIndex = 0;
 			this->ListWares->UseCompatibleStateImageBehavior = false;
 			this->ListWares->View = System::Windows::Forms::View::Details;
 			this->ListWares->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ListWares_SelectedIndexChanged);
 			this->ListWares->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListWares_MouseDoubleClick);
 			this->ListWareText->FullRowSelect = true;
 			this->ListWareText->HideSelection = false;
 			this->ListWareText->Location = System::Drawing::Point(0, 0);
 			this->ListWareText->MultiSelect = false;
 			this->ListWareText->Name = L"ListWareText";
-			this->ListWareText->Size = System::Drawing::Size(741, 99);
+			this->ListWareText->Size = System::Drawing::Size(742, 91);
 			this->ListWareText->TabIndex = 0;
 			this->ListWareText->UseCompatibleStateImageBehavior = false;
 			this->ListWareText->View = System::Windows::Forms::View::Details;
 			this->ListWareText->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListWareText_MouseDoubleClick);
 			//
 			// PageShip
 			//
 			this->PageShip->Controls->Add(this->ListShipText);
 			this->PageShip->Controls->Add(this->PanelTextID);
 			this->PageShip->Controls->Add(this->flowLayoutPanel2);
-			this->PageShip->Location = System::Drawing::Point(4, 22);
+			this->PageShip->Location = System::Drawing::Point(4, 40);
 			this->PageShip->Name = L"PageShip";
-			this->PageShip->Padding = System::Windows::Forms::Padding(8, 8, 8, 8);
+			this->PageShip->Padding = System::Windows::Forms::Padding(8);
-			this->PageShip->Size = System::Drawing::Size(747, 216);
+			this->PageShip->Size = System::Drawing::Size(748, 198);
 			this->PageShip->TabIndex = 6;
 			this->PageShip->Text = L"Ship Settings";
 			this->PageShip->UseVisualStyleBackColor = true;
 			//
 			// ListShipText
 			this->ListShipText->FullRowSelect = true;
 			this->ListShipText->HeaderStyle = System::Windows::Forms::ColumnHeaderStyle::Nonclickable;
 			this->ListShipText->HideSelection = false;
 			this->ListShipText->Location = System::Drawing::Point(8, 110);
 			this->ListShipText->Name = L"ListShipText";
-			this->ListShipText->Size = System::Drawing::Size(731, 98);
+			this->ListShipText->Size = System::Drawing::Size(732, 80);
 			this->ListShipText->TabIndex = 8;
 			this->ListShipText->UseCompatibleStateImageBehavior = false;
 			this->ListShipText->View = System::Windows::Forms::View::Details;
 			this->ListShipText->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListShipText_MouseDoubleClick);
 			//
 			this->PanelTextID->Controls->Add(this->NumTextID);
 			this->PanelTextID->Controls->Add(this->CheckExistingText);
 			this->PanelTextID->Dock = System::Windows::Forms::DockStyle::Top;
 			this->PanelTextID->Location = System::Drawing::Point(8, 90);
 			this->PanelTextID->Name = L"PanelTextID";
-			this->PanelTextID->Size = System::Drawing::Size(731, 20);
+			this->PanelTextID->Size = System::Drawing::Size(732, 20);
 			this->PanelTextID->TabIndex = 9;
 			//
 			// NumTextID
 			//
 			this->NumTextID->Dock = System::Windows::Forms::DockStyle::Left;
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYATF);
 			this->flowLayoutPanel2->Controls->Add(this->CheckSYYaki);
 			this->flowLayoutPanel2->Dock = System::Windows::Forms::DockStyle::Top;
 			this->flowLayoutPanel2->Location = System::Drawing::Point(8, 8);
 			this->flowLayoutPanel2->Name = L"flowLayoutPanel2";
-			this->flowLayoutPanel2->Size = System::Drawing::Size(731, 82);
+			this->flowLayoutPanel2->Size = System::Drawing::Size(732, 82);
 			this->flowLayoutPanel2->TabIndex = 7;
 			//
 			// label16
 			//
 			this->label16->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 8.25F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 			//
 			// PageRaw
 			//
 			this->PageRaw->Controls->Add(this->panel23);
 			this->PageRaw->Controls->Add(this->flowLayoutPanel3);
-			this->PageRaw->Location = System::Drawing::Point(4, 22);
+			this->PageRaw->Location = System::Drawing::Point(4, 40);
 			this->PageRaw->Name = L"PageRaw";
-			this->PageRaw->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->PageRaw->Padding = System::Windows::Forms::Padding(3);
-			this->PageRaw->Size = System::Drawing::Size(747, 216);
+			this->PageRaw->Size = System::Drawing::Size(748, 198);
 			this->PageRaw->TabIndex = 7;
 			this->PageRaw->Text = L"Ship Data";
 			this->PageRaw->UseVisualStyleBackColor = true;
 			//
 			// panel23
 			this->panel23->Controls->Add(this->TextShipData);
 			this->panel23->Controls->Add(this->panel24);
 			this->panel23->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->panel23->Location = System::Drawing::Point(3, 42);
 			this->panel23->Name = L"panel23";
-			this->panel23->Padding = System::Windows::Forms::Padding(10, 10, 10, 10);
+			this->panel23->Padding = System::Windows::Forms::Padding(10);
-			this->panel23->Size = System::Drawing::Size(741, 171);
+			this->panel23->Size = System::Drawing::Size(742, 153);
 			this->panel23->TabIndex = 3;
 			//
 			// TextShipData
 			//
 			this->TextShipData->BackColor = System::Drawing::SystemColors::Control;
 			this->TextShipData->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextShipData->Location = System::Drawing::Point(10, 34);
 			this->TextShipData->Name = L"TextShipData";
 			this->TextShipData->ReadOnly = true;
-			this->TextShipData->Size = System::Drawing::Size(721, 127);
+			this->TextShipData->Size = System::Drawing::Size(722, 109);
 			this->TextShipData->TabIndex = 0;
 			this->TextShipData->Text = L"";
 			this->TextShipData->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextShipData_TextChanged);
 			//
 			// panel24
 			this->panel24->Controls->Add(this->label17);
 			this->panel24->Controls->Add(this->checkBox1);
 			this->panel24->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel24->Location = System::Drawing::Point(10, 10);
 			this->panel24->Name = L"panel24";
-			this->panel24->Size = System::Drawing::Size(721, 24);
+			this->panel24->Size = System::Drawing::Size(722, 24);
 			this->panel24->TabIndex = 2;
 			//
 			// label17
 			//
 			this->label17->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->label17->Location = System::Drawing::Point(107, 0);
 			this->label17->Name = L"label17";
-			this->label17->Size = System::Drawing::Size(614, 24);
+			this->label17->Size = System::Drawing::Size(615, 24);
 			this->label17->TabIndex = 2;
 			this->label17->Text = L"(Warning: Making changes could break the ship if you dont know what your doing)";
 			this->label17->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
 			//
 			// checkBox1
 			this->flowLayoutPanel3->Controls->Add(this->button3);
 			this->flowLayoutPanel3->Controls->Add(this->button5);
 			this->flowLayoutPanel3->Dock = System::Windows::Forms::DockStyle::Top;
 			this->flowLayoutPanel3->Location = System::Drawing::Point(3, 3);
 			this->flowLayoutPanel3->Name = L"flowLayoutPanel3";
-			this->flowLayoutPanel3->Size = System::Drawing::Size(741, 39);
+			this->flowLayoutPanel3->Size = System::Drawing::Size(742, 39);
 			this->flowLayoutPanel3->TabIndex = 4;
 			//
 			// button3
 			//
 			this->button3->AutoSize = true;
 			//
 			// PageShipComp
 			//
 			this->PageShipComp->Controls->Add(this->panel26);
 			this->PageShipComp->Controls->Add(this->panel25);
-			this->PageShipComp->Location = System::Drawing::Point(4, 22);
+			this->PageShipComp->Location = System::Drawing::Point(4, 40);
 			this->PageShipComp->Name = L"PageShipComp";
-			this->PageShipComp->Padding = System::Windows::Forms::Padding(3, 3, 3, 3);
+			this->PageShipComp->Padding = System::Windows::Forms::Padding(3);
-			this->PageShipComp->Size = System::Drawing::Size(747, 216);
+			this->PageShipComp->Size = System::Drawing::Size(748, 198);
 			this->PageShipComp->TabIndex = 8;
 			this->PageShipComp->Text = L"Ship Parts";
 			this->PageShipComp->UseVisualStyleBackColor = true;
 			//
 			// panel26
 			//
 			this->panel26->Controls->Add(this->ListShipPart);
 			this->panel26->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->panel26->Location = System::Drawing::Point(3, 35);
 			this->panel26->Name = L"panel26";
-			this->panel26->Padding = System::Windows::Forms::Padding(10, 10, 10, 10);
+			this->panel26->Padding = System::Windows::Forms::Padding(10);
-			this->panel26->Size = System::Drawing::Size(741, 178);
+			this->panel26->Size = System::Drawing::Size(742, 160);
 			this->panel26->TabIndex = 4;
 			//
 			// ListShipPart
 			//
 			this->ListShipPart->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(3) {
 			this->ListShipPart->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListShipPart->FullRowSelect = true;
 			this->ListShipPart->HideSelection = false;
 			this->ListShipPart->Location = System::Drawing::Point(10, 10);
 			this->ListShipPart->Name = L"ListShipPart";
-			this->ListShipPart->Size = System::Drawing::Size(721, 158);
+			this->ListShipPart->Size = System::Drawing::Size(722, 140);
 			this->ListShipPart->TabIndex = 3;
 			this->ListShipPart->UseCompatibleStateImageBehavior = false;
 			this->ListShipPart->View = System::Windows::Forms::View::Details;
 			this->ListShipPart->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &PackageForm::ListShipPart_MouseDoubleClick);
 			//
 			this->panel25->Controls->Add(this->ComboShipPart);
 			this->panel25->Controls->Add(this->label18);
 			this->panel25->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel25->Location = System::Drawing::Point(3, 3);
 			this->panel25->Name = L"panel25";
-			this->panel25->Padding = System::Windows::Forms::Padding(5, 5, 5, 5);
+			this->panel25->Padding = System::Windows::Forms::Padding(5);
-			this->panel25->Size = System::Drawing::Size(741, 32);
+			this->panel25->Size = System::Drawing::Size(742, 32);
 			this->panel25->TabIndex = 2;
 			//
 			// ComboShipPart
 			//
 			this->ComboShipPart->Dock = System::Windows::Forms::DockStyle::Fill;
 				L"Componants", L"Dummies", L"Cockpits", L"CutData",
 					L"Bodies", L"Animations"
 			});
 			this->ComboShipPart->Location = System::Drawing::Point(105, 5);
 			this->ComboShipPart->Name = L"ComboShipPart";
-			this->ComboShipPart->Size = System::Drawing::Size(631, 21);
+			this->ComboShipPart->Size = System::Drawing::Size(632, 21);
 			this->ComboShipPart->TabIndex = 0;
 			this->ComboShipPart->SelectedIndexChanged += gcnew System::EventHandler(this, &PackageForm::ComboShipPart_SelectedIndexChanged);
 			//
 			// label18
 			//
 			this->label18->Name = L"label18";
 			this->label18->Size = System::Drawing::Size(100, 22);
 			this->label18->TabIndex = 1;
 			this->label18->Text = L"Part Type";
 			this->label18->TextAlign = System::Drawing::ContentAlignment::MiddleLeft;
+			//
+			// tabGlobals
+			//
+			this->tabGlobals->Controls->Add(this->butGlobalClear);
+			this->tabGlobals->Controls->Add(this->butAddGlobal);
+			this->tabGlobals->Controls->Add(this->listGlobals);
+			this->tabGlobals->Location = System::Drawing::Point(4, 40);
+			this->tabGlobals->Name = L"tabGlobals";
+			this->tabGlobals->Padding = System::Windows::Forms::Padding(3);
+			this->tabGlobals->Size = System::Drawing::Size(748, 198);
+			this->tabGlobals->TabIndex = 11;
+			this->tabGlobals->Text = L"Globals";
+			this->tabGlobals->UseVisualStyleBackColor = true;
+			//
+			// butGlobalClear
+			//
+			this->butGlobalClear->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"butGlobalClear.Image")));
+			this->butGlobalClear->Location = System::Drawing::Point(621, 156);
+			this->butGlobalClear->Name = L"butGlobalClear";
+			this->butGlobalClear->Size = System::Drawing::Size(121, 36);
+			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->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"butAddGlobal.Image")));
+			this->butAddGlobal->Location = System::Drawing::Point(6, 156);
+			this->butAddGlobal->Name = L"butAddGlobal";
+			this->butAddGlobal->Size = System::Drawing::Size(121, 36);
+			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);
+			//
+			// listGlobals
+			//
+			this->listGlobals->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(2) {
+				this->ColGlobalName,
+					this->ColGlobalValue
+			});
+			this->listGlobals->ContextMenuStrip = this->contextGlobal;
+			this->listGlobals->HideSelection = false;
+			this->listGlobals->Location = System::Drawing::Point(6, 6);
+			this->listGlobals->Name = L"listGlobals";
+			this->listGlobals->Size = System::Drawing::Size(736, 144);
+			this->listGlobals->TabIndex = 0;
+			this->listGlobals->UseCompatibleStateImageBehavior = false;
+			this->listGlobals->View = System::Windows::Forms::View::Details;
+			//
+			// ColGlobalName
+			//
+			this->ColGlobalName->Text = L"Global";
+			//
+			// ColGlobalValue
+			//
+			this->ColGlobalValue->Text = L"Value";
+			//
+			// contextGlobal
+			//
+			this->contextGlobal->ImageScalingSize = System::Drawing::Size(20, 20);
+			this->contextGlobal->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(6) {
+				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);
+			//
+			// 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->Text = L"Add New";
+			//
+			// toolStripSeparator6
+			//
+			this->toolStripSeparator6->Name = L"toolStripSeparator6";
+			this->toolStripSeparator6->Size = System::Drawing::Size(165, 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->Text = L"Edit Selected";
+			//
+			// 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->Text = L"Remove Selected";
+			//
+			// toolStripSeparator7
+			//
+			this->toolStripSeparator7->Name = L"toolStripSeparator7";
+			this->toolStripSeparator7->Size = System::Drawing::Size(165, 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->Text = L"Clear All";
 			//
 			// CheckShipID
 			//
 			this->CheckShipID->AutoSize = true;
 			this->CheckShipID->Dock = System::Windows::Forms::DockStyle::Left;
 			this->CheckShipID->TabIndex = 2;
 			this->CheckShipID->Text = L"Replace Existing Ship";
 			this->CheckShipID->UseVisualStyleBackColor = true;
 			this->CheckShipID->CheckedChanged += gcnew System::EventHandler(this, &PackageForm::CheckShipID_CheckedChanged);
 			//
 			// panel1
 			//
 			this->panel1->Controls->Add(this->TextName);
 			this->panel1->Controls->Add(this->label1);
 			this->panel1->Dock = System::Windows::Forms::DockStyle::Top;
 			this->panel1->Location = System::Drawing::Point(5, 36);
 			this->panel1->Name = L"panel1";
 			this->panel1->Size = System::Drawing::Size(756, 17);
 			this->panel1->TabIndex = 2;
 			//
 			// TextName
 			//
 			this->TextName->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->TextName->Location = System::Drawing::Point(157, 0);
 			this->TextName->Name = L"TextName";
 			this->TextName->Size = System::Drawing::Size(599, 20);
 			this->TextName->TabIndex = 1;
 			this->TextVersion->Location = System::Drawing::Point(157, 0);
 			this->TextVersion->Name = L"TextVersion";
 			this->TextVersion->Size = System::Drawing::Size(599, 20);
 			this->TextVersion->TabIndex = 1;
 			this->TextVersion->TextChanged += gcnew System::EventHandler(this, &PackageForm::TextVersion_TextChanged);
 			//
 			// label3
 			//
 			this->label3->Dock = System::Windows::Forms::DockStyle::Left;
 			this->label3->Font = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
 				static_cast<System::Byte>(0)));
 			this->Controls->Add(this->panel2);
 			this->Controls->Add(this->panel1);
 			this->Controls->Add(this->toolStrip1);
 			this->Icon = (cli::safe_cast<System::Drawing::Icon^>(resources->GetObject(L"$this.Icon")));
 			this->Name = L"PackageForm";
-			this->Padding = System::Windows::Forms::Padding(5, 5, 5, 5);
+			this->Padding = System::Windows::Forms::Padding(5);
 			this->ShowIcon = false;
 			this->ShowInTaskbar = false;
 			this->StartPosition = System::Windows::Forms::FormStartPosition::CenterParent;
 			this->Text = L"Package";
 			this->Load += gcnew System::EventHandler(this, &PackageForm::PackageForm_Load);
 			this->flowLayoutPanel3->PerformLayout();
 			this->PageShipComp->ResumeLayout(false);
 			this->panel26->ResumeLayout(false);
 			this->ContextShipPart->ResumeLayout(false);
 			this->panel25->ResumeLayout(false);
+			this->tabGlobals->ResumeLayout(false);
+			this->contextGlobal->ResumeLayout(false);
 			this->panel1->ResumeLayout(false);
 			this->panel1->PerformLayout();
 			this->panel2->ResumeLayout(false);
 			this->panel2->PerformLayout();
 			this->panel3->ResumeLayout(false);
 			this->UpdateChanged();
+		 }
 private: System::Void ComboGameFilter_SelectedIndexChanged(System::Object^  sender, System::EventArgs^  e) {
 			 this->UpdateFileList();
+		 }
+private: System::Void butAddGlobal_Click(System::Object^ sender, System::EventArgs^ e) {
+			this->AddNewGlobal();
+		}
+private: System::Void butGlobalClear_Click(System::Object^ sender, System::EventArgs^ e) {
+			m_pPackage->clearGlobals();
+			this->UpdateGlobals();
+			this->UpdateChanged();
+		}
 };
+}

Subversion Repositories spk

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