WebSVN – spk – Diff – /PluginManager/src/Forms/MainGui.h

 using namespace System::Windows::Forms;
 using namespace System::Data;
 using namespace System::Drawing;
 using namespace System::Threading;
+#include "DirectoryControl.h"
 #include "About.h"
 #include "PackageInstalled.h"
 #include "GameLauncherFlags.h"
 #include "FakePatchControl.h"
 //TODO: remove this, move to a generic shared space
 #include "CheckUpdate.h"
 #include "MenuBar.h"
 //TODO: remove this, move to a generic shared space
 #include "..\..\Creator\src\Forms\Waiting.h"
-enum {MGUI_BACKGROUND_NONE, MGUI_BACKGROUND_INSTALL, MGUI_BACKGROUND_UNINSTALL, MGUI_BACKGROUND_DISABLE, MGUI_BACKGROUND_CHANGEDIR, MGUI_BACKGROUND_ADDDIR, MGUI_BACKGROUND_INSTALLBUILTIN, MGUI_BACKGROUND_REMOVEDIR};
+enum {MGUI_BACKGROUND_NONE, MGUI_BACKGROUND_INSTALL, MGUI_BACKGROUND_UNINSTALL, MGUI_BACKGROUND_DISABLE, MGUI_BACKGROUND_CHANGEDIR, MGUI_BACKGROUND_INSTALLBUILTIN, MGUI_BACKGROUND_CLOSEDIR};
 enum {SORT_NAME, SORT_AUTHOR, SORT_VERSION, SORT_CREATED, SORT_TYPE, SORT_ENABLE, SORT_SIGNED};
 #define MAXTIPS 1
 #define TIPSECTION_YESNO		0
 	///          resources associated with this form.
 	/// </summary>
 	public ref class MainGui : public System::Windows::Forms::Form
+	{
 	public:
-		MainGui(CPackages *p, CyStringList *list, CyStringList *removed, bool advanced)
+		MainGui(CPackages *p, Utils::CStringList *list, Utils::CStringList *removed, bool advanced)
+		{
 			InitializeComponent();
 			// additional controls
 			m_pMenuBar = gcnew MenuBar(this, advanced);
 			// update the gui
 			this->UpdateControls();
 			// update the display
-			this->UpdateDirList();
+			this->UpdateDirList("");
 			this->UpdatePackages();
 			// setup the events
 			this->SetupEventHandlers();
 			//this->ButRun->Hide();
+		}
 		void DisplayLocked(bool inthread);
-		void GetGameDirs(CyString &dir, bool askDir, bool askDirAddon);
 		void CheckProtectedDir();
 		void PrepareSaveGameManager()
+		{
 			// copy save games to each game dir
+		}
 				this->backgroundWorker2->RunWorkerAsync();
 				m_pWait->ShowDialog(this);
+			}
+		}
-		void AboutDialog()
+		void OpenDirectoryControl();
-		{
-			 CBaseFile *pm = m_pPackages->FindScriptByAuthor("PluginManager");
-			 System::String ^scriptVer = "None";
-			 if ( pm )
-			 {
-				 scriptVer = _US(pm->version());
-				 if ( !pm->creationDate().empty() )
-					scriptVer += " (" + _US(pm->creationDate()) + ")";
-			 }
-			About ^about = gcnew About(GetVersionString(), PMLDATE, scriptVer, m_bAdvanced);
-			about->ShowDialog(this);
+		void AboutDialog();
-		}
 		// config
 		void SetSize(int x, int y) { m_iSizeX = x; m_iSizeY = y; }
 		void SetTipStrings(int section);
 		void SetTips(int tip, int done)
+		}
 		int GetMaxTips() { return (int)MAXTIPS; }
 		long GetIgnoreJoy() { return m_pLauncherFlags->iIgnoreJoy; }
 		// gui updates
-		void UpdateDirList();
+		void UpdateDirList(const Utils::String &current);
 		void UpdatePackages();
 		void UpdateControls();
 		bool UpdateBuiltInPackages();
 		void AddIconToPackages(String ^icon);
 		void SetupEventHandlers();
 		void StartCheckTimer();
 		// control functions
 		bool InstallPackage(System::String ^file, bool straightAway, bool builtin, bool background);
+		void CloseCurrentDirectory();
-		void ChangeDirectory(CyString dir);
+		void ChangeDirectory(const Utils::String &dir);
 		void SetGameArgs(System::String ^args) { m_sGameArgs = args; }
 		void AddGameArgs(System::String ^args) { m_sGameArgs += " " + args; }
 		bool DisplayTip(int tipsection, int tip);
 		// external control events
 		void InstallEvent(System::Object ^Sender, System::EventArgs ^E);
 		void VanillaEvent(System::Object ^Sender, System::EventArgs ^E);
 		void ModifiedEvent(System::Object ^Sender, System::EventArgs ^E);
