diff --git a/OpenRA.Editor/Form1.Designer.cs b/OpenRA.Editor/Form1.Designer.cs index fc366f0302..d34a4ca771 100644 --- a/OpenRA.Editor/Form1.Designer.cs +++ b/OpenRA.Editor/Form1.Designer.cs @@ -28,176 +28,193 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); - this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tilePalette = new System.Windows.Forms.FlowLayoutPanel(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.actorPalette = new System.Windows.Forms.FlowLayoutPanel(); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tt = new System.Windows.Forms.ToolTip(this.components); - this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog(); - this.surface1 = new OpenRA.Editor.Surface(); - this.toolStripContainer1.ContentPanel.SuspendLayout(); - this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); - this.toolStripContainer1.SuspendLayout(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // toolStripContainer1 - // - // - // toolStripContainer1.ContentPanel - // - this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 681); - this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.toolStripContainer1.Location = new System.Drawing.Point(0, 0); - this.toolStripContainer1.Name = "toolStripContainer1"; - this.toolStripContainer1.Size = new System.Drawing.Size(985, 705); - this.toolStripContainer1.TabIndex = 1; - this.toolStripContainer1.Text = "toolStripContainer1"; - // - // toolStripContainer1.TopToolStripPanel - // - this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1); - // - // 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.tabControl1); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.surface1); - this.splitContainer1.Size = new System.Drawing.Size(985, 681); - this.splitContainer1.SplitterDistance = 198; - this.splitContainer1.TabIndex = 0; - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Multiline = true; - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(198, 681); - this.tabControl1.TabIndex = 0; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.tilePalette); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(190, 655); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Templates"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // tilePalette - // - this.tilePalette.AutoScroll = true; - this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill; - this.tilePalette.Location = new System.Drawing.Point(3, 3); - this.tilePalette.Name = "tilePalette"; - this.tilePalette.Size = new System.Drawing.Size(184, 649); - this.tilePalette.TabIndex = 1; - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.actorPalette); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(190, 655); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Actors"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // actorPalette - // - this.actorPalette.AutoScroll = true; - this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill; - this.actorPalette.Location = new System.Drawing.Point(3, 3); - this.actorPalette.Name = "actorPalette"; - this.actorPalette.Size = new System.Drawing.Size(184, 649); - this.actorPalette.TabIndex = 2; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.resourcePalette); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(190, 655); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Resources"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // resourcePalette - // - this.resourcePalette.AutoScroll = true; - this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill; - this.resourcePalette.Location = new System.Drawing.Point(0, 0); - this.resourcePalette.Name = "resourcePalette"; - this.resourcePalette.Size = new System.Drawing.Size(190, 655); - this.resourcePalette.TabIndex = 3; - // - // menuStrip1 - // - this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tilePalette = new System.Windows.Forms.FlowLayoutPanel(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.actorPalette = new System.Windows.Forms.FlowLayoutPanel(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel(); + this.surface1 = new OpenRA.Editor.Surface(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.cCRedAlertMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.exotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tt = new System.Windows.Forms.ToolTip(this.components); + this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripContainer1.ContentPanel.SuspendLayout(); + this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); + this.toolStripContainer1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // toolStripContainer1 + // + // + // toolStripContainer1.ContentPanel + // + this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1); + this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(985, 727); + this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.toolStripContainer1.Location = new System.Drawing.Point(0, 0); + this.toolStripContainer1.Name = "toolStripContainer1"; + this.toolStripContainer1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 22); + this.toolStripContainer1.Size = new System.Drawing.Size(985, 773); + this.toolStripContainer1.TabIndex = 1; + this.toolStripContainer1.Text = "toolStripContainer1"; + // + // toolStripContainer1.TopToolStripPanel + // + this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1); + // + // 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.tabControl1); + this.splitContainer1.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.splitContainer1_Panel1_Paint); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.surface1); + this.splitContainer1.Size = new System.Drawing.Size(985, 727); + this.splitContainer1.SplitterDistance = 198; + this.splitContainer1.TabIndex = 0; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(0, 0); + this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(198, 727); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.tilePalette); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(190, 701); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Templates"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tilePalette + // + this.tilePalette.AutoScroll = true; + this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill; + this.tilePalette.Location = new System.Drawing.Point(3, 3); + this.tilePalette.Name = "tilePalette"; + this.tilePalette.Size = new System.Drawing.Size(184, 695); + this.tilePalette.TabIndex = 1; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.actorPalette); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(190, 701); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Actors"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // actorPalette + // + this.actorPalette.AutoScroll = true; + this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill; + this.actorPalette.Location = new System.Drawing.Point(3, 3); + this.actorPalette.Name = "actorPalette"; + this.actorPalette.Size = new System.Drawing.Size(184, 695); + this.actorPalette.TabIndex = 2; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.resourcePalette); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(190, 701); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Resources"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // resourcePalette + // + this.resourcePalette.AutoScroll = true; + this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill; + this.resourcePalette.Location = new System.Drawing.Point(0, 0); + this.resourcePalette.Name = "resourcePalette"; + this.resourcePalette.Size = new System.Drawing.Size(190, 701); + this.resourcePalette.TabIndex = 3; + // + // surface1 + // + this.surface1.BackColor = System.Drawing.Color.Black; + this.surface1.Dock = System.Windows.Forms.DockStyle.Fill; + this.surface1.Location = new System.Drawing.Point(0, 0); + this.surface1.Name = "surface1"; + this.surface1.Size = new System.Drawing.Size(783, 727); + this.surface1.TabIndex = 5; + this.surface1.Text = "surface1"; + // + // menuStrip1 + // + this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, - this.mapToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(985, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mapToolStripMenuItem, + this.toolsToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(985, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.toolStripSeparator1, this.openToolStripMenuItem, @@ -207,170 +224,187 @@ this.toolStripMenuItem1, this.toolStripSeparator3, this.exotToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "&File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image"))); - this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.newToolStripMenuItem.Text = "&New..."; - this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.openToolStripMenuItem.Text = "&Open..."; - this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked); - // - // saveAsToolStripMenuItem - // - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveAsToolStripMenuItem.Text = "Save &As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image"))); + this.newToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.newToolStripMenuItem.Text = "&New..."; + this.newToolStripMenuItem.Click += new System.EventHandler(this.NewClicked); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(122, 6); + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.openToolStripMenuItem.Text = "&Open..."; + this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenClicked); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.SaveClicked); + // + // saveAsToolStripMenuItem + // + this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.saveAsToolStripMenuItem.Text = "Save &As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsClicked); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(122, 6); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cCRedAlertMapToolStripMenuItem, this.bitmapToolStripMenuItem}); - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.toolStripMenuItem1.Text = "&Import"; - // - // cCRedAlertMapToolStripMenuItem - // - this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image"))); - this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem"; - this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map..."; - this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked); - // - // bitmapToolStripMenuItem - // - this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image"))); - this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem"; - this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.bitmapToolStripMenuItem.Text = "&Bitmap..."; - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); - // - // exotToolStripMenuItem - // - this.exotToolStripMenuItem.Name = "exotToolStripMenuItem"; - this.exotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.exotToolStripMenuItem.Text = "E&xit"; - this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked); - // - // mapToolStripMenuItem - // - this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(125, 22); + this.toolStripMenuItem1.Text = "&Import"; + // + // cCRedAlertMapToolStripMenuItem + // + this.cCRedAlertMapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cCRedAlertMapToolStripMenuItem.Image"))); + this.cCRedAlertMapToolStripMenuItem.Name = "cCRedAlertMapToolStripMenuItem"; + this.cCRedAlertMapToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.cCRedAlertMapToolStripMenuItem.Text = "&C&&C / Red Alert Map..."; + this.cCRedAlertMapToolStripMenuItem.Click += new System.EventHandler(this.ImportLegacyMapClicked); + // + // bitmapToolStripMenuItem + // + this.bitmapToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("bitmapToolStripMenuItem.Image"))); + this.bitmapToolStripMenuItem.Name = "bitmapToolStripMenuItem"; + this.bitmapToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.bitmapToolStripMenuItem.Text = "&Bitmap..."; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(122, 6); + // + // exotToolStripMenuItem + // + this.exotToolStripMenuItem.Name = "exotToolStripMenuItem"; + this.exotToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.exotToolStripMenuItem.Text = "E&xit"; + this.exotToolStripMenuItem.Click += new System.EventHandler(this.CloseClicked); + // + // mapToolStripMenuItem + // + this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.propertiesToolStripMenuItem, this.resizeToolStripMenuItem, this.toolStripSeparator4, this.spawnpointsToolStripMenuItem}); - this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; - this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 20); - this.mapToolStripMenuItem.Text = "&Map"; - // - // propertiesToolStripMenuItem - // - this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image"))); - this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem"; - this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22); - this.propertiesToolStripMenuItem.Text = "&Properties..."; - this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked); - // - // resizeToolStripMenuItem - // - this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image"))); - this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem"; - this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22); - this.resizeToolStripMenuItem.Text = "&Resize..."; - this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6); - // - // spawnpointsToolStripMenuItem - // - this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image"))); - this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem"; - this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(142, 22); - this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints"; - this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked); - // - // tt - // - this.tt.ShowAlways = true; - // - // surface1 - // - this.surface1.BackColor = System.Drawing.Color.Black; - this.surface1.Dock = System.Windows.Forms.DockStyle.Fill; - this.surface1.Location = new System.Drawing.Point(0, 0); - this.surface1.Name = "surface1"; - this.surface1.Size = new System.Drawing.Size(783, 681); - this.surface1.TabIndex = 5; - this.surface1.Text = "surface1"; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(985, 705); - this.Controls.Add(this.toolStripContainer1); - this.KeyPreview = true; - this.MainMenuStrip = this.menuStrip1; - this.Name = "Form1"; - this.Text = "OpenRA Editor"; - this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); - this.toolStripContainer1.ContentPanel.ResumeLayout(false); - this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false); - this.toolStripContainer1.TopToolStripPanel.PerformLayout(); - this.toolStripContainer1.ResumeLayout(false); - this.toolStripContainer1.PerformLayout(); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - this.splitContainer1.ResumeLayout(false); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage2.ResumeLayout(false); - this.tabPage3.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); + this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; + this.mapToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.mapToolStripMenuItem.Text = "&Map"; + // + // propertiesToolStripMenuItem + // + this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image"))); + this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem"; + this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.propertiesToolStripMenuItem.Text = "&Properties..."; + this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked); + // + // resizeToolStripMenuItem + // + this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image"))); + this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem"; + this.resizeToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.resizeToolStripMenuItem.Text = "&Resize..."; + this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(132, 6); + // + // spawnpointsToolStripMenuItem + // + this.spawnpointsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("spawnpointsToolStripMenuItem.Image"))); + this.spawnpointsToolStripMenuItem.Name = "spawnpointsToolStripMenuItem"; + this.spawnpointsToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.spawnpointsToolStripMenuItem.Text = "&Spawnpoints"; + this.spawnpointsToolStripMenuItem.Click += new System.EventHandler(this.SpawnPointsClicked); + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.layersFloaterToolStripMenuItem}); + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.toolsToolStripMenuItem.Text = "Tools"; + // + // layersFloaterToolStripMenuItem + // + this.layersFloaterToolStripMenuItem.Name = "layersFloaterToolStripMenuItem"; + this.layersFloaterToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.layersFloaterToolStripMenuItem.Text = "Layers floater"; + this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click); + // + // tt + // + this.tt.ShowAlways = true; + // + // statusStrip1 + // + this.statusStrip1.Location = new System.Drawing.Point(0, 751); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(985, 22); + this.statusStrip1.TabIndex = 2; + this.statusStrip1.Text = "statusStrip1"; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(985, 773); + this.Controls.Add(this.statusStrip1); + this.Controls.Add(this.toolStripContainer1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.MainMenuStrip = this.menuStrip1; + this.Name = "Form1"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "OpenRA Editor"; + this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); + this.toolStripContainer1.ContentPanel.ResumeLayout(false); + this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false); + this.toolStripContainer1.TopToolStripPanel.PerformLayout(); + this.toolStripContainer1.ResumeLayout(false); + this.toolStripContainer1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -405,7 +439,10 @@ private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem; } } diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs index 3a8f98058b..9292560bd1 100644 --- a/OpenRA.Editor/Form1.cs +++ b/OpenRA.Editor/Form1.cs @@ -142,9 +142,10 @@ namespace OpenRA.Editor var ibox = new PictureBox { Image = template.Bitmap, - Width = template.Bitmap.Width / 2, - Height = template.Bitmap.Height / 2, - SizeMode = PictureBoxSizeMode.StretchImage + Width = 32, + Height = 32, + SizeMode = PictureBoxSizeMode.StretchImage, + BorderStyle = BorderStyle.FixedSingle }; ibox.Click += (_, e) => surface1.SetActor(template); @@ -193,9 +194,11 @@ namespace OpenRA.Editor surface1.BindResourceTemplates(resourceTemplates); - foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); } + foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); } } + + static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p) { var template = ts.Templates[n]; @@ -321,35 +324,99 @@ namespace OpenRA.Editor void SaveClicked(object sender, EventArgs e) { - if (loadedMapName == null) - SaveAsClicked(sender, e); - else - { - surface1.Map.PlayerCount = surface1.Map.Waypoints.Count; - surface1.Map.Package = new Folder(loadedMapName); - surface1.Map.Save(loadedMapName); + if (loadedMapName == null) + SaveAsClicked(sender, e); + else + { + surface1.Map.PlayerCount = surface1.Map.Waypoints.Count; + surface1.Map.Package = new Folder(loadedMapName); + surface1.Map.Save(loadedMapName); + + dirty = false; + } - dirty = false; - } } void SaveAsClicked(object sender, EventArgs e) { - folderBrowser.ShowNewFolderButton = true; + using (var nms = new MapSelect()) + { + nms.txtPath.Text = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" } + .Aggregate(Path.Combine); - if (DialogResult.OK == folderBrowser.ShowDialog()) - { - loadedMapName = folderBrowser.SelectedPath; - SaveClicked(sender, e); - } + nms.lblNew.Visible = true; + nms.txtNew.Visible = true; + nms.btnOk.Text = "Save"; + nms.txtNew.Text = "Untitled1"; + + + if (DialogResult.OK == nms.ShowDialog()) + { + string mapfolderitem = nms.MapList.SelectedItems[0].Text; + string mapfoldername = nms.txtPath.Text + '\\' + mapfolderitem; + if (nms.txtNew.Text == "") + { + mapfoldername = nms.txtPath.Text + '\\' + mapfolderitem; + } + else + { + mapfoldername = nms.txtPath.Text + '\\' + nms.txtNew.Text; + } + DirectoryInfo directory = new DirectoryInfo(mapfoldername); + loadedMapName = mapfoldername; + try + { + + if (directory.Exists) + { + return; + } + directory.Create(); + } + catch (Exception ed) + { + Console.WriteLine("Directory creation failed: {0}", ed.ToString()); + } + finally { } + + SaveClicked(sender, e); + } + } + + + //if (DialogResult.OK == folderBrowser.ShowDialog()) + //{ + //loadedMapName = folderBrowser.SelectedPath; + // SaveClicked(sender, e); + //} } void OpenClicked(object sender, EventArgs e) { - folderBrowser.ShowNewFolderButton = true; + //folderBrowser.ShowNewFolderButton = true; - if (DialogResult.OK == folderBrowser.ShowDialog()) - LoadMap(folderBrowser.SelectedPath); + + using (var nms = new MapSelect()) + { + nms.txtPath.Text = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" } + .Aggregate(Path.Combine); + + nms.lblNew.Visible = false; + nms.txtNew.Visible = false; + nms.btnOk.Text = "Open"; + + if (DialogResult.OK == nms.ShowDialog()) + { + string mapfolderitem = nms.MapList.SelectedItems[0].Text; + string mapfoldername = nms.txtPath.Text + '\\'+ mapfolderitem; + // nms.txtPath.Text + '\\'; + LoadMap(mapfoldername); + } + } + + + //if (DialogResult.OK == folderBrowser.ShowDialog()) + //LoadMap(folderBrowser.SelectedPath); } void NewClicked(object sender, EventArgs e) @@ -439,5 +506,28 @@ namespace OpenRA.Editor case DialogResult.Cancel: e.Cancel = true; break; } } + + private void splitContainer1_Panel1_Paint(object sender, PaintEventArgs e) + { + + } + + private void statusStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e) + { + + } + + private void surface1_Click(object sender, EventArgs e) + { + + } + + private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e) + { + using (var npb = new PaletteBox()) + { + npb.Show(); + } + } } } \ No newline at end of file diff --git a/OpenRA.Editor/Form1.resx b/OpenRA.Editor/Form1.resx index 1b4bd4ba55..b7f1c45f7c 100644 --- a/OpenRA.Editor/Form1.resx +++ b/OpenRA.Editor/Form1.resx @@ -294,4 +294,247 @@ 182, 17 + + 418, 17 + + + 45 + + + + AAABAAIAMDAAAAEAIACoJQAAJgAAACAgAAABACAAqBAAAM4lAAAoAAAAMAAAAGAAAAABACAAAAAAAAAk + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAQAAAAQAAAAJQAA + ADcAAAA+AAAAOAAAACoAAAAYAAAACwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAUAAAApAAAAVAAAAGIBAQFNAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAASAAAAOgAA + AFkAAAA6AAAAMQEBAUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA + AAoAAAAkAAAAUQAAAHkAAACJAAAAhQAAAHMAAABTAAAAMAAAABUAAAAGAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAIAAAAkAAAAaQEBAZYCAgLaAAAAWgAAAAsAAAABAAAAAAAAAAAAAAAAAAAABwAA + AB8AAABMAAAAfwAAAHkAAAA8AgIAwgEBAWkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAQAAAA8AAAA9AAAAgwAAALMAAADFHRcU3QAAAMMAAACgAAAAdwAAAEUAAAAeAAAABwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAUgAAAJgDBATpAgIG/wEAAI8AAAAYAAAABAAA + AAIAAAAOAAAALgAAAGIAAACVAAAApgEAAJUEBADsAwQK/wAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABYAAABPAAAAngAAAMx3YFX3jXZv/5RuY/9mT0X2GxENygcG + BYsAAABKAAAAGgAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAKAAAAQAAAAJMBAQHRBApN/wQK + U/8CAADQAQEARwAAACkAAABIAAAAeQAAAKMAAAC5AgAA1QQGJf8FC1v/AQEHrAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABwAAACEAAABcAAAApQICAtOFc2z8hnJt/5h6 + cf+hfXL/mHty/3VkXewZExGLAAAAOQAAAAwAAAABAAAAAQAAAAIAAAAFAAAACAAAABAAAAAqAAAAYwAA + AKABAAC8AwAV+QUWxv8ED4P/BgcX/AEAALAAAACWAAAAsQAAAMkEBArzBAli/wMOtf8CCVD/AwIAbAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAEAAAADQAAAB1AAAAsgcE + BNmHcGj8mYiB/6GMhf+lkIj/moiB/5qIgP9dTUfqAgICYAAAACAAAAAGAAAABAAAAAoAAAAZAAAAKgAA + AEEAAABqAQEBmgEBAbkHCw7dBgcH+QEAi/8FHf//AgG0/wIABP8GFRntBiIw6wcYHf8BAET/AgR6/wMF + X/8DACD5AAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAFAAAAGwAA + AE8AAACXAAAAxQwLCuGSfHX9momC/5yLg/+cjIX/mYaA/5aGf/+MdWv/GhUSoQAAAEAAAAAXAAAAEAAA + AB8AAAA+AAAAZgAAAIwAAACtCQkJx0A5N+UYdqT/JsXu/wgdZ/8AAIr/Cyx0/x6Rwf8luf3/Jbv//yCd + 3P8TYIj/FWaB/xdtjf8EDhfkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAEAAAAIAAAAKQAAAG4AAACxBwYD1HdiWPmcioL/mYiA/56Nhf+ejoX/lYV//5WGf/+Wgnv/U0M96AAA + AHUAAAA4AAAALwAAAEYAAABzAAAApAAAAMIkGRHhIBkT6F1WVfYqPUb/KM3//yOt5f8NN0b/J8r+/ybE + +P8ZfqT/G4ay/x6Tz/8hpej/IKTl/xuLwf8FExmmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAIAAAANAAAANwAAAIQAAAC+IhoW5Jt2av+Qfnf/no6G/5WHgP+vnpb/koJ7/5iG + f/+Zh4D/k4B6/kU4M8UAAABvAAAAagAAAIcAAACsAAAAzAMDAt+FW0z8fV5R/VtQS/2PgHn/UUhH/yKV + tf8z////I62//wcXX/8CBMz/AABw/w9HXv8muv3/Iq30/xh0p/8BAABfAAAABAAAAAIAAAABAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAAWAAAASAAAAJQAAADESzkz86CCd/+mlI3/rJyT/4Z5 + cf+djIX/m4qD/5CAef9xZF7/jHx1/3BiWe0GBQSzAAAAsAAAAMQBAQDWCgUE5U83KfaCa2D/lH11/3hp + Y/+QgHn/noyF/xQODf8SU4X/CBuY/wUK//8BAOn/Cypv/yfC5v8luvf/IJvN/yKx+f8MKzrlAAAAIgAA + ABAAAAAHAAAAAwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAwAAAAqAAAAZgAAAKgAAADMVEdA+LKg + mP+pmZH/rp+U/4Z3b/9+cGr/joB5/4R3cf9zZ1//dmhi/4p5cv8fHRjlAAAA3AYEBOQgGhfzV0U4/pqA + df+wnpX/no6F/4V1bv9yZF7/ERIX/wUNzf8AAJ//AgK+/wAA8v8LJlr/K9bh/y/w//8NO0r/EEh+/ynZ + //8SVHj/AAAAywAAAEgAAAAnAAAAEgAAAAQAAAABAAAAAAAAAAAAAAABAAAABAAAABcAAABIAAAAjwAA + AMAAAADZZlxV+rSkmv+4qZ//oZGJ/419dv+QgHn/eGlh/35waP+Nf3b/emxl/5KCe/9kVEr+GxQO+Ug9 + OP2Mf3j+loZ+/52LhP+qmpH/oZGI/15STf8ICTL/CB30/wUTzv8il4j/HYac/wgcRf8qz93/NP///xZg + av8AAJb/D0W8/y3h/f8TWZ7/AQBY/wYEAPABAQCJAAAAQwAAAB0AAAAIAAAAAAAAAAAAAAABAAAACQAA + ACgAAABoAAAArQAAANCCaV74pJSN/8i4rf+omY//koF6/4t7dP9+b2j/koB5/5uJgv+UhHz/iXlx/3Bh + XP9lW1f/UEM8/4F0bf+jk4r/m4qC/52Nhf+gj4f/OjIs/wgUf/8KKv//AgDw/xlhU/87////L+b//y3g + 8P8w7v//F2N//wAAqP8BAP//E1SY/y7n//8PPn//AADr/wYWv/8GCCv/AQMEuQAAAEkAAAAWAAAAAAAA + AAAAAAAEAAAAEQAAADwAAACCAAAAvCUbGOKhjoT+sKCW/7ionf+Yh4D/gHBp/3hoYP+KeHH/kYF4/5+P + h/+Xhn//h3hx/3hoYf+XhoD/cF5V/5WEff+ejYX/nYyF/21hWv8LCQz/ChmV/wop//8IJPr/Ch/z/wcS + of8eiZD/Nv///zP///8jrKD/AABe/wYZ//8CAJ3/H4+m/yrT/v8IGoz/BAzS/wUWy/8GFKX/BQYm/wUG + BOUBAQFBAAAAAAAAAAEAAAAHAAAAHgAAAFUAAACbAAAAyUc/Ou6ejYX/pJOL/6WUjP+ejoX/iXpz/4t7 + cv+Xh37/mId//5+Ohv+pmI//koJ5/5GBeP+cjIP/dGNb/4t7dP+bioP/iHx2/zEtKf8hHyT/KipE/yYk + Jv8lIiX/ISEp/xkSPP8REA7/Gnh5/zb//f86//D/IqGV/wAAlf8NMYr/Nv///xhkgf8eKzT/KDg//xca + Hf8lLDP/ERUd/wYHCu0BAQFxAAAAAAAAAAEAAAAMAAAAMAAAAHQAAAC0AwMD1WleWfidjYT/pZSL/5yK + g/+OfHX/hnly/5CBef+Pfnb/m4uA/6aTiP+di4P/moqC/5mJgf+VhX3/lIN7/5eFfv+gjof/nIqE/5iH + gP+djYT/kIF4/5CAeP+Le3P/hnZv/4x9df+UhX3/SD04/xA6bf8XW6z/EESi/wYMPv8y+f//JKu7/1uA + kv+Nx+P/kcvn/1d4jv9KVmr/LD9N/xIfKacAAAAUAAAAAAAAAAIAAAAQAAAARAAAAJMAAADGKSYj5KWV + jP+woJb/pZSM/4V0b/+MfXb/nYyE/5iJgf+UhHv/pI+G/6GRh/+Qf3j/lYR9/6CRiv+ZiID/mYeA/5mI + gf+ci4P/n46G/5iIf/+KenP/gXBo/31tZf+GdG3/iHdv/4d1b/+LhYP/WGRm/wYASP8AAP//BAmf/zHr + 4f8jrK3/WH6O/3y71P+JxeH/jcjj/4292f9FWWj+JC86+QkPE3EAAAANAAAAAAAAAAIAAAATAAAAUAAA + AKIAAADNh3p0/K2dk/+snZL/no2F/4N0bf+RgXr/jXx1/5yLg/+YiID/mYiA/5ODfP+NfHX/mYiB/56M + hf+Yh4D/nY2E/5CBeP+Sgnr/loZ+/5qJgf+nl47/nY2E/5SEe/+PfXb/e3Rx/1Zocv9fg5L/Pml+/x4s + Pf8OKmv/Ip6E/xhrdf9kjqD/i8zm/4HC3P+Fwdz/iL7X/32xyv8xPkn/Hiw28wUIClcAAAAMAAAAAAAA + AAIAAAARAAAATQAAAKEAAADWqZqR/6STi/+ikon/b2Nd/3xqZP9wYlr/fm5n/4p5cv+OfXb/i3t0/4V1 + bv+MfHX/loR9/5qJgf+WhX3/jn53/4h3b/+Id2//mYmA/6OSiv+hkYn/qJiP/5uNhP9zdnj/T2h6/0uO + rf9UlbP/Z7LP/052hv8RMD3/CSPV/woMIf+GxOD/gsbf/3+/3P+Dvdf/erDJ/3epwv9jla//HTxM6wAD + BEQAAAAFAAAAAAAAAAMAAAAQAAAASgAAAJ4AAADQopOK/56Mhf+gj4f/kX95/4NzbP+DdG3/fGxl/35u + Z/96a2P/dGZf/4R0bf+Nfnb/i3pz/5B/d/+TgXj/nY2E/5+Ohv+di4T/o5KK/6CPiP+fjof/oJGJ/2Vw + dv8/X3T/Y6XF/1WiyP9cosb/drzY/3e51P8JD3b/Ch/e/z1WXv9/wNr/gL3W/4C92v+GxN3/baK9/4G8 + 1P9/wuH/ETJIlwAAABQAAAACAAAAAQAAAAYAAAAXAAAAUAAAAKIAAADMjoJ5/6iYj/+qmpH/oI+H/5GB + ev+SgXr/lYN8/5GBev+RgXn/koF6/41+dv+Le3L/jXdt/4x6c/+XhX3/mYeA/5iHgP+ejYX/opKJ/5qK + gf+NfnX/a3By/zhhdv9orsv/YKvP/0uZv/9krc3/c7zZ/3u72P8sP1P/Cg8t/2qbrv9zrsf/e7TN/4W/ + 2P+FwNv/erbR/3Oiwv9pqsf/AwkOUgAAAAgAAAABAAAAAwAAAA0AAAAoAAAAZQAAAKwAAADQm4yE/7Sl + mv+klIv/oI+H/5iGgP+Le3T/lIN8/5ODfP+Ug33/lIJ7/5iHf/+ch3//kX54/3JjXf+Ugnz/loV+/5WE + ff+ai4L/jHx0/4NzbP+HhYP/R2p//1iny/+Iyeb/O3Wo/0+fwv9vvNv/eL/c/3m72P9LcH7/DAoA/4jG + 3v93uNH/fL3X/4zD2/9/udX/f8De/4y+1/87cJDxAQIDLgAAAAcAAAAAAAAABwAAABwAAABKAAAAiQAA + AL4AAADap5iP/66elf+hkIj/oI+I/5SDfP+Qf3j/koB5/5KAef+aioL/lYR8/56Ohf+ci4T/mIZ//4Ry + bP+RgXr/momC/458df97bmX/gGRU/4l2bP9Qh6b/XqrO/2Oozf9hp8v/Ya3O/2q72v94vdz/gcbi/3y9 + 2/9nnbD/U3OB/4zN5/+Bw9z/gL7a/32zyf92sMn/iMfg/3251f8pUWjIAQEBIQAAAAIAAAAAAAAADQAA + ADQAAAB1AAAAsAAAAM8pIyDsrJuS/56Nhf+ejIX/k4J7/4Z1bv+Pfnf/kYF6/4d1b/+cjIP/mouD/5qI + gf+UhH3/i3pz/4t5cv+XhX7/koB5/2teVf94fH//dK/I/2e42P9RkL7/YrDR/1qoyf9eqsv/WqbJ/3bB + 3v97w9//fcTh/32+3P+DxN//g8Db/4TJ4/9/v93/gbzX/3Kmv/9qqMD/i7/b/1N/p/8ZLjp9AgQEFgAA + AAAAAAAAAAAAGAAAAEwAAACWAAAAxickIemAcWj/loV+/4t5cv9/bmf/fW1m/3BjW/96aGL/bmBZ/31t + Zv+Ne3X/koF6/4x8df+FdW7/i3t0/5SCe/+Qf3j/gnFq/2trav9rtdT/bLTU/2KjyP9tt9f/X6XI/2Ow + zf9Zp8r/Z7DQ/3m/3v+Axd//fL3b/3/B3v+IzOb/h8nk/4rL5P+ExeP/hMXe/2qeuf92scb/oc7q/0yC + pv8OHihoAQEBDQAAAAAAAAAAAAAAJwAAAGMAAACqBwYG03FjXvqTgnv/bl9Y/3dnYP91Z2D/d2dg/3Bg + W/98bGX/gnNs/3trZP+BcGj/fGxk/3NlXv+EdG3/lIV9/6COh/+NfHX/ZF5a/0p5nP9ajar/WJO9/3K+ + 2v9/vdz/YKPG/2muzv9cqcn/ZbHR/3K72P9+wN3/hcXi/4fI5P+Jy+T/f8Dc/4fF3/+NzOX/iMbf/3m3 + 0f9nlrT/b5uz/yhVb+YFCw5KAAEBCQAAAAAAAAAAAAAAQAAAAIMAAAC7CAUF21BEPv5uYFj/hndw/4l6 + cv+KenT/momB/5KBev+RgXr/k4F6/5mJgv+Tgnr/iHdw/4p5c/+ThH3/m4yF/6CPiP+CdXH/TnKL/0tv + k/8hITb/M0Zh/2OjyP90u9j/abHO/2etzf9cqMn/Z7HR/3e92f95u9j/eb7b/5PV8P+Mzeb/fsPd/3/D + 3f+Szeb/h8Lf/3/A3v+Mu9T/RnGF/hEiMcwAAABAAAAABwAAAAAAAAAAAAAAXgAAAKQAAADMKCUj6ZmH + gP+ejIX/lIN8/5iHf/+YiH//mYeA/5OCe/+UhH3/hXRu/4x6dP+SgHn/mYeA/5qJgf+bioP/loV+/4h3 + cf9bXl//bLrc/3S/4P9LdJj/KiNI/z1ehf9mr9L/d77b/1uoy/9Vo8b/bLDN/3q/3P97vdr/hMrj/5LQ + 7P+Oz+v/iMzm/4TF3/+Gwdz/hMbh/4rO6P+Oxd7/PGyF/hocHNUCAwNeAAABEQAAAAEAAAAAAAAAdQAA + ALUAAADekIB7/pODev+ejob/mIeA/6iXj/+jkor/mIZ//5KAef+RgHn/jn12/5qIgf+cioP/no2F/6OR + iv+hkYj/iHdw/2JVTf9NfJX/YqrR/3O31/93weH/VoKj/2+y0f9ppM3/ebvb/1Kfxf9nsdD/YKPG/3G3 + 1v96vNn/gsTg/4rL5/+FyuT/gsTh/4jK5v+Fw93/d7/b/5zT7/97r8//Y6vF/zVZaNwRGx5dAAABEgAA + AAIAAAAAAAAAiQAAAL8jHxzoq5yR/56Nhf+hkIj/rJyT/6mZkP+qmpH/m4uD/5KBev+WhX3/kH55/5WD + fP+VhH3/oo+J/6iXj/+cjIP/c2Ja/3xwaP9WncX/abLS/3O62f9qtNT/d8Hd/3vD4P+MxuP/Y6bM/1up + yv9qtdT/ZK3M/3jA3f95wN//hMrl/4rM5/+Ky+X/hcbk/4rO6P98u9v/hMni/6zZ9f9km77/K1V37gkQ + FGoBAQEHAAAAAAAAAAAAAAAAAAAAngAAAMlZUEzxoI+H/6uckv+omI//oZCJ/6STi/+ikIr/nImD/5aE + ff+aiIH/j313/4x7dP+UhH3/m4mC/6SUi/+Ugnv/cVxO/3ymuv9KibL/dLnZ/3rB3v9fpsj/b73b/3G5 + 1v99x+P/ZLLQ/02Xwf9rtNj/fMXh/3O52P91vt3/eb7b/37A3f+HyOL/js/p/4/Q6v+Dx+T/erPX/5XL + 5/9Jl7v+GjJBrgEBAQoAAAAAAAAAAAAAAAAAAAAAAAAApw0NDdaIeHD9kX95/6qbkf+unpX/j395/459 + dv+pmJD/n46H/56Ohf+gkIj/kH95/4x8dv+JeXL/kIB4/5WFfP9yZmH/b36H/2aqzv9nr8//esLe/3m/ + 3v9rtdT/arbW/2iz0P9rvdr/UqbG/2q41P9gqs3/crjX/2Spzf+AyeT/f8Hd/3m+2/+Cx+H/k9Ht/4rH + 5P+Fx+T/mc7p/2amxP8nSF36AAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqBUSEN2Ug3r9lYV8/6OT + iv+klIv/l4V+/4p6dP+omI//p5aO/56Ohf+WhX3/j394/3hoZP9uXFb/emtk/3NnXv9ydXn/bLXV/2Sp + zv92vdz/fcbh/3zE4f9xu9v/Z67Q/16kx/9QnMD/Xq/O/2Wy0f94wN3/c7jV/3q83P9encj/gsrj/33C + 3v+CxN//jMjk/4bI4/+Lz+n/lM/q/0d+nf8sLiv3BQYHTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArg8P + DdqSgX38qZiQ/6WVjP+ci4P/lYR9/419d/+KeHH/opGJ/5WFfP91YlX/hGpX/2ZkY/9HUlj/OFVn/1eQ + tf9fpcj/Y6jP/3W+3f96wt7/drrX/36/3f9+x+L/bbjV/2241f9hsc7/ZrTS/2u41P92udX/h83o/4fI + 5f97wd3/dr3a/3K72/+DxuL/hsfj/3jA3P+c0+//fLPT/2avyf5HfZLyHzI3SwAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAux0aGuGWhH39rp6V/6qbkf+Yh3//koB6/5B/ef+Rf3j/fWtk/4huXf+jrK//d7jX/2Ow + 1v9kstb/Up3I/2Wlyv9krdD/Y6/S/2y52f9ut9b/er3Z/4PG4v99wt7/f8Xh/3jE4P91wd7/bbrW/3W9 + 2v99w97/hMnl/4jL5/+BxuD/i8/p/3m+3v+Izef/fbzc/4XK4/+s2fX/ZZ7C/y1dhOwTJzK9FxobTQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAxzo0Muqbi4T/saKY/7Cgl/+fjYb/kIB6/49+d/+Bcmn/fGxg/3u7 + 1P9sqc3/Z6vP/2Kny/9vuNf/abfW/3O72P95w9//cLjV/3C+2v9wuNX/gsTh/33A3/9wudb/db7b/2i1 + 0v9uutf/cLzY/4HG4v+P0er/icvk/4XH4v+Ozej/itDr/43S7P+O0Ov/hcnm/3q02P+TyeX+SZu//yNH + XKEHBwcnCgkITAAAAAEAAAAAAAAAAAAAAAAAAAABCwsNtZKEfPicjIX/sqKY/66elP+hj4n/opGJ/5GC + ef+OfnP/icbj/1qdw/9ZmL//f8Xh/3fA3f91wd3/eb7d/4PL5f+EyuP/fsbg/3e+3f93vNv/gMHe/3u9 + 3P9wt9T/dbnW/2m21f9rtNP/cbnW/3693f9dh7T/Ypa8/4bH4f9zp8f/gsLf/47M6P+R0On/jtDs/5jP + 6v9mp8X/GTJFrgAAACYCAgISAgMDEwYGBxAAAAAAAAAAAAAAAAAAAAABExMTgJCGffWdj4f/t6ee/6iX + jv+tnJT/pZWM/5KBc/+WtML/ZqbL/2Gkyv9xvt3/fMXh/3rB3v93vdz/g8nl/37E4P90vdn/ecDd/3nA + 3f97vdz/d7jV/3a71/96wd7/fr/d/3G41f9zuNX/hcfk/1yMtP9Fa5n/LUd8/2yhxP9RcJj/cqPG/4nC + 3/+MyuP/hc3n/5PO6v9Hf5//AwUFYgAAAB8AAAAHBAMDCAsLDBoEBAQHAAAAAAAAAAAAAAAAAAAADwcH + BzMPDg1MPTk2ro6EevKbjYT/o5SK/6GKev95vNn/aqrO/3O61/99xOP/esLe/37E3/96xd//e8Pf/3i9 + 2v9qstL/a7bT/3W+2v9wtNH/dLnV/2+20/9yvdf/eLnW/36+2/+Mzur/i9Pt/16cxP85XpP/Q1mD/2CV + vf9roMP/jMfi/4nF4f+DyOL/hMnm/2yfwv5lvNn/TImj2wAAABMAAAADAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAABAAAABgAAABYAAAA4FBIQlIKCgux4qsn3dKvM/H/A3f+Ky+j/i8nl/4HG + 4v94vdz/gsLf/4TI4v90u9j/dbva/3W51v9xuNf/bbXS/3O82f99vtz/ervZ/4jK5f+T1fL/iMvn/3m8 + 3v98vt3/TnWg/1qQvP96ttf/h8jk/1aErf9qs9P/n9Tv/2ufv/8lUoL+ECQ0jwAAAAwAAAABAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAEAAAACgAAAB4OEBFRHiktejZN + WKdagZTVaY2i4GiRpPF+ssv/kdPv/5DV8f+Fy+f/hMPf/4bI5P9/xuP/ebzb/3m92v94vNn/fMHd/4/Q + 6v+W1PD/l9jy/4fF4f9HcqH/aqHI/3Ot0f9Mf6v/h8Xi/3y93f8lTIL/iL/f/3Cx1P8mTG3QAAAAHwAA + AAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAABAAAAAwAAAAcDBAQYBQYHJQYICTsNEhVlJTM8w1Buf/9Zeo7/i87q/4PE4P+SzOn/icbj/3e4 + 1f97wt//isbi/5PR7f+b2PX/ldPp/4S72v9hmcL/ZqHI/1mMuv+Gw+D/aaPK/1CLuf9hibj/ic3n/kh4 + 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 + Sf+Wh3//nIuE/25iXf8iJmH/CSPe/wYQ8v8ff6H/M/P//y3f5P8MMm//AwfR/xlyn/8chcL/Agbf/wYS + l/8DBBXcAgICYgAAAAAAAAAEAAAAHgAAAHgAAADJcmZg96STi/+ikYn/iXpz/5GBeP+Yh3//pJOL/5KC + ef+Xh37/dGNb/5ODfP+IfHb/KSYn/yoqRP8mIyb/ISEp/xURJf8aeHn/OP/3/yKhlf8HGZD/Nv///xtI + W/8oOD//HiMo/xEVHf8DBQWvAAAAAAAAAAgAAAA6AAAAoRcVEt2XiH/+pZSM/49+eP+Sg3v/k4R7/6CN + g/+ejIP/mIeA/5qKgv+XhX7/nIqD/56Mhf+Whn7/iXlw/4h4cP+Hd2//jX95/1BRT/8MJpn/Cieh/yOo + s/8+laX/fLLL/4/K5f9deY//KTZD/AcMEE8AAAAAAAAACwAAAFAAAAC4h3p0/K2dk/+ejYX/int0/418 + df+aioL/mYiA/5CAef+ZiIH/m4qD/52NhP+Rgnn/loZ+/6GQiP+djYT/koF5/3t0cf9bdoL/Pml+/xYr + VP8inoT/Pn2L/4vM5v+Dwtz/iL7X/1d4iv8eLDbzAwQFMgAAAAAAAAAKAAAATAAAALqml47/oZGI/4Bx + a/99bWb/fW1m/4R0bf+AcWr/iXly/5F/eP+VhHz/loZ+/5OCev+ejoX/oZGJ/6SVjP9tdXr/WYeg/1Wa + vP9vt9T/OFyE/woh2v9Teo//gcLb/4LA2/90qcP/d6/K/xc2S8EAAQEYAAAAAQAAAA8AAABQAAAAt46C + ef+pmZD/oI+H/5KBev+Vg3z/kYF6/5KBev+MfXT/jXdt/5KAeP+Zh4D/m4qD/6KSif+UhHv/a3By/1CI + of9gq8//WKPG/3O82f9UfZb/Cg8t/2+lu/97tM3/hcDa/3q20f9upsX/AwkOUgAAAAUAAAAFAAAAJwAA + AHcAAADFoZKK/6qakf+gj4j/koF6/5OCe/+VhH7/lYN8/5yKgv+Vgnz/h3dw/5iHgP+Pf3f/hnBk/3l+ + gf9Tiqf/abDT/06Ru/9otdX/fcPf/2qiuf8wP0H/hMTd/36+2f+AuNH/hMTf/1uPqu4BAgIoAAAAAwAA + AA0AAABVAAAAsBUREd6sm5L/no2F/5OCe/+LenP/kYF6/5KBef+ai4P/l4Z//4t6c/+Rf3j/koB5/3Jt + av90r8j/XKTL/2Kw0f9cqcr/WqbJ/3nC3/99xOH/gMHe/4PA2/+CxOD/gbzX/26nwP+Lv9v/NlZxvgIE + BBYAAAAAAAAAIAAAAHwDAgLNal9Z+YJya/9+bmf/empj/3ZmYP94amP/gnFq/4d3b/+Dc2z/kIB5/5WD + fP9zaGL/X4qh/2Kkyf9xttb/YKTH/2GszP9msdH/e8Dd/4HB3/+GyeP/g8Xg/4nJ4/+Gxt//cKjC/4i1 + z/8iQFOmAQEBCwAAAAAAAABAAAAAnwgFBdtfUkv/hndw/4p6c/+aiYH/koF6/5OBev+Whn7/iHdw/49/ + eP+bjIX/kYJ9/05yi/82SGX/M0Zh/2yv0P9psc7/YqvL/2ex0f94vNn/eb7b/5DR6/9+w93/icji/4fC + 3/+Gvtn/RnGF/gkRGYYAAAAHAAAAAAAAAGoAAADBXVJO9JuKgv+WhX7/n4+G/5mHgP+Tgnv/inly/5WD + ff+cioP/n46G/49+d/9lam3/Z7LX/2urzP9AU3b/X5m+/3i92/9bp8r/ZqrK/3m82v+Dx+L/jM7p/4XI + 5P+GxeD/fsPe/4zG4f9QjKb/GCUqnAAAARIAAAABAAAAiREQD9SrnJH/oI+H/6yck/+qmpH/m4uD/5SD + fP+Qfnn/lYR9/6KPif+ikon/c2Ja/2mHl/9pstL/b7fX/3fB3f+ExeL/Y6bM/2Ovz/9krcz/ecDe/4TK + 5f+KzOb/hcbk/4PF4v+EyeL/iLra/ytVd+4FCQs5AAAAAAAAAAAAAACjPDYz5JmHgP+rnJL/mIiB/6CP + h/+ejIX/nIuD/5B+eP+Ofnf/loV9/5CBef9wbWv/ZaPD/3e+3P9wt9b/bbrZ/3G82f9brMv/YazP/3e/ + 3P9zu9r/fMDc/4HE3/+R0Ov/icrm/4rB4P9blLH+DRohjQEBAQMAAAAAAAAAAAAAAKhVSkbtlYV8/6SU + i/+XhX7/mYmC/6eWjv+aioH/j394/3NiXf96a2T/c25s/2y11f9ts9X/fcbh/3fA3v9nrtD/V6DE/16v + zv9vudf/c7jV/2yt0v+CyuP/gMPf/4zI5P+JzOb/lM/q/zlWY/sFBgdPAAAAAAAAAAAAAAAAAAAAtVZM + SO2sm5P/oZGI/5SCfP+PfXf/kH53/46BeP9+kZf/Xoaa/0V5mP9gosb/Y6zR/3O82/94vNj/f8Tg/3a/ + 2/9vvNn/arfU/3W92f+Gy+f/g8fj/4HG4v9+xOH/gsLg/5LO6f9xqcv/PG2F5xsmKUwAAAAAAAAAAAAA + AAAAAADHa19a9bGimP+ol4//kIB6/4h4cP98bGD/dLLR/2erz/9psNH/abfW/3a/3P9wuNX/cLvY/4LE + 4f93vdv/db7b/2u41f9wvNj/iMzm/4nL5P+KyuX/itDr/47R7P+Fyeb/h7/f/0mbv/8VJzJkCgkITAAA + AAEAAAAAAAAAARAQEJuXioL7taWb/6qZkP+kk4v/ko6J/3i21/9ipsv/fsXh/3jA3f9+xOH/f8bh/3zD + 3/95vt3/fL3a/3e82v96vNr/brfV/3vA3f9gj7j/SG+c/26gwf96s9P/jsrl/4rP6v92sc//DhwliAEB + ARgDAwMOBgYGDQAAAAAAAAABAAAADwsLCkA9OTaulImA+aOUiv+No6r/aqrO/3i/3f96wt7/fMXf/3vD + 3/9xuNb/a7bT/3O51v90udX/cbrV/3i51v+FxuP/i9Pt/0x9rP9DWYP/ZpvA/4zH4v+Gx+L/hMnm/2mu + zv9MiaPbAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAVCgkIT0NPWJVJan27Zpas33mq + xPB4ssz8isvn/4TJ5f99v93/e8De/3O51/95vdv/e77b/5HR7f+Q0u3/ca3Q/1yLtP9lncT/h8fj/1mR + uP+Uyuf/Snuh9AgSGlcAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA + AAMCAgIQBQYHJQoND1AlMzzDVXSH/4vO6v+LyOX/icbj/3m92v+KxuL/l9Xx/5XT6f9zqs7/ZqHI/3Co + zf9po8r/WYq5/4nN5/4rSGe7AAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAcAAAAuFB0ieE9zhsNonLbpXo+k32SNo+CQxeD9ldHu/4K9 + 3P9fkbz/Un6x/4jA4P9vocn/S4Wv/ypEU4wAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABQMEBRQBAQEVAAAAJRwl + KoJSeY7ubKLI/3Cjwv9WfKz/isPg/16Qvf86cZ//DRQlZAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAEAAAABAAAABgAAAA4DAwQ+ERcaa0BccbdWfpDWZY+092GVtvsJDxE3AAAAAQAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABQAAABYLEBJGHC02gQAAAAYAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAADwD4MD8AeAA+AAAAfgAAAH4AAAD+AAAAPAAAAAgAAAAIAAAACAAAAAgAAAAIAA + AACAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAAAAAAAAwAAAAMAAAAHAAAABwAAAAIAAAACAAAAD4AA + AA/4AAAf/4AAH//wAB///gAf///wPw== + + \ No newline at end of file diff --git a/OpenRA.Editor/MapSelect.Designer.cs b/OpenRA.Editor/MapSelect.Designer.cs new file mode 100644 index 0000000000..aceb3bad85 --- /dev/null +++ b/OpenRA.Editor/MapSelect.Designer.cs @@ -0,0 +1,161 @@ +namespace OpenRA.Editor +{ + partial class MapSelect + { + /// + /// Требуется переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором форм Windows + + /// + /// Обязательный метод для поддержки конструктора - не изменяйте + /// содержимое данного метода при помощи редактора кода. + /// + 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.colTheater = 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.txtPath = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // MapList + // + this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.colMapName, + this.colTheater}); + this.MapList.Dock = System.Windows.Forms.DockStyle.Top; + this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.MapList.LargeImageList = this.MapIconsList; + this.MapList.Location = new System.Drawing.Point(0, 0); + this.MapList.MultiSelect = false; + this.MapList.Name = "MapList"; + this.MapList.Size = new System.Drawing.Size(472, 252); + 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 = 300; + // + // colTheater + // + this.colTheater.Text = "Theater"; + this.colTheater.Width = 140; + // + // 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(385, 258); + 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(304, 258); + 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, 263); + this.lblNew.Name = "lblNew"; + this.lblNew.Size = new System.Drawing.Size(70, 13); + this.lblNew.TabIndex = 3; + this.lblNew.Text = "New name:"; + this.lblNew.Visible = false; + // + // txtNew + // + this.txtNew.Location = new System.Drawing.Point(88, 260); + this.txtNew.Name = "txtNew"; + this.txtNew.Size = new System.Drawing.Size(210, 20); + this.txtNew.TabIndex = 4; + this.txtNew.Visible = false; + // + // txtPath + // + this.txtPath.Location = new System.Drawing.Point(12, 307); + this.txtPath.Name = "txtPath"; + this.txtPath.Size = new System.Drawing.Size(448, 20); + this.txtPath.TabIndex = 5; + this.txtPath.Visible = false; + // + // MapSelect + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(472, 303); + this.Controls.Add(this.txtPath); + this.Controls.Add(this.txtNew); + this.Controls.Add(this.lblNew); + this.Controls.Add(this.btnOk); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.MapList); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + 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); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ColumnHeader colMapName; + private System.Windows.Forms.ColumnHeader colTheater; + private System.Windows.Forms.ImageList MapIconsList; + public System.Windows.Forms.TextBox txtPath; + public System.Windows.Forms.ListView MapList; + public System.Windows.Forms.Button btnCancel; + public System.Windows.Forms.Button btnOk; + public System.Windows.Forms.Label lblNew; + public System.Windows.Forms.TextBox txtNew; + } +} \ No newline at end of file diff --git a/OpenRA.Editor/MapSelect.cs b/OpenRA.Editor/MapSelect.cs new file mode 100644 index 0000000000..0613151560 --- /dev/null +++ b/OpenRA.Editor/MapSelect.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.IO; + +namespace OpenRA.Editor +{ + public partial class MapSelect : Form + { + public MapSelect() + { + InitializeComponent(); + } + + private void MapSelect_Load(object sender, EventArgs e) + { + + DirectoryInfo directory = new DirectoryInfo(txtPath.Text); + DirectoryInfo[] directories = directory.GetDirectories(); + MapList.Items.Clear(); + foreach (DirectoryInfo subDirectory in directories) + { + ListViewItem map1 = new ListViewItem(subDirectory.Name); + map1.ImageIndex = 0; + MapList.Items.Add(map1); + } + MapList.Items[0].Selected = true; + + } + + private void MapList_SelectedIndexChanged(object sender, EventArgs e) + { + if (MapList.SelectedItems.Count > 0) + { + txtNew.Text = MapList.SelectedItems[0].Text; + } + } + } +} diff --git a/OpenRA.Editor/MapSelect.resx b/OpenRA.Editor/MapSelect.resx new file mode 100644 index 0000000000..4b9c04b5b8 --- /dev/null +++ b/OpenRA.Editor/MapSelect.resx @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw + DgAAAk1TRnQBSQFMAwEBAAEIAQABCAEAARgBAAEYAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABYAMA + ARgDAAEBAQABIAYAASQhAAEBAx4BLAMzAW8COAE3AYkDLwFZAxgBIgMBAQIMAAMdASoDNAGFAjQBNQF2 + Aw8BFAMBAQIDDQESAy4BUgM0AXcCMAExAacDDwEU/wAwAAEBAwMBBAMuAVQBOQE1ATMBwgFnAVcBUgH0 + AV4BTwFKAdgBQwE/AT4BjQMVAR4DAgEDAwABAQMCAQMDGgElAzQBlAEEAQUBIgH9ATEBMwFMAaQDLwFX + AzQBcwIqATEBugEXARgBQwHjAi0BLwGyAwABAf8AMAABAQMMARADNAF0AT8BOQE2AdgBmQGIAYEB/wGg + AYwBhQH/AYQBdAFtAfgDMgFhAwoBDgMKAQ0DHQEqAzMBbQMrAbsBCgIMAfkBAgEJAb8B/wEHAQ0BSAH5 + ARUBLAE3AesBAgEJAUgB/wIEAVIB/QMNARH/ADEAAwMBBAMcASkBMgIxAaQBWgFOAUkB7QGbAYsBgwH/ + AZwBjAGEAf8BlgGEAXsB/wFbAVEBTgHYAy8BUwMuAVQDMQGdAToBMgEuAdMBSgFMAU4B8wE0AZ4BuwH/ + ARgBdwGrAf8BGAF5Ab8B/wEUAWoBtgH/ARsBjQHCAf8BJAFhAX0B4QMBAQL/ADAAAQEDCQEMAywBTAE1 + ATMBMQHDAYEBbgFnAfoBqAGZAY8B/wGTAYQBewH/AYwBewF0Af8BhwF1AXAB/wFAATwBOgG+ASsCKgG8 + AS8BKAEkAeUBegFjAVkB+gGDAXEBaQH/AVUBTAFLAf8BEgFPAaQB/wEHAR4BuAH/AREBVQGVAf8BHQGV + AcAB/wEiAXQBmgHrAy4BUgMNARIDAgED/wAlAAMBAQIDFwEhAzMBjwE1ATEBMAHcAZsBjgGFAf0BoQGR + AYkB/wGHAXcBbwH/AYEBcgFpAf8BeQFrAWQB/wFaAU4BRwH9AU8BRAE/AfwBlgGGAX0B/wGjAZIBigH/ + AVcBTgFXAf8BBwEcAfMB/wEWAWQBpgH/ARkBegGVAf8BMwH9Af4B/wELATYBlAH/ARkBfgHIAf8CAAFY + Af8CNAEzAZQDGQEj/wAlAAMGAQgDKgFGAygBvAF1AWcBYgH0AaoBmwGRAf8BiQF4AXEB/wGMAXsBcgH/ + AZoBiQGBAf8BiwF7AXMB/wF5AWkBYgH/AYYBdQFtAf8BlQGGAX4B/wFFAUABTgH/ARcBIwGIAf8BDgEV + Aa4B/wEgAX4BlQH/AS4B3wHiAf8BEgFXAXsB/wENAT0BvAH/AR0BgQGqAf8BDgEWAakB/wESARgBVQH3 + AjMBNwGg/wAlAAMPARUDNAFyAScBJgElAdYBkwGEAXoB/QGaAYkBgwH/AY8BgAF3Af8BlgGGAXwB/wGf + AY0BhAH/AZYBhQF9Af8BlAGEAXsB/wGUAYMBewH/AZcBhwGAAf8BbgFjAWAB/wFnAVsBWgH/AWQBWQFX + Af8BVwFbAVwB/wEmAWcBmgH/AREBTwGdAf8BJAGOAbAB/wFQAZwBrwH/AWwBmgGuAf8BOwFLAVoB/gE4 + ATsBPgGf/wAlAAMYASIDMwGVAYMBeQFzAfwBqAGYAY4B/wGRAYEBeQH/AY0BewF0Af8BmgGJAYEB/wGT + AYMBegH/AZkBiAGBAf8BnAGLAYMB/wGVAYYBfAH/AZYBhgF9Af8BoAGPAYcB/wGWAYUBfAH/AXoBcwFw + Af8BUAFxAYEB/wEiAT8BYQH/ASEBngGEAf8BVwGXAakB/wGGAcUB3wH/AYgBvgHXAf8BRQFfAWwB+wE4 + ATsBPAFz/wAlAAMYASIDMwGVAZ0BjwGGAf8BmwGLAYMB/wGGAXUBbgH/AYUBcwFsAf8BiAF3AXAB/wGJ + AXgBcAH/AZABewFzAf8BlQGEAXsB/wGWAYUBfAH/AZ8BjwGGAf8BmQGLAYQB/wFxAYABhgH/AVoBkwGw + Af8BXgGmAccB/wFQAYMBpAH/AQkBGgGgAf8BZwGaAbAB/wGCAb8B2QH/AXUBrQHIAf8BXQGDAZYB3gEo + ASoBKwFA/wAhAAMDAQQDJAE4AzABowGaAYwBhAH/AacBlgGOAf8BlwGGAX4B/wGUAYIBegH/AZQBgwF7 + Af8BlgGFAXwB/wGSAX0BdgH/AY8BfQF2Af8BlQGEAXwB/wGPAXoBbwH/AXQBgAGHAf8BXgGXAbMB/wFT + AZoBwgH/AWkBtQHUAf8BaQGkAb4B/wEiAS4BOQH/AXwBugHTAf8BgAG7AdUB/wGBAb8B2gH/AVYBcAF9 + AbUDDwEU/wAhAAMKAQ0DNAFzASkCKAHPAasBmgGRAf8BmgGJAYIB/wGOAXwBdQH/AZEBgQF5Af8BlQGE + AXsB/wGYAYgBgAH/AYsBeQFyAf8BkQF+AXcB/wF8AXIBbgH/AXMBrwHIAf8BXQGoAc0B/wFdAasBzAH/ + AVkBpgHJAf8BeQHDAeAB/wF+AcIB3wH/AYMBwAHbAf8BggHBAd0B/wFzAa4ByAH/AYsBvwHbAf8BQgFL + AVIBhgMFAQf/ACEAAx0BKwMyAaABTAFEAUEB7QGDAXMBbAH/AYMBcgFrAf8BgQFwAWkB/wGBAXEBagH/ + AYgBdwFvAf8BhwF2AW8B/wGUAYQBfAH/AYUBegF3Af8BWAFwAYMB/wFRAYQBpgH/AWoBsAHQAf8BYQGq + AcsB/wFlAbEB0QH/AXoBvwHdAf8BhQHIAeMB/wGBAcQB3wH/AYgBxwHiAf8BewG2AdEB/wFxAZ4BtgH/ + ATgBPAE+AWsDAgED/wAhAAMwAVwBMwExATAByAFwAWIBXQH4AZEBgAF4Af8BmAGIAYAB/wGVAYQBfAH/ + AY0BewF0Af8BlQGEAXwB/wGYAYcBgAH/AZMBgwF7Af8BbAGAAYsB/wFaAZABsQH/ATsBTgFuAf8BZwGp + AcoB/wFkAa4BzwH/AWUBrAHMAf8BegG/AdwB/wGJAcwB5wH/AYMBxgHiAf8BhQHFAeAB/wGHAcMB3gH/ + AUwBgwGbAf8BNgI4AWgDBAEF/wAhAAM0AYkBTwFJAUYB4gGkAZMBigH/AawBnAGTAf8BpQGVAYwB/wGW + AYYBfQH/AZABfQF4Af8BmQGIAYEB/wGiAZEBiQH/AXIBYQFZAf8BaAGVAasB/wFsAbUB1QH/AXYBwQHd + Af8BeAG7AdsB/wFiAawBzgH/AWMBrQHMAf8BfAHDAeAB/wGIAcsB5gH/AYUBxgHkAf8BgwHGAeIB/wGH + Ab8B3QH/ATEBVQFzAe4DGwEm/wAlAAMvAaUBYgFXAVQB7wGjAZMBigH/AZgBhwGAAf8BnwGOAYYB/wGd + AYwBhAH/AZABfQF3Af8BiAF2AW8B/wGIAXoBcwH/AW4BhQGPAf8BbAGwAdAB/wFzAbwB2gH/AWoBtgHW + Af8BYwGxAdAB/wFhAa8B0AH/AXUBvQHaAf8BdAG7AdoB/wGAAcQB3wH/AY8BzQHpAf8BigHJAeUB/wFj + AZcBsAH9ATYBOQE6AXkDAAEB/wAlAAMsAbEBcAFjAV8B8wGjAZIBigH/AZUBgwF8Af8BlAGCAXsB/wGU + AYUBewH/AYQBiwGNAf8BXwF3AYYB/wFgAYcBnQH/AWUBrwHSAf8BcwG7AdoB/wF7AcEB3gH/AXABuQHX + Af8BZQGzAdIB/wFtAbkB1gH/AYABxQHhAf8BfAHCAd8B/wGAAcUB4QH/AYUBxAHhAf8BiQHGAeIB/wFS + AYABlQHzAS4CLwFO/wApAAMjAccBgQF1AW4B+AGrAZsBkgH/AZABgAF5Af8BhAFzAWoB/wF2AZoBqwH/ + AWYBqwHPAf8BaAGyAdMB/wFxAbwB2gH/AW8BuAHVAf8BdQG+AdsB/wF6Ab8B3QH/AXQBvgHbAf8BbAG5 + AdYB/wGAAccB4QH/AYkBywHkAf8BigHMAecB/wGNAdEB7AH/AYUByQHmAf8BcQGzAdQB/wFEAVcBYAGY + Ai0BLAFMAwABAQMAAQH/ACEAAzYBbAF8AXQBbgHJAZsBjAGFAfUBpAGTAYsB/wGGAZ4BqQH/AWsBrwHS + Af8BfAHEAeAB/wF6AcIB3gH/AXoBwgHeAf8BdQG/AdsB/wF3AbwB2gH/AXYBuwHYAf8BeAG7AdkB/wF4 + Ab8B3QH/AWUBnQHDAf8BRQFnAZQB/wFxAacByAH/AYcBxAHgAf8BiAHNAekB/wFgAYwBoQHgASsBLQEu + AUQDBwEJAwQBBgMAAQH/ACEAAwQBBQMZASMBOgI5AVQBUgFQAU4BiQFcAWwBdQHBAWQBjgGiAeIBdgGr + AcUB9QF9AbwB1wH+AYABxQHiAf8BdgG8AdoB/wF1AbwB2gH/AXQBuwHYAf8BeQG8AdkB/wGOAc8B6wH/ + AXEBrwHSAf8BUwF5AaQB/wFwAasBzQH/AXIBrwHPAf8BjwHKAecB/wFRAXYBiwHRASIBIwEkATH/AD0A + AwEBAgMJAQwDGgElATkBOwE9AXYBSgFhAW8B6gGJAcwB6AH+AYoBxwHkAf8BfQHAAd0B/wGKAcYB4gH/ + AZYB1AHuAf8BfQG4AdcB/wFlAaEByAH/AW0BpgHMAf8BXQGSAb8B/wGHAcsB5QH+AT4BRgFOAYEDAwEE + /wBJAAMCAQMDEAEWAS8BMAExAVABTgFaAWEBjQFVAWcBbwGdAVUBZAFtAaEBdQGaAawB4AF6AbMB0QH9 + AWQBlwG+Af8BZAGUAcAB/wFzAagBzgH/AUQBfQGqAf8BMwE1ATcBVgMAAQH/AFUAAwIBAwMGAQgDCgEN + ASkBKgErAT0BQgFJAU4BcQFLAVcBXgGcAVYBcgGGAdYBZQGOAawB8gFSAYcBrAH8AyABL/8AcAABAQMI + AQsDIwE2ATsBPwFCAYEDAwEE/wAxAAFCAU0BPgcAAT4DAAEoAwABYAMAARgDAAEBAQABAQUAASABARYA + A/8BAAHgATgBAQkAAcABAAEBCQABwAEAAQMJAAHAAQABAwkAAYALAAGACwABgAsAAYALAAGACwABgD0A + AQELAAEBCwABAyMAAQcJAAHwAQABBwkAAf4BAAEHCQAB/wHAAQ8JAAH/Af4BDwkACw== + + + \ No newline at end of file diff --git a/OpenRA.Editor/OpenRA.Editor.Icon.ico b/OpenRA.Editor/OpenRA.Editor.Icon.ico new file mode 100644 index 0000000000..538ac8f832 Binary files /dev/null and b/OpenRA.Editor/OpenRA.Editor.Icon.ico differ diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj index d8c5a80068..7727e8e305 100644 --- a/OpenRA.Editor/OpenRA.Editor.csproj +++ b/OpenRA.Editor/OpenRA.Editor.csproj @@ -12,6 +12,9 @@ OpenRA.Editor v3.5 512 + OpenRA.Editor.Icon.ico + + true @@ -33,6 +36,7 @@ prompt 4 false + true @@ -59,12 +63,24 @@ Form1.cs + + Form + + + MapSelect.cs + Form NewMapDialog.cs + + Form + + + PaletteBox.cs + Form @@ -76,9 +92,15 @@ Form1.cs + + MapSelect.cs + NewMapDialog.cs + + PaletteBox.cs + PropertiesDialog.cs @@ -123,6 +145,9 @@ OpenRA.Game + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 56fd8de34d..4db1d506a1 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -1,4 +1,4 @@ - + Debug @@ -92,10 +92,6 @@ mkdir "$(SolutionDir)mods/cnc/" copy "$(TargetPath)" "$(SolutionDir)mods/cnc/" -cd "$(SolutionDir)" -ralint cnc +cd "$(SolutionDir)" - - - \ No newline at end of file diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index bbf5d0a108..63c1d90faa 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -1,4 +1,4 @@ - + Debug @@ -265,7 +265,6 @@ mkdir "$(SolutionDir)mods/ra/" copy "$(TargetPath)" "$(SolutionDir)mods/ra/" -cd "$(SolutionDir)" -ralint ra +cd "$(SolutionDir)" \ No newline at end of file