diff --git a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx b/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx index c9fcb6ba..e331c424 100644 --- a/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/AddPropertyPrompt.resx @@ -126,10 +126,14 @@ - 34, 16 + 40, 18 + + + + 4, 0, 4, 0 - 33, 13 + 34, 15 2 @@ -156,10 +160,13 @@ True - 34, 62 + 40, 72 + + + 4, 0, 4, 0 - 35, 13 + 35, 15 3 @@ -180,10 +187,13 @@ 1 - 37, 32 + 43, 37 + + + 4, 3, 4, 3 - 193, 22 + 225, 23 0 @@ -201,10 +211,13 @@ 4 - 37, 78 + 43, 90 + + + 4, 3, 4, 3 - 193, 22 + 225, 23 1 @@ -221,7 +234,6 @@ 3 - None @@ -233,21 +245,24 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALtJREFUSEvt - 1TEKwkAQheG9hKA23ke8T7TzpBZBD6HNOuv+ivDGxOyQLh9MYd5zVgwhaTFJzvlgc7GZqmPFMCv2td9k - /BCKmY+jqH8bPoRS5IDiTKwoRA/4/X3y+Q+IYp0iD2OdIg9jnSIPY50i99xtOpsdc7R52LhYp8g98gDZ - tVONFBVF7llT+bBrmxopKorc4x2wrZGiosg9s/9F75u8Yppv8rVWQnrWKQvLC+f2qrUpP3DPusU/UnoC - 1EgDy/vtD/MAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMBJREFUSEvt + 1TsKwkAYReFsQlAb9yPuR+1cqUXQRWhzJZL/ZuaYBzNglw/ShJObYBSbZlVC0knSXeXO3BolqeWVBZZv + EiXPT8n3v+ZvEhXPT8m37cbOouD5KfnugJ0tBpDPDtgZw1rcNYa1uGsMa3HXGNbirjFMvLrvuKRDf1wk + vRkF7hrDxM8PSNKVUWBrDBPbkXbHKLA1homxG+wZBbbGMPH3jyhe8qY/ql/yg3GFlrvW/+E8eUWB7gGP + 3F3N+gDUSAPLvdCH2wAAAABJRU5ErkJggg== NoControl - 72, 130 + 84, 150 + + + 4, 3, 4, 3 - 120, 40 + 140, 46 20 @@ -277,13 +292,13 @@ True - 6, 13 + 7, 15 - 264, 182 + 308, 210 - Segoe UI, 8.25pt + Segoe UI, 9pt @@ -3105,8 +3120,11 @@ 0, 0 + + 4, 3, 4, 3 + - 264, 105 + 305, 115 CenterParent diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs index 41a175b3..c9f78ab5 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs @@ -46,20 +46,22 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.Color.White; this.label1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label1.Location = new System.Drawing.Point(65, 204); + this.label1.Location = new System.Drawing.Point(219, 45); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(64, 13); + this.label1.Size = new System.Drawing.Size(73, 15); this.label1.TabIndex = 10; - this.label1.Text = "Frame Time"; + this.label1.Text = "Frame Time:"; // // label3 // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.Color.White; this.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label3.Location = new System.Drawing.Point(79, 13); + this.label3.Location = new System.Drawing.Point(133, 10); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(115, 13); + this.label3.Size = new System.Drawing.Size(121, 15); this.label3.TabIndex = 12; this.label3.Text = "may/matt was here :3"; // @@ -68,7 +70,8 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.FrameTimeUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); this.FrameTimeUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.FrameTimeUpDown.ForeColor = System.Drawing.SystemColors.Window; - this.FrameTimeUpDown.Location = new System.Drawing.Point(135, 202); + this.FrameTimeUpDown.Location = new System.Drawing.Point(300, 43); + this.FrameTimeUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.FrameTimeUpDown.Maximum = new decimal(new int[] { 10000, 0, @@ -80,7 +83,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation 0, 0}); this.FrameTimeUpDown.Name = "FrameTimeUpDown"; - this.FrameTimeUpDown.Size = new System.Drawing.Size(73, 22); + this.FrameTimeUpDown.Size = new System.Drawing.Size(85, 23); this.FrameTimeUpDown.TabIndex = 15; this.FrameTimeUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.FrameTimeUpDown.Value = new decimal(new int[] { @@ -97,12 +100,13 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.FrameList.HideSelection = false; this.FrameList.ImageIndex = 0; this.FrameList.ImageList = this.TextureIcons; - this.FrameList.Location = new System.Drawing.Point(59, 37); + this.FrameList.Location = new System.Drawing.Point(15, 43); + this.FrameList.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.FrameList.Name = "FrameList"; this.FrameList.SelectedImageIndex = 0; this.FrameList.ShowLines = false; this.FrameList.ShowRootLines = false; - this.FrameList.Size = new System.Drawing.Size(155, 159); + this.FrameList.Size = new System.Drawing.Size(180, 183); this.FrameList.TabIndex = 1; // // TextureIcons @@ -122,16 +126,17 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.CancelButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.CancelButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.CancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.CancelButton.Font = new System.Drawing.Font("Segoe UI", 12F); + this.CancelButton.Font = new System.Drawing.Font("Segoe UI", 9F); this.CancelButton.ForeColor = System.Drawing.Color.White; this.CancelButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.CancelButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.CancelButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.CancelButton.Image = ((System.Drawing.Image)(resources.GetObject("CancelButton.Image"))); this.CancelButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CancelButton.Location = new System.Drawing.Point(139, 240); + this.CancelButton.Location = new System.Drawing.Point(266, 180); + this.CancelButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(120, 40); + this.CancelButton.Size = new System.Drawing.Size(119, 46); this.CancelButton.TabIndex = 22; this.CancelButton.Text = "Cancel"; this.CancelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -151,16 +156,17 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.SaveButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.SaveButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.SaveButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.SaveButton.Font = new System.Drawing.Font("Segoe UI", 12F); + this.SaveButton.Font = new System.Drawing.Font("Segoe UI", 9F); this.SaveButton.ForeColor = System.Drawing.Color.White; this.SaveButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.SaveButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.SaveButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.SaveButton.Image = ((System.Drawing.Image)(resources.GetObject("SaveButton.Image"))); this.SaveButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.SaveButton.Location = new System.Drawing.Point(13, 240); + this.SaveButton.Location = new System.Drawing.Point(266, 127); + this.SaveButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(120, 40); + this.SaveButton.Size = new System.Drawing.Size(119, 46); this.SaveButton.TabIndex = 21; this.SaveButton.Text = "Save"; this.SaveButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -171,21 +177,22 @@ namespace PckStudio.Forms.Additional_Popups.Animation // // FrameEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(273, 292); + this.ClientSize = new System.Drawing.Size(399, 241); this.Controls.Add(this.CancelButton); this.Controls.Add(this.SaveButton); this.Controls.Add(this.FrameList); this.Controls.Add(this.FrameTimeUpDown); this.Controls.Add(this.label3); this.Controls.Add(this.label1); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrameEditor"; diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs index a8fef50e..02ca86a0 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs @@ -43,20 +43,22 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.Color.White; this.label1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label1.Location = new System.Drawing.Point(57, 35); + this.label1.Location = new System.Drawing.Point(14, 36); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(87, 13); + this.label1.Size = new System.Drawing.Size(96, 15); this.label1.TabIndex = 10; - this.label1.Text = "Animation Time"; + this.label1.Text = "Animation Time:"; // // label3 // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.Color.White; this.label3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label3.Location = new System.Drawing.Point(90, 13); + this.label3.Location = new System.Drawing.Point(63, 11); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(188, 13); + this.label3.Size = new System.Drawing.Size(195, 15); this.label3.TabIndex = 12; this.label3.Text = "Frame Time must be greater than 0."; // @@ -65,14 +67,15 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.TimeUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); this.TimeUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TimeUpDown.ForeColor = System.Drawing.SystemColors.Window; - this.TimeUpDown.Location = new System.Drawing.Point(150, 33); + this.TimeUpDown.Location = new System.Drawing.Point(118, 34); + this.TimeUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.TimeUpDown.Maximum = new decimal(new int[] { 10000, 0, 0, 0}); this.TimeUpDown.Name = "TimeUpDown"; - this.TimeUpDown.Size = new System.Drawing.Size(162, 22); + this.TimeUpDown.Size = new System.Drawing.Size(189, 23); this.TimeUpDown.TabIndex = 15; this.TimeUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -87,16 +90,17 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.CancelButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.CancelButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.CancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.CancelButton.Font = new System.Drawing.Font("Segoe UI", 12F); + this.CancelButton.Font = new System.Drawing.Font("Segoe UI", 9F); this.CancelButton.ForeColor = System.Drawing.Color.White; this.CancelButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.CancelButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.CancelButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.CancelButton.Image = ((System.Drawing.Image)(resources.GetObject("CancelButton.Image"))); this.CancelButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CancelButton.Location = new System.Drawing.Point(187, 76); + this.CancelButton.Location = new System.Drawing.Point(164, 90); + this.CancelButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(120, 40); + this.CancelButton.Size = new System.Drawing.Size(106, 46); this.CancelButton.TabIndex = 24; this.CancelButton.Text = "Cancel"; this.CancelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -116,16 +120,17 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.SaveButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.SaveButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.SaveButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.SaveButton.Font = new System.Drawing.Font("Segoe UI", 12F); + this.SaveButton.Font = new System.Drawing.Font("Segoe UI", 9F); this.SaveButton.ForeColor = System.Drawing.Color.White; this.SaveButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.SaveButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.SaveButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.SaveButton.Image = ((System.Drawing.Image)(resources.GetObject("SaveButton.Image"))); this.SaveButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.SaveButton.Location = new System.Drawing.Point(61, 76); + this.SaveButton.Location = new System.Drawing.Point(50, 90); + this.SaveButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(120, 40); + this.SaveButton.Size = new System.Drawing.Size(106, 46); this.SaveButton.TabIndex = 23; this.SaveButton.Text = "Save"; this.SaveButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -136,23 +141,24 @@ namespace PckStudio.Forms.Additional_Popups.Animation // // SetBulkSpeed // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(368, 128); + this.ClientSize = new System.Drawing.Size(321, 148); this.Controls.Add(this.CancelButton); this.Controls.Add(this.SaveButton); this.Controls.Add(this.label3); this.Controls.Add(this.label1); this.Controls.Add(this.TimeUpDown); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.MaximizeBox = false; this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(266, 96); + this.MinimumSize = new System.Drawing.Size(308, 105); this.Name = "SetBulkSpeed"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Set Bulk Speed"; diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.resx b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.resx index e8f3d08c..86d97b7f 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.resx +++ b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.resx @@ -120,20 +120,19 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAOFJREFUSEvt - lTEOgzAQBHkCTZq8MMlTKdPlNc4O2pOMuIAtQsdIJ4xvd08CC4aLbkopD9XNt83gwevbHAleKnirmoeg - tQee3l6j5qiaZlkpH9XdrZ+gsRbwjm7lILAQNofQswb2wwOENkA6hD33oD08wGAjLIaw9h70hwcYHQDz - ENfx8EAB9QnhWq+7j3MKQQ4M/hcOCqsfCyzeySEUdN4jUsDqhbrS09UFRgfA4rSw9h70D8FgI6RHkT33 - oH0IQhsgDQ/oWQP7QxBYCJvhARprYXuImud+rkGC8344F2uG4QvjMhwJEIsdYQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAKdJREFUSEvt + lTsOwjAQBXOENDScEDgqJR2nGfSEFzmrlfE6cZdpEtnvI3mtZFlOsgA34OLX/yGPvH59A/DgyytTUsLl + EXe//wNYgWcRvoGr13ikKVoh7+o1GzIl6XCjp2Q43GiV7A43opLDwg13Q/Ss37tvWhNXcmy4cMciwsEP + MfWIooFGg/e+LqLwam9fSSu80oyV9IQb6ZJMuJEqmf65FlN/OCcRH+MyHAmzXkcGAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALtJREFUSEvt - 1TEKwkAQheG9hKA23ke8T7TzpBZBD6HNOuv+ivDGxOyQLh9MYd5zVgwhaTFJzvlgc7GZqmPFMCv2td9k - /BCKmY+jqH8bPoRS5IDiTKwoRA/4/X3y+Q+IYp0iD2OdIg9jnSIPY50i99xtOpsdc7R52LhYp8g98gDZ - tVONFBVF7llT+bBrmxopKorc4x2wrZGiosg9s/9F75u8Yppv8rVWQnrWKQvLC+f2qrUpP3DPusU/UnoC - 1EgDy/vtD/MAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMBJREFUSEvt + 1TsKwkAYReFsQlAb9yPuR+1cqUXQRWhzJZL/ZuaYBzNglw/ShJObYBSbZlVC0knSXeXO3BolqeWVBZZv + EiXPT8n3v+ZvEhXPT8m37cbOouD5KfnugJ0tBpDPDtgZw1rcNYa1uGsMa3HXGNbirjFMvLrvuKRDf1wk + vRkF7hrDxM8PSNKVUWBrDBPbkXbHKLA1homxG+wZBbbGMPH3jyhe8qY/ql/yg3GFlrvW/+E8eUWB7gGP + 3F3N+gDUSAPLvdCH2wAAAABJRU5ErkJggg== diff --git a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs index ccf42d6e..58e80d74 100644 --- a/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/ChangeLogForm.Designer.cs @@ -51,7 +51,7 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); this.ClientSize = new System.Drawing.Size(444, 461); this.Controls.Add(this.ChangelogRichTextBox); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.Location = new System.Drawing.Point(0, 0); this.Name = "ChangeLogForm"; diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs index 1796ab20..d6609a61 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs @@ -102,6 +102,7 @@ this.InputTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); this.InputTextBox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode"))); this.InputTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); + this.InputTextBox.CustomButton.Margin = ((System.Windows.Forms.Padding)(resources.GetObject("resource.Margin"))); this.InputTextBox.CustomButton.Name = ""; this.InputTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); this.InputTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx index 3749ae57..2f9f3337 100644 --- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx @@ -127,19 +127,22 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAEFJREFUWEft - 0jEKACAUw9De/9K6ZHewfBDzNkFqBiM9bYHjPN43wAADDOgHsFvH/Bn365jvYddPaIABBnwcIN1LNhlF - TsBTg9AAAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAERJREFUWEft + zkEKACAIRFHvf2nb1GYgCBqN4L+loP4I4Gc56bwNAQQQQEBZwDrspn+2dNFF/1wrO3yKAAIIIOB5AOAw + ABlFTsCYBMJTAAAAAElFTkSuQmCC NoControl - 256, 155 + 299, 179 + + + 4, 3, 4, 3 - 102, 40 + 119, 46 @@ -173,10 +176,13 @@ NoControl - 101, 81 + 118, 93 + + + 4, 0, 4, 0 - 63, 13 + 63, 15 7 @@ -230,10 +236,13 @@ x128 - 104, 97 + 121, 112 + + + 4, 3, 4, 3 - 165, 29 + 192, 29 6 @@ -257,10 +266,13 @@ NoControl - 101, 19 + 118, 22 + + + 4, 0, 4, 0 - 36, 13 + 39, 15 3 @@ -290,10 +302,13 @@ NoControl - 143, 1 + 194, 1 + + + 4, 3, 4, 3 - 21, 21 + 29, 29 1 @@ -302,10 +317,13 @@ False - 104, 35 + 121, 40 + + + 4, 3, 4, 3 - 165, 23 + 192, 27 5 @@ -326,10 +344,13 @@ True - 12, 178 + 14, 205 + + + 4, 3, 4, 3 - 131, 17 + 133, 19 19 @@ -353,13 +374,13 @@ True - 6, 13 + 7, 15 - 370, 207 + 432, 239 - Segoe UI, 8.25pt + Segoe UI, 9pt @@ -3181,6 +3202,9 @@ 0, 0 + + 4, 3, 4, 3 + CenterParent diff --git a/PCK-Studio/Forms/Additional-Popups/FilterPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/FilterPrompt.Designer.cs index 739ae215..854a3e2e 100644 --- a/PCK-Studio/Forms/Additional-Popups/FilterPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/FilterPrompt.Designer.cs @@ -40,8 +40,8 @@ // metroLabel2 // metroLabel2.AutoSize = true; - metroLabel2.Location = new System.Drawing.Point(244, 36); - metroLabel2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + metroLabel2.Location = new System.Drawing.Point(155, 22); + metroLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); metroLabel2.Name = "metroLabel2"; metroLabel2.Size = new System.Drawing.Size(46, 19); metroLabel2.TabIndex = 16; @@ -54,10 +54,10 @@ this.acceptButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.acceptButton.ForeColor = System.Drawing.Color.White; this.acceptButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.acceptButton.Location = new System.Drawing.Point(169, 377); - this.acceptButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.acceptButton.Location = new System.Drawing.Point(108, 226); + this.acceptButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.acceptButton.Name = "acceptButton"; - this.acceptButton.Size = new System.Drawing.Size(138, 44); + this.acceptButton.Size = new System.Drawing.Size(88, 26); this.acceptButton.TabIndex = 7; this.acceptButton.Text = "Save"; this.acceptButton.UseVisualStyleBackColor = true; @@ -69,10 +69,10 @@ this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cancelButton.ForeColor = System.Drawing.Color.White; this.cancelButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.cancelButton.Location = new System.Drawing.Point(315, 377); - this.cancelButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.cancelButton.Location = new System.Drawing.Point(200, 226); + this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(138, 44); + this.cancelButton.Size = new System.Drawing.Size(88, 26); this.cancelButton.TabIndex = 13; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; @@ -84,18 +84,18 @@ // // this.filterTextBox.CustomButton.Image = null; - this.filterTextBox.CustomButton.Location = new System.Drawing.Point(244, 2); - this.filterTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.filterTextBox.CustomButton.Location = new System.Drawing.Point(101, 1); + this.filterTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.filterTextBox.CustomButton.Name = ""; - this.filterTextBox.CustomButton.Size = new System.Drawing.Size(39, 41); + this.filterTextBox.CustomButton.Size = new System.Drawing.Size(13, 13); this.filterTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.filterTextBox.CustomButton.TabIndex = 1; this.filterTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.filterTextBox.CustomButton.UseSelectable = true; this.filterTextBox.CustomButton.Visible = false; this.filterTextBox.Lines = new string[0]; - this.filterTextBox.Location = new System.Drawing.Point(317, 34); - this.filterTextBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.filterTextBox.Location = new System.Drawing.Point(202, 20); + this.filterTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.filterTextBox.MaxLength = 32767; this.filterTextBox.Name = "filterTextBox"; this.filterTextBox.PasswordChar = '\0'; @@ -104,7 +104,7 @@ this.filterTextBox.SelectionLength = 0; this.filterTextBox.SelectionStart = 0; this.filterTextBox.ShortcutsEnabled = true; - this.filterTextBox.Size = new System.Drawing.Size(286, 44); + this.filterTextBox.Size = new System.Drawing.Size(182, 26); this.filterTextBox.TabIndex = 17; this.filterTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.filterTextBox.UseSelectable = true; @@ -114,10 +114,10 @@ // // tabController // - this.tabController.Location = new System.Drawing.Point(11, 16); - this.tabController.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.tabController.Location = new System.Drawing.Point(7, 10); + this.tabController.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabController.Name = "tabController"; - this.tabController.Size = new System.Drawing.Size(598, 354); + this.tabController.Size = new System.Drawing.Size(381, 212); this.tabController.Style = MetroFramework.MetroColorStyle.White; this.tabController.TabIndex = 18; this.tabController.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -126,21 +126,21 @@ // FilterPrompt // this.AcceptButton = this.acceptButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(620, 439); + this.ClientSize = new System.Drawing.Size(395, 263); this.Controls.Add(this.filterTextBox); this.Controls.Add(metroLabel2); this.Controls.Add(this.tabController); this.Controls.Add(this.cancelButton); this.Controls.Add(this.acceptButton); - this.Font = new System.Drawing.Font("Segoe UI", 14.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); - this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FilterPrompt"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs index 3e002138..af5578ab 100644 --- a/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Grf/AddParameter.Designer.cs @@ -42,7 +42,8 @@ // metroLabel1 // metroLabel1.AutoSize = true; - metroLabel1.Location = new System.Drawing.Point(18, 27); + metroLabel1.Location = new System.Drawing.Point(21, 31); + metroLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); metroLabel1.Name = "metroLabel1"; metroLabel1.Size = new System.Drawing.Size(48, 19); metroLabel1.TabIndex = 4; @@ -52,7 +53,8 @@ // metroLabel2 // metroLabel2.AutoSize = true; - metroLabel2.Location = new System.Drawing.Point(17, 56); + metroLabel2.Location = new System.Drawing.Point(20, 64); + metroLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); metroLabel2.Name = "metroLabel2"; metroLabel2.Size = new System.Drawing.Size(42, 19); metroLabel2.TabIndex = 5; @@ -67,16 +69,18 @@ // // this.NameTextBox.CustomButton.Image = null; - this.NameTextBox.CustomButton.Location = new System.Drawing.Point(143, 1); + this.NameTextBox.CustomButton.Location = new System.Drawing.Point(107, 1); + this.NameTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NameTextBox.CustomButton.Name = ""; - this.NameTextBox.CustomButton.Size = new System.Drawing.Size(21, 21); + this.NameTextBox.CustomButton.Size = new System.Drawing.Size(13, 13); this.NameTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.NameTextBox.CustomButton.TabIndex = 1; this.NameTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.NameTextBox.CustomButton.UseSelectable = true; this.NameTextBox.CustomButton.Visible = false; this.NameTextBox.Lines = new string[0]; - this.NameTextBox.Location = new System.Drawing.Point(72, 27); + this.NameTextBox.Location = new System.Drawing.Point(84, 31); + this.NameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.NameTextBox.MaxLength = 32767; this.NameTextBox.Name = "NameTextBox"; this.NameTextBox.PasswordChar = '\0'; @@ -85,7 +89,7 @@ this.NameTextBox.SelectionLength = 0; this.NameTextBox.SelectionStart = 0; this.NameTextBox.ShortcutsEnabled = true; - this.NameTextBox.Size = new System.Drawing.Size(165, 23); + this.NameTextBox.Size = new System.Drawing.Size(192, 26); this.NameTextBox.Style = MetroFramework.MetroColorStyle.White; this.NameTextBox.TabIndex = 0; this.NameTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -99,16 +103,18 @@ // // this.ValueTextBox.CustomButton.Image = null; - this.ValueTextBox.CustomButton.Location = new System.Drawing.Point(143, 1); + this.ValueTextBox.CustomButton.Location = new System.Drawing.Point(107, 1); + this.ValueTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ValueTextBox.CustomButton.Name = ""; - this.ValueTextBox.CustomButton.Size = new System.Drawing.Size(21, 21); + this.ValueTextBox.CustomButton.Size = new System.Drawing.Size(13, 13); this.ValueTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.ValueTextBox.CustomButton.TabIndex = 1; this.ValueTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.ValueTextBox.CustomButton.UseSelectable = true; this.ValueTextBox.CustomButton.Visible = false; this.ValueTextBox.Lines = new string[0]; - this.ValueTextBox.Location = new System.Drawing.Point(72, 56); + this.ValueTextBox.Location = new System.Drawing.Point(84, 64); + this.ValueTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ValueTextBox.MaxLength = 32767; this.ValueTextBox.Name = "ValueTextBox"; this.ValueTextBox.PasswordChar = '\0'; @@ -117,7 +123,7 @@ this.ValueTextBox.SelectionLength = 0; this.ValueTextBox.SelectionStart = 0; this.ValueTextBox.ShortcutsEnabled = true; - this.ValueTextBox.Size = new System.Drawing.Size(165, 23); + this.ValueTextBox.Size = new System.Drawing.Size(192, 26); this.ValueTextBox.TabIndex = 1; this.ValueTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.ValueTextBox.UseSelectable = true; @@ -127,9 +133,10 @@ // CancelBtn // this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.CancelBtn.Location = new System.Drawing.Point(23, 85); + this.CancelBtn.Location = new System.Drawing.Point(27, 98); + this.CancelBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CancelBtn.Name = "CancelBtn"; - this.CancelBtn.Size = new System.Drawing.Size(95, 23); + this.CancelBtn.Size = new System.Drawing.Size(111, 26); this.CancelBtn.Style = MetroFramework.MetroColorStyle.White; this.CancelBtn.TabIndex = 2; this.CancelBtn.Text = "Cancel"; @@ -138,9 +145,10 @@ // // ConfirmBtn // - this.ConfirmBtn.Location = new System.Drawing.Point(141, 85); + this.ConfirmBtn.Location = new System.Drawing.Point(164, 98); + this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ConfirmBtn.Name = "ConfirmBtn"; - this.ConfirmBtn.Size = new System.Drawing.Size(96, 23); + this.ConfirmBtn.Size = new System.Drawing.Size(112, 26); this.ConfirmBtn.Style = MetroFramework.MetroColorStyle.White; this.ConfirmBtn.TabIndex = 3; this.ConfirmBtn.Text = "Confirm"; @@ -151,19 +159,21 @@ // AddParameter // this.AcceptButton = this.ConfirmBtn; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(264, 126); + this.ClientSize = new System.Drawing.Size(308, 146); this.Controls.Add(this.ConfirmBtn); this.Controls.Add(this.CancelBtn); this.Controls.Add(this.ValueTextBox); this.Controls.Add(this.NameTextBox); this.Controls.Add(metroLabel2); this.Controls.Add(metroLabel1); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AddParameter"; diff --git a/PCK-Studio/Forms/Additional-Popups/InProgressPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/InProgressPrompt.Designer.cs index aa7f6c03..77b80864 100644 --- a/PCK-Studio/Forms/Additional-Popups/InProgressPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/InProgressPrompt.Designer.cs @@ -36,8 +36,8 @@ // this.metroLabel1.AutoSize = true; this.metroLabel1.ForeColor = System.Drawing.Color.White; - this.metroLabel1.Location = new System.Drawing.Point(51, 42); - this.metroLabel1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.metroLabel1.Location = new System.Drawing.Point(32, 25); + this.metroLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel1.Name = "metroLabel1"; this.metroLabel1.Size = new System.Drawing.Size(307, 19); this.metroLabel1.TabIndex = 0; @@ -48,17 +48,17 @@ // // InProgressPrompt // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(522, 115); + this.ClientSize = new System.Drawing.Size(332, 69); this.Controls.Add(this.metroLabel1); - this.Font = new System.Drawing.Font("Segoe UI", 14.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); - this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "InProgressPrompt"; this.Text = "Please Wait..."; this.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.resx b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.resx index afcfbbe9..9331377e 100644 --- a/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.resx +++ b/PCK-Studio/Forms/Additional-Popups/ItemSelectionPopUp.resx @@ -123,14 +123,14 @@ - 66, 34 + 42, 20 - 6, 0, 6, 0 + 4, 0, 4, 0 - 61, 25 + 39, 15 3 @@ -154,13 +154,13 @@ 23 - 70, 66 + 45, 40 - 6, 6, 6, 6 + 4, 4, 4, 4 - 349, 29 + 224, 29 7 @@ -188,24 +188,23 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAOFJREFUSEvt - lTEOgzAQBHkCTZq8MMlTKdPlNc4O2pOMuIAtQsdIJ4xvd08CC4aLbkopD9XNt83gwevbHAleKnirmoeg - tQee3l6j5qiaZlkpH9XdrZ+gsRbwjm7lILAQNofQswb2wwOENkA6hD33oD08wGAjLIaw9h70hwcYHQDz - ENfx8EAB9QnhWq+7j3MKQQ4M/hcOCqsfCyzeySEUdN4jUsDqhbrS09UFRgfA4rSw9h70D8FgI6RHkT33 - oH0IQhsgDQ/oWQP7QxBYCJvhARprYXuImud+rkGC8344F2uG4QvjMhwJEIsdYQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAKdJREFUSEvt + lTsOwjAQBXOENDScEDgqJR2nGfSEFzmrlfE6cZdpEtnvI3mtZFlOsgA34OLX/yGPvH59A/DgyytTUsLl + EXe//wNYgWcRvoGr13ikKVoh7+o1GzIl6XCjp2Q43GiV7A43opLDwg13Q/Ss37tvWhNXcmy4cMciwsEP + MfWIooFGg/e+LqLwam9fSSu80oyV9IQb6ZJMuJEqmf65FlN/OCcRH+MyHAmzXkcGAAAAAElFTkSuQmCC NoControl - 246, 141 + 157, 85 - 4, 4, 4, 4 + 3, 2, 3, 2 - 165, 62 + 105, 37 24 @@ -244,13 +243,13 @@ NoControl - 73, 141 + 46, 85 - 4, 4, 4, 4 + 3, 2, 3, 2 - 165, 62 + 105, 37 23 @@ -280,13 +279,13 @@ True - 11, 25 + 7, 15 - 484, 222 + 308, 133 - Segoe UI, 14.25pt + Segoe UI, 9pt @@ -3109,7 +3108,7 @@ 0, 0 - 6, 6, 6, 6 + 4, 4, 4, 4 CenterParent diff --git a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs index ac6e6cb1..8bcf979a 100644 --- a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.Designer.cs @@ -37,10 +37,10 @@ // this.LanguageComboBox.FormattingEnabled = true; this.LanguageComboBox.ItemHeight = 23; - this.LanguageComboBox.Location = new System.Drawing.Point(31, 15); + this.LanguageComboBox.Location = new System.Drawing.Point(27, 14); this.LanguageComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.LanguageComboBox.Name = "LanguageComboBox"; - this.LanguageComboBox.Size = new System.Drawing.Size(323, 29); + this.LanguageComboBox.Size = new System.Drawing.Size(283, 29); this.LanguageComboBox.Style = MetroFramework.MetroColorStyle.Black; this.LanguageComboBox.TabIndex = 0; this.LanguageComboBox.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -64,10 +64,10 @@ this.AddButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.AddButton.Image = ((System.Drawing.Image)(resources.GetObject("AddButton.Image"))); this.AddButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.AddButton.Location = new System.Drawing.Point(112, 60); + this.AddButton.Location = new System.Drawing.Point(98, 56); this.AddButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.AddButton.Name = "AddButton"; - this.AddButton.Size = new System.Drawing.Size(160, 49); + this.AddButton.Size = new System.Drawing.Size(140, 46); this.AddButton.TabIndex = 18; this.AddButton.Text = "Add"; this.AddButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -78,19 +78,20 @@ // // AddLanguage // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.ClientSize = new System.Drawing.Size(385, 124); + this.ClientSize = new System.Drawing.Size(337, 116); this.Controls.Add(this.AddButton); this.Controls.Add(this.LanguageComboBox); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(380, 163); + this.MinimumSize = new System.Drawing.Size(334, 155); this.Name = "AddLanguage"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Add Language"; diff --git a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx index 36161f2c..abbe9924 100644 --- a/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx +++ b/PCK-Studio/Forms/Additional-Popups/Loc/AddLanguage.resx @@ -120,9 +120,9 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAEFJREFUWEft - 0jEKACAUw9De/9K6ZHewfBDzNkFqBiM9bYHjPN43wAADDOgHsFvH/Bn365jvYddPaIABBnwcIN1LNhlF - TsBTg9AAAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAERJREFUWEft + zkEKACAIRFHvf2nb1GYgCBqN4L+loP4I4Gc56bwNAQQQQEBZwDrspn+2dNFF/1wrO3yKAAIIIOB5AOAw + ABlFTsCYBMJTAAAAAElFTkSuQmCC diff --git a/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.Designer.cs index 2b81448c..cb980876 100644 --- a/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.Designer.cs @@ -40,18 +40,18 @@ // // this.PromptTextBox.CustomButton.Image = null; - this.PromptTextBox.CustomButton.Location = new System.Drawing.Point(28, 1); - this.PromptTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.PromptTextBox.CustomButton.Location = new System.Drawing.Point(25, 1); + this.PromptTextBox.CustomButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.PromptTextBox.CustomButton.Name = ""; - this.PromptTextBox.CustomButton.Size = new System.Drawing.Size(569, 593); + this.PromptTextBox.CustomButton.Size = new System.Drawing.Size(217, 205); this.PromptTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; this.PromptTextBox.CustomButton.TabIndex = 1; this.PromptTextBox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.PromptTextBox.CustomButton.UseSelectable = true; this.PromptTextBox.CustomButton.Visible = false; this.PromptTextBox.Lines = new string[0]; - this.PromptTextBox.Location = new System.Drawing.Point(29, 28); - this.PromptTextBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.PromptTextBox.Location = new System.Drawing.Point(18, 17); + this.PromptTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.PromptTextBox.MaxLength = 32767; this.PromptTextBox.Multiline = true; this.PromptTextBox.Name = "PromptTextBox"; @@ -63,7 +63,7 @@ this.PromptTextBox.SelectionStart = 0; this.PromptTextBox.ShortcutsEnabled = true; this.PromptTextBox.ShowClearButton = true; - this.PromptTextBox.Size = new System.Drawing.Size(598, 571); + this.PromptTextBox.Size = new System.Drawing.Size(381, 343); this.PromptTextBox.Style = MetroFramework.MetroColorStyle.Black; this.PromptTextBox.TabIndex = 0; this.PromptTextBox.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -90,10 +90,10 @@ this.cancelBtn.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.cancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("cancelBtn.Image"))); this.cancelBtn.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.cancelBtn.Location = new System.Drawing.Point(331, 623); - this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cancelBtn.Location = new System.Drawing.Point(211, 374); + this.cancelBtn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cancelBtn.Name = "cancelBtn"; - this.cancelBtn.Size = new System.Drawing.Size(165, 62); + this.cancelBtn.Size = new System.Drawing.Size(105, 37); this.cancelBtn.TabIndex = 24; this.cancelBtn.Text = "Cancel"; this.cancelBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -120,10 +120,10 @@ this.okBtn.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.okBtn.Image = ((System.Drawing.Image)(resources.GetObject("okBtn.Image"))); this.okBtn.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.okBtn.Location = new System.Drawing.Point(158, 623); - this.okBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.okBtn.Location = new System.Drawing.Point(101, 374); + this.okBtn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.okBtn.Name = "okBtn"; - this.okBtn.Size = new System.Drawing.Size(165, 62); + this.okBtn.Size = new System.Drawing.Size(105, 37); this.okBtn.TabIndex = 23; this.okBtn.Text = "Ok"; this.okBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -134,22 +134,22 @@ // // MultiTextPrompt // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(656, 697); + this.ClientSize = new System.Drawing.Size(417, 418); this.Controls.Add(this.cancelBtn); this.Controls.Add(this.okBtn); this.Controls.Add(this.PromptTextBox); - this.Font = new System.Drawing.Font("Segoe UI", 14.25F); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); - this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(489, 622); + this.MinimumSize = new System.Drawing.Size(317, 389); this.Name = "MultiTextPrompt"; - this.Padding = new System.Windows.Forms.Padding(37, 116, 37, 77); + this.Padding = new System.Windows.Forms.Padding(24, 70, 24, 46); this.Text = "Multi-Text Prompt"; this.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.resx b/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.resx index 663e8e50..ff9f6b1d 100644 --- a/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/MultiTextPrompt.resx @@ -120,20 +120,19 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAOFJREFUSEvt - lTEOgzAQBHkCTZq8MMlTKdPlNc4O2pOMuIAtQsdIJ4xvd08CC4aLbkopD9XNt83gwevbHAleKnirmoeg - tQee3l6j5qiaZlkpH9XdrZ+gsRbwjm7lILAQNofQswb2wwOENkA6hD33oD08wGAjLIaw9h70hwcYHQDz - ENfx8EAB9QnhWq+7j3MKQQ4M/hcOCqsfCyzeySEUdN4jUsDqhbrS09UFRgfA4rSw9h70D8FgI6RHkT33 - oH0IQhsgDQ/oWQP7QxBYCJvhARprYXuImud+rkGC8344F2uG4QvjMhwJEIsdYQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAKdJREFUSEvt + lTsOwjAQBXOENDScEDgqJR2nGfSEFzmrlfE6cZdpEtnvI3mtZFlOsgA34OLX/yGPvH59A/DgyytTUsLl + EXe//wNYgWcRvoGr13ikKVoh7+o1GzIl6XCjp2Q43GiV7A43opLDwg13Q/Ss37tvWhNXcmy4cMciwsEP + MfWIooFGg/e+LqLwam9fSSu80oyV9IQb6ZJMuJEqmf65FlN/OCcRH+MyHAmzXkcGAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALtJREFUSEvt - 1TEKwkAQheG9hKA23ke8T7TzpBZBD6HNOuv+ivDGxOyQLh9MYd5zVgwhaTFJzvlgc7GZqmPFMCv2td9k - /BCKmY+jqH8bPoRS5IDiTKwoRA/4/X3y+Q+IYp0iD2OdIg9jnSIPY50i99xtOpsdc7R52LhYp8g98gDZ - tVONFBVF7llT+bBrmxopKorc4x2wrZGiosg9s/9F75u8Yppv8rVWQnrWKQvLC+f2qrUpP3DPusU/UnoC - 1EgDy/vtD/MAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMBJREFUSEvt + 1TsKwkAYReFsQlAb9yPuR+1cqUXQRWhzJZL/ZuaYBzNglw/ShJObYBSbZlVC0knSXeXO3BolqeWVBZZv + EiXPT8n3v+ZvEhXPT8m37cbOouD5KfnugJ0tBpDPDtgZw1rcNYa1uGsMa3HXGNbirjFMvLrvuKRDf1wk + vRkF7hrDxM8PSNKVUWBrDBPbkXbHKLA1homxG+wZBbbGMPH3jyhe8qY/ql/yg3GFlrvW/+E8eUWB7gGP + 3F3N+gDUSAPLvdCH2wAAAABJRU5ErkJggg== diff --git a/PCK-Studio/Forms/Additional-Popups/NumericPrompt.resx b/PCK-Studio/Forms/Additional-Popups/NumericPrompt.resx index caf7fb97..99120c7f 100644 --- a/PCK-Studio/Forms/Additional-Popups/NumericPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/NumericPrompt.resx @@ -127,13 +127,13 @@ - 89, 130 + 57, 78 - 6, 0, 6, 0 + 4, 0, 4, 0 - 59, 25 + 35, 15 3 @@ -160,13 +160,13 @@ Top - 52, 18 + 33, 11 - 6, 0, 6, 0 + 4, 0, 4, 0 - 381, 110 + 242, 66 6 @@ -187,13 +187,13 @@ 2 - 94, 161 + 60, 97 - 6, 6, 6, 6 + 4, 4, 4, 4 - 301, 33 + 192, 23 7 @@ -218,24 +218,24 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAALtJREFUSEvt - 1TEKwkAQheG9hKA23ke8T7TzpBZBD6HNOuv+ivDGxOyQLh9MYd5zVgwhaTFJzvlgc7GZqmPFMCv2td9k - /BCKmY+jqH8bPoRS5IDiTKwoRA/4/X3y+Q+IYp0iD2OdIg9jnSIPY50i99xtOpsdc7R52LhYp8g98gDZ - tVONFBVF7llT+bBrmxopKorc4x2wrZGiosg9s/9F75u8Yppv8rVWQnrWKQvLC+f2qrUpP3DPusU/UnoC - 1EgDy/vtD/MAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAMBJREFUSEvt + 1TsKwkAYReFsQlAb9yPuR+1cqUXQRWhzJZL/ZuaYBzNglw/ShJObYBSbZlVC0knSXeXO3BolqeWVBZZv + EiXPT8n3v+ZvEhXPT8m37cbOouD5KfnugJ0tBpDPDtgZw1rcNYa1uGsMa3HXGNbirjFMvLrvuKRDf1wk + vRkF7hrDxM8PSNKVUWBrDBPbkXbHKLA1homxG+wZBbbGMPH3jyhe8qY/ql/yg3GFlrvW/+E8eUWB7gGP + 3F3N+gDUSAPLvdCH2wAAAABJRU5ErkJggg== NoControl - 160, 237 + 102, 142 - 4, 4, 4, 4 + 3, 2, 3, 2 - 165, 62 + 105, 37 24 @@ -265,13 +265,13 @@ True - 11, 25 + 7, 15 - 484, 310 + 308, 186 - Segoe UI, 14.25pt + Segoe UI, 9pt @@ -2783,10 +2783,10 @@ 0, 0 - 6, 6, 6, 6 + 4, 4, 4, 4 - 37, 116, 37, 40 + 24, 70, 24, 24 CenterParent diff --git a/PCK-Studio/Forms/Additional-Popups/TextPrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/TextPrompt.Designer.cs index e3ba9f80..e6de230d 100644 --- a/PCK-Studio/Forms/Additional-Popups/TextPrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/TextPrompt.Designer.cs @@ -40,6 +40,7 @@ // this.InputTextBox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image"))); this.InputTextBox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location"))); + this.InputTextBox.CustomButton.Margin = ((System.Windows.Forms.Padding)(resources.GetObject("resource.Margin"))); this.InputTextBox.CustomButton.Name = ""; this.InputTextBox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size"))); this.InputTextBox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; diff --git a/PCK-Studio/Forms/Additional-Popups/TextPrompt.resx b/PCK-Studio/Forms/Additional-Popups/TextPrompt.resx index fcf75398..5ca8b123 100644 --- a/PCK-Studio/Forms/Additional-Popups/TextPrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/TextPrompt.resx @@ -123,10 +123,13 @@ - 61, 1 + 86, 1 + + + 4, 3, 4, 3 - 283, 283 + 382, 377 @@ -136,10 +139,13 @@ False - 7, 9 + 8, 10 + + + 4, 3, 4, 3 - 345, 285 + 402, 329 0 @@ -166,10 +172,13 @@ NoControl - 119, 300 + 139, 346 + + + 4, 3, 4, 3 - 120, 40 + 140, 46 21 @@ -199,13 +208,13 @@ True - 6, 13 + 7, 15 - 358, 348 + 418, 402 - Segoe UI, 8.25pt + Segoe UI, 9pt @@ -2716,8 +2725,11 @@ 0, 0 + + 4, 3, 4, 3 + - 20, 60, 20, 40 + 23, 69, 23, 46 CenterParent diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs index 30a0b33f..2c4de6f8 100644 --- a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs @@ -81,9 +81,10 @@ // // saveButton // - this.saveButton.Location = new System.Drawing.Point(250, 514); + this.saveButton.Location = new System.Drawing.Point(291, 593); + this.saveButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveButton.Name = "saveButton"; - this.saveButton.Size = new System.Drawing.Size(126, 23); + this.saveButton.Size = new System.Drawing.Size(147, 26); this.saveButton.TabIndex = 1; this.saveButton.Text = "Save"; this.saveButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -107,9 +108,11 @@ this.effectsGroup.Controls.Add(this.classicCheckBox); this.effectsGroup.Controls.Add(this.rightArmOCheckBox); this.effectsGroup.ForeColor = System.Drawing.SystemColors.Window; - this.effectsGroup.Location = new System.Drawing.Point(22, 148); + this.effectsGroup.Location = new System.Drawing.Point(25, 171); + this.effectsGroup.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.effectsGroup.Name = "effectsGroup"; - this.effectsGroup.Size = new System.Drawing.Size(393, 238); + this.effectsGroup.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.effectsGroup.Size = new System.Drawing.Size(458, 274); this.effectsGroup.TabIndex = 2; this.effectsGroup.TabStop = false; this.effectsGroup.Text = "Skin Flags"; @@ -118,7 +121,8 @@ // this.rightLegOCheckBox.AutoSize = true; this.rightLegOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightLegOCheckBox.Location = new System.Drawing.Point(180, 208); + this.rightLegOCheckBox.Location = new System.Drawing.Point(210, 240); + this.rightLegOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightLegOCheckBox.Name = "rightLegOCheckBox"; this.rightLegOCheckBox.Size = new System.Drawing.Size(199, 19); this.rightLegOCheckBox.TabIndex = 13; @@ -133,7 +137,8 @@ // this.headOCheckBox.AutoSize = true; this.headOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.headOCheckBox.Location = new System.Drawing.Point(180, 50); + this.headOCheckBox.Location = new System.Drawing.Point(210, 58); + this.headOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headOCheckBox.Name = "headOCheckBox"; this.headOCheckBox.Size = new System.Drawing.Size(173, 19); this.headOCheckBox.TabIndex = 12; @@ -148,7 +153,8 @@ // this.leftLegOCheckBox.AutoSize = true; this.leftLegOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftLegOCheckBox.Location = new System.Drawing.Point(180, 174); + this.leftLegOCheckBox.Location = new System.Drawing.Point(210, 201); + this.leftLegOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftLegOCheckBox.Name = "leftLegOCheckBox"; this.leftLegOCheckBox.Size = new System.Drawing.Size(190, 19); this.leftLegOCheckBox.TabIndex = 11; @@ -163,7 +169,8 @@ // this.leftArmOCheckBox.AutoSize = true; this.leftArmOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftArmOCheckBox.Location = new System.Drawing.Point(180, 112); + this.leftArmOCheckBox.Location = new System.Drawing.Point(210, 129); + this.leftArmOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftArmOCheckBox.Name = "leftArmOCheckBox"; this.leftArmOCheckBox.Size = new System.Drawing.Size(194, 19); this.leftArmOCheckBox.TabIndex = 9; @@ -178,7 +185,8 @@ // this.bodyOCheckBox.AutoSize = true; this.bodyOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.bodyOCheckBox.Location = new System.Drawing.Point(180, 81); + this.bodyOCheckBox.Location = new System.Drawing.Point(210, 94); + this.bodyOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyOCheckBox.Name = "bodyOCheckBox"; this.bodyOCheckBox.Size = new System.Drawing.Size(172, 19); this.bodyOCheckBox.TabIndex = 8; @@ -193,7 +201,8 @@ // this.rightLegCheckBox.AutoSize = true; this.rightLegCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightLegCheckBox.Location = new System.Drawing.Point(6, 208); + this.rightLegCheckBox.Location = new System.Drawing.Point(7, 240); + this.rightLegCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightLegCheckBox.Name = "rightLegCheckBox"; this.rightLegCheckBox.Size = new System.Drawing.Size(162, 19); this.rightLegCheckBox.TabIndex = 7; @@ -208,7 +217,8 @@ // this.slimCheckBox.AutoSize = true; this.slimCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.slimCheckBox.Location = new System.Drawing.Point(180, 19); + this.slimCheckBox.Location = new System.Drawing.Point(210, 22); + this.slimCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.slimCheckBox.Name = "slimCheckBox"; this.slimCheckBox.Size = new System.Drawing.Size(151, 19); this.slimCheckBox.TabIndex = 6; @@ -223,7 +233,8 @@ // this.headCheckBox.AutoSize = true; this.headCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.headCheckBox.Location = new System.Drawing.Point(6, 50); + this.headCheckBox.Location = new System.Drawing.Point(7, 58); + this.headCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.headCheckBox.Name = "headCheckBox"; this.headCheckBox.Size = new System.Drawing.Size(136, 19); this.headCheckBox.TabIndex = 5; @@ -238,7 +249,8 @@ // this.leftLegCheckBox.AutoSize = true; this.leftLegCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftLegCheckBox.Location = new System.Drawing.Point(6, 174); + this.leftLegCheckBox.Location = new System.Drawing.Point(7, 201); + this.leftLegCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftLegCheckBox.Name = "leftLegCheckBox"; this.leftLegCheckBox.Size = new System.Drawing.Size(153, 19); this.leftLegCheckBox.TabIndex = 4; @@ -253,7 +265,8 @@ // this.rightArmCheckBox.AutoSize = true; this.rightArmCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightArmCheckBox.Location = new System.Drawing.Point(6, 143); + this.rightArmCheckBox.Location = new System.Drawing.Point(7, 165); + this.rightArmCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightArmCheckBox.Name = "rightArmCheckBox"; this.rightArmCheckBox.Size = new System.Drawing.Size(166, 19); this.rightArmCheckBox.TabIndex = 3; @@ -268,7 +281,8 @@ // this.leftArmCheckBox.AutoSize = true; this.leftArmCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftArmCheckBox.Location = new System.Drawing.Point(6, 112); + this.leftArmCheckBox.Location = new System.Drawing.Point(7, 129); + this.leftArmCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftArmCheckBox.Name = "leftArmCheckBox"; this.leftArmCheckBox.Size = new System.Drawing.Size(157, 19); this.leftArmCheckBox.TabIndex = 2; @@ -283,7 +297,8 @@ // this.bodyCheckBox.AutoSize = true; this.bodyCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.bodyCheckBox.Location = new System.Drawing.Point(6, 81); + this.bodyCheckBox.Location = new System.Drawing.Point(7, 94); + this.bodyCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bodyCheckBox.Name = "bodyCheckBox"; this.bodyCheckBox.Size = new System.Drawing.Size(135, 19); this.bodyCheckBox.TabIndex = 1; @@ -298,7 +313,8 @@ // this.classicCheckBox.AutoSize = true; this.classicCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.classicCheckBox.Location = new System.Drawing.Point(6, 19); + this.classicCheckBox.Location = new System.Drawing.Point(7, 22); + this.classicCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.classicCheckBox.Name = "classicCheckBox"; this.classicCheckBox.Size = new System.Drawing.Size(136, 19); this.classicCheckBox.TabIndex = 0; @@ -313,7 +329,8 @@ this.rightArmOCheckBox.AutoSize = true; this.rightArmOCheckBox.BackColor = System.Drawing.Color.Transparent; this.rightArmOCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightArmOCheckBox.Location = new System.Drawing.Point(180, 143); + this.rightArmOCheckBox.Location = new System.Drawing.Point(210, 165); + this.rightArmOCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightArmOCheckBox.Name = "rightArmOCheckBox"; this.rightArmOCheckBox.Size = new System.Drawing.Size(203, 19); this.rightArmOCheckBox.TabIndex = 10; @@ -333,9 +350,11 @@ this.effectsGroup2.Controls.Add(this.leftArmorCheckBox); this.effectsGroup2.Controls.Add(this.chestplateCheckBox); this.effectsGroup2.ForeColor = System.Drawing.SystemColors.Window; - this.effectsGroup2.Location = new System.Drawing.Point(421, 183); + this.effectsGroup2.Location = new System.Drawing.Point(491, 211); + this.effectsGroup2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.effectsGroup2.Name = "effectsGroup2"; - this.effectsGroup2.Size = new System.Drawing.Size(188, 203); + this.effectsGroup2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.effectsGroup2.Size = new System.Drawing.Size(220, 234); this.effectsGroup2.TabIndex = 14; this.effectsGroup2.TabStop = false; this.effectsGroup2.Text = "Armor Flags"; @@ -345,7 +364,8 @@ this.rightLeggingCheckBox.AutoSize = true; this.rightLeggingCheckBox.Enabled = false; this.rightLeggingCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightLeggingCheckBox.Location = new System.Drawing.Point(6, 174); + this.rightLeggingCheckBox.Location = new System.Drawing.Point(7, 201); + this.rightLeggingCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightLeggingCheckBox.Name = "rightLeggingCheckBox"; this.rightLeggingCheckBox.Size = new System.Drawing.Size(173, 19); this.rightLeggingCheckBox.TabIndex = 7; @@ -359,7 +379,8 @@ this.helmetCheckBox.AutoSize = true; this.helmetCheckBox.Enabled = false; this.helmetCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.helmetCheckBox.Location = new System.Drawing.Point(6, 19); + this.helmetCheckBox.Location = new System.Drawing.Point(7, 22); + this.helmetCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.helmetCheckBox.Name = "helmetCheckBox"; this.helmetCheckBox.Size = new System.Drawing.Size(147, 19); this.helmetCheckBox.TabIndex = 5; @@ -373,7 +394,8 @@ this.leftLeggingCheckBox.AutoSize = true; this.leftLeggingCheckBox.Enabled = false; this.leftLeggingCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftLeggingCheckBox.Location = new System.Drawing.Point(6, 143); + this.leftLeggingCheckBox.Location = new System.Drawing.Point(7, 165); + this.leftLeggingCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftLeggingCheckBox.Name = "leftLeggingCheckBox"; this.leftLeggingCheckBox.Size = new System.Drawing.Size(164, 19); this.leftLeggingCheckBox.TabIndex = 4; @@ -387,7 +409,8 @@ this.rightArmorCheckBox.AutoSize = true; this.rightArmorCheckBox.Enabled = false; this.rightArmorCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.rightArmorCheckBox.Location = new System.Drawing.Point(6, 112); + this.rightArmorCheckBox.Location = new System.Drawing.Point(7, 129); + this.rightArmorCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.rightArmorCheckBox.Name = "rightArmorCheckBox"; this.rightArmorCheckBox.Size = new System.Drawing.Size(177, 19); this.rightArmorCheckBox.TabIndex = 3; @@ -401,7 +424,8 @@ this.leftArmorCheckBox.AutoSize = true; this.leftArmorCheckBox.Enabled = false; this.leftArmorCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.leftArmorCheckBox.Location = new System.Drawing.Point(6, 81); + this.leftArmorCheckBox.Location = new System.Drawing.Point(7, 94); + this.leftArmorCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.leftArmorCheckBox.Name = "leftArmorCheckBox"; this.leftArmorCheckBox.Size = new System.Drawing.Size(168, 19); this.leftArmorCheckBox.TabIndex = 2; @@ -415,7 +439,8 @@ this.chestplateCheckBox.AutoSize = true; this.chestplateCheckBox.Enabled = false; this.chestplateCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.chestplateCheckBox.Location = new System.Drawing.Point(6, 50); + this.chestplateCheckBox.Location = new System.Drawing.Point(7, 58); + this.chestplateCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chestplateCheckBox.Name = "chestplateCheckBox"; this.chestplateCheckBox.Size = new System.Drawing.Size(146, 19); this.chestplateCheckBox.TabIndex = 1; @@ -439,9 +464,11 @@ this.groupBox1.Controls.Add(this.zombieCheckBox); this.groupBox1.Controls.Add(this.staticLegsCheckBox); this.groupBox1.ForeColor = System.Drawing.SystemColors.Window; - this.groupBox1.Location = new System.Drawing.Point(22, 388); + this.groupBox1.Location = new System.Drawing.Point(25, 448); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(587, 115); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Size = new System.Drawing.Size(685, 132); this.groupBox1.TabIndex = 15; this.groupBox1.TabStop = false; this.groupBox1.Text = "Special Animations"; @@ -450,7 +477,8 @@ // this.unknownCheckBox.AutoSize = true; this.unknownCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.unknownCheckBox.Location = new System.Drawing.Point(126, 81); + this.unknownCheckBox.Location = new System.Drawing.Point(147, 94); + this.unknownCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.unknownCheckBox.Name = "unknownCheckBox"; this.unknownCheckBox.Size = new System.Drawing.Size(84, 19); this.unknownCheckBox.TabIndex = 13; @@ -464,7 +492,8 @@ // this.crouchCheckBox.AutoSize = true; this.crouchCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.crouchCheckBox.Location = new System.Drawing.Point(126, 50); + this.crouchCheckBox.Location = new System.Drawing.Point(147, 58); + this.crouchCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.crouchCheckBox.Name = "crouchCheckBox"; this.crouchCheckBox.Size = new System.Drawing.Size(137, 19); this.crouchCheckBox.TabIndex = 12; @@ -478,7 +507,8 @@ // this.dinnerboneCheckBox.AutoSize = true; this.dinnerboneCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.dinnerboneCheckBox.Location = new System.Drawing.Point(126, 19); + this.dinnerboneCheckBox.Location = new System.Drawing.Point(147, 22); + this.dinnerboneCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dinnerboneCheckBox.Name = "dinnerboneCheckBox"; this.dinnerboneCheckBox.Size = new System.Drawing.Size(97, 19); this.dinnerboneCheckBox.TabIndex = 11; @@ -492,7 +522,8 @@ // this.noArmorCheckBox.AutoSize = true; this.noArmorCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.noArmorCheckBox.Location = new System.Drawing.Point(420, 81); + this.noArmorCheckBox.Location = new System.Drawing.Point(490, 94); + this.noArmorCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.noArmorCheckBox.Name = "noArmorCheckBox"; this.noArmorCheckBox.Size = new System.Drawing.Size(131, 19); this.noArmorCheckBox.TabIndex = 10; @@ -505,7 +536,8 @@ // this.bobbingCheckBox.AutoSize = true; this.bobbingCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.bobbingCheckBox.Location = new System.Drawing.Point(272, 50); + this.bobbingCheckBox.Location = new System.Drawing.Point(318, 58); + this.bobbingCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bobbingCheckBox.Name = "bobbingCheckBox"; this.bobbingCheckBox.Size = new System.Drawing.Size(124, 19); this.bobbingCheckBox.TabIndex = 9; @@ -518,7 +550,8 @@ // this.santaCheckBox.AutoSize = true; this.santaCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.santaCheckBox.Location = new System.Drawing.Point(420, 50); + this.santaCheckBox.Location = new System.Drawing.Point(490, 58); + this.santaCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.santaCheckBox.Name = "santaCheckBox"; this.santaCheckBox.Size = new System.Drawing.Size(86, 19); this.santaCheckBox.TabIndex = 8; @@ -532,7 +565,8 @@ // this.syncLegsCheckBox.AutoSize = true; this.syncLegsCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.syncLegsCheckBox.Location = new System.Drawing.Point(272, 19); + this.syncLegsCheckBox.Location = new System.Drawing.Point(318, 22); + this.syncLegsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.syncLegsCheckBox.Name = "syncLegsCheckBox"; this.syncLegsCheckBox.Size = new System.Drawing.Size(136, 19); this.syncLegsCheckBox.TabIndex = 7; @@ -545,7 +579,8 @@ // this.staticArmsCheckBox.AutoSize = true; this.staticArmsCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.staticArmsCheckBox.Location = new System.Drawing.Point(6, 19); + this.staticArmsCheckBox.Location = new System.Drawing.Point(7, 22); + this.staticArmsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.staticArmsCheckBox.Name = "staticArmsCheckBox"; this.staticArmsCheckBox.Size = new System.Drawing.Size(94, 19); this.staticArmsCheckBox.TabIndex = 5; @@ -558,7 +593,8 @@ // this.syncArmsCheckBox.AutoSize = true; this.syncArmsCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.syncArmsCheckBox.Location = new System.Drawing.Point(420, 19); + this.syncArmsCheckBox.Location = new System.Drawing.Point(490, 22); + this.syncArmsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.syncArmsCheckBox.Name = "syncArmsCheckBox"; this.syncArmsCheckBox.Size = new System.Drawing.Size(140, 19); this.syncArmsCheckBox.TabIndex = 4; @@ -571,7 +607,8 @@ // this.statueCheckBox.AutoSize = true; this.statueCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.statueCheckBox.Location = new System.Drawing.Point(272, 81); + this.statueCheckBox.Location = new System.Drawing.Point(318, 94); + this.statueCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.statueCheckBox.Name = "statueCheckBox"; this.statueCheckBox.Size = new System.Drawing.Size(126, 19); this.statueCheckBox.TabIndex = 3; @@ -585,7 +622,8 @@ // this.zombieCheckBox.AutoSize = true; this.zombieCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.zombieCheckBox.Location = new System.Drawing.Point(6, 81); + this.zombieCheckBox.Location = new System.Drawing.Point(7, 94); + this.zombieCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.zombieCheckBox.Name = "zombieCheckBox"; this.zombieCheckBox.Size = new System.Drawing.Size(107, 19); this.zombieCheckBox.TabIndex = 2; @@ -598,7 +636,8 @@ // this.staticLegsCheckBox.AutoSize = true; this.staticLegsCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; - this.staticLegsCheckBox.Location = new System.Drawing.Point(6, 50); + this.staticLegsCheckBox.Location = new System.Drawing.Point(7, 58); + this.staticLegsCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.staticLegsCheckBox.Name = "staticLegsCheckBox"; this.staticLegsCheckBox.Size = new System.Drawing.Size(90, 19); this.staticLegsCheckBox.TabIndex = 1; @@ -609,9 +648,10 @@ // // copyButton // - this.copyButton.Location = new System.Drawing.Point(425, 119); + this.copyButton.Location = new System.Drawing.Point(496, 138); + this.copyButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.copyButton.Name = "copyButton"; - this.copyButton.Size = new System.Drawing.Size(173, 23); + this.copyButton.Size = new System.Drawing.Size(202, 26); this.copyButton.TabIndex = 22; this.copyButton.Text = "Copy ANIM Value"; this.copyButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -620,9 +660,10 @@ // // importButton // - this.importButton.Location = new System.Drawing.Point(32, 119); + this.importButton.Location = new System.Drawing.Point(38, 138); + this.importButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.importButton.Name = "importButton"; - this.importButton.Size = new System.Drawing.Size(186, 23); + this.importButton.Size = new System.Drawing.Size(217, 26); this.importButton.TabIndex = 23; this.importButton.Text = "Import ANIM"; this.importButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -631,9 +672,10 @@ // // exportButton // - this.exportButton.Location = new System.Drawing.Point(229, 119); + this.exportButton.Location = new System.Drawing.Point(267, 138); + this.exportButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.exportButton.Name = "exportButton"; - this.exportButton.Size = new System.Drawing.Size(186, 23); + this.exportButton.Size = new System.Drawing.Size(217, 26); this.exportButton.TabIndex = 24; this.exportButton.Text = "Export Template Texture"; this.exportButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -645,7 +687,8 @@ this.animValue.AutoSize = true; this.animValue.FontSize = MetroFramework.MetroLabelSize.Tall; this.animValue.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.animValue.Location = new System.Drawing.Point(260, 60); + this.animValue.Location = new System.Drawing.Point(304, 69); + this.animValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.animValue.Name = "animValue"; this.animValue.Size = new System.Drawing.Size(110, 25); this.animValue.TabIndex = 25; @@ -655,9 +698,10 @@ // // uncheckAllButton // - this.uncheckAllButton.Location = new System.Drawing.Point(229, 90); + this.uncheckAllButton.Location = new System.Drawing.Point(267, 104); + this.uncheckAllButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.uncheckAllButton.Name = "uncheckAllButton"; - this.uncheckAllButton.Size = new System.Drawing.Size(186, 23); + this.uncheckAllButton.Size = new System.Drawing.Size(217, 26); this.uncheckAllButton.TabIndex = 26; this.uncheckAllButton.Text = "Uncheck All"; this.uncheckAllButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -666,9 +710,10 @@ // // checkAllButton // - this.checkAllButton.Location = new System.Drawing.Point(32, 90); + this.checkAllButton.Location = new System.Drawing.Point(38, 104); + this.checkAllButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.checkAllButton.Name = "checkAllButton"; - this.checkAllButton.Size = new System.Drawing.Size(186, 23); + this.checkAllButton.Size = new System.Drawing.Size(217, 26); this.checkAllButton.TabIndex = 27; this.checkAllButton.Text = "Check All"; this.checkAllButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -684,9 +729,10 @@ // // resetButton // - this.resetButton.Location = new System.Drawing.Point(425, 90); + this.resetButton.Location = new System.Drawing.Point(496, 104); + this.resetButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.resetButton.Name = "resetButton"; - this.resetButton.Size = new System.Drawing.Size(173, 23); + this.resetButton.Size = new System.Drawing.Size(202, 26); this.resetButton.TabIndex = 28; this.resetButton.Text = "Restore ANIM"; this.resetButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -695,9 +741,10 @@ // // templateButton // - this.templateButton.Location = new System.Drawing.Point(425, 154); + this.templateButton.Location = new System.Drawing.Point(496, 178); + this.templateButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.templateButton.Name = "templateButton"; - this.templateButton.Size = new System.Drawing.Size(173, 23); + this.templateButton.Size = new System.Drawing.Size(202, 26); this.templateButton.TabIndex = 29; this.templateButton.Text = "Skin Presets"; this.templateButton.Theme = MetroFramework.MetroThemeStyle.Dark; @@ -706,10 +753,10 @@ // // ANIMEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.ClientSize = new System.Drawing.Size(614, 515); + this.ClientSize = new System.Drawing.Size(717, 594); this.Controls.Add(this.templateButton); this.Controls.Add(this.effectsGroup); this.Controls.Add(this.resetButton); @@ -722,12 +769,14 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.effectsGroup2); this.Controls.Add(this.saveButton); + this.Font = new System.Drawing.Font("Segoe UI", 9F); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(630, 554); + this.MaximumSize = new System.Drawing.Size(733, 633); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(630, 554); + this.MinimumSize = new System.Drawing.Size(733, 633); this.Name = "ANIMEditor"; this.Text = "ANIM Editor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ANIMEditor_FormClosing); diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs index 4fed8d2a..522972a7 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs @@ -73,13 +73,13 @@ this.frameTreeView.ForeColor = System.Drawing.Color.White; this.frameTreeView.ImageIndex = 0; this.frameTreeView.ImageList = this.TextureIcons; - this.frameTreeView.Location = new System.Drawing.Point(20, 88); + this.frameTreeView.Location = new System.Drawing.Point(24, 101); this.frameTreeView.Margin = new System.Windows.Forms.Padding(0); this.frameTreeView.Name = "frameTreeView"; this.frameTreeView.SelectedImageIndex = 0; this.frameTreeView.ShowLines = false; this.frameTreeView.ShowRootLines = false; - this.frameTreeView.Size = new System.Drawing.Size(134, 253); + this.frameTreeView.Size = new System.Drawing.Size(155, 292); this.frameTreeView.TabIndex = 15; this.frameTreeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.frameTreeView_ItemDrag); this.frameTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.frameTreeView_AfterSelect); @@ -125,10 +125,11 @@ this.fileToolStripMenuItem, this.editToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip.Location = new System.Drawing.Point(20, 60); + this.menuStrip.Location = new System.Drawing.Point(24, 69); this.menuStrip.Name = "menuStrip"; + this.menuStrip.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); this.menuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.menuStrip.Size = new System.Drawing.Size(134, 24); + this.menuStrip.Size = new System.Drawing.Size(157, 28); this.menuStrip.TabIndex = 14; this.menuStrip.Text = "menuStrip1"; // @@ -141,21 +142,21 @@ this.exportAsToolStripMenuItem}); this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 24); this.fileToolStripMenuItem.Text = "File"; // // saveToolStripMenuItem1 // this.saveToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem1.Image"))); this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; - this.saveToolStripMenuItem1.Size = new System.Drawing.Size(122, 22); + this.saveToolStripMenuItem1.Size = new System.Drawing.Size(121, 22); this.saveToolStripMenuItem1.Text = "Save"; this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(118, 6); // // importToolStripMenuItem // @@ -164,7 +165,7 @@ this.importJavaAnimationToolStripMenuItem, this.importGifToolStripMenuItem}); this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.importToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.importToolStripMenuItem.Text = "Import"; // // importAnimationTextureToolStripMenuItem @@ -194,7 +195,7 @@ this.exportJavaAnimationToolStripMenuItem, this.gifToolStripMenuItem}); this.exportAsToolStripMenuItem.Name = "exportAsToolStripMenuItem"; - this.exportAsToolStripMenuItem.Size = new System.Drawing.Size(122, 22); + this.exportAsToolStripMenuItem.Size = new System.Drawing.Size(121, 22); this.exportAsToolStripMenuItem.Text = "Export as"; // // exportJavaAnimationToolStripMenuItem @@ -217,7 +218,7 @@ this.bulkAnimationSpeedToolStripMenuItem}); this.editToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(46, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(47, 24); this.editToolStripMenuItem.Text = "Tools"; // // bulkAnimationSpeedToolStripMenuItem @@ -237,7 +238,7 @@ this.javaAnimationSupportToolStripMenuItem}); this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 24); this.helpToolStripMenuItem.Text = "Help"; // // frameTimeandTicksToolStripMenuItem @@ -278,7 +279,8 @@ // InterpolationCheckbox // this.InterpolationCheckbox.AutoSize = true; - this.InterpolationCheckbox.Location = new System.Drawing.Point(161, 63); + this.InterpolationCheckbox.Location = new System.Drawing.Point(188, 72); + this.InterpolationCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.InterpolationCheckbox.Name = "InterpolationCheckbox"; this.InterpolationCheckbox.Size = new System.Drawing.Size(129, 15); this.InterpolationCheckbox.TabIndex = 17; @@ -291,9 +293,10 @@ // this.AnimationStartStopBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.AnimationStartStopBtn.Location = new System.Drawing.Point(157, 317); + this.AnimationStartStopBtn.Location = new System.Drawing.Point(183, 366); + this.AnimationStartStopBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.AnimationStartStopBtn.Name = "AnimationStartStopBtn"; - this.AnimationStartStopBtn.Size = new System.Drawing.Size(232, 24); + this.AnimationStartStopBtn.Size = new System.Drawing.Size(270, 28); this.AnimationStartStopBtn.Style = MetroFramework.MetroColorStyle.White; this.AnimationStartStopBtn.TabIndex = 18; this.AnimationStartStopBtn.Text = "Play Animation"; @@ -305,8 +308,9 @@ // this.tileLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.tileLabel.AutoSize = true; - this.tileLabel.Location = new System.Drawing.Point(20, 341); - this.tileLabel.MinimumSize = new System.Drawing.Size(170, 19); + this.tileLabel.Location = new System.Drawing.Point(24, 394); + this.tileLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.tileLabel.MinimumSize = new System.Drawing.Size(199, 22); this.tileLabel.Name = "tileLabel"; this.tileLabel.Size = new System.Drawing.Size(57, 19); this.tileLabel.TabIndex = 20; @@ -322,30 +326,34 @@ this.animationPictureBox.BlendMode = PckStudio.Extensions.BlendMode.Multiply; this.animationPictureBox.Image = null; this.animationPictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; - this.animationPictureBox.Location = new System.Drawing.Point(157, 88); + this.animationPictureBox.Location = new System.Drawing.Point(183, 101); + this.animationPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.animationPictureBox.Name = "animationPictureBox"; - this.animationPictureBox.Size = new System.Drawing.Size(235, 223); + this.animationPictureBox.Size = new System.Drawing.Size(274, 258); this.animationPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.animationPictureBox.TabIndex = 16; this.animationPictureBox.TabStop = false; // // AnimationEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(412, 362); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.ClientSize = new System.Drawing.Size(480, 418); this.Controls.Add(this.InterpolationCheckbox); this.Controls.Add(this.AnimationStartStopBtn); this.Controls.Add(this.tileLabel); this.Controls.Add(this.animationPictureBox); this.Controls.Add(this.frameTreeView); this.Controls.Add(this.menuStrip); + this.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(412, 362); + this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MinimumSize = new System.Drawing.Size(478, 411); this.Name = "AnimationEditor"; - this.Style = MetroFramework.MetroColorStyle.Silver; this.Text = "Animation Editor"; - this.Theme = MetroFramework.MetroThemeStyle.Dark; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AnimationEditor_FormClosing); this.Load += new System.EventHandler(this.AnimationEditor_Load); this.contextMenuStrip1.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index f0c03a5b..c155f7bf 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -34,10 +34,11 @@ using PckStudio.Properties; using PckStudio.Internal; using PckStudio.Internal.Deserializer; using PckStudio.Internal.Serializer; +using PckStudio.ToolboxItems; namespace PckStudio.Forms.Editor { - public partial class AnimationEditor : MetroForm + public partial class AnimationEditor : ThemeForm { public Animation Result => _animation; diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.resx b/PCK-Studio/Forms/Editor/AnimationEditor.resx index c3546ac8..a8456bfc 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.resx +++ b/PCK-Studio/Forms/Editor/AnimationEditor.resx @@ -130,11 +130,11 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8 - QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C - y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga - QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN - 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADdSURBVDhPzZJB + CoJQEIa9jy0iPFAnCDpAtG3ZooUE4b6oVtIuClpJIAgqZEVlKpqEHUAm5pGPmhTbRA18G//5P5iHgvA3 + I7ZniiQ7aVM9QZzcOKYbwVDbw8I6A2YAICBvg2VJdtjSs2Cse1Dt6tCYbliGO0UCFlLBxAj590yA0D4X + 1Ec7CK8JF9j+lUmWzoVlpYJaz4JKZ5ULZqWCT6F9Jhhowcv9eeBOoQBvPXoBrA0zF8yyR6V9LvCjGLYH + NxfMvipIMaQ3Ux6ClPYFsaUq/bmd0rspuIO/Pe3/bu5p+sr3gTvFEQAAAABJRU5ErkJggg== diff --git a/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs b/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs index 10f0c722..e4b0a99d 100644 --- a/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/AudioEditor.Designer.cs @@ -29,261 +29,254 @@ namespace PckStudio.Forms.Editor /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioEditor)); - this.treeView1 = new System.Windows.Forms.TreeView(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.changeCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.catImages = new System.Windows.Forms.ImageList(this.components); - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteUnusedBINKAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bulkReplaceExistingTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.organizeTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.howToEditCreditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.optimizeDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bINKACompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.treeView2 = new System.Windows.Forms.TreeView(); - this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.verifyFileLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.convertToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.playOverworldInCreative = new MetroFramework.Controls.MetroCheckBox(); - this.compressionUpDown = new System.Windows.Forms.NumericUpDown(); - this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); - this.contextMenuStrip1.SuspendLayout(); - this.menuStrip.SuspendLayout(); - this.contextMenuStrip2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).BeginInit(); - this.SuspendLayout(); - // - // treeView1 - // - resources.ApplyResources(this.treeView1, "treeView1"); - this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeView1.ContextMenuStrip = this.contextMenuStrip1; - this.treeView1.ForeColor = System.Drawing.Color.White; - this.treeView1.ImageList = this.catImages; - this.treeView1.LabelEdit = true; - this.treeView1.Name = "treeView1"; - this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); - this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); - // - // contextMenuStrip1 - // + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AudioEditor)); + this.treeView1 = new System.Windows.Forms.TreeView(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.removeCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.changeCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.catImages = new System.Windows.Forms.ImageList(this.components); + this.addCategoryStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteUnusedBINKAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bulkReplaceExistingTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.organizeTracksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToAddSongsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.whatIsEachCategoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.howToEditCreditsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optimizeDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bINKACompressionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openDataFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.treeView2 = new System.Windows.Forms.TreeView(); + this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.verifyFileLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.convertToWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.removeEntryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.playOverworldInCreative = new MetroFramework.Controls.MetroCheckBox(); + this.compressionUpDown = new System.Windows.Forms.NumericUpDown(); + this.metroLabel1 = new MetroFramework.Controls.MetroLabel(); + this.contextMenuStrip1.SuspendLayout(); + this.menuStrip.SuspendLayout(); + this.contextMenuStrip2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).BeginInit(); + this.SuspendLayout(); + // + // treeView1 + // + resources.ApplyResources(this.treeView1, "treeView1"); + this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeView1.ContextMenuStrip = this.contextMenuStrip1; + this.treeView1.ForeColor = System.Drawing.Color.White; + this.treeView1.ImageList = this.catImages; + this.treeView1.LabelEdit = true; + this.treeView1.Name = "treeView1"; + this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); + this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); + // + // contextMenuStrip1 + // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.removeCategoryStripMenuItem, this.changeCategoryToolStripMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); - // - // addCategoryStripMenuItem - // - resources.ApplyResources(this.addCategoryStripMenuItem, "addCategoryStripMenuItem"); - this.addCategoryStripMenuItem.Name = "addCategoryStripMenuItem"; - this.addCategoryStripMenuItem.Click += new System.EventHandler(this.addCategoryStripMenuItem_Click); - // - // removeCategoryStripMenuItem - // - this.removeCategoryStripMenuItem.Name = "removeCategoryStripMenuItem"; - resources.ApplyResources(this.removeCategoryStripMenuItem, "removeCategoryStripMenuItem"); - this.removeCategoryStripMenuItem.Click += new System.EventHandler(this.removeCategoryStripMenuItem_Click); - // - // changeCategoryToolStripMenuItem - // - this.changeCategoryToolStripMenuItem.Name = "changeCategoryToolStripMenuItem"; - resources.ApplyResources(this.changeCategoryToolStripMenuItem, "changeCategoryToolStripMenuItem"); - this.changeCategoryToolStripMenuItem.Click += new System.EventHandler(this.setCategoryToolStripMenuItem_Click); - // - // catImages - // - this.catImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("catImages.ImageStream"))); - this.catImages.TransparentColor = System.Drawing.Color.Transparent; - this.catImages.Images.SetKeyName(0, "0_overworld.png"); - this.catImages.Images.SetKeyName(1, "1_nether.png"); - this.catImages.Images.SetKeyName(2, "2_end.png"); - this.catImages.Images.SetKeyName(3, "3_creative.png"); - this.catImages.Images.SetKeyName(4, "4_menu.png"); - this.catImages.Images.SetKeyName(5, "5_mg01.png"); - this.catImages.Images.SetKeyName(6, "6_mg02.png"); - this.catImages.Images.SetKeyName(7, "7_mg03.png"); - this.catImages.Images.SetKeyName(8, "8_mg04.png"); - // - // menuStrip - // - resources.ApplyResources(this.menuStrip, "menuStrip"); - this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); + // + // removeCategoryStripMenuItem + // + this.removeCategoryStripMenuItem.Name = "removeCategoryStripMenuItem"; + resources.ApplyResources(this.removeCategoryStripMenuItem, "removeCategoryStripMenuItem"); + this.removeCategoryStripMenuItem.Click += new System.EventHandler(this.removeCategoryStripMenuItem_Click); + // + // changeCategoryToolStripMenuItem + // + this.changeCategoryToolStripMenuItem.Name = "changeCategoryToolStripMenuItem"; + resources.ApplyResources(this.changeCategoryToolStripMenuItem, "changeCategoryToolStripMenuItem"); + this.changeCategoryToolStripMenuItem.Click += new System.EventHandler(this.setCategoryToolStripMenuItem_Click); + // + // catImages + // + this.catImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("catImages.ImageStream"))); + this.catImages.TransparentColor = System.Drawing.Color.Transparent; + this.catImages.Images.SetKeyName(0, "0_overworld.png"); + this.catImages.Images.SetKeyName(1, "1_nether.png"); + this.catImages.Images.SetKeyName(2, "2_end.png"); + this.catImages.Images.SetKeyName(3, "3_creative.png"); + this.catImages.Images.SetKeyName(4, "4_menu.png"); + this.catImages.Images.SetKeyName(5, "5_mg01.png"); + this.catImages.Images.SetKeyName(6, "6_mg02.png"); + this.catImages.Images.SetKeyName(7, "7_mg03.png"); + this.catImages.Images.SetKeyName(8, "8_mg04.png"); + // + // addCategoryStripMenuItem + // + resources.ApplyResources(this.addCategoryStripMenuItem, "addCategoryStripMenuItem"); + this.addCategoryStripMenuItem.Name = "addCategoryStripMenuItem"; + this.addCategoryStripMenuItem.Click += new System.EventHandler(this.addCategoryStripMenuItem_Click); + // + // menuStrip + // + resources.ApplyResources(this.menuStrip, "menuStrip"); + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.toolsToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip.Name = "menuStrip"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.Name = "menuStrip"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveToolStripMenuItem1}); - this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); - // - // saveToolStripMenuItem1 - // - resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); - this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; - this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click); - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); + // + // saveToolStripMenuItem1 + // + resources.ApplyResources(this.saveToolStripMenuItem1, "saveToolStripMenuItem1"); + this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1"; + this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click); + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.deleteUnusedBINKAsToolStripMenuItem, this.bulkReplaceExistingTracksToolStripMenuItem, this.organizeTracksToolStripMenuItem}); - this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem"); - // - // deleteUnusedBINKAsToolStripMenuItem - // - this.deleteUnusedBINKAsToolStripMenuItem.Name = "deleteUnusedBINKAsToolStripMenuItem"; - resources.ApplyResources(this.deleteUnusedBINKAsToolStripMenuItem, "deleteUnusedBINKAsToolStripMenuItem"); - this.deleteUnusedBINKAsToolStripMenuItem.Click += new System.EventHandler(this.deleteUnusedBINKAsToolStripMenuItem_Click); - // - // openDataFolderToolStripMenuItem - // - this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem"; - resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem"); - this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click); - // - // bulkReplaceExistingTracksToolStripMenuItem - // - this.bulkReplaceExistingTracksToolStripMenuItem.Name = "bulkReplaceExistingTracksToolStripMenuItem"; - resources.ApplyResources(this.bulkReplaceExistingTracksToolStripMenuItem, "bulkReplaceExistingTracksToolStripMenuItem"); - this.bulkReplaceExistingTracksToolStripMenuItem.Click += new System.EventHandler(this.bulkReplaceExistingFilesToolStripMenuItem_Click); - // - // organizeTracksToolStripMenuItem - // - this.organizeTracksToolStripMenuItem.Name = "organizeTracksToolStripMenuItem"; - resources.ApplyResources(this.organizeTracksToolStripMenuItem, "organizeTracksToolStripMenuItem"); - this.organizeTracksToolStripMenuItem.Click += new System.EventHandler(this.organizeTracksToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.howToAddSongsToolStripMenuItem, - this.whatIsEachCategoryToolStripMenuItem, - this.howToEditCreditsToolStripMenuItem, - this.optimizeDataFolderToolStripMenuItem, - this.bINKACompressionToolStripMenuItem}); + this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem"); + // + // deleteUnusedBINKAsToolStripMenuItem + // + this.deleteUnusedBINKAsToolStripMenuItem.Name = "deleteUnusedBINKAsToolStripMenuItem"; + resources.ApplyResources(this.deleteUnusedBINKAsToolStripMenuItem, "deleteUnusedBINKAsToolStripMenuItem"); + this.deleteUnusedBINKAsToolStripMenuItem.Click += new System.EventHandler(this.deleteUnusedBINKAsToolStripMenuItem_Click); + // + // bulkReplaceExistingTracksToolStripMenuItem + // + this.bulkReplaceExistingTracksToolStripMenuItem.Name = "bulkReplaceExistingTracksToolStripMenuItem"; + resources.ApplyResources(this.bulkReplaceExistingTracksToolStripMenuItem, "bulkReplaceExistingTracksToolStripMenuItem"); + this.bulkReplaceExistingTracksToolStripMenuItem.Click += new System.EventHandler(this.bulkReplaceExistingFilesToolStripMenuItem_Click); + // + // organizeTracksToolStripMenuItem + // this.organizeTracksToolStripMenuItem.Name = "organizeTracksToolStripMenuItem"; resources.ApplyResources(this.organizeTracksToolStripMenuItem, "organizeTracksToolStripMenuItem"); this.organizeTracksToolStripMenuItem.Click += new System.EventHandler(this.organizeTracksToolStripMenuItem_Click); // // helpToolStripMenuItem - this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); - // - // howToAddSongsToolStripMenuItem - // - this.howToAddSongsToolStripMenuItem.Name = "howToAddSongsToolStripMenuItem"; - resources.ApplyResources(this.howToAddSongsToolStripMenuItem, "howToAddSongsToolStripMenuItem"); - this.howToAddSongsToolStripMenuItem.Click += new System.EventHandler(this.howToAddSongsToolStripMenuItem_Click); - // - // whatAreTheCategoriesToolStripMenuItem - // - this.whatIsEachCategoryToolStripMenuItem.Name = "whatIsEachCategoryToolStripMenuItem"; - resources.ApplyResources(this.whatIsEachCategoryToolStripMenuItem, "whatIsEachCategoryToolStripMenuItem"); - // - // howToEditCreditsToolStripMenuItem - // - this.howToEditCreditsToolStripMenuItem.Name = "howToEditCreditsToolStripMenuItem"; - resources.ApplyResources(this.howToEditCreditsToolStripMenuItem, "howToEditCreditsToolStripMenuItem"); - this.howToEditCreditsToolStripMenuItem.Click += new System.EventHandler(this.howToEditCreditsToolStripMenuItem_Click); - // - // optimizeDataFolderToolStripMenuItem - // - this.optimizeDataFolderToolStripMenuItem.Name = "optimizeDataFolderToolStripMenuItem"; - resources.ApplyResources(this.optimizeDataFolderToolStripMenuItem, "optimizeDataFolderToolStripMenuItem"); - this.optimizeDataFolderToolStripMenuItem.Click += new System.EventHandler(this.optimizeDataFolderToolStripMenuItem_Click); - // - // bINKACompressionToolStripMenuItem - // - this.bINKACompressionToolStripMenuItem.Name = "bINKACompressionToolStripMenuItem"; - resources.ApplyResources(this.bINKACompressionToolStripMenuItem, "bINKACompressionToolStripMenuItem"); - this.bINKACompressionToolStripMenuItem.Click += new System.EventHandler(this.BINKACompressionToolStripMenuItem_Click); - // - // treeView2 - // - this.treeView2.AllowDrop = true; - resources.ApplyResources(this.treeView2, "treeView2"); - this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.treeView2.ContextMenuStrip = this.contextMenuStrip2; - this.treeView2.ForeColor = System.Drawing.Color.White; - this.treeView2.Name = "treeView2"; - this.treeView2.DragDrop += new System.Windows.Forms.DragEventHandler(this.Binka_DragDrop); - this.treeView2.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView2_DragEnter); - this.treeView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown); - // - // contextMenuStrip2 - // - this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.verifyFileLocationToolStripMenuItem, - this.convertToWAVToolStripMenuItem}); + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.howToAddSongsToolStripMenuItem, + this.whatIsEachCategoryToolStripMenuItem, + this.howToEditCreditsToolStripMenuItem, + this.optimizeDataFolderToolStripMenuItem, + this.bINKACompressionToolStripMenuItem}); + this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + // + // howToAddSongsToolStripMenuItem + // + this.howToAddSongsToolStripMenuItem.Name = "howToAddSongsToolStripMenuItem"; + resources.ApplyResources(this.howToAddSongsToolStripMenuItem, "howToAddSongsToolStripMenuItem"); + this.howToAddSongsToolStripMenuItem.Click += new System.EventHandler(this.howToAddSongsToolStripMenuItem_Click); + // + // whatIsEachCategoryToolStripMenuItem + // + this.whatIsEachCategoryToolStripMenuItem.Name = "whatIsEachCategoryToolStripMenuItem"; + resources.ApplyResources(this.whatIsEachCategoryToolStripMenuItem, "whatIsEachCategoryToolStripMenuItem"); + // + // howToEditCreditsToolStripMenuItem + // + this.howToEditCreditsToolStripMenuItem.Name = "howToEditCreditsToolStripMenuItem"; + resources.ApplyResources(this.howToEditCreditsToolStripMenuItem, "howToEditCreditsToolStripMenuItem"); + this.howToEditCreditsToolStripMenuItem.Click += new System.EventHandler(this.howToEditCreditsToolStripMenuItem_Click); + // + // optimizeDataFolderToolStripMenuItem + // + this.optimizeDataFolderToolStripMenuItem.Name = "optimizeDataFolderToolStripMenuItem"; + resources.ApplyResources(this.optimizeDataFolderToolStripMenuItem, "optimizeDataFolderToolStripMenuItem"); + this.optimizeDataFolderToolStripMenuItem.Click += new System.EventHandler(this.optimizeDataFolderToolStripMenuItem_Click); + // + // bINKACompressionToolStripMenuItem + // + this.bINKACompressionToolStripMenuItem.Name = "bINKACompressionToolStripMenuItem"; + resources.ApplyResources(this.bINKACompressionToolStripMenuItem, "bINKACompressionToolStripMenuItem"); + this.bINKACompressionToolStripMenuItem.Click += new System.EventHandler(this.BINKACompressionToolStripMenuItem_Click); + // + // openDataFolderToolStripMenuItem + // + this.openDataFolderToolStripMenuItem.Name = "openDataFolderToolStripMenuItem"; + resources.ApplyResources(this.openDataFolderToolStripMenuItem, "openDataFolderToolStripMenuItem"); + this.openDataFolderToolStripMenuItem.Click += new System.EventHandler(this.openDataFolderToolStripMenuItem_Click); + // + // treeView2 + // + this.treeView2.AllowDrop = true; + resources.ApplyResources(this.treeView2, "treeView2"); + this.treeView2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.treeView2.ContextMenuStrip = this.contextMenuStrip2; + this.treeView2.ForeColor = System.Drawing.Color.White; + this.treeView2.Name = "treeView2"; this.treeView2.DragDrop += new System.Windows.Forms.DragEventHandler(this.Binka_DragDrop); this.treeView2.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeView2_DragEnter); - this.contextMenuStrip2.Name = "contextMenuStrip1"; - resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2"); - // - // addEntryMenuItem - // - resources.ApplyResources(this.addEntryMenuItem, "addEntryMenuItem"); - this.addEntryMenuItem.Name = "addEntryMenuItem"; - this.addEntryMenuItem.Click += new System.EventHandler(this.addEntryMenuItem_Click); - // - // removeEntryMenuItem - // - this.removeEntryMenuItem.Name = "removeEntryMenuItem"; - resources.ApplyResources(this.removeEntryMenuItem, "removeEntryMenuItem"); - this.removeEntryMenuItem.Click += new System.EventHandler(this.removeEntryMenuItem_Click); - // - // verifyFileLocationToolStripMenuItem - // - this.verifyFileLocationToolStripMenuItem.Name = "verifyFileLocationToolStripMenuItem"; - resources.ApplyResources(this.verifyFileLocationToolStripMenuItem, "verifyFileLocationToolStripMenuItem"); - this.verifyFileLocationToolStripMenuItem.Click += new System.EventHandler(this.verifyFileLocationToolStripMenuItem_Click); - // - // convertToWAVToolStripMenuItem - // - this.convertToWAVToolStripMenuItem.Name = "convertToWAVToolStripMenuItem"; - resources.ApplyResources(this.convertToWAVToolStripMenuItem, "convertToWAVToolStripMenuItem"); - this.convertToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertToWAVToolStripMenuItem_Click); - // - // playOverworldInCreative - // - resources.ApplyResources(this.playOverworldInCreative, "playOverworldInCreative"); - this.playOverworldInCreative.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.playOverworldInCreative.ForeColor = System.Drawing.SystemColors.Window; - this.playOverworldInCreative.Name = "playOverworldInCreative"; - this.playOverworldInCreative.Theme = MetroFramework.MetroThemeStyle.Dark; - this.playOverworldInCreative.UseCustomBackColor = true; - this.playOverworldInCreative.UseCustomForeColor = true; - this.playOverworldInCreative.UseSelectable = true; + this.treeView2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown); + // + // contextMenuStrip2 + // + this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.verifyFileLocationToolStripMenuItem, + this.convertToWAVToolStripMenuItem}); + this.contextMenuStrip2.Name = "contextMenuStrip1"; + resources.ApplyResources(this.contextMenuStrip2, "contextMenuStrip2"); + // + // verifyFileLocationToolStripMenuItem + // + this.verifyFileLocationToolStripMenuItem.Name = "verifyFileLocationToolStripMenuItem"; + resources.ApplyResources(this.verifyFileLocationToolStripMenuItem, "verifyFileLocationToolStripMenuItem"); + this.verifyFileLocationToolStripMenuItem.Click += new System.EventHandler(this.verifyFileLocationToolStripMenuItem_Click); + // + // convertToWAVToolStripMenuItem + // + this.convertToWAVToolStripMenuItem.Name = "convertToWAVToolStripMenuItem"; + resources.ApplyResources(this.convertToWAVToolStripMenuItem, "convertToWAVToolStripMenuItem"); + this.convertToWAVToolStripMenuItem.Click += new System.EventHandler(this.convertToWAVToolStripMenuItem_Click); + // + // addEntryMenuItem + // + resources.ApplyResources(this.addEntryMenuItem, "addEntryMenuItem"); + this.addEntryMenuItem.Name = "addEntryMenuItem"; + this.addEntryMenuItem.Click += new System.EventHandler(this.addEntryMenuItem_Click); + // + // removeEntryMenuItem + // + this.removeEntryMenuItem.Name = "removeEntryMenuItem"; + resources.ApplyResources(this.removeEntryMenuItem, "removeEntryMenuItem"); + this.removeEntryMenuItem.Click += new System.EventHandler(this.removeEntryMenuItem_Click); + // + // playOverworldInCreative + // + resources.ApplyResources(this.playOverworldInCreative, "playOverworldInCreative"); + this.playOverworldInCreative.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.playOverworldInCreative.ForeColor = System.Drawing.SystemColors.Window; + this.playOverworldInCreative.Name = "playOverworldInCreative"; + this.playOverworldInCreative.Theme = MetroFramework.MetroThemeStyle.Dark; + this.playOverworldInCreative.UseCustomBackColor = true; + this.playOverworldInCreative.UseCustomForeColor = true; + this.playOverworldInCreative.UseSelectable = true; // // compressionUpDown // - this.compressionUpDown.BackColor = System.Drawing.Color.FromArgb(64, 64, 64); - this.compressionUpDown.ForeColor = System.Drawing.SystemColors.Window; resources.ApplyResources(this.compressionUpDown, "compressionUpDown"); + this.compressionUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.compressionUpDown.ForeColor = System.Drawing.SystemColors.Window; this.compressionUpDown.Maximum = new decimal(new int[] { 9, 0, @@ -294,35 +287,44 @@ namespace PckStudio.Forms.Editor 0, 0, 0}); + this.compressionUpDown.Name = "compressionUpDown"; + this.compressionUpDown.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); // // metroLabel1 // resources.ApplyResources(this.metroLabel1, "metroLabel1"); - this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; - // - // AudioEditor - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.metroLabel1); - this.Controls.Add(this.compressionUpDown); - this.Controls.Add(this.playOverworldInCreative); - this.Controls.Add(this.treeView1); - this.Controls.Add(this.treeView2); - this.Controls.Add(this.menuStrip); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "AudioEditor"; + this.metroLabel1.Name = "metroLabel1"; + this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark; + // + // AudioEditor + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.Controls.Add(this.metroLabel1); + this.Controls.Add(this.compressionUpDown); + this.Controls.Add(this.playOverworldInCreative); + this.Controls.Add(this.treeView1); + this.Controls.Add(this.treeView2); + this.Controls.Add(this.menuStrip); + this.ForeColor = System.Drawing.Color.White; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "AudioEditor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.AudioEditor_FormClosing); this.Shown += new System.EventHandler(this.AudioEditor_Shown); - this.contextMenuStrip1.ResumeLayout(false); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.contextMenuStrip2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.contextMenuStrip1.ResumeLayout(false); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.contextMenuStrip2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.compressionUpDown)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs index 19a8a236..ab51d6a9 100644 --- a/PCK-Studio/Forms/Editor/AudioEditor.cs +++ b/PCK-Studio/Forms/Editor/AudioEditor.cs @@ -20,12 +20,13 @@ using PckStudio.Properties; using PckStudio.External.API.Miles; using PckStudio.Extensions; using PckStudio.Internal.App; +using PckStudio.ToolboxItems; // Audio Editor by MattNL and Miku-666 namespace PckStudio.Forms.Editor { - public partial class AudioEditor : MetroForm + public partial class AudioEditor : ThemeForm { public string defaultType = "yes"; PckAudioFile _audioFile = null; diff --git a/PCK-Studio/Forms/Editor/AudioEditor.resx b/PCK-Studio/Forms/Editor/AudioEditor.resx index bb8e68c4..75ecb075 100644 --- a/PCK-Studio/Forms/Editor/AudioEditor.resx +++ b/PCK-Studio/Forms/Editor/AudioEditor.resx @@ -125,20 +125,6 @@ 127, 8 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x - DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5 - jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC - - - - 168, 22 - - - Add Category - 168, 22 @@ -172,7 +158,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK - NAAAAk1TRnQBSQFMAgEBCQEAAdgBAAHYAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + NAAAAk1TRnQBSQFMAgEBCQEAAeABAAHgAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABMAMAAQEBAAEgBgABMBIAATkBXgFzAf8BOQFeAXMB/wE5AV4BcwH/AT4BYgF8Af8BMwFUAWkB/wEz AVQBaQH/AT4BYgF8Af8BMwFUAWkB/wE5AV4BcwH/ATkBXgFzAf8BOQFeAXMB/wEzAVQBaQH/ASYBPQFM Af8BMwFUAWkB/wEzAVQBaQH/ATkBXgFzAf/AAAFiAZgBvAH/AWIBmAG8Af8BTQGEAZ8B/wFNAYQBnwH/ @@ -400,7 +386,7 @@ - 20, 84 + 24, 97 0, 0, 0, 0 @@ -409,7 +395,7 @@ 0 - 128, 208 + 148, 240 12 @@ -426,6 +412,20 @@ 5 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx + DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x + 4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC + + + + 168, 22 + + + Add Category + 19, 8 @@ -435,11 +435,11 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8 - QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C - y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga - QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN - 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADdSURBVDhPzZJB + CoJQEIa9jy0iPFAnCDpAtG3ZooUE4b6oVtIuClpJIAgqZEVlKpqEHUAm5pGPmhTbRA18G//5P5iHgvA3 + I7ZniiQ7aVM9QZzcOKYbwVDbw8I6A2YAICBvg2VJdtjSs2Cse1Dt6tCYbliGO0UCFlLBxAj590yA0D4X + 1Ec7CK8JF9j+lUmWzoVlpYJaz4JKZ5ULZqWCT6F9Jhhowcv9eeBOoQBvPXoBrA0zF8yyR6V9LvCjGLYH + NxfMvipIMaQ3Ux6ClPYFsaUq/bmd0rspuIO/Pe3/bu5p+sr3gTvFEQAAAABJRU5ErkJggg== @@ -449,7 +449,7 @@ Save - 37, 20 + 37, 24 File @@ -460,26 +460,20 @@ Delete Unused BINKAs - - 220, 22 - - - Open Data Folder - 220, 22 Bulk Replace Existing Tracks - - 46, 20 + + 220, 22 Organize Tracks - 46, 20 + 47, 24 Tools @@ -512,16 +506,19 @@ BINKA Compression - 44, 20 + 44, 24 Help - 20, 60 + 0, 0 + + + 7, 2, 0, 2 - 410, 24 + 525, 28 11 @@ -541,32 +538,18 @@ 7 + + 220, 22 + + + Open Data Folder + Top, Bottom, Left, Right 282, 8 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABSSURBVDhP5c0x - DsAgDENRxt7/wmkNSpRGf0CCCZAegxNMM7MlGMp3dIU6dxhKf/QMNxRogeQC8ivw5Vn7C0heJlFA+kL5 - jWAohxRkde4wnGftBS90axNmphIGAAAAAElFTkSuQmCC - - - - 173, 22 - - - Add Entry - - - 173, 22 - - - Remove Entry - 173, 22 @@ -580,7 +563,7 @@ Convert To WAV - 174, 92 + 174, 48 contextMenuStrip2 @@ -589,10 +572,13 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 151, 84 + 176, 97 + + + 4, 4, 4, 4 - 279, 208 + 325, 240 13 @@ -609,11 +595,34 @@ 6 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMkMEa+wAAABPSURBVDhP5ZAx + DgAgCAMZ/f+HMcbYYOmg0UmHY2ibGzB3txNSgMKsHcD9ksBL5wcBPwyPCwLFJBjjVe4LFHGsgEDBAu6x + 4+AxAT9MkYJdKi90axNkwjxWAAAAAElFTkSuQmCC + + + + 173, 22 + + + Add Entry + + + 173, 22 + + + Remove Entry + True - 232, 64 + 270, 74 + + + 4, 4, 4, 4 194, 15 @@ -643,10 +652,13 @@ Bottom, Right - 310, 298 + 361, 344 + + + 4, 4, 4, 4 - 120, 20 + 140, 23 15 @@ -670,7 +682,10 @@ True - 93, 299 + 108, 345 + + + 4, 0, 4, 0 211, 19 @@ -700,10 +715,13 @@ 37 - 6, 13 + 7, 15 - 450, 330 + 525, 381 + + + Segoe UI, 9pt @@ -3214,8 +3232,11 @@ 0, 0 + + 4, 4, 4, 4 + - 450, 330 + 523, 375 CenterParent @@ -3223,24 +3244,30 @@ Music Editor - - addCategoryStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - removeCategoryStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + changeCategoryToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + catImages System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + addCategoryStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + fileToolStripMenuItem @@ -3265,18 +3292,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - openDataFolderToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - bulkReplaceExistingTracksToolStripMenuItem System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + organizeTracksToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + helpToolStripMenuItem @@ -3313,16 +3340,10 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - addEntryMenuItem + + openDataFolderToolStripMenuItem - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - removeEntryMenuItem - - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3337,10 +3358,22 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + addEntryMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + removeEntryMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + AudioEditor - PckStudio.ToolboxItems.ThemeForm, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null + PckStudio.ToolboxItems.ThemeForm, PCK-Studio, Version=7.0.0.2, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs index ed133825..b4496e67 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.Designer.cs @@ -63,10 +63,10 @@ this.treeView1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.treeView1.ContextMenuStrip = this.metroContextMenu1; this.treeView1.ForeColor = System.Drawing.Color.White; - this.treeView1.Location = new System.Drawing.Point(20, 84); + this.treeView1.Location = new System.Drawing.Point(24, 97); this.treeView1.Margin = new System.Windows.Forms.Padding(0); this.treeView1.Name = "treeView1"; - this.treeView1.Size = new System.Drawing.Size(186, 176); + this.treeView1.Size = new System.Drawing.Size(217, 203); this.treeView1.TabIndex = 13; this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); this.treeView1.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseClick); @@ -126,9 +126,10 @@ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip.Location = new System.Drawing.Point(20, 60); + this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(309, 24); + this.menuStrip.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + this.menuStrip.Size = new System.Drawing.Size(407, 28); this.menuStrip.TabIndex = 14; this.menuStrip.Text = "menuStrip1"; // @@ -138,7 +139,7 @@ this.saveToolStripMenuItem1}); this.fileToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 24); this.fileToolStripMenuItem.Text = "File"; // // saveToolStripMenuItem1 @@ -153,14 +154,15 @@ // this.helpToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 24); this.helpToolStripMenuItem.Text = "Help"; // // MobIsTamedCheckbox // this.MobIsTamedCheckbox.AutoSize = true; this.MobIsTamedCheckbox.Enabled = false; - this.MobIsTamedCheckbox.Location = new System.Drawing.Point(221, 104); + this.MobIsTamedCheckbox.Location = new System.Drawing.Point(258, 120); + this.MobIsTamedCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MobIsTamedCheckbox.Name = "MobIsTamedCheckbox"; this.MobIsTamedCheckbox.Size = new System.Drawing.Size(96, 15); this.MobIsTamedCheckbox.TabIndex = 22; @@ -173,7 +175,8 @@ // this.MobHasSaddleCheckbox.AutoSize = true; this.MobHasSaddleCheckbox.Enabled = false; - this.MobHasSaddleCheckbox.Location = new System.Drawing.Point(221, 136); + this.MobHasSaddleCheckbox.Location = new System.Drawing.Point(258, 157); + this.MobHasSaddleCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MobHasSaddleCheckbox.Name = "MobHasSaddleCheckbox"; this.MobHasSaddleCheckbox.Size = new System.Drawing.Size(106, 15); this.MobHasSaddleCheckbox.TabIndex = 23; @@ -188,7 +191,8 @@ this.zUpDown.DecimalPlaces = 3; this.zUpDown.Enabled = false; this.zUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.zUpDown.Location = new System.Drawing.Point(254, 220); + this.zUpDown.Location = new System.Drawing.Point(297, 254); + this.zUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.zUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -200,7 +204,7 @@ 0, -2147483648}); this.zUpDown.Name = "zUpDown"; - this.zUpDown.Size = new System.Drawing.Size(75, 20); + this.zUpDown.Size = new System.Drawing.Size(88, 23); this.zUpDown.TabIndex = 29; this.zUpDown.ValueChanged += new System.EventHandler(this.zUpDown_ValueChanged); // @@ -210,7 +214,8 @@ this.yUpDown.DecimalPlaces = 3; this.yUpDown.Enabled = false; this.yUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.yUpDown.Location = new System.Drawing.Point(254, 194); + this.yUpDown.Location = new System.Drawing.Point(297, 224); + this.yUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.yUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -222,14 +227,15 @@ 0, -2147483648}); this.yUpDown.Name = "yUpDown"; - this.yUpDown.Size = new System.Drawing.Size(75, 20); + this.yUpDown.Size = new System.Drawing.Size(88, 23); this.yUpDown.TabIndex = 28; this.yUpDown.ValueChanged += new System.EventHandler(this.yUpDown_ValueChanged); // // zLabel // this.zLabel.AutoSize = true; - this.zLabel.Location = new System.Drawing.Point(221, 220); + this.zLabel.Location = new System.Drawing.Point(258, 254); + this.zLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.zLabel.Name = "zLabel"; this.zLabel.Size = new System.Drawing.Size(20, 19); this.zLabel.TabIndex = 25; @@ -239,7 +245,8 @@ // yLabel // this.yLabel.AutoSize = true; - this.yLabel.Location = new System.Drawing.Point(222, 194); + this.yLabel.Location = new System.Drawing.Point(259, 224); + this.yLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.yLabel.Name = "yLabel"; this.yLabel.Size = new System.Drawing.Size(20, 19); this.yLabel.TabIndex = 24; @@ -252,7 +259,8 @@ this.xUpDown.DecimalPlaces = 3; this.xUpDown.Enabled = false; this.xUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.xUpDown.Location = new System.Drawing.Point(254, 168); + this.xUpDown.Location = new System.Drawing.Point(297, 194); + this.xUpDown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.xUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -264,14 +272,15 @@ 0, -2147483648}); this.xUpDown.Name = "xUpDown"; - this.xUpDown.Size = new System.Drawing.Size(75, 20); + this.xUpDown.Size = new System.Drawing.Size(88, 23); this.xUpDown.TabIndex = 31; this.xUpDown.ValueChanged += new System.EventHandler(this.xUpDown_ValueChanged); // // xLabel // this.xLabel.AutoSize = true; - this.xLabel.Location = new System.Drawing.Point(222, 168); + this.xLabel.Location = new System.Drawing.Point(259, 194); + this.xLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.xLabel.Name = "xLabel"; this.xLabel.Size = new System.Drawing.Size(20, 19); this.xLabel.TabIndex = 30; @@ -280,9 +289,10 @@ // // BehaviourEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(349, 280); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.ClientSize = new System.Drawing.Size(407, 323); this.Controls.Add(this.xUpDown); this.Controls.Add(this.xLabel); this.Controls.Add(this.zUpDown); @@ -293,12 +303,13 @@ this.Controls.Add(this.MobIsTamedCheckbox); this.Controls.Add(this.menuStrip); this.Controls.Add(this.treeView1); + this.Font = new System.Drawing.Font("Segoe UI", 9F); + this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Location = new System.Drawing.Point(0, 0); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "BehaviourEditor"; - this.Resizable = false; - this.Style = MetroFramework.MetroColorStyle.Silver; this.Text = "Behaviour Editor"; - this.Theme = MetroFramework.MetroThemeStyle.Dark; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BehaviourEditor_FormClosing); this.metroContextMenu1.ResumeLayout(false); this.menuStrip.ResumeLayout(false); diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs index c47957ee..bb3eec62 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs @@ -16,10 +16,11 @@ using PckStudio.Internal; using PckStudio.Extensions; using PckStudio.Internal.Json; using PckStudio.Internal.App; +using PckStudio.ToolboxItems; namespace PckStudio.Forms.Editor { - public partial class BehaviourEditor : MetroForm + public partial class BehaviourEditor : ThemeForm { // Behaviours File Format research by Miku and MattNL private readonly PckAsset _asset; diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.resx b/PCK-Studio/Forms/Editor/BehaviourEditor.resx index 64662fee..b78bf73d 100644 --- a/PCK-Studio/Forms/Editor/BehaviourEditor.resx +++ b/PCK-Studio/Forms/Editor/BehaviourEditor.resx @@ -127,11 +127,11 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8 - QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C - y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga - QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN - 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADdSURBVDhPzZJB + CoJQEIa9jy0iPFAnCDpAtG3ZooUE4b6oVtIuClpJIAgqZEVlKpqEHUAm5pGPmhTbRA18G//5P5iHgvA3 + I7ZniiQ7aVM9QZzcOKYbwVDbw8I6A2YAICBvg2VJdtjSs2Cse1Dt6tCYbliGO0UCFlLBxAj590yA0D4X + 1Ec7CK8JF9j+lUmWzoVlpYJaz4JKZ5ULZqWCT6F9Jhhowcv9eeBOoQBvPXoBrA0zF8yyR6V9LvCjGLYH + NxfMvipIMaQ3Ux6ClPYFsaUq/bmd0rspuIO/Pe3/bu5p+sr3gTvFEQAAAABJRU5ErkJggg==