-		void AddDirectoryEvent(System::Object ^Sender, System::EventArgs ^E);
 		void ModSelectorEvent(System::Object ^Sender, System::EventArgs ^E);
 		void PackageBrowserEvent(System::Object ^Sender, System::EventArgs ^E);
 		void FindPackagesOnline();
 		void ViewFileLog();
 		void EditGlobalsDialog();
 		void EditWaresDialog();
 		void CommandSlotsDialog();
 		void FakePatchControlDialog();
-		void RemoveDirectory();
 		void ExportPackageList();
 		void VerifyInstalledFiles();
 		CPackages *GetPackageControl() { return m_pPackages; }
 	protected:
 		bool StartInstalling(bool builtin, bool background) { return StartInstalling(builtin, background, false); }
 		bool StartInstalling(bool builtin, bool background, bool archive);
 		void DoInstall(bool builtin, bool frombackground);
 		void DoUninstall();
 		void DoDisable();
-		bool RemoveCurrentDirectory();
 		CBaseFile *FindPackageFromList(ListViewItem ^item);
 		bool StartBackground(int type);
 		bool StartBackground(int type, System::String ^info);
 		void LaunchGame();
 		void RunFromToolItem(ToolStripMenuItem ^item);
 		MenuBar			^m_pMenuBar;
 		CPackages		*m_pPackages;
-		CyStringList	*m_pDirList;
+		Utils::CStringList	*m_pDirList;
-		CyStringList	*m_pRemovedDirList;
+		Utils::CStringList	*m_pRemovedDirList;
 		CyStringList	*m_pUpdateList;
 		CyStringList	*m_pFileErrors;
 		int				 m_iBackgroundTask;
 		int				 m_iSortingColumn;
 		bool			 m_bSortingAsc;
 			this->GroupDir->SuspendLayout();
 			this->contextMenuStrip1->SuspendLayout();
 			this->panel1->SuspendLayout();
 			this->GroupPackages->SuspendLayout();
 			this->PanelDisplay->SuspendLayout();
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PictureDisplay))->BeginInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PictureDisplay))->BeginInit();
 			this->panel2->SuspendLayout();
 			this->statusStrip1->SuspendLayout();
 			this->SuspendLayout();
 			//
 			// GroupDir
 			//
 			this->GroupDir->Controls->Add(this->ComboDir);
 			this->GroupDir->Dock = System::Windows::Forms::DockStyle::Top;
 			this->GroupDir->Location = System::Drawing::Point(0, 0);
+			this->GroupDir->Margin = System::Windows::Forms::Padding(4);
 			this->GroupDir->Name = L"GroupDir";
-			this->GroupDir->Padding = System::Windows::Forms::Padding(5);
+			this->GroupDir->Padding = System::Windows::Forms::Padding(7, 6, 7, 6);
-			this->GroupDir->Size = System::Drawing::Size(626, 52);
+			this->GroupDir->Size = System::Drawing::Size(835, 64);
 			this->GroupDir->TabIndex = 0;
 			this->GroupDir->TabStop = false;
 			this->GroupDir->Text = L"Current Directory";
 			//
 			// ComboDir
 			//
 			this->ComboDir->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ComboDir->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList;
 			this->ComboDir->FormattingEnabled = true;
-			this->ComboDir->Location = System::Drawing::Point(5, 18);
+			this->ComboDir->Location = System::Drawing::Point(7, 21);
-			this->ComboDir->Margin = System::Windows::Forms::Padding(10);
+			this->ComboDir->Margin = System::Windows::Forms::Padding(13, 12, 13, 12);
 			this->ComboDir->Name = L"ComboDir";
-			this->ComboDir->Size = System::Drawing::Size(616, 21);
+			this->ComboDir->Size = System::Drawing::Size(821, 24);
 			this->ComboDir->TabIndex = 0;
 			//
 			// ListPackages
 			//
 			this->ListPackages->AllowDrop = true;
-			this->ListPackages->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(6) {this->columnHeader1,
+			this->ListPackages->Columns->AddRange(gcnew cli::array< System::Windows::Forms::ColumnHeader^  >(6) {
+				this->columnHeader1,
-				this->columnHeader2, this->columnHeader3, this->columnHeader4, this->columnHeader6, this->columnHeader5});
+					this->columnHeader2, this->columnHeader3, this->columnHeader4, this->columnHeader6, this->columnHeader5
+			});
 			this->ListPackages->ContextMenuStrip = this->contextMenuStrip1;
 			this->ListPackages->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ListPackages->FullRowSelect = true;
 			this->ListPackages->HideSelection = false;
-			this->ListPackages->Location = System::Drawing::Point(3, 16);
+			this->ListPackages->Location = System::Drawing::Point(4, 19);
+			this->ListPackages->Margin = System::Windows::Forms::Padding(4);
 			this->ListPackages->Name = L"ListPackages";
 			this->ListPackages->ShowItemToolTips = true;
