From 40533a50c1ad83723a803587f3c7174506337252 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 17 Sep 2010 07:57:57 +1200 Subject: [PATCH] fix some editor weirdness (1/2) --- OpenRA.Editor/MapSelect.Designer.cs | 602 ++++++++++++++-------------- OpenRA.Editor/MapSelect.cs | 7 +- OpenRA.Editor/MapSelect.resx | 124 +++--- 3 files changed, 367 insertions(+), 366 deletions(-) diff --git a/OpenRA.Editor/MapSelect.Designer.cs b/OpenRA.Editor/MapSelect.Designer.cs index 8251c33964..dbd02346bd 100644 --- a/OpenRA.Editor/MapSelect.Designer.cs +++ b/OpenRA.Editor/MapSelect.Designer.cs @@ -27,309 +27,307 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect)); - this.MapList = new System.Windows.Forms.ListView(); - this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)"); - this.MapIconsList = new System.Windows.Forms.ImageList(this.components); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOk = new System.Windows.Forms.Button(); - this.lblNew = new System.Windows.Forms.Label(); - this.txtNew = new System.Windows.Forms.TextBox(); - this.pbMinimap = new System.Windows.Forms.PictureBox(); - this.pnlBottom = new System.Windows.Forms.Panel(); - this.lblPathOut = new System.Windows.Forms.Label(); - this.lblPath = new System.Windows.Forms.Label(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.lblMapList = new System.Windows.Forms.Label(); - this.txtDesc = new System.Windows.Forms.TextBox(); - this.lblDesc = new System.Windows.Forms.Label(); - this.txtTheater = new System.Windows.Forms.TextBox(); - this.lblTheater = new System.Windows.Forms.Label(); - this.txtAuthor = new System.Windows.Forms.TextBox(); - this.lblAuthor = new System.Windows.Forms.Label(); - this.txtTitle = new System.Windows.Forms.TextBox(); - this.lblMapName = new System.Windows.Forms.Label(); - this.lblMinimap = new System.Windows.Forms.Label(); - this.txtPathOut = new System.Windows.Forms.TextBox(); - ((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit(); - this.pnlBottom.SuspendLayout(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.SuspendLayout(); - // - // MapList - // - this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect)); + this.MapList = new System.Windows.Forms.ListView(); + this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)"); + this.MapIconsList = new System.Windows.Forms.ImageList(this.components); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOk = new System.Windows.Forms.Button(); + this.lblNew = new System.Windows.Forms.Label(); + this.txtNew = new System.Windows.Forms.TextBox(); + this.pbMinimap = new System.Windows.Forms.PictureBox(); + this.pnlBottom = new System.Windows.Forms.Panel(); + this.txtPathOut = new System.Windows.Forms.TextBox(); + this.lblPathOut = new System.Windows.Forms.Label(); + this.lblPath = new System.Windows.Forms.Label(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.lblMapList = new System.Windows.Forms.Label(); + this.txtDesc = new System.Windows.Forms.TextBox(); + this.lblDesc = new System.Windows.Forms.Label(); + this.txtTheater = new System.Windows.Forms.TextBox(); + this.lblTheater = new System.Windows.Forms.Label(); + this.txtAuthor = new System.Windows.Forms.TextBox(); + this.lblAuthor = new System.Windows.Forms.Label(); + this.txtTitle = new System.Windows.Forms.TextBox(); + this.lblMapName = new System.Windows.Forms.Label(); + this.lblMinimap = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit(); + this.pnlBottom.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // MapList + // + this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.colMapName}); - this.MapList.FullRowSelect = true; - this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.MapList.LargeImageList = this.MapIconsList; - this.MapList.Location = new System.Drawing.Point(15, 25); - this.MapList.MultiSelect = false; - this.MapList.Name = "MapList"; - this.MapList.Size = new System.Drawing.Size(273, 294); - this.MapList.SmallImageList = this.MapIconsList; - this.MapList.StateImageList = this.MapIconsList; - this.MapList.TabIndex = 0; - this.MapList.UseCompatibleStateImageBehavior = false; - this.MapList.View = System.Windows.Forms.View.Details; - this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged); - // - // colMapName - // - this.colMapName.Text = "Map name"; - this.colMapName.Width = 240; - // - // MapIconsList - // - this.MapIconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("MapIconsList.ImageStream"))); - this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent; - this.MapIconsList.Images.SetKeyName(0, "mapicon"); - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(407, 35); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 1; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOk - // - this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOk.Location = new System.Drawing.Point(326, 35); - this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(75, 23); - this.btnOk.TabIndex = 2; - this.btnOk.Text = "Open"; - this.btnOk.UseVisualStyleBackColor = true; - // - // lblNew - // - this.lblNew.AutoSize = true; - this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.lblNew.Location = new System.Drawing.Point(12, 40); - this.lblNew.Name = "lblNew"; - this.lblNew.Size = new System.Drawing.Size(69, 13); - this.lblNew.TabIndex = 3; - this.lblNew.Text = "Map name:"; - // - // txtNew - // - this.txtNew.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtNew.Location = new System.Drawing.Point(88, 37); - this.txtNew.Name = "txtNew"; - this.txtNew.ReadOnly = true; - this.txtNew.Size = new System.Drawing.Size(232, 20); - this.txtNew.TabIndex = 4; - // - // pbMinimap - // - this.pbMinimap.BackColor = System.Drawing.Color.Black; - this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pbMinimap.Location = new System.Drawing.Point(32, 25); - this.pbMinimap.Name = "pbMinimap"; - this.pbMinimap.Size = new System.Drawing.Size(124, 124); - this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbMinimap.TabIndex = 5; - this.pbMinimap.TabStop = false; - // - // pnlBottom - // - this.pnlBottom.Controls.Add(this.txtPathOut); - this.pnlBottom.Controls.Add(this.lblPathOut); - this.pnlBottom.Controls.Add(this.lblPath); - this.pnlBottom.Controls.Add(this.btnCancel); - this.pnlBottom.Controls.Add(this.btnOk); - this.pnlBottom.Controls.Add(this.txtNew); - this.pnlBottom.Controls.Add(this.lblNew); - this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 332); - this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70); - this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(494, 70); - this.pnlBottom.TabIndex = 6; - // - // lblPathOut - // - this.lblPathOut.AutoSize = true; - this.lblPathOut.Location = new System.Drawing.Point(55, 13); - this.lblPathOut.Name = "lblPathOut"; - this.lblPathOut.Size = new System.Drawing.Size(0, 13); - this.lblPathOut.TabIndex = 6; - // - // lblPath - // - this.lblPath.AutoSize = true; - this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.lblPath.Location = new System.Drawing.Point(12, 13); - this.lblPath.Name = "lblPath"; - this.lblPath.Size = new System.Drawing.Size(37, 13); - this.lblPath.TabIndex = 5; - this.lblPath.Text = "Path:"; - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.lblMapList); - this.splitContainer1.Panel1.Controls.Add(this.MapList); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.txtDesc); - this.splitContainer1.Panel2.Controls.Add(this.lblDesc); - this.splitContainer1.Panel2.Controls.Add(this.txtTheater); - this.splitContainer1.Panel2.Controls.Add(this.lblTheater); - this.splitContainer1.Panel2.Controls.Add(this.txtAuthor); - this.splitContainer1.Panel2.Controls.Add(this.lblAuthor); - this.splitContainer1.Panel2.Controls.Add(this.txtTitle); - this.splitContainer1.Panel2.Controls.Add(this.lblMapName); - this.splitContainer1.Panel2.Controls.Add(this.lblMinimap); - this.splitContainer1.Panel2.Controls.Add(this.pbMinimap); - this.splitContainer1.Size = new System.Drawing.Size(494, 332); - this.splitContainer1.SplitterDistance = 300; - this.splitContainer1.TabIndex = 7; - // - // lblMapList - // - this.lblMapList.AutoSize = true; - this.lblMapList.Location = new System.Drawing.Point(12, 9); - this.lblMapList.Name = "lblMapList"; - this.lblMapList.Size = new System.Drawing.Size(81, 13); - this.lblMapList.TabIndex = 1; - this.lblMapList.Text = "Available maps:"; - // - // txtDesc - // - this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace; - this.txtDesc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtDesc.Location = new System.Drawing.Point(16, 289); - this.txtDesc.Name = "txtDesc"; - this.txtDesc.ReadOnly = true; - this.txtDesc.Size = new System.Drawing.Size(162, 20); - this.txtDesc.TabIndex = 14; - // - // lblDesc - // - this.lblDesc.AutoSize = true; - this.lblDesc.Location = new System.Drawing.Point(13, 273); - this.lblDesc.Name = "lblDesc"; - this.lblDesc.Size = new System.Drawing.Size(63, 13); - this.lblDesc.TabIndex = 13; - this.lblDesc.Text = "Description:"; - // - // txtTheater - // - this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace; - this.txtTheater.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtTheater.Location = new System.Drawing.Point(16, 252); - this.txtTheater.Name = "txtTheater"; - this.txtTheater.ReadOnly = true; - this.txtTheater.Size = new System.Drawing.Size(162, 20); - this.txtTheater.TabIndex = 12; - // - // lblTheater - // - this.lblTheater.AutoSize = true; - this.lblTheater.Location = new System.Drawing.Point(13, 236); - this.lblTheater.Name = "lblTheater"; - this.lblTheater.Size = new System.Drawing.Size(47, 13); - this.lblTheater.TabIndex = 11; - this.lblTheater.Text = "Theater:"; - // - // txtAuthor - // - this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace; - this.txtAuthor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtAuthor.Location = new System.Drawing.Point(16, 214); - this.txtAuthor.Name = "txtAuthor"; - this.txtAuthor.ReadOnly = true; - this.txtAuthor.Size = new System.Drawing.Size(162, 20); - this.txtAuthor.TabIndex = 10; - // - // lblAuthor - // - this.lblAuthor.AutoSize = true; - this.lblAuthor.Location = new System.Drawing.Point(13, 198); - this.lblAuthor.Name = "lblAuthor"; - this.lblAuthor.Size = new System.Drawing.Size(41, 13); - this.lblAuthor.TabIndex = 9; - this.lblAuthor.Text = "Author:"; - // - // txtTitle - // - this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace; - this.txtTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtTitle.Location = new System.Drawing.Point(16, 177); - this.txtTitle.Name = "txtTitle"; - this.txtTitle.ReadOnly = true; - this.txtTitle.Size = new System.Drawing.Size(162, 20); - this.txtTitle.TabIndex = 8; - // - // lblMapName - // - this.lblMapName.AutoSize = true; - this.lblMapName.Location = new System.Drawing.Point(13, 161); - this.lblMapName.Name = "lblMapName"; - this.lblMapName.Size = new System.Drawing.Size(30, 13); - this.lblMapName.TabIndex = 7; - this.lblMapName.Text = "Title:"; - // - // lblMinimap - // - this.lblMinimap.AutoSize = true; - this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.lblMinimap.Location = new System.Drawing.Point(29, 9); - this.lblMinimap.Name = "lblMinimap"; - this.lblMinimap.Size = new System.Drawing.Size(71, 13); - this.lblMinimap.TabIndex = 6; - this.lblMinimap.Text = "Map preview:"; - // - // txtPathOut - // - this.txtPathOut.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtPathOut.Location = new System.Drawing.Point(55, 10); - this.txtPathOut.Name = "txtPathOut"; - this.txtPathOut.ReadOnly = true; - this.txtPathOut.Size = new System.Drawing.Size(265, 20); - this.txtPathOut.TabIndex = 7; - this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged); - // - // MapSelect - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(494, 402); - this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.pnlBottom); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "MapSelect"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Select map"; - this.Load += new System.EventHandler(this.MapSelect_Load); - ((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit(); - this.pnlBottom.ResumeLayout(false); - this.pnlBottom.PerformLayout(); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel1.PerformLayout(); - this.splitContainer1.Panel2.ResumeLayout(false); - this.splitContainer1.Panel2.PerformLayout(); - this.splitContainer1.ResumeLayout(false); - this.ResumeLayout(false); + this.MapList.FullRowSelect = true; + this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.MapList.LargeImageList = this.MapIconsList; + this.MapList.Location = new System.Drawing.Point(15, 25); + this.MapList.MultiSelect = false; + this.MapList.Name = "MapList"; + this.MapList.Size = new System.Drawing.Size(273, 294); + this.MapList.SmallImageList = this.MapIconsList; + this.MapList.StateImageList = this.MapIconsList; + this.MapList.TabIndex = 0; + this.MapList.UseCompatibleStateImageBehavior = false; + this.MapList.View = System.Windows.Forms.View.Details; + this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged); + // + // colMapName + // + this.colMapName.Text = "Map name"; + this.colMapName.Width = 240; + // + // MapIconsList + // + this.MapIconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("MapIconsList.ImageStream"))); + this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent; + this.MapIconsList.Images.SetKeyName(0, "mapicon"); + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(407, 35); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.TabIndex = 3; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnOk + // + this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOk.Location = new System.Drawing.Point(326, 35); + this.btnOk.Name = "btnOk"; + this.btnOk.Size = new System.Drawing.Size(75, 23); + this.btnOk.TabIndex = 2; + this.btnOk.Text = "Open"; + this.btnOk.UseVisualStyleBackColor = true; + // + // lblNew + // + this.lblNew.AutoSize = true; + this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblNew.Location = new System.Drawing.Point(12, 40); + this.lblNew.Name = "lblNew"; + this.lblNew.Size = new System.Drawing.Size(69, 13); + this.lblNew.TabIndex = 3; + this.lblNew.Text = "Map name:"; + // + // txtNew + // + this.txtNew.BackColor = System.Drawing.SystemColors.Window; + this.txtNew.Location = new System.Drawing.Point(88, 37); + this.txtNew.Name = "txtNew"; + this.txtNew.ReadOnly = true; + this.txtNew.Size = new System.Drawing.Size(232, 20); + this.txtNew.TabIndex = 1; + // + // pbMinimap + // + this.pbMinimap.BackColor = System.Drawing.Color.Black; + this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pbMinimap.Location = new System.Drawing.Point(32, 25); + this.pbMinimap.Name = "pbMinimap"; + this.pbMinimap.Size = new System.Drawing.Size(124, 124); + this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pbMinimap.TabIndex = 5; + this.pbMinimap.TabStop = false; + // + // pnlBottom + // + this.pnlBottom.Controls.Add(this.txtPathOut); + this.pnlBottom.Controls.Add(this.lblPathOut); + this.pnlBottom.Controls.Add(this.lblPath); + this.pnlBottom.Controls.Add(this.btnCancel); + this.pnlBottom.Controls.Add(this.btnOk); + this.pnlBottom.Controls.Add(this.txtNew); + this.pnlBottom.Controls.Add(this.lblNew); + this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlBottom.Location = new System.Drawing.Point(0, 332); + this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70); + this.pnlBottom.Name = "pnlBottom"; + this.pnlBottom.Size = new System.Drawing.Size(494, 70); + this.pnlBottom.TabIndex = 6; + // + // txtPathOut + // + this.txtPathOut.BackColor = System.Drawing.SystemColors.Window; + this.txtPathOut.Location = new System.Drawing.Point(55, 10); + this.txtPathOut.Name = "txtPathOut"; + this.txtPathOut.ReadOnly = true; + this.txtPathOut.Size = new System.Drawing.Size(265, 20); + this.txtPathOut.TabIndex = 0; + this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged); + // + // lblPathOut + // + this.lblPathOut.AutoSize = true; + this.lblPathOut.Location = new System.Drawing.Point(55, 13); + this.lblPathOut.Name = "lblPathOut"; + this.lblPathOut.Size = new System.Drawing.Size(0, 13); + this.lblPathOut.TabIndex = 6; + // + // lblPath + // + this.lblPath.AutoSize = true; + this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblPath.Location = new System.Drawing.Point(12, 13); + this.lblPath.Name = "lblPath"; + this.lblPath.Size = new System.Drawing.Size(37, 13); + this.lblPath.TabIndex = 5; + this.lblPath.Text = "Path:"; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.lblMapList); + this.splitContainer1.Panel1.Controls.Add(this.MapList); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.txtDesc); + this.splitContainer1.Panel2.Controls.Add(this.lblDesc); + this.splitContainer1.Panel2.Controls.Add(this.txtTheater); + this.splitContainer1.Panel2.Controls.Add(this.lblTheater); + this.splitContainer1.Panel2.Controls.Add(this.txtAuthor); + this.splitContainer1.Panel2.Controls.Add(this.lblAuthor); + this.splitContainer1.Panel2.Controls.Add(this.txtTitle); + this.splitContainer1.Panel2.Controls.Add(this.lblMapName); + this.splitContainer1.Panel2.Controls.Add(this.lblMinimap); + this.splitContainer1.Panel2.Controls.Add(this.pbMinimap); + this.splitContainer1.Size = new System.Drawing.Size(494, 332); + this.splitContainer1.SplitterDistance = 300; + this.splitContainer1.TabIndex = 7; + // + // lblMapList + // + this.lblMapList.AutoSize = true; + this.lblMapList.Location = new System.Drawing.Point(12, 9); + this.lblMapList.Name = "lblMapList"; + this.lblMapList.Size = new System.Drawing.Size(81, 13); + this.lblMapList.TabIndex = 1; + this.lblMapList.Text = "Available maps:"; + // + // txtDesc + // + this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace; + this.txtDesc.Location = new System.Drawing.Point(16, 289); + this.txtDesc.Name = "txtDesc"; + this.txtDesc.ReadOnly = true; + this.txtDesc.Size = new System.Drawing.Size(162, 20); + this.txtDesc.TabIndex = 14; + // + // lblDesc + // + this.lblDesc.AutoSize = true; + this.lblDesc.Location = new System.Drawing.Point(13, 273); + this.lblDesc.Name = "lblDesc"; + this.lblDesc.Size = new System.Drawing.Size(63, 13); + this.lblDesc.TabIndex = 13; + this.lblDesc.Text = "Description:"; + // + // txtTheater + // + this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace; + this.txtTheater.Location = new System.Drawing.Point(16, 252); + this.txtTheater.Name = "txtTheater"; + this.txtTheater.ReadOnly = true; + this.txtTheater.Size = new System.Drawing.Size(162, 20); + this.txtTheater.TabIndex = 12; + // + // lblTheater + // + this.lblTheater.AutoSize = true; + this.lblTheater.Location = new System.Drawing.Point(13, 236); + this.lblTheater.Name = "lblTheater"; + this.lblTheater.Size = new System.Drawing.Size(47, 13); + this.lblTheater.TabIndex = 11; + this.lblTheater.Text = "Theater:"; + // + // txtAuthor + // + this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace; + this.txtAuthor.Location = new System.Drawing.Point(16, 214); + this.txtAuthor.Name = "txtAuthor"; + this.txtAuthor.ReadOnly = true; + this.txtAuthor.Size = new System.Drawing.Size(162, 20); + this.txtAuthor.TabIndex = 10; + // + // lblAuthor + // + this.lblAuthor.AutoSize = true; + this.lblAuthor.Location = new System.Drawing.Point(13, 198); + this.lblAuthor.Name = "lblAuthor"; + this.lblAuthor.Size = new System.Drawing.Size(41, 13); + this.lblAuthor.TabIndex = 9; + this.lblAuthor.Text = "Author:"; + // + // txtTitle + // + this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace; + this.txtTitle.Location = new System.Drawing.Point(16, 177); + this.txtTitle.Name = "txtTitle"; + this.txtTitle.ReadOnly = true; + this.txtTitle.Size = new System.Drawing.Size(162, 20); + this.txtTitle.TabIndex = 8; + // + // lblMapName + // + this.lblMapName.AutoSize = true; + this.lblMapName.Location = new System.Drawing.Point(13, 161); + this.lblMapName.Name = "lblMapName"; + this.lblMapName.Size = new System.Drawing.Size(30, 13); + this.lblMapName.TabIndex = 7; + this.lblMapName.Text = "Title:"; + // + // lblMinimap + // + this.lblMinimap.AutoSize = true; + this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblMinimap.Location = new System.Drawing.Point(29, 9); + this.lblMinimap.Name = "lblMinimap"; + this.lblMinimap.Size = new System.Drawing.Size(71, 13); + this.lblMinimap.TabIndex = 6; + this.lblMinimap.Text = "Map preview:"; + // + // MapSelect + // + this.AcceptButton = this.btnOk; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; + this.ClientSize = new System.Drawing.Size(494, 402); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.pnlBottom); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "MapSelect"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Select map"; + this.Load += new System.EventHandler(this.MapSelect_Load); + ((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit(); + this.pnlBottom.ResumeLayout(false); + this.pnlBottom.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/OpenRA.Editor/MapSelect.cs b/OpenRA.Editor/MapSelect.cs index 4b22eb29c0..2ac5521a0b 100644 --- a/OpenRA.Editor/MapSelect.cs +++ b/OpenRA.Editor/MapSelect.cs @@ -8,6 +8,7 @@ using System.Text; using OpenRA.FileFormats; using System.Windows.Forms; using System.IO; +using OpenRA.Graphics; namespace OpenRA.Editor { @@ -55,10 +56,12 @@ namespace OpenRA.Editor txtAuthor.Text = map.Author; txtTheater.Text = map.Theater; txtDesc.Text = map.Description; - pbMinimap.Image = new Bitmap(pbMinimap.Width, pbMinimap.Height); + pbMinimap.Image = null; try { - pbMinimap.Image = Image.FromFile(Path.Combine(Path.Combine(MapFolderPath, txtNew.Text), "map.png")); + var b = Minimap.TerrainBitmap(map, true); + Minimap.AddStaticResources(map, b); + pbMinimap.Image = b; } catch (Exception ed) { diff --git a/OpenRA.Editor/MapSelect.resx b/OpenRA.Editor/MapSelect.resx index 5944301fa9..acc9c46064 100644 --- a/OpenRA.Editor/MapSelect.resx +++ b/OpenRA.Editor/MapSelect.resx @@ -124,69 +124,69 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABw - DgAAAk1TRnQBSQFMAwEBAAEgAQABIAEAARgBAAEYAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABYAMA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABW + DgAAAk1TRnQBSQFMAwEBAAEoAQABKAEAARgBAAEYAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABYAMA ARgDAAEBAQABIAYAASQhAAEBAx8BLAM/AW8DSQGJAzYBWQMYASIDAQECDAADHQEqA0gBhQNCAXYDDwEU - AwEBAgMNARIDMwFSA0MBdwNQAacDDwEU/wAwAAEBAwMBBAM0AVQCUgFRAcIBZQFUAVIB9AFeAlYB2ANK - AY0DFgEeAwIBAwMAAQEDAgEDAxoBJQNMAZQBBwEIASUB/QJPAVABpAM1AVcDQQFzAlABUQG6AjwBUQHj - AlABUgGyAwABAf8AMAABAQMMARADQgF0AVEBUAFOAdgBmQGIAYEB/wGgAYwBhQH/AX0BcQFnAfgDOgFh - AwoBDgMKAQ0DHQEqAz8BbQNQAbsBFgIYAfkBAAEGAb8B/wETARkBRwH5ATMBQQFIAesBAAEGAUUB/wIH - AU8B/QMNARH/ADEAAwMBBAMdASkDTwGkAV0BUgFQAe0BmwGLAYMB/wGcAYwBhAH/AZYBhAF4Af8BWwFY - AVYB2AMzAVMDNAFUA00BnQFPAU4BTQHTAkwBTgHzATEBngG7Af8BFQF0AasB/wEVAXYBvwH/AREBZwG2 - Af8BGAGNAcIB/wFCAWEBbQHhAwEBAv8AMAABAQMJAQwDMAFMAVMCUQHDAXwBawFiAfoBqAGZAY8B/wGT - AYQBeAH/AYwBeAFxAf8BhwFyAW0B/wJUAVMBvgNQAbwBRgFDAT8B5QF3AV0BUwH6AYMBbgFmAf8BUgFJ - AUgB/wEPAUwBpAH/AQQBGwG4Af8BDgFSAZUB/wEaAZUBwAH/ATsBawGGAesDMwFSAw0BEgMCAQP/ACUA - AwEBAgMYASEDSwGPA0wB3AGbAY4BhQH9AaEBkQGJAf8BhwF0AWwB/wGBAW8BZgH/AXYBaAFhAf8BVAFL - AUQB/QFJAT8BPAH8AZYBhgF6Af8BowGSAYoB/wFUAUsBVAH/AQQBGQHzAf8BEwFhAaYB/wEWAXcBlQH/ - ATAB/QH+Af8BCAEzAZQB/wEWAXsByAH/AgABVQH/A0wBlAMZASP/ACUAAwYBCAMtAUYDUAG8AW0BZQFi - AfQBqgGbAZEB/wGJAXUBbgH/AYwBeAFvAf8BmgGJAYEB/wGLAXgBcAH/AXYBZgFfAf8BhgFyAWoB/wGV - AYYBewH/AUIBPQFLAf8BFAEgAYgB/wELARIBrgH/AR0BewGVAf8BKwHfAeIB/wEPAVQBeAH/AQoBOgG8 - Af8BGgGBAaoB/wELARMBqQH/AR0BIQFSAfcDTwGg/wAlAAMQARUDQQFyA0oB1gGTAYQBdAH9AZoBiQGD - Af8BjwGAAXQB/wGWAYYBeQH/AZ8BjQGEAf8BlgGFAXoB/wGUAYQBeAH/AZQBgwF4Af8BlwGHAYAB/wFr - AWABXQH/AWQBWAFXAf8BYQFWAVQB/wFUAVgBWQH/ASMBZAGaAf8BDgFMAZ0B/wEhAY4BsAH/AU0BnAGv - Af8BaQGaAa4B/wE7AUsBWgH+A04Bn/8AJQADGAEiA00BlQF9AXYBcAH8AagBmAGOAf8BkQGBAXYB/wGN - AXgBcQH/AZoBiQGBAf8BkwGDAXcB/wGZAYgBgQH/AZwBiwGDAf8BlQGGAXkB/wGWAYYBegH/AaABjwGH - Af8BlgGFAXkB/wF3AXABbQH/AU0BbgGBAf8BHwE8AV4B/wEeAZ4BhAH/AVQBlwGpAf8BhgHFAd8B/wGI - Ab4B1wH/AUUBXwFkAfsDQQFz/wAlAAMYASIDTQGVAZ0BjwGGAf8BmwGLAYMB/wGGAXIBawH/AYUBcAFp - Af8BiAF0AW0B/wGJAXUBbQH/AZABeAFwAf8BlQGEAXgB/wGWAYUBeQH/AZ8BjwGGAf8BmQGLAYQB/wFu - AYABhgH/AVcBkwGwAf8BWwGmAccB/wFNAYMBpAH/AQYBFwGgAf8BZAGaAbAB/wGCAb8B2QH/AXIBrQHI - Af8BXQFtAXcB3gMqAUD/ACEAAwMBBAMmATgDTgGjAZoBjAGEAf8BpwGWAY4B/wGXAYYBewH/AZQBggF3 - Af8BlAGDAXgB/wGWAYUBeQH/AZIBegFzAf8BjwF6AXMB/wGVAYQBeQH/AY8BdwFsAf8BcQGAAYcB/wFb - AZcBswH/AVABmgHCAf8BZgG1AdQB/wFmAaQBvgH/AR8BKwE2Af8BeQG6AdMB/wGAAbsB1QH/AYEBvwHa - Af8BVQFZAVsBtQMPART/ACEAAwoBDQNBAXMDTAHPAasBmgGRAf8BmgGJAYIB/wGOAXkBcgH/AZEBgQF2 - Af8BlQGEAXgB/wGYAYgBgAH/AYsBdgFvAf8BkQF7AXQB/wF5AW8BawH/AXABrwHIAf8BWgGoAc0B/wFa - AasBzAH/AVYBpgHJAf8BdgHDAeAB/wF7AcIB3wH/AYMBwAHbAf8BggHBAd0B/wFwAa4ByAH/AYsBvwHb - Af8DSAGGAwUBB/8AIQADHgErA08BoAFRAU0BSgHtAYMBcAFpAf8BgwFvAWgB/wGBAW0BZgH/AYEBbgFn - Af8BiAF0AWwB/wGHAXMBbAH/AZQBhAF5Af8BhQF3AXQB/wFVAW0BgwH/AU4BhAGmAf8BZwGwAdAB/wFe - AaoBywH/AWIBsQHRAf8BdwG/Ad0B/wGFAcgB4wH/AYEBxAHfAf8BiAHHAeIB/wF4AbYB0QH/AW4BngG2 - Af8DPgFrAwIBA/8AIQADOAFcA1IByAFtAV0BXAH4AZEBgAF1Af8BmAGIAYAB/wGVAYQBeQH/AY0BeAFx - Af8BlQGEAXkB/wGYAYcBgAH/AZMBgwF4Af8BaQGAAYsB/wFXAZABsQH/ATgBSwFrAf8BZAGpAcoB/wFh - Aa4BzwH/AWIBrAHMAf8BdwG/AdwB/wGJAcwB5wH/AYMBxgHiAf8BhQHFAeAB/wGHAcMB3gH/AUkBgwGb - Af8DPAFoAwQBBf8AIQADSQGJAVYBVAFSAeIBpAGTAYoB/wGsAZwBkwH/AaUBlQGMAf8BlgGGAXoB/wGQ - AXoBdQH/AZkBiAGBAf8BogGRAYkB/wFvAV4BVgH/AWUBlQGrAf8BaQG1AdUB/wFzAcEB3QH/AXUBuwHb - Af8BXwGsAc4B/wFgAa0BzAH/AXkBwwHgAf8BiAHLAeYB/wGFAcYB5AH/AYMBxgHiAf8BhwG/Ad0B/wE/ - AVUBawHuAxsBJv8AJQADTwGlAWIBWAFXAe8BowGTAYoB/wGYAYcBgAH/AZ8BjgGGAf8BnQGMAYQB/wGQ - AXoBdAH/AYgBcwFsAf8BiAF3AXAB/wFrAYUBjwH/AWkBsAHQAf8BcAG8AdoB/wFnAbYB1gH/AWABsQHQ - Af8BXgGvAdAB/wFyAb0B2gH/AXEBuwHaAf8BgAHEAd8B/wGPAc0B6QH/AYoByQHlAf8BXQGXAa0B/QNE - AXkDAAEB/wAlAANRAbEBbQJfAfMBowGSAYoB/wGVAYMBeQH/AZQBggF4Af8BlAGFAXgB/wGEAYsBjQH/ - AVwBdAGGAf8BXQGHAZ0B/wFiAa8B0gH/AXABuwHaAf8BeAHBAd4B/wFtAbkB1wH/AWIBswHSAf8BagG5 - AdYB/wGAAcUB4QH/AXkBwgHfAf8BgAHFAeEB/wGFAcQB4QH/AYkBxgHiAf8BUgF3AYcB8wMxAU7/ACkA - A00BxwF8AXIBaQH4AasBmwGSAf8BkAGAAXYB/wGEAXABZwH/AXMBmgGrAf8BYwGrAc8B/wFlAbIB0wH/ - AW4BvAHaAf8BbAG4AdUB/wFyAb4B2wH/AXcBvwHdAf8BcQG+AdsB/wFpAbkB1gH/AYABxwHhAf8BiQHL - AeQB/wGKAcwB5wH/AY0B0QHsAf8BhQHJAeYB/wFuAbMB1AH/Ak4BTwGYAzABTAMAAQEDAAEB/wAhAAM+ - AWwBZQFiAV8ByQGNAYQBfwH1AaQBkwGLAf8BhgGeAakB/wFoAa8B0gH/AXkBxAHgAf8BdwHCAd4B/wF3 - AcIB3gH/AXIBvwHbAf8BdAG8AdoB/wFzAbsB2AH/AXUBuwHZAf8BdQG/Ad0B/wFiAZ0BwwH/AUIBZAGU - Af8BbgGnAcgB/wGHAcQB4AH/AYgBzQHpAf8BXwF1AX8B4AMsAUQDBwEJAwQBBgMAAQH/ACEAAwQBBQMZ - ASMDNAFUA0oBiQFYAVwBXQHBAWEBeAGAAeIBbwGbAa8B9QF9AbYB0QH+AYABxQHiAf8BcwG8AdoB/wFy - AbwB2gH/AXEBuwHYAf8BdgG8AdkB/wGOAc8B6wH/AW4BrwHSAf8BUAF2AaQB/wFtAasBzQH/AW8BrwHP - Af8BjwHKAecB/wFYAWYBawHRAyIBMf8APQADAQECAwkBDAMaASUDQgF2AVEBXQFmAeoBgwHGAeIB/gGK - AccB5AH/AXoBwAHdAf8BigHGAeIB/wGWAdQB7gH/AXoBuAHXAf8BYgGhAcgB/wFqAaYBzAH/AVoBkgG/ - Af8BgQHFAd8B/gJGAUcBgQMDAQT/AEkAAwIBAwMQARYDMgFQAkoBTAGNAlABUgGdAlIBUwGhAWkBewGD - AeABdAGwAcgB/QFhAZcBvgH/AWEBlAHAAf8BcAGoAc4B/wFBAXoBqgH/AzUBVgMAAQH/AFUAAwIBAwMG - AQgDCgENAygBPQNAAXEBTwJRAZwBWgFkAW0B1gFlAYMBmQHyAUwBfgGkAfwDIAEv/wBwAAEBAwgBCwMk - ATYDRgGBAwMBBP8AMQABQgFNAT4HAAE+AwABKAMAAWADAAEYAwABAQEAAQEFAAEgAQEWAAP/AQAB4AE4 - AQEJAAHAAQABAQkAAcABAAEDCQABwAEAAQMJAAGACwABgAsAAYALAAGACwABgAsAAYA9AAEBCwABAQsA - AQMjAAEHCQAB8AEAAQcJAAH+AQABBwkAAf8BwAEPCQAB/wH+AQ8JAAs= + AwEBAgMNARIDMwFSA0MBdwNRAacDDwEU/wAwAAEBAwMBBAM0BFQBwgFlAVMBUgH0AV4CWAHYA0oBjQMW + AR4DAgEDAwABAQMCAQMDGgElA00BlAEIAQkBJgH9A1ABpAM1AVcDQQFzA1MBugJDAVMB4wJTAVQBsgMA + AQH/ADAAAQEDDAEQA0IBdAFVAVQBUQHYAZkBiAGBAf8BoAGMAYUB/wF8AXABZQH4AzoBYQMKAQ4DCgEN + Ax0BKgM/AW0DVAG7ARkCGgH5AQABBQG/Af8BFwEbAUcB+QE5AUYBSwHrAQABBQFEAf8CCAFOAf0DDQER + /wAxAAMDAQQDHQEpA1ABpAFdAVMBUQHtAZsBiwGDAf8BnAGMAYQB/wGWAYQBdwH/AVsBWgFYAdgDMwFT + AzQBVANPAZ0CUwFSAdMCTAFOAfMBMAGeAbsB/wEUAXMBqwH/ARQBdQG/Af8BEAFmAbYB/wEXAY0BwgH/ + AUgBYQFpAeEDAQEC/wAwAAEBAwkBDAMwAUwBVgJVAcMBewFqAWAB+gGoAZkBjwH/AZMBhAF3Af8BjAF3 + AXAB/wGHAXEBbAH/A1YBvgNTAbwBTAFIAUYB5QF2AVsBUgH6AYMBbQFlAf8BUQFIAUcB/wEOAUsBpAH/ + AQMBGgG4Af8BDQFRAZUB/wEZAZUBwAH/AUABagGBAesDMwFSAw0BEgMCAQP/ACUAAwEBAgMYASEDSwGP + A1EB3AGbAY4BhQH9AaEBkQGJAf8BhwFzAWsB/wGBAW4BZQH/AXUBZwFgAf8BUwFKAUMB/QFHAT4BOwH8 + AZYBhgF5Af8BowGSAYoB/wFTAUoBUwH/AQMBGAHzAf8BEgFgAaYB/wEVAXYBlQH/AS8B/QH+Af8BBwEy + AZQB/wEVAXoByAH/AgABVAH/A00BlAMZASP/ACUAAwYBCAMtAUYDUwG8AWoBZQFiAfQBqgGbAZEB/wGJ + AXQBbQH/AYwBdwFuAf8BmgGJAYEB/wGLAXcBbwH/AXUBZQFeAf8BhgFxAWkB/wGVAYYBegH/AUEBPAFK + Af8BEwEfAYgB/wEKAREBrgH/ARwBegGVAf8BKgHfAeIB/wEOAVMBdwH/AQkBOQG8Af8BGQGBAaoB/wEK + ARIBqQH/ASABJQFSAfcDUQGg/wAlAAMQARUDQQFyA08B1gGTAYQBcgH9AZoBiQGDAf8BjwGAAXMB/wGW + AYYBeAH/AZ8BjQGEAf8BlgGFAXkB/wGUAYQBdwH/AZQBgwF3Af8BlwGHAYAB/wFqAV8BXAH/AWMBVwFW + Af8BYAFVAVMB/wFTAVcBWAH/ASIBYwGaAf8BDQFLAZ0B/wEgAY4BsAH/AUwBnAGvAf8BaAGaAa4B/wE7 + AUsBWgH+A1ABn/8AJQADGAEiA00BlQF8AXUBbwH8AagBmAGOAf8BkQGBAXUB/wGNAXcBcAH/AZoBiQGB + Af8BkwGDAXYB/wGZAYgBgQH/AZwBiwGDAf8BlQGGAXgB/wGWAYYBeQH/AaABjwGHAf8BlgGFAXgB/wF2 + AW8BbAH/AUwBbQGBAf8BHgE7AV0B/wEdAZ4BhAH/AVMBlwGpAf8BhgHFAd8B/wGIAb4B1wH/AUUBXwFi + AfsDQQFz/wAlAAMYASIDTQGVAZ0BjwGGAf8BmwGLAYMB/wGGAXEBagH/AYUBbwFoAf8BiAFzAWwB/wGJ + AXQBbAH/AZABdwFvAf8BlQGEAXcB/wGWAYUBeAH/AZ8BjwGGAf8BmQGLAYQB/wFtAYABhgH/AVYBkwGw + Af8BWgGmAccB/wFMAYMBpAH/AQUBFgGgAf8BYwGaAbAB/wGCAb8B2QH/AXEBrQHIAf8BXQFpAXIB3gMq + AUD/ACEAAwMBBAMmATgDUAGjAZoBjAGEAf8BpwGWAY4B/wGXAYYBegH/AZQBggF2Af8BlAGDAXcB/wGW + AYUBeAH/AZIBeQFyAf8BjwF5AXIB/wGVAYQBeAH/AY8BdgFrAf8BcAGAAYcB/wFaAZcBswH/AU8BmgHC + Af8BZQG1AdQB/wFlAaQBvgH/AR4BKgE1Af8BeAG6AdMB/wGAAbsB1QH/AYEBvwHaAf8BVQFWAVkBtQMP + ART/ACEAAwoBDQNBAXMDUgHPAasBmgGRAf8BmgGJAYIB/wGOAXgBcQH/AZEBgQF1Af8BlQGEAXcB/wGY + AYgBgAH/AYsBdQFuAf8BkQF6AXMB/wF4AW4BagH/AW8BrwHIAf8BWQGoAc0B/wFZAasBzAH/AVUBpgHJ + Af8BdQHDAeAB/wF6AcIB3wH/AYMBwAHbAf8BggHBAd0B/wFvAa4ByAH/AYsBvwHbAf8DSAGGAwUBB/8A + IQADHgErA1EBoAFSAVABTQHtAYMBbwFoAf8BgwFuAWcB/wGBAWwBZQH/AYEBbQFmAf8BiAFzAWsB/wGH + AXIBawH/AZQBhAF4Af8BhQF2AXMB/wFUAWwBgwH/AU0BhAGmAf8BZgGwAdAB/wFdAaoBywH/AWEBsQHR + Af8BdgG/Ad0B/wGFAcgB4wH/AYEBxAHfAf8BiAHHAeIB/wF3AbYB0QH/AW0BngG2Af8DPgFrAwIBA/8A + IQADOAFcA1UByAFrAlwB+AGRAYABdAH/AZgBiAGAAf8BlQGEAXgB/wGNAXcBcAH/AZUBhAF4Af8BmAGH + AYAB/wGTAYMBdwH/AWgBgAGLAf8BVgGQAbEB/wE3AUoBagH/AWMBqQHKAf8BYAGuAc8B/wFhAawBzAH/ + AXYBvwHcAf8BiQHMAecB/wGDAcYB4gH/AYUBxQHgAf8BhwHDAd4B/wFIAYMBmwH/AzwBaAMEAQX/ACEA + A0kBiQFXAVYBVQHiAaQBkwGKAf8BrAGcAZMB/wGlAZUBjAH/AZYBhgF5Af8BkAF5AXQB/wGZAYgBgQH/ + AaIBkQGJAf8BbgFdAVUB/wFkAZUBqwH/AWgBtQHVAf8BcgHBAd0B/wF0AbsB2wH/AV4BrAHOAf8BXwGt + AcwB/wF4AcMB4AH/AYgBywHmAf8BhQHGAeQB/wGDAcYB4gH/AYcBvwHdAf8BQwFVAWkB7gMbASb/ACUA + A08BpQFiAlgB7wGjAZMBigH/AZgBhwGAAf8BnwGOAYYB/wGdAYwBhAH/AZABeQFzAf8BiAFyAWsB/wGI + AXYBbwH/AWoBhQGPAf8BaAGwAdAB/wFvAbwB2gH/AWYBtgHWAf8BXwGxAdAB/wFdAa8B0AH/AXEBvQHa + Af8BcAG7AdoB/wGAAcQB3wH/AY8BzQHpAf8BigHJAeUB/wFbAZcBrAH9A0QBeQMAAQH/ACUAA1MBsQFs + Al8B8wGjAZIBigH/AZUBgwF4Af8BlAGCAXcB/wGUAYUBdwH/AYQBiwGNAf8BWwFzAYYB/wFcAYcBnQH/ + AWEBrwHSAf8BbwG7AdoB/wF3AcEB3gH/AWwBuQHXAf8BYQGzAdIB/wFpAbkB1gH/AYABxQHhAf8BeAHC + Ad8B/wGAAcUB4QH/AYUBxAHhAf8BiQHGAeIB/wFSAXMBhAHzAzEBTv8AKQADUQHHAXsBcQFnAfgBqwGb + AZIB/wGQAYABdQH/AYQBbwFmAf8BcgGaAasB/wFiAasBzwH/AWQBsgHTAf8BbQG8AdoB/wFrAbgB1QH/ + AXEBvgHbAf8BdgG/Ad0B/wFwAb4B2wH/AWgBuQHWAf8BgAHHAeEB/wGJAcsB5AH/AYoBzAHnAf8BjQHR + AewB/wGFAckB5gH/AW0BswHUAf8DTgGYAzABTAMAAQEDAAEB/wAhAAM+AWwBYgFfAV4ByQGJAYIBfAH1 + AaQBkwGLAf8BhgGeAakB/wFnAa8B0gH/AXgBxAHgAf8BdgHCAd4B/wF2AcIB3gH/AXEBvwHbAf8BcwG8 + AdoB/wFyAbsB2AH/AXQBuwHZAf8BdAG/Ad0B/wFhAZ0BwwH/AUEBYwGUAf8BbQGnAcgB/wGHAcQB4AH/ + AYgBzQHpAf8BXwFxAXkB4AMsAUQDBwEJAwQBBgMAAQH/ACEAAwQBBQMZASMDNAFUA0oBiQFYAlsBwQFh + AXIBeQHiAW4BlwGoAfUBfQG0Ac8B/gGAAcUB4gH/AXIBvAHaAf8BcQG8AdoB/wFwAbsB2AH/AXUBvAHZ + Af8BjgHPAesB/wFtAa8B0gH/AU8BdQGkAf8BbAGrAc0B/wFuAa8BzwH/AY8BygHnAf8BWAFjAWYB0QMi + ATH/AD0AAwEBAgMJAQwDGgElA0IBdgFSAVwBZQHqAYEBxAHgAf4BigHHAeQB/wF5AcAB3QH/AYoBxgHi + Af8BlgHUAe4B/wF5AbgB1wH/AWEBoQHIAf8BaQGmAcwB/wFZAZIBvwH/AX8BwwHdAf4CRgFHAYEDAwEE + /wBJAAMCAQMDEAEWAzIBUANKAY0DUAGdA1IBoQFmAXUBewHgAXIBrwHFAf0BYAGXAb4B/wFgAZQBwAH/ + AW8BqAHOAf8BQAF5AaoB/wM1AVYDAAEB/wBVAAMCAQMDBgEIAwoBDQMoAT0DQAFxAU8CUQGcAVsBYgFo + AdYBZQF/AZMB8gFKAX0BoQH8AyABL/8AcAABAQMIAQsDJAE2A0YBgQMDAQT/ADEAAUIBTQE+BwABPgMA + ASgDAAFgAwABGAMAAQEBAAEBBQABIAEBFgAD/wEAAeABOAEBCQABwAEAAQEJAAHAAQABAwkAAcABAAED + CQABgAsAAYALAAGACwABgAsAAYALAAGAPQABAQsAAQELAAEDIwABBwkAAfABAAEHCQAB/gEAAQcJAAH/ + AcABDwkAAf8B/gEPCQAL \ No newline at end of file