diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs index 412d1846..349cb642 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs @@ -204,6 +204,6 @@ namespace PckStudio.Forms.Additional_Popups.Animation private System.Windows.Forms.TreeView FrameList; public System.Windows.Forms.ImageList TextureIcons; private CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton CancelButton; - private CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton SaveButton; + internal CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton SaveButton; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs index 8c61b4fa..148d6f06 100644 --- a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.Designer.cs @@ -78,6 +78,7 @@ this.RenameButton.BorderRadius = 10; this.RenameButton.BorderSize = 1; this.RenameButton.ClickedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.RenameButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.RenameButton.FlatAppearance.BorderSize = 0; this.RenameButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); this.RenameButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); @@ -112,6 +113,6 @@ #endregion public System.Windows.Forms.Label TextLabel; private MetroFramework.Controls.MetroTextBox InputTextBox; - private CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton RenameButton; + internal CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton RenameButton; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx index a2bf977c..e9205026 100644 --- a/PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx +++ b/PCK-Studio/Forms/Additional-Popups/RenamePrompt.resx @@ -200,11 +200,11 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAADWSURBVFhH7ZZBCsIwEEVDF1256gF04b1Ez6iX0L1u1Av0BN3FH3xFaQgVktQW8uCB6QzzB1dj - CoUUWGtbeZVHuZcrPMiTvMmW9vRo+JCHfL5/fqA9PZrdyK3cyYvsOUv3zdUa2vOioEr2VHyeFsLz/eVj - kP/7AvRHwzhvAZ4elGe0AM9oGBecR3nGC/AMQlsQ2soCC14gFsYtcIFYGOcF8PSgPIMFUsP8fAFjkP+f - BZQ7/UGioFpuZOgkW8ua9vS4pAF3OelR2kl3CYfOclfraC8UvjDmBTcW9LuwEs8rAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAANZJREFUWEft + lkEKwjAQRUMXXbnqAXThvUTPqJfQvW7UC/QE3cUffEVpCBWS1Bby4IHpDPMHV2MKhRRYa1t5lUe5lys8 + yJO8yZb29Gj4kId8vn9+oD09mt3IrdzJi+w5S/fN1Rra86KgSvZUfJ4WwvP95WOQ//sC9EfDOG8Bnh6U + Z7QAz2gYF5xHecYL8AxCWxDaygILXiAWxi1wgVgY5wXw9KA8gwVSw/x8AWOQ/58FlDv9QaKgWm5k6CRb + y5r29LikAXc56VHaSXcJh85yV+toLxS+MOYFNxb0u7ASzysAAAAASUVORK5CYII= @@ -2472,9 +2472,6 @@ vbLH9tge22N7bI/tsT22x/bYHttjC+3/B71iqRn22EDpAAAAAElFTkSuQmCC - - NoControl - 0, 0 diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index 28fd7b3e..313e66fd 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -246,13 +246,8 @@ namespace PckStudio.Forms.Editor private void addFrameToolStripMenuItem_Click(object sender, EventArgs e) { using FrameEditor diag = new FrameEditor(TextureIcons); - - //Miku, MNL or Phoenix, this function needs a bit of fixing. - //I removed the SaveBtn and replaced it with a button with the name 'SaveButton' - //It does not want to work though so this part needs fixing. - // - EternalModz - //diag.SaveButton.Text = "Add"; + diag.SaveButton.Text = "Add"; if (diag.ShowDialog(this) == DialogResult.OK) { currentAnimation.AddFrame(diag.FrameTextureIndex, TileName == "clock" || TileName == "compass" ? 1 : diag.FrameTime); diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs index 1a06d377..f37cc217 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs @@ -72,29 +72,30 @@ namespace PckStudio.Forms.Editor this.underwaterTab = new System.Windows.Forms.TabPage(); this.fogTab = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); - this.crEaTiiOn_ModernSlider1 = new CBH.Controls.CrEaTiiOn_ModernSlider(); - this.crEaTiiOn_ModernSlider2 = new CBH.Controls.CrEaTiiOn_ModernSlider(); + this.SetColorButton = new CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton(); + this.colorSliderVertical1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorSliderVertical(); + this.colorBox2D1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorBox2D(); + this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.crEaTiiOn_ModernSlider3 = new CBH.Controls.CrEaTiiOn_ModernSlider(); this.crEaTiiOn_ModernSlider4 = new CBH.Controls.CrEaTiiOn_ModernSlider(); - this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); - this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); - this.colorBox2D1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorBox2D(); - this.colorSliderVertical1 = new MechanikaDesign.WinForms.UI.ColorPicker.ColorSliderVertical(); - this.SetColorButton = new CBH.Ultimate.Controls.CrEaTiiOn_Ultimate_GradientButton(); + this.crEaTiiOn_ModernSlider2 = new CBH.Controls.CrEaTiiOn_ModernSlider(); + this.crEaTiiOn_ModernSlider1 = new CBH.Controls.CrEaTiiOn_ModernSlider(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.tabControl.SuspendLayout(); - this.colorsTab.SuspendLayout(); - this.ColorContextMenu.SuspendLayout(); + this.menuStrip.SuspendLayout(); this.waterTab.SuspendLayout(); + this.ColorContextMenu.SuspendLayout(); + this.colorsTab.SuspendLayout(); + this.tabControl.SuspendLayout(); this.underwaterTab.SuspendLayout(); this.fogTab.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.SuspendLayout(); // // metroTextBox1 @@ -112,8 +113,7 @@ namespace PckStudio.Forms.Editor this.metroTextBox1.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; this.metroTextBox1.CustomButton.UseSelectable = true; this.metroTextBox1.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible"))); - this.metroTextBox1.Lines = new string[] { - "Filter by searching..."}; + this.metroTextBox1.Lines = new string[0]; resources.ApplyResources(this.metroTextBox1, "metroTextBox1"); this.metroTextBox1.MaxLength = 32767; this.metroTextBox1.Name = "metroTextBox1"; @@ -365,8 +365,8 @@ namespace PckStudio.Forms.Editor this.underwaterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(10)))), ((int)(((byte)(10)))), ((int)(((byte)(10))))); this.underwaterTreeView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.underwaterTreeView.ContextMenuStrip = this.ColorContextMenu; - this.underwaterTreeView.ForeColor = System.Drawing.Color.White; resources.ApplyResources(this.underwaterTreeView, "underwaterTreeView"); + this.underwaterTreeView.ForeColor = System.Drawing.Color.White; this.underwaterTreeView.Name = "underwaterTreeView"; this.underwaterTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView3_AfterSelect); this.underwaterTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView3_KeyDown); @@ -450,49 +450,74 @@ namespace PckStudio.Forms.Editor resources.ApplyResources(this.panel1, "panel1"); this.panel1.Name = "panel1"; // - // crEaTiiOn_ModernSlider1 + // SetColorButton // - this.crEaTiiOn_ModernSlider1.BarThickness = 4; - this.crEaTiiOn_ModernSlider1.BigStepIncrement = 10; - this.crEaTiiOn_ModernSlider1.Colors = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider1.Colors"))); - this.crEaTiiOn_ModernSlider1.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality; - this.crEaTiiOn_ModernSlider1.Cursor = System.Windows.Forms.Cursors.Hand; - this.crEaTiiOn_ModernSlider1.FilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(119)))), ((int)(((byte)(215))))); - this.crEaTiiOn_ModernSlider1.InterpolationType = System.Drawing.Drawing2D.InterpolationMode.HighQualityBilinear; - this.crEaTiiOn_ModernSlider1.KnobColor = System.Drawing.Color.Gray; - this.crEaTiiOn_ModernSlider1.KnobImage = null; - resources.ApplyResources(this.crEaTiiOn_ModernSlider1, "crEaTiiOn_ModernSlider1"); - this.crEaTiiOn_ModernSlider1.Max = 100; - this.crEaTiiOn_ModernSlider1.Name = "crEaTiiOn_ModernSlider1"; - this.crEaTiiOn_ModernSlider1.Percentage = 50; - this.crEaTiiOn_ModernSlider1.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; - this.crEaTiiOn_ModernSlider1.Positions = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider1.Positions"))); - this.crEaTiiOn_ModernSlider1.QuickHopping = false; - this.crEaTiiOn_ModernSlider1.SliderStyle = CBH.Controls.CrEaTiiOn_ModernSlider.Style.Windows10; - this.crEaTiiOn_ModernSlider1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; - this.crEaTiiOn_ModernSlider1.UnfilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(26)))), ((int)(((byte)(169)))), ((int)(((byte)(219))))); + this.SetColorButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.SetColorButton.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.SetColorButton.BorderRadius = 10; + this.SetColorButton.BorderSize = 1; + this.SetColorButton.ClickedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.SetColorButton.FlatAppearance.BorderSize = 0; + this.SetColorButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.SetColorButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); + resources.ApplyResources(this.SetColorButton, "SetColorButton"); + this.SetColorButton.ForeColor = System.Drawing.Color.White; + this.SetColorButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.SetColorButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.SetColorButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); + this.SetColorButton.Name = "SetColorButton"; + this.SetColorButton.TextColor = System.Drawing.Color.White; + this.SetColorButton.UseVisualStyleBackColor = false; + this.SetColorButton.Click += new System.EventHandler(this.SetColorButton_Click); // - // crEaTiiOn_ModernSlider2 + // colorSliderVertical1 // - this.crEaTiiOn_ModernSlider2.BarThickness = 4; - this.crEaTiiOn_ModernSlider2.BigStepIncrement = 10; - this.crEaTiiOn_ModernSlider2.Colors = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider2.Colors"))); - this.crEaTiiOn_ModernSlider2.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality; - this.crEaTiiOn_ModernSlider2.Cursor = System.Windows.Forms.Cursors.Hand; - this.crEaTiiOn_ModernSlider2.FilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(119)))), ((int)(((byte)(215))))); - this.crEaTiiOn_ModernSlider2.InterpolationType = System.Drawing.Drawing2D.InterpolationMode.HighQualityBilinear; - this.crEaTiiOn_ModernSlider2.KnobColor = System.Drawing.Color.Gray; - this.crEaTiiOn_ModernSlider2.KnobImage = null; - resources.ApplyResources(this.crEaTiiOn_ModernSlider2, "crEaTiiOn_ModernSlider2"); - this.crEaTiiOn_ModernSlider2.Max = 100; - this.crEaTiiOn_ModernSlider2.Name = "crEaTiiOn_ModernSlider2"; - this.crEaTiiOn_ModernSlider2.Percentage = 50; - this.crEaTiiOn_ModernSlider2.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; - this.crEaTiiOn_ModernSlider2.Positions = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider2.Positions"))); - this.crEaTiiOn_ModernSlider2.QuickHopping = false; - this.crEaTiiOn_ModernSlider2.SliderStyle = CBH.Controls.CrEaTiiOn_ModernSlider.Style.Windows10; - this.crEaTiiOn_ModernSlider2.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; - this.crEaTiiOn_ModernSlider2.UnfilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(26)))), ((int)(((byte)(169)))), ((int)(((byte)(219))))); + this.colorSliderVertical1.BackColor = System.Drawing.Color.Transparent; + this.colorSliderVertical1.ColorMode = MechanikaDesign.WinForms.UI.ColorPicker.ColorModes.Hue; + this.colorSliderVertical1.ColorRGB = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + resources.ApplyResources(this.colorSliderVertical1, "colorSliderVertical1"); + this.colorSliderVertical1.Name = "colorSliderVertical1"; + this.colorSliderVertical1.NubColor = System.Drawing.Color.Empty; + this.colorSliderVertical1.Position = 0; + // + // colorBox2D1 + // + this.colorBox2D1.ColorMode = MechanikaDesign.WinForms.UI.ColorPicker.ColorModes.Hue; + this.colorBox2D1.ColorRGB = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + resources.ApplyResources(this.colorBox2D1, "colorBox2D1"); + this.colorBox2D1.Name = "colorBox2D1"; + // + // numericUpDown4 + // + this.numericUpDown4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.numericUpDown4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.numericUpDown4.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.numericUpDown4, "numericUpDown4"); + this.numericUpDown4.Name = "numericUpDown4"; + // + // numericUpDown3 + // + this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.numericUpDown3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.numericUpDown3.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); + this.numericUpDown3.Name = "numericUpDown3"; + // + // numericUpDown2 + // + this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.numericUpDown2.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); + this.numericUpDown2.Name = "numericUpDown2"; + // + // numericUpDown1 + // + this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); + this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.numericUpDown1.ForeColor = System.Drawing.Color.White; + resources.ApplyResources(this.numericUpDown1, "numericUpDown1"); + this.numericUpDown1.Name = "numericUpDown1"; // // crEaTiiOn_ModernSlider3 // @@ -538,74 +563,49 @@ namespace PckStudio.Forms.Editor this.crEaTiiOn_ModernSlider4.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; this.crEaTiiOn_ModernSlider4.UnfilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(26)))), ((int)(((byte)(169)))), ((int)(((byte)(219))))); // - // numericUpDown1 + // crEaTiiOn_ModernSlider2 // - this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown1.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown1, "numericUpDown1"); - this.numericUpDown1.Name = "numericUpDown1"; + this.crEaTiiOn_ModernSlider2.BarThickness = 4; + this.crEaTiiOn_ModernSlider2.BigStepIncrement = 10; + this.crEaTiiOn_ModernSlider2.Colors = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider2.Colors"))); + this.crEaTiiOn_ModernSlider2.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality; + this.crEaTiiOn_ModernSlider2.Cursor = System.Windows.Forms.Cursors.Hand; + this.crEaTiiOn_ModernSlider2.FilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(119)))), ((int)(((byte)(215))))); + this.crEaTiiOn_ModernSlider2.InterpolationType = System.Drawing.Drawing2D.InterpolationMode.HighQualityBilinear; + this.crEaTiiOn_ModernSlider2.KnobColor = System.Drawing.Color.Gray; + this.crEaTiiOn_ModernSlider2.KnobImage = null; + resources.ApplyResources(this.crEaTiiOn_ModernSlider2, "crEaTiiOn_ModernSlider2"); + this.crEaTiiOn_ModernSlider2.Max = 100; + this.crEaTiiOn_ModernSlider2.Name = "crEaTiiOn_ModernSlider2"; + this.crEaTiiOn_ModernSlider2.Percentage = 50; + this.crEaTiiOn_ModernSlider2.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; + this.crEaTiiOn_ModernSlider2.Positions = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider2.Positions"))); + this.crEaTiiOn_ModernSlider2.QuickHopping = false; + this.crEaTiiOn_ModernSlider2.SliderStyle = CBH.Controls.CrEaTiiOn_ModernSlider.Style.Windows10; + this.crEaTiiOn_ModernSlider2.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; + this.crEaTiiOn_ModernSlider2.UnfilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(26)))), ((int)(((byte)(169)))), ((int)(((byte)(219))))); // - // numericUpDown2 + // crEaTiiOn_ModernSlider1 // - this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown2.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown2, "numericUpDown2"); - this.numericUpDown2.Name = "numericUpDown2"; - // - // numericUpDown3 - // - this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown3.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown3, "numericUpDown3"); - this.numericUpDown3.Name = "numericUpDown3"; - // - // numericUpDown4 - // - this.numericUpDown4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.numericUpDown4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.numericUpDown4.ForeColor = System.Drawing.Color.White; - resources.ApplyResources(this.numericUpDown4, "numericUpDown4"); - this.numericUpDown4.Name = "numericUpDown4"; - // - // colorBox2D1 - // - this.colorBox2D1.ColorMode = MechanikaDesign.WinForms.UI.ColorPicker.ColorModes.Hue; - this.colorBox2D1.ColorRGB = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - resources.ApplyResources(this.colorBox2D1, "colorBox2D1"); - this.colorBox2D1.Name = "colorBox2D1"; - // - // colorSliderVertical1 - // - this.colorSliderVertical1.BackColor = System.Drawing.Color.Transparent; - this.colorSliderVertical1.ColorMode = MechanikaDesign.WinForms.UI.ColorPicker.ColorModes.Hue; - this.colorSliderVertical1.ColorRGB = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - resources.ApplyResources(this.colorSliderVertical1, "colorSliderVertical1"); - this.colorSliderVertical1.Name = "colorSliderVertical1"; - this.colorSliderVertical1.NubColor = System.Drawing.Color.Empty; - this.colorSliderVertical1.Position = 0; - // - // SetColorButton - // - this.SetColorButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.SetColorButton.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.SetColorButton.BorderRadius = 10; - this.SetColorButton.BorderSize = 1; - this.SetColorButton.ClickedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.SetColorButton.FlatAppearance.BorderSize = 0; - this.SetColorButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15))))); - this.SetColorButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); - resources.ApplyResources(this.SetColorButton, "SetColorButton"); - this.SetColorButton.ForeColor = System.Drawing.Color.White; - this.SetColorButton.GradientColorPrimary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.SetColorButton.GradientColorSecondary = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); - this.SetColorButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); - this.SetColorButton.Name = "SetColorButton"; - this.SetColorButton.TextColor = System.Drawing.Color.White; - this.SetColorButton.UseVisualStyleBackColor = false; - this.SetColorButton.Click += new System.EventHandler(this.SetColorButton_Click); + this.crEaTiiOn_ModernSlider1.BarThickness = 4; + this.crEaTiiOn_ModernSlider1.BigStepIncrement = 10; + this.crEaTiiOn_ModernSlider1.Colors = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider1.Colors"))); + this.crEaTiiOn_ModernSlider1.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality; + this.crEaTiiOn_ModernSlider1.Cursor = System.Windows.Forms.Cursors.Hand; + this.crEaTiiOn_ModernSlider1.FilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(119)))), ((int)(((byte)(215))))); + this.crEaTiiOn_ModernSlider1.InterpolationType = System.Drawing.Drawing2D.InterpolationMode.HighQualityBilinear; + this.crEaTiiOn_ModernSlider1.KnobColor = System.Drawing.Color.Gray; + this.crEaTiiOn_ModernSlider1.KnobImage = null; + resources.ApplyResources(this.crEaTiiOn_ModernSlider1, "crEaTiiOn_ModernSlider1"); + this.crEaTiiOn_ModernSlider1.Max = 100; + this.crEaTiiOn_ModernSlider1.Name = "crEaTiiOn_ModernSlider1"; + this.crEaTiiOn_ModernSlider1.Percentage = 50; + this.crEaTiiOn_ModernSlider1.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; + this.crEaTiiOn_ModernSlider1.Positions = ((System.Collections.Generic.List)(resources.GetObject("crEaTiiOn_ModernSlider1.Positions"))); + this.crEaTiiOn_ModernSlider1.QuickHopping = false; + this.crEaTiiOn_ModernSlider1.SliderStyle = CBH.Controls.CrEaTiiOn_ModernSlider.Style.Windows10; + this.crEaTiiOn_ModernSlider1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; + this.crEaTiiOn_ModernSlider1.UnfilledColor = System.Drawing.Color.FromArgb(((int)(((byte)(26)))), ((int)(((byte)(169)))), ((int)(((byte)(219))))); // // COLEditor // @@ -619,18 +619,20 @@ namespace PckStudio.Forms.Editor this.ForeColor = System.Drawing.Color.White; this.Name = "COLEditor"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.tabControl.ResumeLayout(false); - this.colorsTab.ResumeLayout(false); - this.ColorContextMenu.ResumeLayout(false); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); this.waterTab.ResumeLayout(false); + this.ColorContextMenu.ResumeLayout(false); + this.colorsTab.ResumeLayout(false); + this.tabControl.ResumeLayout(false); this.underwaterTab.ResumeLayout(false); this.fogTab.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.ResumeLayout(false); } diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx index 43713cc8..6db27444 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.resx +++ b/PCK-Studio/Forms/Editor/COLEditor.resx @@ -147,9 +147,6 @@ 24 - - Filter by searching... - metroTextBox1 @@ -380,19 +377,18 @@ - 180, 22 + 98, 22 Save - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAADfSURBVFhH7Zc9CsJAEIUXtNTbeIRcwVPYC2LhcUI8h5X3sVCL9U32LYhksz+TRpgPHoRk5vGV - GWek8N6vkB2yL0zHVT0o2yJ3pJYjK3Sg6Bz6mtBLoKQPXSNdQW7IG4noJFAwhB7v+WoWjF2RB/KUHXLh - 53qw3CIgLCOBxVYBQS+BJY2AoJPAglZAEIlXeBw5cDwPhpcQEEQiMnA8jwyHnTKBOVgjmIAJmIAJmIAJ - /JfA90/p1A1Qk0jP+jwY1vyWpzixPg+GWw+TFNK1YX0ZWIin2dQdUBPpWLPW+MG5DyU9ZWg+UN+KAAAA - AElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAN9JREFUWEft + lz0KwkAQhRe01Nt4hFzBU9gLYuFxQjyHlfexUIv1TfYtiGSzP5NGmA8ehGTm8ZUZZ6Tw3q+QHbIvTMdV + PSjbInekliMrdKDoHPqa0EugpA9dI11BbsgbiegkUDCEHu/5ahaMXZEH8pQdcuHnerDcIiAsI4HFVgFB + L4EljYCgk8CCVkAQiVd4HDlwPA+GlxAQRCIycDyPDIedMoE5WCOYgAmYgAmYgAn8l8D3T+nUDVCTSM/6 + PBjW/JanOLE+D4ZbD5MU0rVhfRlYiKfZ1B1QE+lYs9b4wbkPJT1laD5Q34oAAAAASUVORK5CYII= @@ -481,15 +477,15 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAGvSURBVFhH7Za5SgNRGEbTBYWgRhRMrATFRxALQcSXsItbLxaSwicSA3YaENRGQezcRQttLcQX - uJ5/7jegGcIsWQYhBw7M/bfJMsstDPjXOKFl/9H5+/cBONckbmEDbzHEji22iRMq7x4MLWIdvzEOq9nD - oto7g0EVvMKQY6zhbLDy2PE6ngQrzyVOaUw2GDCNHzYN7nBBqQAf/nsNsFzE+yDh3DtWlEoHjcN4Y1Pg - DEeUioXaUTy3RrjGIaWSQ9N+0O7cE44pnBh6yvhiA6CucDJoGMfwgltSODX0LvsR7gvLCsdDsd1ORlOh - zDDj1I9yNYXiofjI97gNhTLDjG0/yjUUiofiZ9/j5hTKDDPm/Sj3oFB7VBhB6dSoPYLSUZSPoHRq1B5B - 6fZQ04u/4FGheCjO/SLM/TbM90Fk0JDfo9igqfVllPgbUGu/4IU1QraXkUFjFe2VarziilIBPhx5Ha/i - W5DwvVWlssGA1g1JE23zMROsPHZsMcuFdL4hCWGQbcl28RPjsJod7M6W7DcMLeEaHqJdnCF2fICWK6m8 - 99iZDS37j86f3wcY0DmFwg/cPTmHFnfblgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAa9JREFUWEft + lrlKA1EYRtMFhaBGFEysBMVHEAtBxJewi1svFpLCJxIDdhoQ1EZB7NxFC20txBe4nn/uN6AZwixZBiEH + Dsz9t8kyyy0M+Nc4oWX/0fn79wE41yRuYQNvMcSOLbaJEyrvHgwtYh2/MQ6r2cOi2juDQRW8wpBjrOFs + sPLY8TqeBCvPJU5pTDYYMI0fNg3ucEGpAB/+ew2wXMT7IOHcO1aUSgeNw3hjU+AMR5SKhdpRPLdGuMYh + pZJD037Q7twTjimcGHrK+GIDoK5wMmgYx/CCW1I4NfQu+xHuC8sKx0Ox3U5GU6HMMOPUj3I1heKh+Mj3 + uA2FMsOMbT/KNRSKh+Jn3+PmFMoMM+b9KPegUHtUGEHp1Kg9gtJRlI+gdGrUHkHp9lDTi7/gUaF4KM79 + Isz9Nsz3QWTQkN+j2KCp9WWU+BtQa7/ghTVCtpeRQWMV7ZVqvOKKUgE+HHkdr+JbkPC9VaWywYDWDUkT + bfMxE6w8dmwxy4V0viEJYZBtyXbxE+Owmh3szpbsNwwt4Roeol2cIXZ8gJYrqbz32JkNLfuPzp/fBxjQ + OYXCD9w9OYcWd9uWAAAAAElFTkSuQmCC @@ -525,8 +521,23 @@ 125, 17 + + 134, 22 + + + 134, 22 + + + Copy Color + + + 134, 22 + + + Paste Color + - 187, 70 + 135, 70 ColorContextMenu @@ -537,17 +548,17 @@ Fill - - 186, 22 + + 0, 0 - - Copy Color + + No 320, 335 - - Paste Color + + 0 waterTreeView @@ -585,31 +596,16 @@ 1 - + Fill - + 0, 0 - - No + + 320, 335 - - 320, 533 - - - 0 - - - waterTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - waterTab - - + 0 @@ -763,7 +759,7 @@ $this - 0 + 1 Flat @@ -3684,33 +3680,12 @@ 0, 0 - - 0, 0 - CenterParent COL Editor - - restoreOriginalColorToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - copyColorToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pasteColorToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - fileToolStripMenuItem @@ -3807,6 +3782,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + restoreOriginalColorToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + copyColorToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pasteColorToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + COLEditor diff --git a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs index fda8cf84..fad54f10 100644 --- a/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs +++ b/PCK-Studio/Forms/Editor/GameRuleFileEditor.cs @@ -169,10 +169,7 @@ namespace PckStudio.Forms.Editor using (RenamePrompt prompt = new RenamePrompt("")) { - //Miku, NML or PhoenixARC, this happened after I replaced the old button, it needs fixing. Same issue as all of the other issues. - // - EternalModz - - //prompt.SaveButton.Text = "Add"; + prompt.RenameButton.Text = "Add"; if (MessageBox.Show($"Add Game Rule to {parentRule.Name}", "Attention", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes && prompt.ShowDialog() == DialogResult.OK && diff --git a/PCK-Studio/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs index 560f954d..6049e1ed 100644 --- a/PCK-Studio/Forms/Editor/LOCEditor.cs +++ b/PCK-Studio/Forms/Editor/LOCEditor.cs @@ -60,10 +60,7 @@ namespace PckStudio.Forms.Editor if (treeViewLocKeys.SelectedNode is TreeNode) using (RenamePrompt prompt = new RenamePrompt("")) { - //Miku, NML, PhoenixARC, here is another one of those problems. - // - EternalModz - - //prompt.OKButton.Text = "Add"; + prompt.RenameButton.Text = "Add"; if (prompt.ShowDialog() == DialogResult.OK && !currentLoc.LocKeys.ContainsKey(prompt.NewText) && currentLoc.AddLocKey(prompt.NewText, "")) diff --git a/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs index 775e4203..5a15f527 100644 --- a/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs +++ b/PCK-Studio/Forms/Utilities/Skins/ANIMEditor.cs @@ -169,11 +169,7 @@ namespace PckStudio.Forms.Utilities.Skins if (!first) MessageBox.Show($"The following value \"{new_value}\" is not valid. Please try again."); RenamePrompt diag = new RenamePrompt(new_value); diag.TextLabel.Text = "ANIM"; - - //Miku, NML, PhoenixARC, here is another one of those problems. - // - EternalModz - - //diag.SaveButton.Text = "Ok"; + diag.RenameButton.Text = "Ok"; if (diag.ShowDialog() == DialogResult.OK) { new_value = diag.NewText; diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 5d22d93b..38d6074d 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -1277,11 +1277,8 @@ namespace PckStudio { checkSaveState(); RenamePrompt namePrompt = new RenamePrompt(""); + namePrompt.RenameButton.Text = "Ok"; - //Miku, NML, PhoenixARC, here is another one of those problems. - // - EternalModz - - //namePrompt.OKButton.Text = "Ok"; if (namePrompt.ShowDialog() == DialogResult.OK) { currentPCK = InitializePack(new Random().Next(8000, int.MaxValue), 0, namePrompt.NewText, true); @@ -1627,11 +1624,7 @@ namespace PckStudio private void folderToolStripMenuItem_Click(object sender, EventArgs e) { RenamePrompt folderNamePrompt = new RenamePrompt(""); - - //Miku, NML, PhoenixARC, here is another one of those problems. - // - EternalModz - - //folderNamePrompt.OKButton.Text = "Add"; + folderNamePrompt.RenameButton.Text = "Add"; if (folderNamePrompt.ShowDialog() == DialogResult.OK) { TreeNode folerNode = CreateNode(folderNamePrompt.NewText);