-			this->ListPackages->Size = System::Drawing::Size(620, 386);
+			this->ListPackages->Size = System::Drawing::Size(827, 478);
 			this->ListPackages->TabIndex = 0;
 			this->ListPackages->UseCompatibleStateImageBehavior = false;
 			this->ListPackages->View = System::Windows::Forms::View::Details;
-			this->ListPackages->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &MainGui::ListPackages_MouseDoubleClick);
+			this->ListPackages->DrawSubItem += gcnew System::Windows::Forms::DrawListViewSubItemEventHandler(this, &MainGui::ListPackages_DrawSubItem);
 			this->ListPackages->DragDrop += gcnew System::Windows::Forms::DragEventHandler(this, &MainGui::ListPackages_DragDrop);
 			this->ListPackages->DragOver += gcnew System::Windows::Forms::DragEventHandler(this, &MainGui::ListPackages_DragOver);
-			this->ListPackages->DrawSubItem += gcnew System::Windows::Forms::DrawListViewSubItemEventHandler(this, &MainGui::ListPackages_DrawSubItem);
+			this->ListPackages->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &MainGui::ListPackages_MouseDoubleClick);
 			//
 			// columnHeader1
 			//
 			this->columnHeader1->Text = L"Package";
 			//
 			this->columnHeader5->TextAlign = System::Windows::Forms::HorizontalAlignment::Right;
 			//
 			// contextMenuStrip1
 			//
 			this->contextMenuStrip1->ImageScalingSize = System::Drawing::Size(24, 24);
-			this->contextMenuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(15) {this->ContextName,
+			this->contextMenuStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(15) {
+				this->ContextName,
-				this->toolStripSeparator3, this->uninstallToolStripMenuItem, this->UninstallSelectedContext, this->ContextEnable, this->ContextDisable,
+					this->toolStripSeparator3, this->uninstallToolStripMenuItem, this->UninstallSelectedContext, this->ContextEnable, this->ContextDisable,
-				this->ContextSeperator, this->viewReadmeToolStripMenuItem, this->extrasToolStripMenuItem, this->ContextSeperator2, this->emailAuthorToolStripMenuItem,
+					this->ContextSeperator, this->viewReadmeToolStripMenuItem, this->extrasToolStripMenuItem, this->ContextSeperator2, this->emailAuthorToolStripMenuItem,
-				this->visitForumPageToolStripMenuItem, this->visitWebSiteToolStripMenuItem, this->toolStripSeparator2, this->checkForUpdatesToolStripMenuItem});
+					this->visitForumPageToolStripMenuItem, this->visitWebSiteToolStripMenuItem, this->toolStripSeparator2, this->checkForUpdatesToolStripMenuItem
+			});
 			this->contextMenuStrip1->Name = L"contextMenuStrip1";
-			this->contextMenuStrip1->Size = System::Drawing::Size(216, 578);
+			this->contextMenuStrip1->Size = System::Drawing::Size(244, 578);
 			this->contextMenuStrip1->Opening += gcnew System::ComponentModel::CancelEventHandler(this, &MainGui::contextMenuStrip1_Opening);
 			//
 			// ContextName
 			//
-			this->ContextName->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextName.Image")));
+			this->ContextName->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextName.Image")));
 			this->ContextName->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextName->Name = L"ContextName";
-			this->ContextName->Size = System::Drawing::Size(215, 50);
+			this->ContextName->Size = System::Drawing::Size(243, 50);
 			this->ContextName->Text = L"Name";
 			this->ContextName->Click += gcnew System::EventHandler(this, &MainGui::ContextName_Click);
 			//
 			// toolStripSeparator3
 			//
 			this->toolStripSeparator3->Name = L"toolStripSeparator3";
-			this->toolStripSeparator3->Size = System::Drawing::Size(212, 6);
+			this->toolStripSeparator3->Size = System::Drawing::Size(240, 6);
 			//
 			// uninstallToolStripMenuItem
 			//
-			this->uninstallToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"uninstallToolStripMenuItem.Image")));
+			this->uninstallToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"uninstallToolStripMenuItem.Image")));
 			this->uninstallToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->uninstallToolStripMenuItem->Name = L"uninstallToolStripMenuItem";
-			this->uninstallToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->uninstallToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->uninstallToolStripMenuItem->Text = L"Uninstall";
 			this->uninstallToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainGui::uninstallToolStripMenuItem_Click);
 			//
 			// UninstallSelectedContext
 			//
-			this->UninstallSelectedContext->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"UninstallSelectedContext.Image")));
+			this->UninstallSelectedContext->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"UninstallSelectedContext.Image")));
 			this->UninstallSelectedContext->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->UninstallSelectedContext->Name = L"UninstallSelectedContext";
