diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs index fc45338f..762110bc 100644 --- a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs @@ -81,7 +81,7 @@ // // saveButton // - this.saveButton.Location = new System.Drawing.Point(291, 593); + this.saveButton.Location = new System.Drawing.Point(281, 546); this.saveButton.Margin = new System.Windows.Forms.Padding(4); this.saveButton.Name = "saveButton"; this.saveButton.Size = new System.Drawing.Size(147, 26); @@ -108,7 +108,7 @@ 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(25, 171); + this.effectsGroup.Location = new System.Drawing.Point(15, 124); this.effectsGroup.Margin = new System.Windows.Forms.Padding(4); this.effectsGroup.Name = "effectsGroup"; this.effectsGroup.Padding = new System.Windows.Forms.Padding(4); @@ -350,7 +350,7 @@ 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(491, 211); + this.effectsGroup2.Location = new System.Drawing.Point(481, 164); this.effectsGroup2.Margin = new System.Windows.Forms.Padding(4); this.effectsGroup2.Name = "effectsGroup2"; this.effectsGroup2.Padding = new System.Windows.Forms.Padding(4); @@ -464,7 +464,7 @@ 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(25, 448); + this.groupBox1.Location = new System.Drawing.Point(15, 401); this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); @@ -648,7 +648,7 @@ // // copyButton // - this.copyButton.Location = new System.Drawing.Point(496, 138); + this.copyButton.Location = new System.Drawing.Point(486, 91); this.copyButton.Margin = new System.Windows.Forms.Padding(4); this.copyButton.Name = "copyButton"; this.copyButton.Size = new System.Drawing.Size(202, 26); @@ -660,7 +660,7 @@ // // importButton // - this.importButton.Location = new System.Drawing.Point(38, 138); + this.importButton.Location = new System.Drawing.Point(28, 91); this.importButton.Margin = new System.Windows.Forms.Padding(4); this.importButton.Name = "importButton"; this.importButton.Size = new System.Drawing.Size(217, 26); @@ -672,7 +672,7 @@ // // exportButton // - this.exportButton.Location = new System.Drawing.Point(267, 138); + this.exportButton.Location = new System.Drawing.Point(257, 91); this.exportButton.Margin = new System.Windows.Forms.Padding(4); this.exportButton.Name = "exportButton"; this.exportButton.Size = new System.Drawing.Size(217, 26); @@ -687,7 +687,7 @@ this.animValue.AutoSize = true; this.animValue.FontSize = MetroFramework.MetroLabelSize.Tall; this.animValue.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.animValue.Location = new System.Drawing.Point(304, 69); + this.animValue.Location = new System.Drawing.Point(294, 22); 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); @@ -698,7 +698,7 @@ // // uncheckAllButton // - this.uncheckAllButton.Location = new System.Drawing.Point(267, 104); + this.uncheckAllButton.Location = new System.Drawing.Point(257, 57); this.uncheckAllButton.Margin = new System.Windows.Forms.Padding(4); this.uncheckAllButton.Name = "uncheckAllButton"; this.uncheckAllButton.Size = new System.Drawing.Size(217, 26); @@ -710,7 +710,7 @@ // // checkAllButton // - this.checkAllButton.Location = new System.Drawing.Point(38, 104); + this.checkAllButton.Location = new System.Drawing.Point(28, 57); this.checkAllButton.Margin = new System.Windows.Forms.Padding(4); this.checkAllButton.Name = "checkAllButton"; this.checkAllButton.Size = new System.Drawing.Size(217, 26); @@ -729,7 +729,7 @@ // // resetButton // - this.resetButton.Location = new System.Drawing.Point(496, 104); + this.resetButton.Location = new System.Drawing.Point(486, 57); this.resetButton.Margin = new System.Windows.Forms.Padding(4); this.resetButton.Name = "resetButton"; this.resetButton.Size = new System.Drawing.Size(202, 26); @@ -741,7 +741,7 @@ // // templateButton // - this.templateButton.Location = new System.Drawing.Point(496, 178); + this.templateButton.Location = new System.Drawing.Point(486, 131); this.templateButton.Margin = new System.Windows.Forms.Padding(4); this.templateButton.Name = "templateButton"; this.templateButton.Size = new System.Drawing.Size(202, 26); diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs index 1084b520..cddaf94d 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.Designer.cs @@ -66,7 +66,8 @@ // frameTreeView // this.frameTreeView.AllowDrop = true; - this.frameTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.frameTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.frameTreeView.BorderStyle = System.Windows.Forms.BorderStyle.None; this.frameTreeView.ContextMenuStrip = this.contextMenuStrip1; this.frameTreeView.Dock = System.Windows.Forms.DockStyle.Left; this.frameTreeView.ForeColor = System.Drawing.Color.White; @@ -118,7 +119,7 @@ // menuStrip // this.menuStrip.AutoSize = false; - this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, @@ -310,7 +311,7 @@ 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(199, 22); + this.tileLabel.Size = new System.Drawing.Size(57, 19); this.tileLabel.TabIndex = 20; this.tileLabel.Text = "tileLabel"; this.tileLabel.Theme = MetroFramework.MetroThemeStyle.Dark; diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index ed1c9d92..79b7df67 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -106,7 +106,6 @@ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.themeColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.videosToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.donateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toNobledezJackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -115,6 +114,7 @@ this.forEternalModzContributorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.joinDevelopmentDiscordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.trelloBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.themeColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.howToMakeABasicSkinPackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.howToMakeACustomSkinModelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -718,13 +718,6 @@ resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // - // themeColorToolStripMenuItem - // - this.themeColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.Theme_Color_Icon; - this.themeColorToolStripMenuItem.Name = "themeColorToolStripMenuItem"; - resources.ApplyResources(this.themeColorToolStripMenuItem, "themeColorToolStripMenuItem"); - this.themeColorToolStripMenuItem.Click += new System.EventHandler(this.themeColorToolStripMenuItem_Click); - // // videosToolStripMenuItem // this.videosToolStripMenuItem.Image = global::PckStudio.Properties.Resources.Minecraft_Book_Videos_Icon; @@ -778,6 +771,13 @@ resources.ApplyResources(this.trelloBoardToolStripMenuItem, "trelloBoardToolStripMenuItem"); this.trelloBoardToolStripMenuItem.Click += new System.EventHandler(this.trelloBoardToolStripMenuItem_Click); // + // themeColorToolStripMenuItem + // + this.themeColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.Theme_Color_Icon; + this.themeColorToolStripMenuItem.Name = "themeColorToolStripMenuItem"; + resources.ApplyResources(this.themeColorToolStripMenuItem, "themeColorToolStripMenuItem"); + this.themeColorToolStripMenuItem.Click += new System.EventHandler(this.themeColorToolStripMenuItem_Click); + // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Image = global::PckStudio.Properties.Resources.settingsAsset; diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index 73884594..3c5cdf9f 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -7031,12 +7031,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - themeColorToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - videosToolStripMenuItem @@ -7085,6 +7079,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + themeColorToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + settingsToolStripMenuItem