-			this->UninstallSelectedContext->Size = System::Drawing::Size(215, 50);
+			this->UninstallSelectedContext->Size = System::Drawing::Size(243, 50);
 			this->UninstallSelectedContext->Text = L"Uninstall Selected";
 			this->UninstallSelectedContext->Click += gcnew System::EventHandler(this, &MainGui::UninstallSelectedContext_Click);
 			//
 			// ContextEnable
 			//
-			this->ContextEnable->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextEnable.Image")));
+			this->ContextEnable->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextEnable.Image")));
 			this->ContextEnable->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextEnable->Name = L"ContextEnable";
-			this->ContextEnable->Size = System::Drawing::Size(215, 50);
+			this->ContextEnable->Size = System::Drawing::Size(243, 50);
 			this->ContextEnable->Text = L"Enable";
 			this->ContextEnable->Click += gcnew System::EventHandler(this, &MainGui::ContextEnable_Click);
 			//
 			// ContextDisable
 			//
-			this->ContextDisable->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ContextDisable.Image")));
+			this->ContextDisable->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ContextDisable.Image")));
 			this->ContextDisable->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->ContextDisable->Name = L"ContextDisable";
-			this->ContextDisable->Size = System::Drawing::Size(215, 50);
+			this->ContextDisable->Size = System::Drawing::Size(243, 50);
 			this->ContextDisable->Text = L"Disable";
 			this->ContextDisable->Click += gcnew System::EventHandler(this, &MainGui::ContextDisable_Click);
 			//
 			// ContextSeperator
 			//
 			this->ContextSeperator->Name = L"ContextSeperator";
-			this->ContextSeperator->Size = System::Drawing::Size(212, 6);
+			this->ContextSeperator->Size = System::Drawing::Size(240, 6);
 			//
 			// viewReadmeToolStripMenuItem
 			//
-			this->viewReadmeToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"viewReadmeToolStripMenuItem.Image")));
+			this->viewReadmeToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"viewReadmeToolStripMenuItem.Image")));
 			this->viewReadmeToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->viewReadmeToolStripMenuItem->Name = L"viewReadmeToolStripMenuItem";
-			this->viewReadmeToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->viewReadmeToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->viewReadmeToolStripMenuItem->Text = L"View Readme";
 			//
 			// extrasToolStripMenuItem
 			//
-			this->extrasToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"extrasToolStripMenuItem.Image")));
+			this->extrasToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"extrasToolStripMenuItem.Image")));
 			this->extrasToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->extrasToolStripMenuItem->Name = L"extrasToolStripMenuItem";
-			this->extrasToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->extrasToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->extrasToolStripMenuItem->Text = L"Extras";
 			//
 			// ContextSeperator2
 			//
 			this->ContextSeperator2->Name = L"ContextSeperator2";
-			this->ContextSeperator2->Size = System::Drawing::Size(212, 6);
+			this->ContextSeperator2->Size = System::Drawing::Size(240, 6);
 			//
 			// emailAuthorToolStripMenuItem
 			//
-			this->emailAuthorToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"emailAuthorToolStripMenuItem.Image")));
+			this->emailAuthorToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"emailAuthorToolStripMenuItem.Image")));
 			this->emailAuthorToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->emailAuthorToolStripMenuItem->Name = L"emailAuthorToolStripMenuItem";
-			this->emailAuthorToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->emailAuthorToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->emailAuthorToolStripMenuItem->Text = L"Email Author";
 			this->emailAuthorToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainGui::emailAuthorToolStripMenuItem_Click);
 			//
 			// visitForumPageToolStripMenuItem
 			//
-			this->visitForumPageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"visitForumPageToolStripMenuItem.Image")));
+			this->visitForumPageToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"visitForumPageToolStripMenuItem.Image")));
 			this->visitForumPageToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->visitForumPageToolStripMenuItem->Name = L"visitForumPageToolStripMenuItem";
-			this->visitForumPageToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->visitForumPageToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->visitForumPageToolStripMenuItem->Text = L"Visit Forum Page";
 			this->visitForumPageToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainGui::visitForumPageToolStripMenuItem_Click);
 			//
 			// visitWebSiteToolStripMenuItem
 			//
-			this->visitWebSiteToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"visitWebSiteToolStripMenuItem.Image")));
+			this->visitWebSiteToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"visitWebSiteToolStripMenuItem.Image")));
 			this->visitWebSiteToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->visitWebSiteToolStripMenuItem->Name = L"visitWebSiteToolStripMenuItem";
-			this->visitWebSiteToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->visitWebSiteToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->visitWebSiteToolStripMenuItem->Text = L"Visit Web Site";
 			this->visitWebSiteToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainGui::visitWebSiteToolStripMenuItem_Click);
 			//
 			// toolStripSeparator2
 			//
 			this->toolStripSeparator2->Name = L"toolStripSeparator2";
-			this->toolStripSeparator2->Size = System::Drawing::Size(212, 6);
+			this->toolStripSeparator2->Size = System::Drawing::Size(240, 6);
 			//
 			// checkForUpdatesToolStripMenuItem
 			//
-			this->checkForUpdatesToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"checkForUpdatesToolStripMenuItem.Image")));
+			this->checkForUpdatesToolStripMenuItem->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"checkForUpdatesToolStripMenuItem.Image")));
 			this->checkForUpdatesToolStripMenuItem->ImageScaling = System::Windows::Forms::ToolStripItemImageScaling::None;
 			this->checkForUpdatesToolStripMenuItem->Name = L"checkForUpdatesToolStripMenuItem";
-			this->checkForUpdatesToolStripMenuItem->Size = System::Drawing::Size(215, 50);
+			this->checkForUpdatesToolStripMenuItem->Size = System::Drawing::Size(243, 50);
 			this->checkForUpdatesToolStripMenuItem->Text = L"Check For Updates";
 			this->checkForUpdatesToolStripMenuItem->Click += gcnew System::EventHandler(this, &MainGui::checkForUpdatesToolStripMenuItem_Click);
 			//
 			// panel1
 			//
 			this->panel1->AllowDrop = true;
 			this->panel1->Controls->Add(this->ProgressBar);
 			this->panel1->Controls->Add(this->ButRun);
 			this->panel1->Controls->Add(this->ButClose);
 			this->panel1->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel1->Location = System::Drawing::Point(0, 551);
+			this->panel1->Location = System::Drawing::Point(0, 681);
-			this->panel1->Margin = System::Windows::Forms::Padding(5, 10, 5, 10);
+			this->panel1->Margin = System::Windows::Forms::Padding(7, 12, 7, 12);
 			this->panel1->Name = L"panel1";
-			this->panel1->Size = System::Drawing::Size(626, 37);
+			this->panel1->Size = System::Drawing::Size(835, 46);
 			this->panel1->TabIndex = 2;
 			//
 			// ProgressBar
 			//
 			this->ProgressBar->Dock = System::Windows::Forms::DockStyle::Fill;
 			this->ProgressBar->Location = System::Drawing::Point(0, 0);
-			this->ProgressBar->Margin = System::Windows::Forms::Padding(10);
+			this->ProgressBar->Margin = System::Windows::Forms::Padding(13, 12, 13, 12);
 			this->ProgressBar->MarqueeAnimationSpeed = 5;
 			this->ProgressBar->Name = L"ProgressBar";
-			this->ProgressBar->Size = System::Drawing::Size(432, 37);
+			this->ProgressBar->Size = System::Drawing::Size(576, 46);
 			this->ProgressBar->Style = System::Windows::Forms::ProgressBarStyle::Marquee;
 			this->ProgressBar->TabIndex = 1;
 			this->ProgressBar->Visible = false;
 			//
 			// ButRun
 			//
 			this->ButRun->AutoSize = true;
 			this->ButRun->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButRun->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ButRun.Image")));
+			this->ButRun->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ButRun.Image")));
-			this->ButRun->Location = System::Drawing::Point(432, 0);
+			this->ButRun->Location = System::Drawing::Point(576, 0);
+			this->ButRun->Margin = System::Windows::Forms::Padding(4);
 			this->ButRun->Name = L"ButRun";
-			this->ButRun->Size = System::Drawing::Size(119, 37);
+			this->ButRun->Size = System::Drawing::Size(159, 46);
 			this->ButRun->TabIndex = 2;
 			this->ButRun->Text = L"Run Game";
 			this->ButRun->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->ButRun->UseVisualStyleBackColor = true;
 			this->ButRun->Click += gcnew System::EventHandler(this, &MainGui::ButRun_Click);
 			//
 			// ButClose
 			//
 			this->ButClose->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButClose->Location = System::Drawing::Point(551, 0);
+			this->ButClose->Location = System::Drawing::Point(735, 0);
+			this->ButClose->Margin = System::Windows::Forms::Padding(4);
 			this->ButClose->Name = L"ButClose";
-			this->ButClose->Size = System::Drawing::Size(75, 37);
+			this->ButClose->Size = System::Drawing::Size(100, 46);
 			this->ButClose->TabIndex = 0;
 			this->ButClose->Text = L"Close";
 			this->ButClose->UseVisualStyleBackColor = true;
 			//
 			// GroupPackages
 			//
 			this->GroupPackages->Controls->Add(this->ListPackages);
 			this->GroupPackages->Controls->Add(this->PanelDisplay);
 			this->GroupPackages->Controls->Add(this->panel2);
 			this->GroupPackages->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->GroupPackages->Location = System::Drawing::Point(0, 52);
+			this->GroupPackages->Location = System::Drawing::Point(0, 64);
+			this->GroupPackages->Margin = System::Windows::Forms::Padding(4);
 			this->GroupPackages->Name = L"GroupPackages";
+			this->GroupPackages->Padding = System::Windows::Forms::Padding(4);
-			this->GroupPackages->Size = System::Drawing::Size(626, 499);
+			this->GroupPackages->Size = System::Drawing::Size(835, 617);
 			this->GroupPackages->TabIndex = 3;
 			this->GroupPackages->TabStop = false;
 			this->GroupPackages->Text = L"Installed Packages";
 			//
 			// PanelDisplay
 			//
 			this->PanelDisplay->AllowDrop = true;
 			this->PanelDisplay->Controls->Add(this->TextDesc);
 			this->PanelDisplay->Controls->Add(this->PictureDisplay);
 			this->PanelDisplay->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->PanelDisplay->Location = System::Drawing::Point(3, 402);
+			this->PanelDisplay->Location = System::Drawing::Point(4, 497);
+			this->PanelDisplay->Margin = System::Windows::Forms::Padding(4);
 			this->PanelDisplay->Name = L"PanelDisplay";
-			this->PanelDisplay->Size = System::Drawing::Size(620, 68);
+			this->PanelDisplay->Size = System::Drawing::Size(827, 84);
 			this->PanelDisplay->TabIndex = 2;
 			//
 			// TextDesc
 			//
 			this->TextDesc->Dock = System::Windows::Forms::DockStyle::Fill;
-			this->TextDesc->Location = System::Drawing::Point(72, 0);
+			this->TextDesc->Location = System::Drawing::Point(96, 0);
+			this->TextDesc->Margin = System::Windows::Forms::Padding(4);
 			this->TextDesc->Name = L"TextDesc";
 			this->TextDesc->ReadOnly = true;
-			this->TextDesc->Size = System::Drawing::Size(548, 68);
+			this->TextDesc->Size = System::Drawing::Size(731, 84);
 			this->TextDesc->TabIndex = 1;
 			this->TextDesc->Text = L"";
 			//
 			// PictureDisplay
 			//
 			this->PictureDisplay->Dock = System::Windows::Forms::DockStyle::Left;
-			this->PictureDisplay->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"PictureDisplay.Image")));
+			this->PictureDisplay->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"PictureDisplay.Image")));
 			this->PictureDisplay->Location = System::Drawing::Point(0, 0);
+			this->PictureDisplay->Margin = System::Windows::Forms::Padding(4);
 			this->PictureDisplay->Name = L"PictureDisplay";
-			this->PictureDisplay->Size = System::Drawing::Size(72, 68);
+			this->PictureDisplay->Size = System::Drawing::Size(96, 84);
 			this->PictureDisplay->SizeMode = System::Windows::Forms::PictureBoxSizeMode::StretchImage;
 			this->PictureDisplay->TabIndex = 2;
 			this->PictureDisplay->TabStop = false;
 			//
 			// panel2
 			this->panel2->Controls->Add(this->button1);
 			this->panel2->Controls->Add(this->ButUninstall);
 			this->panel2->Controls->Add(this->ButDisable);
 			this->panel2->Controls->Add(this->ButInstall);
 			this->panel2->Dock = System::Windows::Forms::DockStyle::Bottom;
-			this->panel2->Location = System::Drawing::Point(3, 470);
+			this->panel2->Location = System::Drawing::Point(4, 581);
+			this->panel2->Margin = System::Windows::Forms::Padding(4);
 			this->panel2->Name = L"panel2";
-			this->panel2->Size = System::Drawing::Size(620, 26);
+			this->panel2->Size = System::Drawing::Size(827, 32);
 			this->panel2->TabIndex = 0;
 			//
 			// button1
 			//
 			this->button1->Dock = System::Windows::Forms::DockStyle::Left;
-			this->button1->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"button1.Image")));
+			this->button1->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"button1.Image")));
-			this->button1->Location = System::Drawing::Point(122, 0);
+			this->button1->Location = System::Drawing::Point(172, 0);
+			this->button1->Margin = System::Windows::Forms::Padding(4);
 			this->button1->Name = L"button1";
-			this->button1->Size = System::Drawing::Size(121, 26);
+			this->button1->Size = System::Drawing::Size(161, 32);
 			this->button1->TabIndex = 3;
 			this->button1->Text = L"Install Archive";
 			this->button1->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->button1->UseVisualStyleBackColor = true;
 			this->button1->Click += gcnew System::EventHandler(this, &MainGui::button1_Click);
 			//
 			// ButUninstall
 			//
 			this->ButUninstall->AutoSize = true;
 			this->ButUninstall->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButUninstall->Location = System::Drawing::Point(357, 0);
+			this->ButUninstall->Location = System::Drawing::Point(476, 0);
+			this->ButUninstall->Margin = System::Windows::Forms::Padding(4);
 			this->ButUninstall->Name = L"ButUninstall";
-			this->ButUninstall->Size = System::Drawing::Size(122, 26);
+			this->ButUninstall->Size = System::Drawing::Size(163, 32);
 			this->ButUninstall->TabIndex = 2;
 			this->ButUninstall->Text = L"Uninstall";
 			this->ButUninstall->UseVisualStyleBackColor = true;
 			//
 			// ButDisable
 			//
 			this->ButDisable->AutoSize = true;
 			this->ButDisable->Dock = System::Windows::Forms::DockStyle::Right;
-			this->ButDisable->Location = System::Drawing::Point(479, 0);
+			this->ButDisable->Location = System::Drawing::Point(639, 0);
+			this->ButDisable->Margin = System::Windows::Forms::Padding(4);
 			this->ButDisable->Name = L"ButDisable";
-			this->ButDisable->Size = System::Drawing::Size(141, 26);
+			this->ButDisable->Size = System::Drawing::Size(188, 32);
 			this->ButDisable->TabIndex = 1;
 			this->ButDisable->Text = L"Disable";
 			this->ButDisable->UseVisualStyleBackColor = true;
 			//
 			// ButInstall
 			//
 			this->ButInstall->AutoSize = true;
 			this->ButInstall->Dock = System::Windows::Forms::DockStyle::Left;
-			this->ButInstall->Image = (cli::safe_cast<System::Drawing::Image^  >(resources->GetObject(L"ButInstall.Image")));
+			this->ButInstall->Image = (cli::safe_cast<System::Drawing::Image^>(resources->GetObject(L"ButInstall.Image")));
 			this->ButInstall->Location = System::Drawing::Point(0, 0);
+			this->ButInstall->Margin = System::Windows::Forms::Padding(4);
 			this->ButInstall->Name = L"ButInstall";
-			this->ButInstall->Size = System::Drawing::Size(122, 26);
+			this->ButInstall->Size = System::Drawing::Size(172, 32);
 			this->ButInstall->TabIndex = 0;
 			this->ButInstall->Text = L"Install Package";
 			this->ButInstall->TextImageRelation = System::Windows::Forms::TextImageRelation::ImageBeforeText;
 			this->ButInstall->UseVisualStyleBackColor = true;
 			//
 			// statusStrip1
 			//
+			this->statusStrip1->ImageScalingSize = System::Drawing::Size(20, 20);
-			this->statusStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(1) {this->LabelStatus});
+			this->statusStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^  >(1) { this->LabelStatus });
-			this->statusStrip1->Location = System::Drawing::Point(0, 588);
+			this->statusStrip1->Location = System::Drawing::Point(0, 727);
 			this->statusStrip1->Name = L"statusStrip1";
+			this->statusStrip1->Padding = System::Windows::Forms::Padding(1, 0, 19, 0);
-			this->statusStrip1->Size = System::Drawing::Size(626, 22);
+			this->statusStrip1->Size = System::Drawing::Size(835, 24);
 			this->statusStrip1->TabIndex = 5;
 			this->statusStrip1->Text = L"statusStrip1";
 			//
 			// LabelStatus
 			//
 			this->LabelStatus->Name = L"LabelStatus";
-			this->LabelStatus->Size = System::Drawing::Size(0, 17);
+			this->LabelStatus->Size = System::Drawing::Size(0, 19);
 			//
 			// imageList1
 			//
-			this->imageList1->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^  >(resources->GetObject(L"imageList1.ImageStream")));
+			this->imageList1->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^>(resources->GetObject(L"imageList1.ImageStream")));
 			this->imageList1->TransparentColor = System::Drawing::Color::Transparent;
 			this->imageList1->Images->SetKeyName(0, L"ship.png");
 			this->imageList1->Images->SetKeyName(1, L"package.png");
 			this->imageList1->Images->SetKeyName(2, L"fake.png");
 			this->imageList1->Images->SetKeyName(3, L"library.png");
 			this->imageList1->Images->SetKeyName(5, L"tick.png");
 			this->imageList1->Images->SetKeyName(6, L"no.png");
 			//
 			// imageList2
 			//
-			this->imageList2->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^  >(resources->GetObject(L"imageList2.ImageStream")));
+			this->imageList2->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^>(resources->GetObject(L"imageList2.ImageStream")));
 			this->imageList2->TransparentColor = System::Drawing::Color::Transparent;
 			this->imageList2->Images->SetKeyName(0, L"application");
 			this->imageList2->Images->SetKeyName(1, L"exe");
 			this->imageList2->Images->SetKeyName(2, L"doc");
 			this->imageList2->Images->SetKeyName(3, L"pdf");
 			this->backgroundWorker2->RunWorkerCompleted += gcnew System::ComponentModel::RunWorkerCompletedEventHandler(this, &MainGui::backgroundWorker2_RunWorkerCompleted);
 			//
 			// MainGui
 			//
 			this->AllowDrop = true;
-			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
+			this->AutoScaleDimensions = System::Drawing::SizeF(8, 16);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
-			this->ClientSize = System::Drawing::Size(626, 610);
+			this->ClientSize = System::Drawing::Size(835, 751);
 			this->Controls->Add(this->GroupPackages);
 			this->Controls->Add(this->panel1);
 			this->Controls->Add(this->GroupDir);
 			this->Controls->Add(this->statusStrip1);
-			this->Icon = (cli::safe_cast<System::Drawing::Icon^  >(resources->GetObject(L"$this.Icon")));
+			this->Icon = (cli::safe_cast<System::Drawing::Icon^>(resources->GetObject(L"$this.Icon")));
+			this->Margin = System::Windows::Forms::Padding(4);
 			this->Name = L"MainGui";
 			this->StartPosition = System::Windows::Forms::FormStartPosition::Manual;
 			this->Text = L"X-Universe Plugin Manager Lite";
 			this->Load += gcnew System::EventHandler(this, &MainGui::MainGui_Load);
+			this->Shown += gcnew System::EventHandler(this, &MainGui::MainGui_Shown);
 			this->GroupDir->ResumeLayout(false);
 			this->contextMenuStrip1->ResumeLayout(false);
 			this->panel1->ResumeLayout(false);
 			this->panel1->PerformLayout();
 			this->GroupPackages->ResumeLayout(false);
 			this->PanelDisplay->ResumeLayout(false);
-			(cli::safe_cast<System::ComponentModel::ISupportInitialize^  >(this->PictureDisplay))->EndInit();
+			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->PictureDisplay))->EndInit();
 			this->panel2->ResumeLayout(false);
 			this->panel2->PerformLayout();
 			this->statusStrip1->ResumeLayout(false);
 			this->statusStrip1->PerformLayout();
 			this->ResumeLayout(false);
 			this->PerformLayout();
+		}
 #pragma endregion
-private: System::Void MainGui_Load(System::Object^  sender, System::EventArgs^  e) {
+private: System::Void MainGui_Load(System::Object^  sender, System::EventArgs^  e);
-			 if ( m_iSaveGameManager == -1 )
-			 {
-				 if ( MessageBox::Show(this, "The save game manager will keep seperate save games for each directory and keeps vanilla and modified save games seperate\n\nDo you want to enable the save game manager?", "Save Game Manager", MessageBoxButtons::YesNo, MessageBoxIcon::Question) == Windows::Forms::DialogResult::Yes )
+private: System::Void MainGui_Shown(System::Object^  sender, System::EventArgs^  e);
-				 {
-					 m_iSaveGameManager = 1;
-					 this->PrepareSaveGameManager();
-				 }
-				 else
-					 m_iSaveGameManager = 0;
-			 }
-			 m_pMenuBar->SetSaveGameManager((m_iSaveGameManager == 1) ? true : false);
- 			// auto update
-			if ( m_iSizeX != -1 && m_iSizeY != -1 )
-				this->Size = System::Drawing::Size(m_iSizeX, m_iSizeY);
-			this->UpdateBuiltInPackages();
-			this->AutoUpdate();
-		 }
 private: System::Void ButRun_Click(System::Object^  sender, System::EventArgs^  e) {
 			 this->LaunchGame();
+		 }
 private: System::Void uninstallToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
 			 if ( m_pListItem )
 					int errorNum = m_pPackages->PrepareInstallPackage(m_pConverted, false, false, IC_ALL);
 					if ( errorNum != INSTALLCHECK_OK )
+					{
 						if ( errorNum == INSTALLCHECK_NOSHIP )
+						{
-							this->DisplayMessageBox(false, "No Ships", "Ships are not supported for " + SystemStringFromCyString(m_pPackages->GetGameName()), MessageBoxButtons::OK, MessageBoxIcon::Stop);
+							this->DisplayMessageBox(false, "No Ships", "Ships are not supported for " + _US(m_pPackages->getGameName()), MessageBoxButtons::OK, MessageBoxIcon::Stop);
 							errored = true;
+						}
 						else if ( m_pPackages->PrepareInstallPackage(m_pConverted, false, false, IC_MODIFIED) != INSTALLCHECK_OK )
+						{
 							this->DisplayMessageBox(false, "Installing", "Currently in Vanilla Mode, Package is not an Vanilla Package\n" + SystemStringFromCyString(m_pConverted->GetLanguageName(m_pPackages->GetLanguage())) + "\n\nSwitch to modified mode if you wish to install this package", MessageBoxButtons::OK, MessageBoxIcon::Question);

Subversion Repositories spk

(root)/PluginManager/src/Forms/MainGui.h – Rev 104 → 121